From 5feecc725ba4e6d593b98e37ea45deb8e8c592ce Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 2 Aug 2017 03:53:16 -0400 Subject: [PATCH] Add support for dropdown menus for the item list view template. Signed-off-by: Roberto Rosario --- .../generic_list_items_subtemplate.html | 2 +- .../navigation/generic_navigation.html | 28 +++++++++++++++++-- .../navigation/generic_subnavigation.html | 14 +++++----- 3 files changed, 33 insertions(+), 11 deletions(-) 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 65dfc1a00c..fb19aab886 100644 --- a/mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html +++ b/mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html @@ -103,7 +103,7 @@

{% get_menu_links 'object menu' source=object as resolved_links %} {% for object_navigation_links in resolved_links %} - {% with 'true' as horizontal %} + {% with 'true' as as_dropdown %} {% include 'navigation/generic_navigation.html' %} {% endwith %} {% endfor %} diff --git a/mayan/apps/appearance/templates/navigation/generic_navigation.html b/mayan/apps/appearance/templates/navigation/generic_navigation.html index 5f5ff5fc34..0a7782a231 100644 --- a/mayan/apps/appearance/templates/navigation/generic_navigation.html +++ b/mayan/apps/appearance/templates/navigation/generic_navigation.html @@ -1,3 +1,25 @@ -{% for link in object_navigation_links %} - {% include 'navigation/generic_subnavigation.html' %} -{% endfor %} +{% load i18n %} + +{% if as_dropdown %} +

+{% else %} + {% for link in object_navigation_links %} + {% include 'navigation/generic_subnavigation.html' %} + {% endfor %} +{% endif %} diff --git a/mayan/apps/appearance/templates/navigation/generic_subnavigation.html b/mayan/apps/appearance/templates/navigation/generic_subnavigation.html index dfbfb97740..463f74d522 100644 --- a/mayan/apps/appearance/templates/navigation/generic_subnavigation.html +++ b/mayan/apps/appearance/templates/navigation/generic_subnavigation.html @@ -24,14 +24,14 @@ {% else %} -{% if as_li %} -
  • -{% endif %} + {% if as_li %} +
  • + {% endif %} - {% include link_template|default:'navigation/generic_link_instance.html' %} + {% include link_template|default:'navigation/generic_link_instance.html' %} -{% if as_li %} -
  • -{% endif %} + {% if as_li %} + + {% endif %} {% endif %}