aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2022-06-23 20:56:37 +0000
committerzsloan2022-06-23 20:56:37 +0000
commitca368e32528073de15d925b4293b938f95f69dac (patch)
tree7c6b7293ba181b4c3cc652fffab425fa1be0be17
parent0ddd74a4d417389f7a35ac0971b0c17f5d79fb56 (diff)
downloadgenenetwork2-ca368e32528073de15d925b4293b938f95f69dac.tar.gz
Fix JS/CSS imports and include scroller setting in custom table settings
-rw-r--r--wqflask/wqflask/templates/collections/view.html11
1 files changed, 8 insertions, 3 deletions
diff --git a/wqflask/wqflask/templates/collections/view.html b/wqflask/wqflask/templates/collections/view.html
index 6ea129f9..a12c1369 100644
--- a/wqflask/wqflask/templates/collections/view.html
+++ b/wqflask/wqflask/templates/collections/view.html
@@ -3,6 +3,7 @@
{% block css %}
<link rel="stylesheet" type="text/css" href="{{ url_for('css', filename='DataTables/css/jquery.dataTables.css') }}" />
<link rel="stylesheet" type="text/css" href="{{ url_for('js', filename='DataTablesExtensions/buttonStyles/css/buttons.dataTables.min.css') }}">
+ <link href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css" rel="stylesheet" type="text/css" />
<link rel="stylesheet" type="text/css" href="/static/new/css/show_trait.css" />
<link rel="stylesheet" type="text/css" href="/static/new/css/trait_list.css" />
{% endblock %}
@@ -112,9 +113,8 @@
<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='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="{{ url_for('js', filename='DataTablesExtensions/scroller/js/dataTables.scroller.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/colResize/dataTables.colResize.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/buttons/js/dataTables.buttons.min.js') }}"></script>
<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/buttons/js/buttons.colVis.min.js') }}"></script>
<script type="text/javascript" src="/static/new/javascript/search_results.js"></script>
@@ -276,7 +276,12 @@
]
table_settings = {
- "order": [[1, "asc" ]]
+ "order": [[1, "asc" ]],
+ {% if traits_json|length > 10 %}
+ "scroller": true
+ {% else %}
+ "scroller": false
+ {% endif %}
}
create_table(table_id, traits_json, column_defs, table_settings)