From: Emilie Date: Tue, 5 Jul 2016 13:36:53 +0000 (+0200) Subject: Adding tree menu : action / header / footer X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=483d006a22bf5e3022cb6552812ecc1a867c2306;p=mezzo.git Adding tree menu : action / header / footer --- diff --git a/app/settings.py b/app/settings.py index 07a1896b..778bc3d5 100644 --- a/app/settings.py +++ b/app/settings.py @@ -42,9 +42,9 @@ from django.utils.translation import ugettext_lazy as _ # that doesn't appear in this setting, all pages will appear in it. PAGE_MENU_TEMPLATES = ( - (1, _("Top header"), "pages/menus/header.html"), - (2, _("Top navigation bar"), "pages/menus/dropdown.html"), - (3, _("Footer"), "pages/menus/footer.html"), + (1, _("Action"), "pages/menus/action.html"), + (2, _("Departement"), "pages/menus/header.html"), + (3, _("Footer"), "pages/menus/footer.html") ) # A sequence of fields that will be injected into Mezzanine's (or any @@ -224,7 +224,7 @@ INSTALLED_APPS = [ "meta", "mezzanine_agenda", "festival", - "organization", + "organization" ] diff --git a/app/templates/base.html b/app/templates/base.html index 371a4d8d..1cf860e8 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -47,6 +47,8 @@ + {% page_menu "pages/menus/action.html" %} + {% if settings.SITE_TAGLINE %}

{{ settings.SITE_TAGLINE }}

{% endif %} @@ -55,7 +57,7 @@
@@ -80,7 +82,7 @@ {% if settings.USE_MODELTRANSLATION and languages|length > 1 %} {% for language in languages %}
  • - + {{ language.code|title }}
    • @@ -147,44 +149,10 @@ {% include "includes/footer_scripts.html" %} diff --git a/app/templates/includes/footer_scripts.html b/app/templates/includes/footer_scripts.html index 409bea06..4b6c8e75 100644 --- a/app/templates/includes/footer_scripts.html +++ b/app/templates/includes/footer_scripts.html @@ -2,7 +2,7 @@ {% compress js %} - #} + {% block extra_js %}{% endblock %} {% editable_loader %} diff --git a/app/templates/pages/menus/action.html b/app/templates/pages/menus/action.html new file mode 100644 index 00000000..20591526 --- /dev/null +++ b/app/templates/pages/menus/action.html @@ -0,0 +1,43 @@ +{% load i18n pages_tags %} +{% get_language_info_list for LANGUAGES as languages %} + +{% spaceless %} +{% if page_branch_in_menu %} + {% for page in page_branch %} + {% if page.is_primary %} + {% if forloop.first %} +
    +
      + {% endif %} + {% if page.in_menu %} + {#
        #} + {% endif %} + {% endif %} + {% if page.in_menu %} + {% if forloop.first and not page.parent.in_menu and not page.is_primary %} + {% endif %} +
      • +

        + {{ page.title }} +

        +
        • + {% endif %} + {% if page.in_menu and page.has_children_in_menu %}{% page_menu page %}{% endif %} + {% if page.in_menu %} + {% if forloop.first and not page.parent.in_menu and not page.is_primary %} + {# #} + {% endif %} + {#
      #} + {% endif %} + {% if page.is_primary %} + {% if page.in_menu %} + {#
    #} + {% endif %} + {% if forloop.last %} + +
    + {% endif %} + {% endif %} + {% endfor %} +{% endif %} +{% endspaceless %} diff --git a/app/templates/pages/menus/dropdown.html b/app/templates/pages/menus/dropdown.html deleted file mode 100644 index 8d9c3cff..00000000 --- a/app/templates/pages/menus/dropdown.html +++ /dev/null @@ -1,35 +0,0 @@ -{% load i18n pages_tags %} -{% get_language_info_list for LANGUAGES as languages %} - -{% spaceless %} -{% if page_branch_in_menu %} - {% if branch_level == 0 %} - - {% else %} - - {% endif %} -{% endif %} -{% endspaceless %} diff --git a/app/templates/pages/menus/header.html b/app/templates/pages/menus/header.html index e69de29b..8a5b1a09 100644 --- a/app/templates/pages/menus/header.html +++ b/app/templates/pages/menus/header.html @@ -0,0 +1,35 @@ +{% load i18n pages_tags %} +{% get_language_info_list for LANGUAGES as languages %} + +{% spaceless %} +{% if page_branch_in_menu %} + {% if branch_level == 0 %} + + {% else %} + + {% endif %} +{% endif %} +{% endspaceless %}