Merge pull request #1929 from UlrichB22/fix_1928

add icon for +admin/user and some fault tolerance

Author: RogerHaase

src/moin/constants/misc.py

@@ -81,6 +81,7 @@
 
 # Iconclass to endpoint mapping used in navibars
 ICON_MAP = {
+    "admin.index": "fa fa-cog",
     "admin.index_user": "fa fa-user",
     "frontend.backrefs": "fa fa-share",
     "frontend.convert_item": "fa fa-clone",

src/moin/themes/__init__.py

@@ -189,7 +189,7 @@ def get_action_tabs(self, fqname, current_endpoint):
                 if not check_exists or exists:
                     if endpoint in navtabs_endpoints:
 
-                        iconcls = ICON_MAP[endpoint]
+                        iconcls = ICON_MAP[endpoint] if endpoint in ICON_MAP else ""
                         linkcls = None
 
                         if endpoint == "special.comments":
@@ -251,7 +251,7 @@ def get_local_panel(self, fqname):
                     if endpoint in user_actions_endpoints:
                         if flaskg.user.valid:
                             href = url_for(endpoint, item_name=fqname)
-                            iconcls = ICON_MAP[endpoint]
+                            iconcls = ICON_MAP[endpoint] if endpoint in ICON_MAP else ""
                             # endpoint = iconcls = label = None
 
                             if endpoint == "frontend.quicklink_item":
@@ -269,15 +269,15 @@ def get_local_panel(self, fqname):
 
                     elif endpoint in item_actions_endpoints:
 
-                        iconcls = ICON_MAP[endpoint]
+                        iconcls = ICON_MAP[endpoint] if endpoint in ICON_MAP else ""
 
                         href = url_for(endpoint, item_name=fqname)
                         item_actions.append((endpoint, href, iconcls, label, title, True))
 
                     # Special Supplementation defined only for named items
                     elif endpoint in item_navigation_endpoints and fqname.field == NAME_EXACT:
 
-                        iconcls = ICON_MAP[endpoint]
+                        iconcls = ICON_MAP[endpoint] if endpoint in ICON_MAP else ""
 
                         if endpoint == "special.supplementation":
                             for sub_item_name in app.cfg.supplementation_item_names:
@@ -452,7 +452,7 @@ def navibar(self, fqname):
                     link_text = f"{fqname.namespace}/{link_text}"
             elif endpoint == "admin.index" and not getattr(flaskg.user.may, SUPERUSER)():
                 continue
-            iconcls = ICON_MAP[endpoint]
+            iconcls = ICON_MAP[endpoint] if endpoint in ICON_MAP else ""
             items.append((cls, url_for(endpoint, **args), link_text, title, iconcls))
         # Add user links to wiki links.
         for text in self.user.quicklinks: