Merge branch 'master' into release_prepare

igemsoftware · Apr 2, 2015 · 08cec5c · 08cec5c
2 parents e1e5a66 + ff2bb05
commit 08cec5c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/server/static/css/circuit.css b/server/static/css/circuit.css
@@ -521,3 +521,24 @@ th {
     top:0px;
     z-index:800;
 }
+
+#menu {
+    position:fixed;
+    top:30px;
+    left:400px;
+    font-size:30px;
+}
+
+#menu a, a:visited {
+    color:white;
+    margin-left:10px;
+}
+
+#menu a.active, a.active:visited {
+    color:#00B5AD;
+    border-bottom:2px #00B5AD solid;
+}
+
+#menu a:hover {
+    color:#00B5AD;
+}
diff --git a/server/templates/circuit.html b/server/templates/circuit.html
@@ -4,6 +4,13 @@
 <link rel="stylesheet" type="text/css" href="../static/css/circuit.css">
 {%endblock css %}
 {%block content %}
+<div class="ui huge breadcrumb" id="menu">
+    <a class="active section" href="/design">Design</a>
+    <a class="section" href="/shape">Display</a>
+    <a class="section" href="/simulation">Simulation</a>
+    <a class="section" href="/experiment">Experiment</a>
+    <a class="section" href="/help">Help</a>
+</div>
 <div id="circuits">
     <div class="ui teal button" id="upload">
         Complete
@@ -193,7 +200,7 @@
                         </tr> 
                     </thead>
                     <tbody>
-                        <tr><td></td><td></td></tr>
+                    <tr><td></td><td></td></tr>
                     </tbody> 
                 </table>
             </form>