This is an automated email from the ASF dual-hosted git repository. dzamo pushed a commit to branch 1.21 in repository https://gitbox.apache.org/repos/asf/drill.git
commit 00fe630a1a889869b564f971dc2d793e778a4cf0 Author: Maksym Rymar <[email protected]> AuthorDate: Fri Aug 11 19:16:32 2023 +0300 DRILL-8451: options and profile pages have bad order symbols style (#2820) --- exec/java-exec/src/main/resources/rest/options.ftl | 13 ++++++++----- exec/java-exec/src/main/resources/rest/profile/profile.ftl | 13 ++++++++++--- .../rest/static/css/drill-dataTables.sortable.css | 11 ----------- .../src/main/resources/rest/static/img/black-asc.gif | Bin 48 -> 0 bytes .../src/main/resources/rest/static/img/black-desc.gif | Bin 49 -> 0 bytes .../src/main/resources/rest/static/img/black-unsorted.gif | Bin 54 -> 0 bytes 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/exec/java-exec/src/main/resources/rest/options.ftl b/exec/java-exec/src/main/resources/rest/options.ftl index b18d871262..09178c2bd4 100644 --- a/exec/java-exec/src/main/resources/rest/options.ftl +++ b/exec/java-exec/src/main/resources/rest/options.ftl @@ -69,7 +69,6 @@ <!-- List of Option Descriptions --> <script src="/dynamic/options.describe.js"></script> <link href="/static/css/datatables.min.css" rel="stylesheet"> - <link href="/static/css/drill-dataTables.sortable.css" rel="stylesheet"> </#macro> <#macro page_body> @@ -91,12 +90,12 @@ </div> <#include "*/alertModals.ftl"> <div class="table-responsive"> - <table id='optionsTbl' class="table table-striped table-condensed display sortable" style="table-layout: auto; width: 100%;"> + <table id='optionsTbl' class="table table-striped table-condensed display" style="table-layout: auto; width: 100%;"> <thead> <tr> - <th style="width:30%">OPTION</th> - <th style="width:25%">VALUE</th> - <th style="width:45%">DESCRIPTION</th> + <th class="option" style="width:30%">OPTION</th> + <th class="value" style="width:25%">VALUE</th> + <th class="description" style="width:45%">DESCRIPTION</th> </tr> </thead> <tbody><#assign i = 1><#list model.getOptions() as option> @@ -140,6 +139,10 @@ "dom": 'lrit', "jQueryUI" : true, "searching": true, + "columnDefs": [ { + "targets": [ "value", "description" ], + "orderable": false + } ], "language": { "lengthMenu": "Display _MENU_ records per page", "zeroRecords": "No matching options found. Check search entry", diff --git a/exec/java-exec/src/main/resources/rest/profile/profile.ftl b/exec/java-exec/src/main/resources/rest/profile/profile.ftl index 16071e72c3..513e22cf59 100644 --- a/exec/java-exec/src/main/resources/rest/profile/profile.ftl +++ b/exec/java-exec/src/main/resources/rest/profile/profile.ftl @@ -33,8 +33,10 @@ <script src="/static/js/ace-code-editor/theme-sqlserver.js" type="text/javascript" charset="utf-8"></script> <script src="/static/js/ace-code-editor/snippets/sql.js" type="text/javascript" charset="utf-8"></script> <script src="/static/js/ace-code-editor/mode-snippets.js" type="text/javascript" charset="utf-8"></script> -<link href="/static/css/drill-dataTables.sortable.css" rel="stylesheet"> - +<link href="/static/css/datatables.min.css" rel="stylesheet"> +<style> + table.dataTable th {background-color: transparent} +</style> <script> var globalconfig = { "queryid" : "${model.getQueryId()}" @@ -45,7 +47,12 @@ "searching": false, "lengthChange": false, "paging": false, - "info": false + "info": false, + "sDom": '<"top"lftip><"bottom"><"clear">', + "columnDefs": [ { + "targets": "_all", + "className": "dt-right" + } ] }); //Enable Warnings by making it visible checkForWarnings(); diff --git a/exec/java-exec/src/main/resources/rest/static/css/drill-dataTables.sortable.css b/exec/java-exec/src/main/resources/rest/static/css/drill-dataTables.sortable.css deleted file mode 100644 index 47f4260096..0000000000 --- a/exec/java-exec/src/main/resources/rest/static/css/drill-dataTables.sortable.css +++ /dev/null @@ -1,11 +0,0 @@ -/* DataTables Sorting: inherited via sortable class */ -table.sortable thead .sorting,.sorting_asc,.sorting_desc { - background-repeat: no-repeat; - background-position: center right; - cursor: pointer; -} -/* Sorting Symbols */ -table.sortable thead .sorting { background-image: url("/static/img/black-unsorted.gif"); } -table.sortable thead .sorting_asc { background-image: url("/static/img/black-asc.gif"); } -table.sortable thead .sorting_desc { background-image: url("/static/img/black-desc.gif"); } - diff --git a/exec/java-exec/src/main/resources/rest/static/img/black-asc.gif b/exec/java-exec/src/main/resources/rest/static/img/black-asc.gif deleted file mode 100644 index 730533fa35..0000000000 Binary files a/exec/java-exec/src/main/resources/rest/static/img/black-asc.gif and /dev/null differ diff --git a/exec/java-exec/src/main/resources/rest/static/img/black-desc.gif b/exec/java-exec/src/main/resources/rest/static/img/black-desc.gif deleted file mode 100644 index 4c3b61020b..0000000000 Binary files a/exec/java-exec/src/main/resources/rest/static/img/black-desc.gif and /dev/null differ diff --git a/exec/java-exec/src/main/resources/rest/static/img/black-unsorted.gif b/exec/java-exec/src/main/resources/rest/static/img/black-unsorted.gif deleted file mode 100644 index 5647f65832..0000000000 Binary files a/exec/java-exec/src/main/resources/rest/static/img/black-unsorted.gif and /dev/null differ
