diff --git a/mayan/apps/appearance/templates/appearance/base.html b/mayan/apps/appearance/templates/appearance/base.html
index ed08e66723..0e63d2bb47 100644
--- a/mayan/apps/appearance/templates/appearance/base.html
+++ b/mayan/apps/appearance/templates/appearance/base.html
@@ -37,8 +37,8 @@
- {% get_menus_links names='object menu,sidebar menu,secondary menu' sort_results=True as links %}
- {% get_menu_links 'object facet' sort_results=True as form_navigation_links %}
+ {% get_menus_links names='object,sidebar,secondary' sort_results=True as links %}
+ {% get_menu_links name='facet' sort_results=True as form_navigation_links %}
{% if links or form_navigation_links %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html
index a8559717b4..dfcba688e8 100644
--- a/mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html
@@ -88,7 +88,7 @@
{% if not hide_links %}
- {% get_menu_links 'object menu' source=object as resolved_links %}
+ {% get_menu_links name='object' source=object as resolved_links %}
{% for object_navigation_links in resolved_links %}
{% with 'true' as as_dropdown %}
{% include 'navigation/generic_navigation.html' %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
index 8b05503c3a..4b1d0e2cd9 100644
--- a/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
@@ -96,7 +96,7 @@
{% endfor %}
{% if not hide_links %}
- {% get_menu_links 'object menu' source=object as resolved_links %}
+ {% get_menu_links 'object' source=object as resolved_links %}
{% for object_navigation_links in resolved_links %}
{% with 'true' as horizontal %}
{% with 'true' as hide_icon %}
diff --git a/mayan/apps/appearance/templates/appearance/main_menu.html b/mayan/apps/appearance/templates/appearance/main_menu.html
index 3bddb21b6f..59f9074b05 100644
--- a/mayan/apps/appearance/templates/appearance/main_menu.html
+++ b/mayan/apps/appearance/templates/appearance/main_menu.html
@@ -16,7 +16,7 @@
- {% get_menu_links 'main menu' as menu_links %}
+ {% get_menu_links name='main' as menu_links %}
{% for link_set in menu_links %}
{% for link in link_set %}
{% with 'true' as as_li %}
diff --git a/mayan/apps/cabinets/menus.py b/mayan/apps/cabinets/menus.py
index 5e2a9253b6..e4e82d36c3 100644
--- a/mayan/apps/cabinets/menus.py
+++ b/mayan/apps/cabinets/menus.py
@@ -12,5 +12,5 @@ menu_cabinets = Menu(
app_label='cabinets', model_name='Cabinet',
object_permission=permission_cabinet_view,
view_permission=permission_cabinet_create,
- ), icon_class=icon_cabinet_list, label=_('Cabinets'), name='cabinets menu'
+ ), icon_class=icon_cabinet_list, label=_('Cabinets'), name='cabinets'
)
diff --git a/mayan/apps/common/menus.py b/mayan/apps/common/menus.py
index 7ee8c2e9e8..74c6cae07e 100644
--- a/mayan/apps/common/menus.py
+++ b/mayan/apps/common/menus.py
@@ -12,16 +12,16 @@ __all__ = (
)
menu_about = Menu(
- icon_class=icon_menu_about, label=_('System'), name='about menu'
+ icon_class=icon_menu_about, label=_('System'), name='about'
)
-menu_facet = Menu(name='object facet')
-menu_object = Menu(name='object menu')
-menu_main = Menu(name='main menu')
-menu_multi_item = Menu(name='multi item menu')
-menu_secondary = Menu(name='secondary menu')
-menu_setup = Menu(name='setup menu')
-menu_sidebar = Menu(name='sidebar menu')
-menu_tools = Menu(name='tools menu')
+menu_facet = Menu(label=_('Facet'), name='facet')
+menu_main = Menu(name='main')
+menu_multi_item = Menu(name='multi item')
+menu_object = Menu(label=_('Actions'), name='object')
+menu_secondary = Menu(label=_('Secondary'), name='secondary')
+menu_setup = Menu(name='setup')
+menu_sidebar = Menu(name='sidebar')
+menu_tools = Menu(name='tools')
menu_user = Menu(
- icon_class=icon_menu_user, name='user menu', label=_('User')
+ icon_class=icon_menu_user, name='user', label=_('User')
)
diff --git a/mayan/apps/documents/menus.py b/mayan/apps/documents/menus.py
index 71f2ad08a8..6e8e457a17 100644
--- a/mayan/apps/documents/menus.py
+++ b/mayan/apps/documents/menus.py
@@ -8,5 +8,5 @@ from .icons import icon_menu_documents
menu_documents = Menu(
icon_class=icon_menu_documents, label=_('Documents'),
- name='documents menu'
+ name='documents'
)
diff --git a/mayan/apps/navigation/templatetags/navigation_tags.py b/mayan/apps/navigation/templatetags/navigation_tags.py
index 589798c54c..fca0351bc0 100644
--- a/mayan/apps/navigation/templatetags/navigation_tags.py
+++ b/mayan/apps/navigation/templatetags/navigation_tags.py
@@ -38,7 +38,7 @@ def get_menus_links(context, names, source=None, sort_results=None):
@register.simple_tag(takes_context=True)
def get_multi_item_links_form(context, object_list):
actions = []
- for link_set in Menu.get('multi item menu').resolve(context=context, source=object_list[0], sort_results=True):
+ for link_set in Menu.get('multi item').resolve(context=context, source=object_list[0], sort_results=True):
for link in link_set:
actions.append((link.url, link.text))
diff --git a/mayan/apps/tags/menus.py b/mayan/apps/tags/menus.py
index 759788637e..c8e3e8c842 100644
--- a/mayan/apps/tags/menus.py
+++ b/mayan/apps/tags/menus.py
@@ -12,5 +12,5 @@ menu_tags = Menu(
app_label='tags', model_name='Tag',
object_permission=permission_tag_view,
view_permission=permission_tag_create,
- ), icon_class=icon_menu_tags, label=_('Tags'), name='tags menu'
+ ), icon_class=icon_menu_tags, label=_('Tags'), name='tags'
)
|