add link to route view in sidebar

change dashboard template to inherit from app_base.html

add new block to app_base to allow child templates to add additional
content to the sidebar

change 'Route Views' to 'Route View'

change 'AS' to 'Origin AS' in the routes_view.html template

svn path=/branches/tk161/; revision=4167

3 files changed, 8 insertions, 14 deletions

diff --git a/rpkid/rpki/gui/app/templates/rpkigui/app_base.html b/rpkid/rpki/gui/app/templates/rpkigui/app_base.html
index a9eaecfe..c61bc2f2 100644
--- a/rpkid/rpki/gui/app/templates/rpkigui/app_base.html
+++ b/rpkid/rpki/gui/app/templates/rpkigui/app_base.html
@@ -10,10 +10,13 @@
 
 <ul class='unstyled'>
   <li><a href="{% url rpki.gui.app.views.dashboard %}">dashboard</a></li>
+  <li><a href="{% url rpki.gui.app.views.route_view %}">routes</a></li>
   <li><a href="{% url rpki.gui.app.views.parent_list %}">parents</a></li>
   <li><a href="{% url rpki.gui.app.views.child_list %}">children</a></li>
   <li><a href="{% url rpki.gui.app.views.roa_request_list %}">roas</a></li>
   <li><a href="{% url rpki.gui.app.views.ghostbusters_list %}">ghostbusters</a></li>
 </ul>
 
+{% block sidebar_extra %}{% endblock %}
+
 {% endblock sidebar %}
diff --git a/rpkid/rpki/gui/app/templates/rpkigui/dashboard.html b/rpkid/rpki/gui/app/templates/rpkigui/dashboard.html
index 497b9be2..ee8f749d 100644
--- a/rpkid/rpki/gui/app/templates/rpkigui/dashboard.html
+++ b/rpkid/rpki/gui/app/templates/rpkigui/dashboard.html
@@ -1,15 +1,6 @@
-{% extends "base.html" %}
+{% extends "rpkigui/app_base.html" %}
 
-{% block sidebar %}
-<p><strong>{{ request.session.handle }}</strong>
-
-<ul class='unstyled'>
-  <li><a href="#">dashboard</a></li>
-  <li><a href="{% url rpki.gui.app.views.parent_list %}">parents</a></li>
-  <li><a href="{% url rpki.gui.app.views.child_list %}">children</a></li>
-  <li><a href="{% url rpki.gui.app.views.roa_request_list %}">roas</a></li>
-  <li><a href="{% url rpki.gui.app.views.ghostbusters_list %}">ghostbusters</a></li>
-</ul>
+{% block sidebar_extra %}
 
 <ul class='unstyled'>
   <li><a href="{% url rpki.gui.app.views.conf_export %}" title="download XML identity to send to parent">export identity</a></li>
@@ -31,7 +22,7 @@
 <ul class='unstyled'>
     <li><a href="{% url rpki.gui.app.views.refresh %}">refresh</a></li>
 </ul>
-{% endblock %}
+{% endblock sidebar_extra %}
 
 {% block content %}
 
diff --git a/rpkid/rpki/gui/app/templates/rpkigui/routes_view.html b/rpkid/rpki/gui/app/templates/rpkigui/routes_view.html
index 41213c26..10a2ba3f 100644
--- a/rpkid/rpki/gui/app/templates/rpkigui/routes_view.html
+++ b/rpkid/rpki/gui/app/templates/rpkigui/routes_view.html
@@ -3,7 +3,7 @@
 {% block content %}
 
 <div class='page-header'>
-	<h1>Route Views</h1>
+	<h1>Route View</h1>
 </div>
 
 <p>
@@ -12,7 +12,7 @@ This view shows currently advertised routes for the prefixes listed in resource
 <table class='zebra-striped condensed-table'>
   <tr>
     <th>Prefix</th>
-    <th>AS</th>
+    <th>Origin AS</th>
     <th>Validation Status</th>
   </tr>
   {% for r in routes %}