diff --git a/mo/web/menu.py b/mo/web/menu.py index 5a0ca85ee8691f5491ffc0eccf4bb8746471b759..77dfeeb3063ae87b9fbd93f5715369ecee8b4db6 100644 --- a/mo/web/menu.py +++ b/mo/web/menu.py @@ -7,14 +7,12 @@ from mo.web import app class MenuItem: url: str name: str - icon: str active_prefix: str classes: List[str] - def __init__(self, url: str, name: str, icon: Optional[str] = None, active_prefix: Optional[str] = None, classes: Optional[List[str]] = None): + def __init__(self, url: str, name: str, active_prefix: Optional[str] = None, classes: Optional[List[str]] = None): self.url = url self.name = name - self.icon = icon self.active_prefix = active_prefix or url self.classes = classes or [] @@ -22,12 +20,12 @@ class MenuItem: def get_menu(): if not g.user: items = [ - MenuItem(url_for('index'), "", "home"), + MenuItem(url_for('index'), "Domů") MenuItem(url_for('public_rounds'), "Výsledky") ] elif g.user.is_org or g.user.is_admin: items = [ - MenuItem(url_for('org_index'), "", "home"), + 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í"), @@ -37,7 +35,7 @@ def get_menu(): ] else: items = [ - MenuItem(url_for('user_index'), "", "home"), + 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 27d98ede5ebb80fef22e95c5e6fb8041d4f3da99..a45300dc5ac637261bb6ff39e3e1e9de34f0bd5f 100644 --- a/mo/web/templates/base.html +++ b/mo/web/templates/base.html @@ -62,12 +62,7 @@ <ul class="nav navbar-nav"> {% for item in get_menu() %} <li {% if item.classes %}class="{{ " ".join(item.classes) }}"{% endif %}> - <a href="{{ item.url }}"> - {% if item.icon %} - <span class="glyphicon glyphicon-{{ item.icon }}"></span> - {% endif %} - {{ item.name }} - </a> + <a href="{{ item.url }}">{{ item.name }}</a> </li> {% endfor %} </ul>