From 8c2b62fe616363bf9242a0e13c10a86630e436ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pracha=C5=99?= <jan.prachar@gmail.com> Date: Mon, 25 Apr 2022 11:34:11 +0200 Subject: [PATCH] style: menu --- mo/web/menu.py | 5 +---- mo/web/templates/base.html | 13 ++++++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/mo/web/menu.py b/mo/web/menu.py index 77dfeeb3..87d285ae 100644 --- a/mo/web/menu.py +++ b/mo/web/menu.py @@ -20,12 +20,10 @@ class MenuItem: def get_menu(): if not g.user: items = [ - MenuItem(url_for('index'), "Domů") - MenuItem(url_for('public_rounds'), "Výsledky") + MenuItem(url_for('public_rounds'), "Výsledky"), ] elif g.user.is_org or g.user.is_admin: items = [ - MenuItem(url_for('org_index'), "Domů"), MenuItem(url_for('org_place_root'), "Místa"), MenuItem(url_for('org_rounds'), "Soutěž"), MenuItem(url_for('org_users'), "Soutěžící"), @@ -35,7 +33,6 @@ def get_menu(): ] else: items = [ - MenuItem(url_for('user_index'), "Domů"), MenuItem(url_for('doc_index'), "Návod"), ] diff --git a/mo/web/templates/base.html b/mo/web/templates/base.html index a45300dc..8873a482 100644 --- a/mo/web/templates/base.html +++ b/mo/web/templates/base.html @@ -55,6 +55,9 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> + <a class="navbar-brand" href="/" title="Domů"> + <span class="glyphicon glyphicon-home"></span> + </a> </div> <!-- Collect the nav links, forms, and other content for toggling --> @@ -67,8 +70,13 @@ {% endfor %} </ul> {% if g.user %} - <form class="navbar-form navbar-right" method="post" action='{{ url_for('logout') }}'> - <button type="submit" class="btn btn-default">Odhlásit se</button> + <form class="navbar-form navbar-right" method="post" action='{{ url_for('logout') }}' style="padding-right: 0"> + <button type="submit" class="btn btn-default visible-sm" title="Odhlásit se"> + <span class="glyphicon glyphicon-log-out"></span> + </button> + <button type="submit" class="btn btn-default hidden-sm" title="Odhlásit se"> + <span class="glyphicon glyphicon-log-out"></span> Odhlásit se + </button> </form> {% endif %} <ul class="nav navbar-nav navbar-right"> @@ -78,7 +86,6 @@ </li> {% endfor %} </ul> - </ul> </div> </div> </nav> -- GitLab