Menu: Pokus o sjednocené menu (issue #12)

mo/web/menu.py

@@ -19,17 +19,17 @@ class MenuItem:
 
 def get_menu():
     items = [
-        MenuItem(url_for('index'), "Index")
+        MenuItem(url_for('index'), "Domů")
     ]
 
-    if request.path.startswith('/org/'):
-        items = [
+    if g.user and (g.user.is_org or g.user.is_admin):
+        items.extend([
             MenuItem(url_for('org_index'), "Org"),
             MenuItem(url_for('org_place_root'), "Místa"),
             MenuItem(url_for('org_contest_root'), "Soutěž"),
-            MenuItem(url_for('org_users'), "Soutěžící", active_prefix="/org/user"),
-            MenuItem(url_for('org_orgs'), "Organizátoři", active_prefix="/org/org"),
-        ]
+            MenuItem(url_for('org_users'), "Soutěžící"),
+            MenuItem(url_for('org_orgs'), "Organizátoři"),
+        ])
 
     # Login / user settings
     if g.user: