aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2020-12-08 13:32:14 -0600
committerzsloan2020-12-08 13:32:14 -0600
commit0edd6f931c0204f9cc2a0e64cc5fd7a983e6767d (patch)
treed07ae600cd4f5d461e93aa2610469d02a2915ba1
parent03c2ec3eddfaf5279a008b7408c8dc2ccfd57d47 (diff)
parentcb4b8f2fb26d68cfafdaa2e70d158531a02b9892 (diff)
downloadgenenetwork2-0edd6f931c0204f9cc2a0e64cc5fd7a983e6767d.tar.gz
Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testing
-rw-r--r--test/requests/link_checker.py2
-rw-r--r--wqflask/wqflask/templates/show_trait.html5
2 files changed, 4 insertions, 3 deletions
diff --git a/test/requests/link_checker.py b/test/requests/link_checker.py
index dfac58d3..1a9eb695 100644
--- a/test/requests/link_checker.py
+++ b/test/requests/link_checker.py
@@ -116,6 +116,8 @@ def check_packaged_js_files(args_obj, parser):
"/js/nvd3/nv.d3.min.css",
"/js/qtip2/jquery.qtip.min.js",
"/js/js_alt/md5.min.js",
+ "/css/nouislider/nouislider.min.css",
+ "/js/nouislider/nouislider.js",
"/js/purescript-genome-browser/js/purescript-genetics-browser.js",
"/js/purescript-genome-browser/css/purescript-genetics-browser.css",
"/js/cytoscape/cytoscape.min.js",
diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html
index 07efbe62..bacab9f4 100644
--- a/wqflask/wqflask/templates/show_trait.html
+++ b/wqflask/wqflask/templates/show_trait.html
@@ -7,8 +7,7 @@
<link rel="stylesheet" type="text/css" href="/static/new/css/scatter-matrix.css" />
<link rel="stylesheet" type="text/css" href="{{ url_for('css', filename='d3-tip/d3-tip.css') }}" />
<link rel="stylesheet" type="text/css" href="{{ url_for('css', filename='DataTables/css/jquery.dataTables.css') }}" />
- <link rel="stylesheet" type="text/css" href="/static/new/packages/noUiSlider/nouislider.css" />
- <link rel="stylesheet" type="text/css" href="/static/new/packages/noUiSlider/nouislider.pips.css" />
+ <link rel="stylesheet" type="text/css" href="{{ url_for('css', filename='nouislider/nouislider.min.css') }}" />
<link rel="stylesheet" type="text/css" href="/static/new/css/show_trait.css" />
{% endblock %}
@@ -148,7 +147,7 @@
<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/scientific.js') }}"></script>
<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/natural.js') }}"></script>
<script type="text/javascript" src="https://cdn.datatables.net/scroller/2.0.2/js/dataTables.scroller.min.js"></script>
- <script language="javascript" type="text/javascript" src="/static/new/packages/noUiSlider/nouislider.js"></script>
+ <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='nouislider/nouislider.js') }}"></script>
<script type="text/javascript" src="/static/new/javascript/initialize_show_trait_tables.js"></script>
<script type="text/javascript" src="/static/new/javascript/show_trait_mapping_tools.js"></script>