DRILL-977: changed container style to fluid. Added column filter.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/78bc8563 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/78bc8563 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/78bc8563 Branch: refs/heads/master Commit: 78bc8563eb546f7c484b341b181a626294f8cfcd Parents: 7821b51 Author: Sudheesh Katkam <[email protected]> Authored: Thu Jun 12 15:07:21 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Mon Jun 16 12:44:10 2014 -0700 ---------------------------------------------------------------------- exec/java-exec/src/main/resources/rest/generic.ftl | 4 ++-- .../src/main/resources/rest/query/result.ftl | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/78bc8563/exec/java-exec/src/main/resources/rest/generic.ftl ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/resources/rest/generic.ftl b/exec/java-exec/src/main/resources/rest/generic.ftl index 1a47915..c5ed400 100644 --- a/exec/java-exec/src/main/resources/rest/generic.ftl +++ b/exec/java-exec/src/main/resources/rest/generic.ftl @@ -41,7 +41,7 @@ <body role="document"> <div class="navbar navbar-inverse navbar-fixed-top" role="navigation"> - <div class="container"> + <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="sr-only">Toggle navigation</span> @@ -64,7 +64,7 @@ </div> </div> - <div class="container theme-showcase" role="main"> + <div class="container-fluid" role="main"> <@page_body/> </div> </body> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/78bc8563/exec/java-exec/src/main/resources/rest/query/result.ftl ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/resources/rest/query/result.ftl b/exec/java-exec/src/main/resources/rest/query/result.ftl index bedbf9f..a3cb0ce 100644 --- a/exec/java-exec/src/main/resources/rest/query/result.ftl +++ b/exec/java-exec/src/main/resources/rest/query/result.ftl @@ -17,6 +17,9 @@ <script type="text/javascript" language="javascript" src="//code.jquery.com/jquery-1.10.2.min.js"></script> <script type="text/javascript" language="javascript" src="//cdn.datatables.net/1.10.0/js/jquery.dataTables.min.js"></script> <script type="text/javascript" language="javascript" src="//cdn.datatables.net/plug-ins/be7019ee387/integration/jqueryui/dataTables.jqueryui.js"></script> + + <link rel="stylesheet" type="text/css" href="//cdn.datatables.net/colvis/1.1.0/css/dataTables.colVis.css"> + <script type="text/javascript" language="javascript" src="//cdn.datatables.net/colvis/1.1.0/js/dataTables.colVis.min.js"></script> </#macro> <#macro page_body> @@ -25,16 +28,16 @@ </div> <h2>Result</h2> <div style="width=100%; overflow: auto;"> - <table id="relation" class="table table-striped table-bordered table-condensed" style="display: table; table-layout: fized; width=100%;"> + <table id="relation" class="table table-striped table-bordered table-condensed" style="table-layout: auto; width=100%;"> <#assign rows = model[0]> - <thead style="overflow: auto;"> + <thead> <tr> <#list rows as row> <th>${row}</th> </#list> </tr> </thead> - <tbody style="overflow: auto;"> + <tbody> <#list model as rows> <#if (rows_index > 0)> <tr> @@ -49,7 +52,10 @@ </div> <script charset="utf-8"> $(document).ready(function() { - $('#relation').dataTable( { "scrollX" : true } ); + $('#relation').dataTable( { + "scrollX" : true, + "dom": '<Clfrtip>' + } ); } ); </script> </#macro>
