about summary refs log tree commit diff
path: root/wqflask/wqflask/templates/gsearch_pheno.html
diff options
context:
space:
mode:
Diffstat (limited to 'wqflask/wqflask/templates/gsearch_pheno.html')
-rw-r--r--wqflask/wqflask/templates/gsearch_pheno.html53
1 files changed, 21 insertions, 32 deletions
diff --git a/wqflask/wqflask/templates/gsearch_pheno.html b/wqflask/wqflask/templates/gsearch_pheno.html
index 05b2f988..987b51a7 100644
--- a/wqflask/wqflask/templates/gsearch_pheno.html
+++ b/wqflask/wqflask/templates/gsearch_pheno.html
@@ -20,7 +20,7 @@
             <button class="btn btn-default" id="select_all"><span class="glyphicon glyphicon-ok"></span> Select All</button>
             <button class="btn btn-default" id="deselect_all"><span class="glyphicon glyphicon-remove"></span> Deselect All</button>
             <button class="btn btn-default" id="invert"><span class="glyphicon glyphicon-resize-vertical"></span> Invert</button>
-            <button class="btn btn-default" id="add" disabled ><span class="glyphicon glyphicon-plus-sign"></span> Add</button>
+            <button class="btn btn-success" id="add" disabled ><span class="glyphicon glyphicon-plus-sign"></span> Add</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 ...">
             <form id="export_form" method="POST" action="/export_traits_csv" style="display: inline;">
@@ -31,7 +31,7 @@
             </form>
             <br />
             <br />
-            <div style="width: 100%;">
+            <div style="min-width: 2000px; width: 100%;">
               <table id="trait_table" class="table-hover table-striped cell-border" style="float: left;">
                 <tbody>
                  <td colspan="100%" align="center"><br><b><font size="15">Loading...</font></b><br></td>
@@ -46,33 +46,19 @@
 {% endblock %}
 
 {% block js %}
-    <script language="javascript" type="text/javascript" src="/static/new/js_external/md5.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/javascript/search_results.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/md5.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/js_external/jszip.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/dataTables.naturalSort.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/extensions/dataTables.colReorder.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/extensions/dataTables.colResize.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='jszip/jszip.min.js') }}"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/natural.js') }}"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/colReorder/js/dataTables.colReorder.js') }}"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/colResize/dataTables.colResize.js') }}"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/search_results.js"></script>
 
     <script type='text/javascript'>
       var the_rows = {{ trait_list|safe }};
     </script>
 
     <script type="text/javascript" charset="utf-8">
-        $.fn.dataTable.ext.order['dom-checkbox'] = function  ( settings, col )
-        {
-            return this.api().column( col, {order:'index'} ).nodes().map( function ( td, i ) {
-                return $('input', td).prop('checked') ? '1' : '0';
-            } );
-        };
-
-        $.fn.dataTable.ext.order['dom-inner-text'] = function  ( settings, col )
-        {
-            return this.api().column( col, {order:'index'} ).nodes().map( function ( td, i ) {
-                return $(td).text();
-            } );
-        }
-
         $(document).ready( function () {
 
             $('#trait_table tr').click(function(event) {
@@ -131,6 +117,7 @@
                         $('td', row).eq(6).text($('td', row).eq(6).text().substring(0, 150));
                         $('td', row).eq(6).text($('td', row).eq(6).text() + '...')
                     }
+                    $('td', row).eq(6).attr("align", "right");
                     $('td', row).slice(8,11).attr("align", "right");
                     $('td', row).eq(1).attr('data-export', $('td', row).eq(1).text());
                     $('td', row).eq(2).attr('data-export', $('td', row).eq(2).text());
@@ -172,6 +159,7 @@
                       'title': "Record",
                       'type': "natural",
                       'data': null,
+                      'orderDataType': "dom-inner-text",
                       'render': function(data, type, row, meta) {
                         return '<a target="_blank" href="/show_trait?trait_id=' + data.name + '&dataset=' + data.dataset + '">' + data.display_name + '</a>'
                       }
@@ -191,7 +179,7 @@
                     },
                     {
                       'title': "Mean",
-                      'type': "natural",
+                      'type': "natural-minus-na",
                       'width': "10%",
                       'data': "mean"
                     },
@@ -218,7 +206,7 @@
                     },
                     {
                       'title': "Year",
-                      'type': "natural",
+                      'type': "natural-minus-na",
                       'data': null,
                       'orderDataType': "dom-inner-text",
                       'render': function(data, type, row, meta) {
@@ -231,29 +219,30 @@
                       'orderSequence': [ "desc", "asc"]
                     },
                     {
-                      'title': "Max LRS<a href=\"http://genenetwork.org//glossary.html#LRS\" target=\"_blank\" style=\"color: white;\"><sup>?</sup></a>",
-                      'type': "natural",
+                      'title': "Max LRS<a href=\"{{ url_for('glossary_blueprint.glossary') }}#LRS\" target=\"_blank\" style=\"color: white;\"><sup>?</sup></a>",
+                      'type': "natural-minus-na",
                       'data': "LRS_score_repr",
                       'orderSequence': [ "desc", "asc"]
                     },
                     {
                       'title': "Max LRS Location",
-                      'type': "natural",
+                      'type': "natural-minus-na",
                       'width': "10%",
                       'data': "max_lrs_text"
                     },
                     {
-                      'title': "Additive Effect<a href=\"http://genenetwork.org//glossary.html#A\" target=\"_blank\" style=\"color: white;\"><sup>?</sup></a>",
-                      'type': "natural",
+                      'title': "Additive Effect<a href=\"{{ url_for('glossary_blueprint.glossary') }}#A\" target=\"_blank\" style=\"color: white;\"><sup>?</sup></a>",
+                      'type': "natural-minus-na",
                       'data': "additive",
                       'orderSequence': [ "desc", "asc"]
                     }
                 ],
                 'order': [[1, "asc" ]],
-                'sDom': "tir",
+                'sDom': "pitirp",
                 'autoWidth': false,
-                'deferRender': true,
-                'paging': false,
+                'deferRender': false,
+                'iDisplayLength': 500,
+                'paging': true,
                 'orderClasses': true,
                 'processing': true,
                 'language': {