diff options
| -rwxr-xr-x | wqflask/wqflask/templates/search_result_page.html | 39 | ||||
| -rwxr-xr-x | wqflask/wqflask/templates/show_trait.html | 7 | ||||
| -rwxr-xr-x | wqflask/wqflask/templates/show_trait_edit_data.html | 6 |
3 files changed, 29 insertions, 23 deletions
diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html index 7c8bdb1b..b9bb65fd 100755 --- a/wqflask/wqflask/templates/search_result_page.html +++ b/wqflask/wqflask/templates/search_result_page.html @@ -39,14 +39,16 @@ <p>To study a record, click on its ID below. Check records below and click Add button to add to selection.</p> <div> - <br /> - <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"><span class="glyphicon glyphicon-plus-sign"></span> Add</button> - <button class="btn btn-primary"><span class="glyphicon glyphicon-download"></span> Download Table</button> - <br /> - <br /> + <br /> + <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"><span class="glyphicon glyphicon-plus-sign"></span> Add</button> + <button class="btn btn-default"><span class="glyphicon glyphicon-download"></span> Download Table</button> + <button id="redraw" class="btn btn-default">Reset Columns</button> + <br /> + <br /> + <div id="table_container"> <table class="table table-hover table-striped" id='trait_table' {% if dataset.type == 'Geno' %}width="400px"{% endif %} style="float: left;"> <thead> <tr> @@ -104,6 +106,7 @@ </tbody> </table> + </div> </div> </div> @@ -178,16 +181,16 @@ { "type": "natural" }, { "type": "natural" }, { "type": "natural" }, + { "type": "natural", "width": "30%" }, + { "type": "natural", "width": "15%" }, { "type": "natural" }, { "type": "natural" }, - { "type": "natural" }, - { "type": "natural" }, - { "type": "natural" }, + { "type": "natural", "width": "15%" }, { "type": "natural" } ], "sDom": "RJtir", "iDisplayLength": -1, - "autoWidth": true, + "autoWidth": false, "bLengthChange": true, "bDeferRender": true, "bSortClasses": false, @@ -212,7 +215,7 @@ ], "sDom": "RJtir", "iDisplayLength": -1, - "autoWidth": true, + "autoWidth": false, "bLengthChange": true, "bDeferRender": true, "bSortClasses": false, @@ -232,7 +235,7 @@ ], "sDom": "RJtir", "iDisplayLength": -1, - "autoWidth": true, + "autoWidth": false, "bLengthChange": true, "bDeferRender": true, "bSortClasses": false, @@ -245,8 +248,12 @@ } ); {% endif %} console.timeEnd("Creating table"); - - //var table = $('#trait_table').DataTable(); + + $('#redraw').click(function() { + var table = $('#trait_table').DataTable(); + table.colReorder.reset() + }); + //new $.fn.dataTable.FixedHeader( table ); //new $.fn.dataTable.FixedColumns( table ); diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html index b4d6b85b..40f6eafd 100755 --- a/wqflask/wqflask/templates/show_trait.html +++ b/wqflask/wqflask/templates/show_trait.html @@ -145,7 +145,7 @@ <script language="javascript" type="text/javascript" src="/static/new/javascript/create_lodchart.js"></script> <script language="javascript" type="text/javascript" src="/static/new/javascript/lod_chart.js"></script> - <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.dataTables.min.js"></script> + <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.dataTables.js"></script> <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/dataTables.scientific.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.colResize.js"></script> @@ -226,7 +226,7 @@ "sSwfPath": "/static/packages/TableTools/media/swf/copy_csv_xls_pdf.swf" }, "iDisplayLength": -1, - "autoWidth": true, + "autoWidth": false, "bLengthChange": true, "bDeferRender": true, "bSortClasses": false, @@ -262,12 +262,11 @@ "sSwfPath": "/static/packages/TableTools/media/swf/copy_csv_xls_pdf.swf" }, "iDisplayLength": -1, - "autoWidth": true, + "autoWidth": false, "bLengthChange": true, "bDeferRender": true, "bSortClasses": false, "scrollY": "600px", - "scrollX": true, "scrollCollapse": false, "colResize": { "tableWidthFixed": false diff --git a/wqflask/wqflask/templates/show_trait_edit_data.html b/wqflask/wqflask/templates/show_trait_edit_data.html index 8c919ee0..5c7b0417 100755 --- a/wqflask/wqflask/templates/show_trait_edit_data.html +++ b/wqflask/wqflask/templates/show_trait_edit_data.html @@ -75,10 +75,10 @@ <!--<div id="edit_sample_lists">--> {% for sample_type in sample_groups %} - <!--<div class="sample_group">--> + <div class="sample_group" style="width:50%;"> <h3>{{ sample_type.header }}</h3> - <table class="table table-hover table-striped" id="samples_{{ sample_type.sample_group_type }}" style="float: left;"> + <table class="table-hover table-striped" id="samples_{{ sample_type.sample_group_type }}" style="float: left;"> <thead> <tr> <th>Index</td> @@ -147,7 +147,7 @@ {% endfor %} </tbody> </table> - <!--</div>--> + </div> {% endfor %} <!--</div>--> |