matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Shorten menu names

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-04-21 16:05:44 -04:00
parent c04063838b
commit 9ebace4014
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mayan/apps/appearance/templates/appearance/base.html
View File

@@ -37,8 +37,8 @@
</div>
</div>
{% 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 %}
<div class="row">
{% if links or form_navigation_links %}

2
mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html
View File

@@ -88,7 +88,7 @@
{% if not hide_links %}
<p class="text-center">
{% 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' %}

2
mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
View File

@@ -96,7 +96,7 @@
{% endfor %}
{% if not hide_links %}
<td class="last">
{% 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 %}

2
mayan/apps/appearance/templates/appearance/main_menu.html
View File

@@ -16,7 +16,7 @@
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
{% 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 %}

2
mayan/apps/cabinets/menus.py
View File

@@ -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'
)

20
mayan/apps/common/menus.py
View File

@@ -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')
)

2
mayan/apps/documents/menus.py
View File

@@ -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'
)

2
mayan/apps/navigation/templatetags/navigation_tags.py
View File

@@ -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))

2
mayan/apps/tags/menus.py
View File

@@ -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'
)