Enable display of code tab at all times.

souffle-lang · Oct 2, 2018 · c6d2b2d · c6d2b2d
1 parent 03f66aa
commit c6d2b2d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 30 deletions.
diff --git a/src/profile/htmlCssStyle.h b/src/profile/htmlCssStyle.h
@@ -623,15 +623,29 @@ button {
     margin-bottom: 1em;
 }
 
+#code-list {
+    background: #AAA;
+    padding-left: 2em;
+    color: #666;
+}
+
+.code-li {
+    background: #FAFAFA;
+    marginBottom: 0;
+}
+
 #code-view {
     overflow: auto;
     height: calc( 100vh - 160px );
     width: calc( 100vw - 25px );
     font-family: Consolas, Menlo, Monaco, Lucida Console,'Bitstream Vera Sans Mono','Courier',monospace;
     line-height: 21px;
 }
+
 #code-view .text-span {
     white-space: nowrap;
+    padding-left: 6px;
+    color: #666;
 }
 
 #code-view .ol li:before  {

diff --git a/src/profile/htmlJsMain.h b/src/profile/htmlJsMain.h
@@ -24,16 +24,6 @@ function changeSelectedRul(id) {
     genRulVer();
 }
 
-
-
-function goBack() {
-    if (came_from==="rel") {
-        document.getElementById("rel_tab").click();
-    } else if (came_from==="rul") {
-        document.getElementById("rul_tab").click();
-    }
-}
-
 function highlightRow() {
     var i;
     for (i=0;i<document.getElementsByClassName("rel_row").length;i++) {
@@ -196,13 +186,8 @@ function drawGraph() {
 
 function changeTab(event, change_to) {
     if (change_to === "Chart") {
-        document.getElementById("code-tab").style.display = "none";
         document.getElementById("chart-tab").style.display = "block";
-    } else if (change_to === "Code") {
-        document.getElementById("code-tab").style.display = "block";
-        document.getElementById("chart-tab").style.display = "none";
     } else {
-        document.getElementById("code-tab").style.display = "none";
         document.getElementById("chart-tab").style.display = "none";
     }
     var c, d, e;
@@ -534,22 +519,15 @@ function gen_code(highlight_row) {
     var list, row, text, target_row;
     list = document.getElementById("code-list");
     list.innerHTML = "";
-    list.style.background = "#AAA";
-    list.style.paddingLeft = "12px";
-    list.style.color = "#666";
     for (var i=0; i<data.code.length; i++) {
         row = document.createElement("li");
         row.className = "code-li";
-        if (i+1 != highlight_row) {
-            row.style.background = "#FAFAFA";
+        if (i+1 == highlight_row) {
             target_row = row;
-        } else {
             row.style.background = "#E0FFFF";
         }
         row.style.marginBottom = "0";
         text = document.createElement("span");
-        text.style.paddingLeft = "6px";
-        text.style.color = "#666";
         text.className = "text-span";
         text.textContent = data.code[i];
         row.appendChild(text);
@@ -575,6 +553,7 @@ function init() {
     gen_top();
     gen_rel_table();
     gen_rul_table();
+    gen_code(-1)
     Tablesort(document.getElementById('Rel_table'),{descending: true});
     Tablesort(document.getElementById('Rul_table'),{descending: true});
     Tablesort(document.getElementById('rulesofrel_table'),{descending: true});

diff --git a/src/profile/htmlMain.h b/src/profile/htmlMain.h
@@ -25,12 +25,12 @@ std::string htmlBodyTop = R"___(
 <body>
 <div id="wrapper" style="width:100%;height:inherit;">
     <ul class="tab">
-        <li><a href="javascript:void(0)" class="tablinks" id="default" onclick="changeTab(event, 'Top');">Top</a></li>
-        <li><a href="javascript:void(0)" class="tablinks" id="rel_tab" onclick="changeTab(event, 'Relations');came_from = 'rel';">Relations</a></li>
-        <li><a href="javascript:void(0)" class="tablinks" id="rul_tab" onclick="changeTab(event, 'Rules');came_from = 'rul';">Rules</a></li>
-        <li><a href="javascript:void(0)" class="tablinks" onclick="changeTab(event, 'Help')">Help</a></li>
-        <li id="chart-tab" style="display:none;"><a href="javascript:void(0)" id="chart_tab" onclick="changeTab(event, 'Chart')" class="tablinks">Chart</a></li>
-        <li id="code-tab" style="display:none;"><a href="javascript:void(0)" id="code_tab" onclick="changeTab(event, 'Code')" class="tablinks">Code</a></li>
+        <li><a class="tablinks" id="default" onclick="changeTab(event, 'Top');">Top</a></li>
+        <li><a class="tablinks" id="rel_tab" onclick="changeTab(event, 'Relations');came_from = 'rel';">Relations</a></li>
+        <li><a class="tablinks" id="rul_tab" onclick="changeTab(event, 'Rules');came_from = 'rul';">Rules</a></li>
+        <li id="code-tab"><a class="tablinks" id="code_tab" onclick="changeTab(event, 'Code')">Code</a></li>
+        <li><a class="tablinks" onclick="changeTab(event, 'Help')">Help</a></li>
+        <li id="chart-tab" style="display:none;"><a id="chart_tab" onclick="changeTab(event, 'Chart')" class="tablinks">Chart</a></li>
     </ul>
     <div id="Help" class="tabcontent" style="max-width:800px;margin-left: auto;margin-right: auto;">
         <h3>GUI Souffle profiler</h3>
@@ -176,7 +176,6 @@ std::string htmlBodyTop = R"___(
     <!--<button onclick="show_graph_vals=!show_graph_vals;draw_graph();">Toggle values</button>-->
 </div>
 <div id="Code" class="tabcontent">
-    <button onclick="goBack(event)">Go Back</button>
     <h3>Source Code</h3>
     <div id="code-view">
         <ol id="code-list"></ol>