Merge branch 'master' into plannet-v1.2

scastlara · Jan 23, 2019 · 5e567f0 · 5e567f0
2 parents 33cfb25 + 69af9eb
commit 5e567f0
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 2 deletions.
diff --git a/NetExplorer/static/Images/blast-icon.png b/NetExplorer/static/Images/blast-icon.png
diff --git a/NetExplorer/static/Images/compgen-logo-header.png b/NetExplorer/static/Images/compgen-logo-header.png
diff --git a/NetExplorer/static/Images/gene-finder-icon.png b/NetExplorer/static/Images/gene-finder-icon.png
diff --git a/NetExplorer/static/Images/network-icon.png b/NetExplorer/static/Images/network-icon.png
diff --git a/NetExplorer/static/Images/pathway-icon.png b/NetExplorer/static/Images/pathway-icon.png
diff --git a/NetExplorer/static/Images/ub_logo.png b/NetExplorer/static/Images/ub_logo.png
diff --git a/NetExplorer/templates/NetExplorer/base.html b/NetExplorer/templates/NetExplorer/base.html
@@ -128,8 +128,6 @@
         <script src="{% static 'js/root.js' %}"></script>
         <script src="{% static 'js/jquery-min.js' %}"></script>
         <script src="{% static 'js/cytoscape.js' %}"></script>
-        <script src="https://unpkg.com/lodash@4.17.4"></script>
-        <script src="{% static 'js/cytoscape-edgehandles.js' %}"></script>
         <script src="{% static 'js/jquery-data-tables-min.js' %}"></script>
         <script src="https://cdn.datatables.net/buttons/1.5.2/js/dataTables.buttons.min.js"></script>
         <script src="https://cdn.datatables.net/buttons/1.5.2/js/buttons.html5.min.js"></script>

diff --git a/NetExplorer/templates/NetExplorer/planexp.html b/NetExplorer/templates/NetExplorer/planexp.html
@@ -368,6 +368,8 @@ <h4>Delete interaction:</h4>
 
 
     {% block scripts %}
+    <script src="https://unpkg.com/lodash@4.17.4"></script>
+    <script src="{% static 'js/cytoscape-edgehandles.js' %}"></script>
     <script src="https://cdn.plot.ly/plotly-1.32.0.min.js"></script>
     <script src="{% static 'js/scrollTo.js' %}"></script>
     <script src="{% static 'js/FileSaver.js' %}"></script>

diff --git a/static/Images/blast-icon.png b/static/Images/blast-icon.png
diff --git a/static/Images/compgen-logo-header.png b/static/Images/compgen-logo-header.png
diff --git a/static/Images/gene-finder-icon.png b/static/Images/gene-finder-icon.png
diff --git a/static/Images/network-icon.png b/static/Images/network-icon.png
diff --git a/static/Images/pathway-icon.png b/static/Images/pathway-icon.png
diff --git a/static/Images/ub_logo.png b/static/Images/ub_logo.png