From 9e37f7fe8e3746c8e8b34cca20b946880ec10e47 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:05:58 +0200
Subject: [PATCH] Revert "menu: Podpora pro ikony"
This reverts commit 9f41c70d9a02791dbb74a92a6f2f2aee479d8e09.
---
mo/web/menu.py | 10 ++++------
mo/web/templates/base.html | 7 +------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/mo/web/menu.py b/mo/web/menu.py
index 5a0ca85e..77dfeeb3 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 27d98ede..a45300dc 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>
--
GitLab