From 53ed7175876325f4d6f9c2b411d4763ec747833c Mon Sep 17 00:00:00 2001 From: Andreas <andreasv@fsmpi.rwth-aachen.de> Date: Sat, 10 Sep 2016 00:33:27 +0200 Subject: [PATCH] fixed icons in navbar --- schedule.py | 2 +- server.py | 6 +++--- templates/base.html | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/schedule.py b/schedule.py index 93f511f..5961d05 100755 --- a/schedule.py +++ b/schedule.py @@ -1,7 +1,7 @@ from server import * @app.route('/schedule') -@register_navbar('Drehplan', 'calendar') +@register_navbar('Drehplan', icon='calendar') @mod_required def schedule(): if 'kw' not in request.args: diff --git a/server.py b/server.py index 33f4749..1931e3e 100755 --- a/server.py +++ b/server.py @@ -351,13 +351,13 @@ def auth(): # For use with nginx auth_request return "Not allowed", 403 @app.route('/stats') -@register_navbar('Statistiken', 'stats') +@register_navbar('Statistiken', icon='stats') @mod_required def stats(): return render_template('stats.html') @app.route('/changelog') -@register_navbar('Changelog', 'book') +@register_navbar('Changelog', icon='book') @mod_required def changelog(): changelog = query('SELECT *, ( "table" || "." || id_value || "." ||field) as path FROM changelog LEFT JOIN users ON (changelog.who = users.id) ORDER BY `when` DESC LIMIT 50') @@ -418,7 +418,7 @@ def sitemap(): @app.route('/sortlog') -@register_navbar('Sortierlog', 'sort-by-attributes-alt') +@register_navbar('Sortierlog', icon='sort-by-attributes-alt') @mod_required def sortlog(): return render_template('sortlog.html') diff --git a/templates/base.html b/templates/base.html index fc99e5f..bc15889 100644 --- a/templates/base.html +++ b/templates/base.html @@ -41,15 +41,15 @@ </div> <div class="collapse navbar-collapse"> <ul class="nav nav-pills" style="margin-top: 5px;"> - {% for endpoint, caption, gly, iconlib, visible in navbar if visible or ismod() %} + {% for endpoint, caption, iconlib, gly, visible in navbar if visible or ismod() %} <li{% if endpoint == request.endpoint %} class="active"{% endif %}> <a href="{{ url_for(endpoint) }}"> {% if gly != '' %} - {% if iconlib == 'bootstrap' %} - <span aria-hidden="true" class="glyphicon glyphicon-{{ gly }}"></span> - {% elif iconlib == 'fa' %} - <span aria-hidden="true" class="fa fa-{{ gly }}"></span> - {% endif %} + {% if iconlib == 'bootstrap' %} + <span aria-hidden="true" class="glyphicon glyphicon-{{ gly }}"></span> + {% elif iconlib == 'fa' %} + <span aria-hidden="true" class="fa fa-{{ gly }}"></span> + {% endif %} {{ caption }} {% endif %} </a> @@ -125,7 +125,7 @@ </div> <footer class="footer"> <div class="container-fluid"> - <ul class="list-inline col-xs-12"> + <ul class="list-inline"> <li> <a href="http://www.fsmpi.rwth-aachen.de/">Fachschaft I/1</a> </li> -- GitLab