From 1320283cb1374365777dbe61e9c4ec6d42cba40d Mon Sep 17 00:00:00 2001
From: zsloan
Date: Tue, 29 Sep 2020 16:10:07 -0500
Subject: Made a variety of changes to table pages

* wqflask/wqflask/static/new/css/show_trait.css - Adding position
relative and a 2px offset for glyphicons to make them better align with
button text
* wqflask/wqflask/templates/collections/view.html - Added glyphicon to
Download button, changed a couple head names (Peak Location and Effect
Size), made Location and Peak Location columns the same width, and made
the "?" glossary links a little larger and red
* wqflask/wqflask/templates/search_result_page.html - same as above
* wqflask/wqflask/templates/show_trait_edit_data.html - Added glyphicon
to Export button
---
 wqflask/wqflask/static/new/css/show_trait.css       |  5 +++++
 wqflask/wqflask/templates/collections/view.html     | 10 ++++------
 wqflask/wqflask/templates/search_result_page.html   | 20 ++++++++++----------
 wqflask/wqflask/templates/show_trait_edit_data.html |  2 +-
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/wqflask/wqflask/static/new/css/show_trait.css b/wqflask/wqflask/static/new/css/show_trait.css
index 338302af..92deab20 100644
--- a/wqflask/wqflask/static/new/css/show_trait.css
+++ b/wqflask/wqflask/static/new/css/show_trait.css
@@ -46,4 +46,9 @@ table.dataTable.cell-border tbody th, table.dataTable.cell-border tbody td {
 table.dataTable.cell-border tbody tr th:first-child,
 table.dataTable.cell-border tbody tr td:first-child {
   border-left: 1px solid #ccc;
+}
+
+.glyphicon {
+  position: relative;
+  top: 2px;
 }
\ No newline at end of file
diff --git a/wqflask/wqflask/templates/collections/view.html b/wqflask/wqflask/templates/collections/view.html
index 13d45d62..ca8aece3 100644
--- a/wqflask/wqflask/templates/collections/view.html
+++ b/wqflask/wqflask/templates/collections/view.html
@@ -16,8 +16,6 @@
         </h1>
         <h3>This collection has {{ '{}'.format(numify(trait_obs|count, "record", "records")) }}</h3>
 
-        <!--<hr style="height: 1px; background-color: #A9A9A9;">-->
-
         <div>
           <form id="collection_form" action="/delete" method="post">
             <input type="hidden" name="uc_id" id="uc_id" value="{{ uc.id }}" />
@@ -77,7 +75,7 @@
             <input type="hidden" name="database_name" id="database_name" value="None">
             <input type="hidden" name="export_data" id="export_data" value="">
             <input type="hidden" name="file_name" id="file_name" value="collection_table">
-            <button class="btn btn-default" id="export_traits">Download CSV</button>
+            <button class="btn btn-default" id="export_traits">Download</button>
             <input type="text" id="searchbox" class="form-control" style="width: 200px; display: inline; padding-bottom: 9px;" placeholder="Search Table For ...">
             <input type="text" id="select_top" class="form-control" style="width: 200px; display: inline; padding-bottom: 9px;" placeholder="Select Top ...">
             <button class="btn btn-default" id="deselect_all" type="button"><span class="glyphicon glyphicon-remove"></span> Deselect</button>
@@ -99,9 +97,9 @@
                             <th data-export="Description">Description</th>
                             <th data-export="Location">Location</th>
                             <th data-export="Mean">Mean</th>
-                            <th data-export="Max LRS">Max LRS <a href="http://genenetwork.org//glossary.html#L" target="_blank"><sup>?</sup></a></th>
-                            <th data-export="Max LRS Location">Max LRS Location</th>
-                            <th data-export="Add. Eff.">Additive Effect <a href="http://genenetwork.org//glossary.html#A" target="_blank"><sup>?</sup></a></th>
+                            <th data-export="Max LRS">Max LRS <a href="http://genenetwork.org//glossary.html#L" target="_blank"><sup style="font-size: small; color: #FF0000;"> ?</sup></a></th>
+                            <th data-export="Peak Location">Peak Location</th>
+                            <th data-export="Add. Eff.">Effect Size <a href="http://genenetwork.org//glossary.html#A" target="_blank"><sup style="font-size: small; color: #FF0000;"> ?</sup></a></th>
                         </tr>
                     </thead>
 
diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html
index 282e752d..487c6980 100644
--- a/wqflask/wqflask/templates/search_result_page.html
+++ b/wqflask/wqflask/templates/search_result_page.html
@@ -127,7 +127,7 @@
               <input type="hidden" name="export_data" id="export_data" value="">
               <button class="btn btn-default" id="select_all" type="button"><span class="glyphicon glyphicon-ok"></span> Select</button>
               <button class="btn btn-success" id="add" type="button" disabled><span class="glyphicon glyphicon-plus-sign"></span> Add</button>
-              <button class="btn btn-default" id="export_traits">Download CSV</button>
+              <button class="btn btn-default" id="export_traits">Download <span class="glyphicon glyphicon-download"></span></button>
               <input type="text" id="searchbox" class="form-control" style="width: 200px; display: inline;" placeholder="Search This Table For ...">
               <input type="text" id="select_top" class="form-control" style="width: 200px; display: inline;" placeholder="Select Top ...">
               <button class="btn btn-default" id="deselect_all" type="button"><span class="glyphicon glyphicon-remove"></span> Deselect</button>
@@ -315,20 +315,20 @@
                       'orderSequence': [ "desc", "asc"]
                     },
                     {
-                      'title': "Max LRS<a href=\"http://genenetwork.org//glossary.html#LRS\" target=\"_blank\" style=\"color: white;\"><sup>?</sup></a>",
+                      'title': "Max LRS<a href=\"http://genenetwork.org//glossary.html#LRS\" target=\"_blank\" style=\"color: white;\"><sup style=\"font-size: small; color: #FF0000;\"> ?</sup></a>",
                       'type': "natural-minus-na",
                       'data': "lrs_score",
                       'width': "80px",
                       'orderSequence': [ "desc", "asc"]
                     },
                     {
-                      'title': "Max LRS Location",
+                      'title': "Peak Location",
                       'type': "natural-minus-na",
-                      'width': "150px",
+                      'width': "120px",
                       'data': "lrs_location"
                     },
                     {
-                      'title': "Additive Effect<a href=\"http://genenetwork.org//glossary.html#A\" target=\"_blank\" style=\"color: white;\"><sup>?</sup></a>",
+                      'title': "Effect Size<a href=\"http://genenetwork.org//glossary.html#A\" target=\"_blank\" style=\"color: white;\"><sup style=\"font-size: small; color: #FF0000;\"> ?</sup></a>",
                       'type': "natural-minus-na",
                       'data': "additive",
                       'width': "120px",
@@ -390,20 +390,20 @@
                       'orderSequence': [ "desc", "asc"]
                     },
                     {
-                      'title': "Max LRS<a href=\"http://genenetwork.org//glossary.html#LRS\" target=\"_blank\" style=\"color: white;\"><sup>?</sup></a>",
+                      'title': "Max LRS<a href=\"http://genenetwork.org//glossary.html#LRS\" target=\"_blank\" style=\"color: white;\"><sup style=\"font-size: small; color: #FF0000;\"> ?</sup></a>",
                       'type': "natural-minus-na",
                       'data': "lrs_score",
                       'width': "80px",
                       'orderSequence': [ "desc", "asc"]
                     },
                     {
-                      'title': "Max LRS Location",
+                      'title': "Peak Location",
                       'type': "natural-minus-na",
-                      'width': "150px",
+                      'width': "120px",
                       'data': "lrs_location"
                     },
                     {
-                      'title': "Additive Effect<a href=\"http://genenetwork.org//glossary.html#A\" target=\"_blank\" style=\"color: white;\"><sup>?</sup></a>",
+                      'title': "Effect Size<a href=\"http://genenetwork.org//glossary.html#A\" target=\"_blank\" style=\"color: white;\"><sup style=\"font-size: small; color: #FF0000;\"> ?</sup></a>",
                       'type': "natural-minus-na",
                       'width': "120px",
                       'data': "additive",
@@ -412,7 +412,7 @@
                     {
                       'title': "Location",
                       'type': "natural-minus-na",
-                      'width': "140px",
+                      'width': "120px",
                       'data': "location"
                     }{% endif %}
                 ],
diff --git a/wqflask/wqflask/templates/show_trait_edit_data.html b/wqflask/wqflask/templates/show_trait_edit_data.html
index 05a2be73..a8ed91b1 100644
--- a/wqflask/wqflask/templates/show_trait_edit_data.html
+++ b/wqflask/wqflask/templates/show_trait_edit_data.html
@@ -5,7 +5,7 @@
           <input type="text" id="{{ sample_type.sample_group_type }}_searchbox" class="form-control" style="width: 200px; display: inline; float: left; vertical-align: top;" placeholder="Search This Table For ...">
         </div>
         <div style="padding-left: 10px; display: inline;">
-          <input type="button" class="btn btn-default export" value="Export">
+          <button class="btn btn-default export">Export <span class="glyphicon glyphicon-download-alt"></span></button>
           <select class="select optional span2 export_format">
             <option value="excel">Excel</option>
             <option value="csv">CSV</option>
-- 
cgit v1.2.3