[ISSUE 1988] moving the About menu to the user menu (#1989)

* moving About menu to the user menu

* update the menu according to the rescrictions of the admin users

* remove the About button from the topbar menu

* keeping the TOPBAR_MENU_RIGHT variable

Author: Gpetrak

geonode_mapstore_client/templates/geonode-mapstore-client/snippets/topbar.html

@@ -2,7 +2,6 @@
 {% get_base_left_topbar_menu as BASE_TOPBAR_MENU_LEFT %}
 {% get_menu_json 'TOPBAR_MENU' as TOPBAR_MENU %}
 {% get_menu_json 'TOPBAR_MENU_LEFT' as TOPBAR_MENU_LEFT %}
-{% get_base_right_topbar_menu as BASE_TOPBAR_MENU_RIGHT %}
 {% get_menu_json 'TOPBAR_MENU_RIGHT' as TOPBAR_MENU_RIGHT %}
 
 <nav id="{{ id|default:'' }}" class="gn-menu gn-primary" data-gn-menu-resize="true">
@@ -57,13 +56,10 @@
             <div class="gn-menu-content-right">
                 {% block right_menu %}
                 <ul class="gn-menu-list">
-                    {% for menu_item in BASE_TOPBAR_MENU_RIGHT %}
-                        {% include './menu_item.html' with menu_item=menu_item variant='primary' align_right=True %}
-                    {% endfor %}
                     {% for menu_item in TOPBAR_MENU_RIGHT %}
                         {% include './menu_item.html' with menu_item=menu_item variant='primary' align_right=True %}
                     {% endfor %}
-
+                    
                     {% block language_selector %}
                         {% include './language_selector.html' with variant='primary' align_right=True %}
                     {% endblock %}

geonode_mapstore_client/templatetags/get_menu_json.py

@@ -65,49 +65,6 @@ def get_base_left_topbar_menu():
         }
     ]
 
-
-@register.simple_tag(takes_context=True)
-def get_base_right_topbar_menu(context):
-    is_mobile = _is_mobile_device(context)
-
-    if is_mobile:
-        return []
-
-    about = {
-        "label": "About",
-        "type": "dropdown",
-        "items": [
-            {"type": "link", "href": "/people/", "label": "People"},
-            {"type": "link", "href": "/groups/", "label": "Groups"},
-        ],
-    }
-
-    user = _get_request_user(context)
-
-    if user and user.is_authenticated and not Configuration.load().read_only:
-        about["items"].extend(
-            [
-                {"type": "divider"},
-                {
-                    "type": "link",
-                    "href": "/invitations/geonode-send-invite/",
-                    "label": "Invite users",
-                },
-                {
-                    "type": "link",
-                    "href": "/admin/people/profile/add/",
-                    "label": "Add user",
-                }
-                if user.is_superuser
-                else None,
-                {"type": "link", "href": "/groups/create/", "label": "Create group"}
-                if user.is_superuser
-                else None,
-            ]
-        )
-    return [about]
-
-
 @register.simple_tag(takes_context=True)
 def get_user_menu(context):
     is_mobile = _is_mobile_device(context)
@@ -165,7 +122,31 @@ def get_user_menu(context):
             devider,
         ],
     }
-    general = [{"type": "link", "href": "/help/", "label": "Help"}, devider, logout]
+
+    people_groups = [
+        {"type": "link", "href": "/people/", "label": "People"},
+        {"type": "link", "href": "/groups/", "label": "Groups"},
+        devider
+        ]
+        
+    if user.is_superuser: 
+        people_groups.extend(
+            [
+            {"type": "link", "href": "/invitations/geonode-send-invite/", "label": "Invite users"},
+            {"type": "link","href": "/admin/people/profile/add/","label": "Add user"},
+            {"type": "link", "href": "/groups/create/", "label": "Create group"},
+            devider
+            ]
+        )
+    
+    general =  (
+        people_groups + [
+            {"type": "link", "href": "/help/", "label": "Help"}, 
+            devider, 
+            logout
+            ]
+    )
+
     monitoring = []
     if settings.MONITORING_ENABLED:
         monitoring = [