diff options
| author | Michael Elkins <melkins@tislabs.com> | 2013-06-13 18:47:44 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2013-06-13 18:47:44 +0000 |
| commit | b77a1561cadbd1efed1b7544165d839288e50e67 (patch) | |
| tree | 6c2454c93d9fde100e031d90f20c98ec591b74f4 | |
| parent | 40b017c2eb7684b307377dc99913174c0b8a44c5 (diff) | |
display rpki.net software version in the gui toolbar
see #543
svn path=/trunk/; revision=5403
| -rw-r--r-- | rpkid/rpki/gui/app/templates/base.html | 5 | ||||
| -rw-r--r-- | rpkid/rpki/gui/app/templatetags/app_extras.py | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/rpkid/rpki/gui/app/templates/base.html b/rpkid/rpki/gui/app/templates/base.html index 6138feb3..89f3abb9 100644 --- a/rpkid/rpki/gui/app/templates/base.html +++ b/rpkid/rpki/gui/app/templates/base.html @@ -1,4 +1,5 @@ {% load url from future %} +{% load app_extras %} <!DOCTYPE HTML> <html lang="en"> @@ -17,7 +18,7 @@ <div class="container"> <div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> - <a class="brand" href="#">rpki.net</a> + <a class="brand" href="#">rpki.net {% rpki_version %}</a> <ul class='nav'> <li class="active"> <a href="#">Home</a> @@ -28,6 +29,8 @@ <li class="divider-vertical"></li> <li><a href="{% url "rpki.gui.views.logout" %}">Log Out</a></li> {% endif %} + </ul> + <ul class="nav pull-right"> <li><a href="https://trac.rpki.net/wiki/doc/RPKI/CA/UI/GUI">Help</a></li> </ul> </div> diff --git a/rpkid/rpki/gui/app/templatetags/app_extras.py b/rpkid/rpki/gui/app/templatetags/app_extras.py index 93d3a9ad..2bde9bc2 100644 --- a/rpkid/rpki/gui/app/templatetags/app_extras.py +++ b/rpkid/rpki/gui/app/templatetags/app_extras.py @@ -50,3 +50,9 @@ def alert_count(conf): else: css_class = 'badge-default' return u'<span class="badge %s">%d</span>' % (css_class, unread) + + +@register.simple_tag +def rpki_version(): + import rpki.version + return rpki.version.VERSION |