Merge branch 'master' into plannet-v1.2

scastlara · Jan 23, 2019 · 8f1c3e9 · 8f1c3e9
2 parents 5e567f0 + efdfdd0
commit 8f1c3e9
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 41 deletions.
diff --git a/NetExplorer/static/css/style.css b/NetExplorer/static/css/style.css
@@ -246,7 +246,7 @@ h1, h2, h3, h4, h5, h6 {
 .app-icon-inside {
     position: relative;
     margin-top: 4%;
-    width: 180;
+    width: 150px;
     right: -30px;
 }
 
@@ -1044,7 +1044,7 @@ h1, h2, h3, h4, h5, h6 {
 
 #cyt-controls-header {
     width: 100%;
-    height: 350px;
+    height: 320px;
 }
 
 

diff --git a/NetExplorer/templates/NetExplorer/netexplorer.html b/NetExplorer/templates/NetExplorer/netexplorer.html
@@ -365,6 +365,8 @@ <h4>Select Colors</h4>
             </div>
             <div id="node-not-found" style="display: none;"><div class="panel panel-danger"><div class="panel-heading node-not-found-err"> </div></div></div>
             <hr>
+
+
         <div id="layout-homologs-container">
             <!-- Layout Selection-->
             <div class="dropdown" id="select-layout-container">
@@ -408,6 +410,45 @@ <h4>Select Colors</h4>
             <hr>
         </div>
 
+        <!--- "On click" Behaviour -->
+        <div id="on-click-container">
+                <h3>On Click <a  class="info-tooltip"
+                title="
+                    This option will determine what happens when you click on a node.
+                    <ul>
+                        <li>Card: An information card for the node will appear.</li>
+                        <li>Expand: All the elements interacting with the node will be added to the graph.</li>
+                        <li>Delete: The node and all its interactions will be removed from the graph.</li>
+                    </ul>
+                "><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span></a></h3>
+
+                <fieldset>
+                    <div class="switch-toggle switch-candy behaviour-div">
+                        <form action="" id="behaviour-form">
+                            <input id="radio-card" name="behaviour" type="radio" value="card" checked>
+                            <label class="behaviour-btn" for="radio-card" onclick="">Card</label>
+                            <input id="radio-expand" value="expand" name="behaviour" type="radio">
+                            <label class="behaviour-btn" for="radio-expand" onclick="">Expand</label>
+                            <input id="radio-delete" value="delete" name="behaviour" type="radio">
+                            <label class="behaviour-btn" for="radio-delete" onclick="">Delete</label>
+                            <a></a>
+                        </form>
+                    </div>
+                </fieldset>
+
+                <!--<input
+                    class="click-behaviour"
+                    checked type="checkbox"
+                    data-toggle="toggle"
+                    data-on="Show card"
+                    data-off="Expand"
+                    data-onstyle="info"
+                    data-offstyle="success"
+                > -->
+                <hr>
+            </div>
+            <br>
+
         <!-- SHOW CONNECTIONS -->
         <div id="showconnections-container">
             <button id="show_connections" class="btn btn-default btn-netexplorer">
@@ -504,43 +545,7 @@ <h3>Node Labels</h3>
         </div>
 
 
-            <!--- "On click" Behaviour -->
-            <div id="on-click-container">
-                <h3>On Click <a  class="info-tooltip"
-                title="
-                    This option will determine what happens when you click on a node.
-                    <ul>
-                        <li>Card: An information card for the node will appear.</li>
-                        <li>Expand: All the elements interacting with the node will be added to the graph.</li>
-                        <li>Delete: The node and all its interactions will be removed from the graph.</li>
-                    </ul>
-                "><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span></a></h3>
-
-                <fieldset>
-                    <div class="switch-toggle switch-candy behaviour-div">
-                        <form action="" id="behaviour-form">
-                            <input id="radio-card" name="behaviour" type="radio" value="card" checked>
-                            <label class="behaviour-btn" for="radio-card" onclick="">Card</label>
-                            <input id="radio-expand" value="expand" name="behaviour" type="radio">
-                            <label class="behaviour-btn" for="radio-expand" onclick="">Expand</label>
-                            <input id="radio-delete" value="delete" name="behaviour" type="radio">
-                            <label class="behaviour-btn" for="radio-delete" onclick="">Delete</label>
-                            <a></a>
-                        </form>
-                    </div>
-                </fieldset>
-
-                <!--<input
-                    class="click-behaviour"
-                    checked type="checkbox"
-                    data-toggle="toggle"
-                    data-on="Show card"
-                    data-off="Expand"
-                    data-onstyle="info"
-                    data-offstyle="success"
-                > -->
-                <hr>
-            </div>
+
 
             <div id="expression-container">
                 <h3>Show Expression Data <a class="info-tooltip" title="

diff --git a/static/css/style.css b/static/css/style.css
@@ -246,7 +246,7 @@ h1, h2, h3, h4, h5, h6 {
 .app-icon-inside {
     position: relative;
     margin-top: 4%;
-    width: 180;
+    width: 150px;
     right: -30px;
 }
 
@@ -1044,7 +1044,7 @@ h1, h2, h3, h4, h5, h6 {
 
 #cyt-controls-header {
     width: 100%;
-    height: 350px;
+    height: 320px;
 }