From 2efd33c5dc88ce0663b2a64bf456eb8dbc678f23 Mon Sep 17 00:00:00 2001 From: zsloan Date: Fri, 26 Aug 2016 16:43:51 +0000 Subject: Fixed appearance (border width mostly) of basic stats table on trait page Removed unnecessary datatables javascript code that referred to basic stats table --- .../static/packages/bootstrap/css/bootstrap.css | 6 ++-- wqflask/wqflask/templates/show_trait.html | 32 ---------------------- .../wqflask/templates/show_trait_statistics.html | 4 +-- 3 files changed, 5 insertions(+), 37 deletions(-) diff --git a/wqflask/wqflask/static/packages/bootstrap/css/bootstrap.css b/wqflask/wqflask/static/packages/bootstrap/css/bootstrap.css index 461fd089..2c20f635 100644 --- a/wqflask/wqflask/static/packages/bootstrap/css/bootstrap.css +++ b/wqflask/wqflask/static/packages/bootstrap/css/bootstrap.css @@ -261,7 +261,7 @@ th { } .table-bordered th, .table-bordered td { - border: 1px solid #ddd !important; + border: 1px solid #000 !important; } } @font-face { @@ -2114,7 +2114,7 @@ th { padding: 5px; } .table-bordered { - border: 1px solid #ddd; + border: 1px solid #000; } .table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, @@ -2122,7 +2122,7 @@ th { .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td { - border: 1px solid #ddd; + border: 1px solid #000; } .table-bordered > thead > tr > th, .table-bordered > thead > tr > td { diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html index 1890cf3f..59e0185e 100644 --- a/wqflask/wqflask/templates/show_trait.html +++ b/wqflask/wqflask/templates/show_trait.html @@ -254,38 +254,6 @@ } ); {% endif %} - if (Object.keys(js_data.sample_group_types).length > 1) { - $('#stats_table').DataTable( { - "columnDefs": [ - { "orderable": false, "targets": [0, 1, 2, 3] } - ], - "order": [], - "sDom": "tr", - "iDisplayLength": -1, - "autoWidth": false, - "bLengthChange": true, - "bDeferRender": true, - "bSortClasses": false, - "paging": false - } ); - } - else { - $('#stats_table').DataTable( { - "columnDefs": [ - { "orderable": false, "targets": [0, 1] } - ], - "order": [], - "sDom": "tr", - "iDisplayLength": -1, - "autoWidth": false, - "bLengthChange": true, - "bDeferRender": true, - "bSortClasses": false, - "paging": false - } ); - - } - var slider = document.getElementById('p_range_slider'); noUiSlider.create(slider, { start: [-1.0, 1.0], diff --git a/wqflask/wqflask/templates/show_trait_statistics.html b/wqflask/wqflask/templates/show_trait_statistics.html index 62d6dcfd..8e237868 100644 --- a/wqflask/wqflask/templates/show_trait_statistics.html +++ b/wqflask/wqflask/templates/show_trait_statistics.html @@ -25,8 +25,8 @@