fixed a long standing bug with the width of the cytoscape window

proost · Feb 15, 2017 · 6cd956a · 6cd956a
1 parent d5b40c0
commit 6cd956a
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/planet/templates/expression_graph.html b/planet/templates/expression_graph.html
@@ -195,29 +195,6 @@ <h1>Custom network <button id="cy-reset" class="btn btn-default"><i class="fa fa
             {% elif ecc_pair %}
             <h1>ECC pair <button id="cy-reset" class="btn btn-default"><i class="fa fa-arrows-h"></i></button></h1>
             {% endif %}
-
-        </div>
-    </div>
-</div>
-</div>
-            {% if node %}
-            <div id="cy" json="{{ url_for('expression_network.expression_network_json', node_id=node.id, family_method_id=family_method_id) }}" cycss="{{ url_for('static', filename='js/cytoscape.cycss') }}"></div>
-            {% elif cluster %}
-            <div id="cy" json="{{ url_for('expression_cluster.expression_cluster_json', cluster_id=cluster.id, family_method_id=family_method_id) }}" cycss="{{ url_for('static', filename='js/cytoscape.cycss') }}"></div>
-            {% elif cluster_one %}
-            <div id="cy" json="{{ url_for('graph_comparison.graph_comparison_cluster_json', one=cluster_one.id, two=cluster_two.id, family_method_id=family_method_id) }}" cycss="{{ url_for('static', filename='js/cytoscape.cycss') }}"></div>
-           {% elif sequence %}
-            <div id="cy" json="{{ url_for('ecc.ecc_graph_json', sequence=sequence.id, network=network_method_id, family=family_method_id) }}" cycss="{{ url_for('static', filename='js/cytoscape.cycss') }}"></div>
-           {% elif graph_data %}
-            <div id="cy" cycss="{{ url_for('static', filename='js/cytoscape.cycss') }}"></div>
-           {% elif ecc_pair %}
-            <div id="cy" json="{{ url_for('ecc.ecc_graph_pair_json', ecc_id = ecc_pair.id) }}" cycss="{{ url_for('static', filename='js/cytoscape.cycss') }}"></div>
-            {% endif %}
-
-<div class=container">
-<div class=container-fluid">
-<div class="col-lg-10 col-lg-offset-2 col-sm-8 col-sm-offset-4 col-md-8 col-md-offset-4 main" id="main">
-    <div class="row">
             <div id="loading">
                 <svg id="svg2" xmlns="http://www.w3.org/2000/svg" height="150" width="150" version="1.1">
                  <defs id="defs4">
@@ -264,6 +241,29 @@ <h1>ECC pair <button id="cy-reset" class="btn btn-default"><i class="fa fa-arrow
 
                 </svg>
             </div>
+        </div>
+    </div>
+</div>
+</div>
+            {% if node %}
+            <div id="cy" json="{{ url_for('expression_network.expression_network_json', node_id=node.id, family_method_id=family_method_id) }}" cycss="{{ url_for('static', filename='js/cytoscape.cycss') }}"></div>
+            {% elif cluster %}
+            <div id="cy" json="{{ url_for('expression_cluster.expression_cluster_json', cluster_id=cluster.id, family_method_id=family_method_id) }}" cycss="{{ url_for('static', filename='js/cytoscape.cycss') }}"></div>
+            {% elif cluster_one %}
+            <div id="cy" json="{{ url_for('graph_comparison.graph_comparison_cluster_json', one=cluster_one.id, two=cluster_two.id, family_method_id=family_method_id) }}" cycss="{{ url_for('static', filename='js/cytoscape.cycss') }}"></div>
+           {% elif sequence %}
+            <div id="cy" json="{{ url_for('ecc.ecc_graph_json', sequence=sequence.id, network=network_method_id, family=family_method_id) }}" cycss="{{ url_for('static', filename='js/cytoscape.cycss') }}"></div>
+           {% elif graph_data %}
+            <div id="cy" cycss="{{ url_for('static', filename='js/cytoscape.cycss') }}"></div>
+           {% elif ecc_pair %}
+            <div id="cy" json="{{ url_for('ecc.ecc_graph_pair_json', ecc_id = ecc_pair.id) }}" cycss="{{ url_for('static', filename='js/cytoscape.cycss') }}"></div>
+            {% endif %}
+
+<div class=container">
+<div class=container-fluid">
+<div class="col-lg-10 col-lg-offset-2 col-sm-8 col-sm-offset-4 col-md-8 col-md-offset-4 main">
+    <div class="row">
+
 
             <div id="legend" url="{{ url_for('static', filename='svg/legend.svg') }}"></div>
             </div>