Skip to content

Commit

Permalink
DRILL-8451: options and profile pages have bad order symbols style (a…
Browse files Browse the repository at this point in the history
  • Loading branch information
rymarm authored and jnturton committed Dec 31, 2023
1 parent 19f8f0a commit c012f64
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 19 deletions.
13 changes: 8 additions & 5 deletions exec/java-exec/src/main/resources/rest/options.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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",
Expand Down
13 changes: 10 additions & 3 deletions exec/java-exec/src/main/resources/rest/profile/profile.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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()}"
Expand All @@ -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();
Expand Down

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit c012f64

Please sign in to comment.