diff options
author | Michael Elkins <melkins@tislabs.com> | 2013-03-29 21:01:03 +0000 |
---|---|---|
committer | Michael Elkins <melkins@tislabs.com> | 2013-03-29 21:01:03 +0000 |
commit | b512ddec4b5221396f7d2931eeb6e508c708dd99 (patch) | |
tree | 8fad75c0a580fd844fa27820005fe4595c550740 | |
parent | c36a614a74cefaf310001fb7ac15f26817160b2d (diff) |
use nav-list css class for sidebar entries
svn path=/trunk/; revision=5246
-rw-r--r-- | rpkid/rpki/gui/app/templates/app/app_base.html | 13 | ||||
-rw-r--r-- | rpkid/rpki/gui/app/templates/app/dashboard.html | 6 | ||||
-rw-r--r-- | rpkid/rpki/gui/app/templates/app/roa_detail.html | 7 | ||||
-rw-r--r-- | rpkid/rpki/gui/app/templates/app/routes_view.html | 13 |
4 files changed, 18 insertions, 21 deletions
diff --git a/rpkid/rpki/gui/app/templates/app/app_base.html b/rpkid/rpki/gui/app/templates/app/app_base.html index 57bb6c2f..c50490a4 100644 --- a/rpkid/rpki/gui/app/templates/app/app_base.html +++ b/rpkid/rpki/gui/app/templates/app/app_base.html @@ -10,23 +10,18 @@ {# common navigation #} -<ul class='unstyled'> +<ul class='nav nav-list'> <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> -</ul> - -<ul class='unstyled'> + <li class="divider"></li> <li><a href="{% url "rpki.gui.app.views.conf_list" %}" title="select a different resource handle to manage">select identity</a></li> -</ul> - {% if request.user.is_superuser %} -<ul class='unstyled'> + <li class="divider"></li> <li><a href="{% url "rpki.gui.app.views.user_list" %}" title="manage users"><i class="icon-user"></i> web users</a></li> <li><a href="{% url "rpki.gui.app.views.resource_holder_list" %}" title="manage resource holders"><i class="icon-user"></i> resource holders</a></li> <li><a href="{% url "rpki.gui.app.views.client_list" %}" title="manage repository clients">repository clients</a></li> -</ul> {% endif %} - {% block sidebar_extra %}{% endblock %} +</ul> {% endblock sidebar %} diff --git a/rpkid/rpki/gui/app/templates/app/dashboard.html b/rpkid/rpki/gui/app/templates/app/dashboard.html index 65e26a86..65dbb90f 100644 --- a/rpkid/rpki/gui/app/templates/app/dashboard.html +++ b/rpkid/rpki/gui/app/templates/app/dashboard.html @@ -4,9 +4,9 @@ {% load url from future %} {% block sidebar_extra %} -<ul class='unstyled'> - <li><a href="{% url "rpki.gui.app.views.conf_export" %}" title="download XML identity to send to parent"><i class="icon-download"></i> export identity</a></li> -</ul> + <li class="divider"></li> + <li><a href="{% url "rpki.gui.app.views.conf_export" %}" title="download XML identity to send to parent"> + {#<i class="icon-download"></i> #}export identity</a></li> {% endblock sidebar_extra %} {% block content %} diff --git a/rpkid/rpki/gui/app/templates/app/roa_detail.html b/rpkid/rpki/gui/app/templates/app/roa_detail.html index b17c5a99..ec76579d 100644 --- a/rpkid/rpki/gui/app/templates/app/roa_detail.html +++ b/rpkid/rpki/gui/app/templates/app/roa_detail.html @@ -25,7 +25,12 @@ <table class="table"> <tr><th>Prefix</th><th>AS</th><th>Validity</th></tr> {% for r in object.routes %} - <tr><td>{{ r.as_resource_range }}</td><td>{{ r.asn }}</td><td>{% validity_label r.status %}</tr> + <tr> + <td>{{ r.as_resource_range }}</td> + <td>{{ r.asn }}</td> + <td>{% validity_label r.status %}</td> + <td><a href="{{ r.get_absolute_url }}" title="view route detail"><i class="icon-info-sign"></i></a></td> + </tr> {% endfor %} </table> </div> diff --git a/rpkid/rpki/gui/app/templates/app/routes_view.html b/rpkid/rpki/gui/app/templates/app/routes_view.html index cafacd5a..885f3fa9 100644 --- a/rpkid/rpki/gui/app/templates/app/routes_view.html +++ b/rpkid/rpki/gui/app/templates/app/routes_view.html @@ -4,14 +4,11 @@ {% load app_extras %} {% block sidebar_extra %} -<p> -BGP data updated<br> -IPv4: {{ timestamp.bgp_v4_import.isoformat }}<br> -IPv6: {{ timestamp.bgp_v6_import.isoformat }} -<p> -rcynic cache updated<br> -{{ timestamp.rcynic_import.isoformat }} - +<li class="nav-header">BGP data updated</li> +<li>IPv4: {{ timestamp.bgp_v4_import.isoformat }}</li> +<li>IPv6: {{ timestamp.bgp_v6_import.isoformat }}</li> +<li class="nav-header">rcynic cache updated</li> +<li>{{ timestamp.rcynic_import.isoformat }}</li> {% endblock sidebar_extra %} {% block content %} |