From 42725426ec02d359b67cd8d665afe17882d38958 Mon Sep 17 00:00:00 2001
From: ficus <ficus@robocracy.org>
Date: Sat, 15 Sep 2012 19:46:49 +0200
Subject: more WIP

---
 templates/base.html | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'templates/base.html')

diff --git a/templates/base.html b/templates/base.html
index a2c1407..4c15c73 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -37,13 +37,12 @@
             <li {% if path == request.path %}class="active"{% endif %}><a href="{{path}}">{{name}}</a></li>
 {%- endmacro %}
             {{ pagelink("/", "Status") }}
-            {{ pagelink("/admin/", "Administration") }}
             {{ pagelink("/reboot/", "Reboot...") }}
             <li class="nav-header">Configuration</li>
-            {{ pagelink("/wan/", "Upstream") }}
-            {{ pagelink("/lan/", "Local") }}
-            {{ pagelink("/wireless/", "Wireless") }}
-            {{ pagelink("/tor/", "Tor") }}
+            {{ pagelink("/wan/", "Upstream Ethernet") }}
+            {{ pagelink("/lan/", "Local Ethernet") }}
+            {{ pagelink("/wifi/", "WiFi") }}
+            {{ pagelink("/tor/", "Tor Network") }}
             <li class="nav-header">Monitoring</li>
             {{ pagelink("/logs/", "Logs") }}
             {{ pagelink("/processes/", "Processes") }}
@@ -51,8 +50,8 @@
         </div><!--/.well -->
       </div><!--/span-->
       <div class="span9">
-    {% with messages = get_flashed_messages(with_categories=true) %}
     {% if messages %}
+        {{ mesages }}
         {% for category, message in messages %}
             <div class="alert alert-{{ category }}">
             <button type="button" class="close" data-dismiss="alert">×</button>
@@ -63,7 +62,6 @@
             </div>
         {% endfor %}
     {% endif %}
-    {% endwith %}
 {% block body %}{% endblock %}
       </div><!--/span-->
     </div><!--/row-->
-- 
cgit v1.2.3