From 483d006a22bf5e3022cb6552812ecc1a867c2306 Mon Sep 17 00:00:00 2001
From: Emilie <zawadzki@ircam.fr>
Date: Tue, 5 Jul 2016 15:36:53 +0200
Subject: [PATCH] Adding tree menu : action / header / footer

---
 app/settings.py                            |  8 ++--
 app/templates/base.html                    | 44 +++-------------------
 app/templates/includes/footer_scripts.html |  2 +-
 app/templates/pages/menus/action.html      | 43 +++++++++++++++++++++
 app/templates/pages/menus/dropdown.html    | 35 -----------------
 app/templates/pages/menus/header.html      | 35 +++++++++++++++++
 6 files changed, 89 insertions(+), 78 deletions(-)
 create mode 100644 app/templates/pages/menus/action.html
 delete mode 100644 app/templates/pages/menus/dropdown.html

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 @@
                     <span></span>
                 </button>
 
+                {% page_menu "pages/menus/action.html" %}
+
                 {% if settings.SITE_TAGLINE %}
                 <p class="header__baseline">{{ settings.SITE_TAGLINE }}</p>
                 {% endif %}
@@ -55,7 +57,7 @@
         </div>
 
         <div class="navigation" role="navigation">
-            {% page_menu "pages/menus/dropdown.html" %}
+            {% page_menu "pages/menus/header.html" %}
         </div>
 
         <div class="nav__complementary">
@@ -80,7 +82,7 @@
                     {% if settings.USE_MODELTRANSLATION and languages|length > 1 %}
                         {% for language in languages %}
                             <li class="nav__complementary__item__lang {% if language.code == LANGUAGE_CODE %}is-active{% endif %}">
-                                <a href="#" onclick="$('#language_selector_select').val('{{ language.code }}'); $('#language_selector_form').submit();">
+                                <a href="#" onclic"$('#language_selector_select').val('{{ language.code }}'); $('#language_selector_form').submit();">
                                   {{ language.code|title }}
                                 </a>
                             </li>
@@ -147,44 +149,10 @@
 
     <footer class="footer" role="footer">
         <div class="container">
-            <div class="footer-logo">
-                <img src="{% static "img/logo_manifeste16_black.png" %}" alt="Logo Manifeste 2016 ircam" width="80">
-            </div>
+
             {% page_menu "pages/menus/footer.html" %}
 
-            <ul class="footer-partners list-inline">
-                <li>
-                    <a href="http://www.culturecommunication.gouv.fr/" target="_blank">
-                        <img src="{% static "img/logo_mmc.png" %}" alt="Logo Ministere Culture et Communication">
-                    </a>
-                </li>
-                <li>
-                    <a href="http://www.cnrs.fr/" target="_blank">
-                        <img src="{% static "img/logo_cnrs.png" %}" alt="Logo CNRS">
-                    </a>
-                </li>
-                <li>
-                    <a href="http://www.upmc.fr/" target="_blank">
-                        <img src="{% static "img/logo_upmc.png" %}" alt="Logo UPMC">
-                    </a>
-                </li>
-                <li>
-                    <a href="http://www.inria.fr/" target="_blank">
-                        <img src="{% static "img/logo_inra.png" %}" alt="Logo Inria">
-                    </a>
-                </li>
-            </ul>
-
-            <div class="footer-legals">
-                <p>
-                    {# {% trans "Powered by" %} #}
-                    Conception & réalisation : <br><br>
-                    <a href="http://www.philippebarbosa.com" target="_blank" titre="Développeur front-end freelance & photographe professionnel à Paris">
-                        Philippe Barbosa</a>,
-                        <a href="http://www.ircam.com" target="_blank" titre="IRCAM">Mary Delacour & Guillaume Pellerin</a>
-
-                </p>
-            </div>
+
         </div>
     </footer>
     {% 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 %}
     <script src="{{ STATIC_URL }}jquery/dist/jquery.min.js"></script>
-    <script src="{% static "js/plugins.js" %}"></script>#}
+    <script src="{% static "js/plugins.js" %}"></script>
     <script src="{% static "js/index.js" %}"></script>
 {% 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 %}
+                <div>
+                <ul>
+            {% endif %}
+            {% if page.in_menu %}
+                {# <ul class="list-unstyled"> #}
+            {% endif %}
+        {% endif %}
+        {% if page.in_menu %}
+            {% if forloop.first and not page.parent.in_menu and not page.is_primary %}
+            {% endif %}
+            <li>
+                <h2>
+                    <a href="{{ page.get_absolute_url }}">{{ page.title }}</a>
+                </h2>
+            </li>
+        {% 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 %}
+            {# </li> #}
+            {% endif %}
+            {# </ul> #}
+        {% endif %}
+        {% if page.is_primary %}
+            {% if page.in_menu %}
+            {# </ul> #}
+            {% endif %}
+            {% if forloop.last %}
+            </ul>
+            </div>
+            {% 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 %}
-        <ul class="menu">
-            {% for page in page_branch %}
-            {% if not has_home and page.is_primary and forloop.first %}
-            <li class="menu__item{% if on_home %} active{% endif %}">
-                <a href="{% url "home" %}" class="menu__item__link">{% trans "Home" %}</a>
-            </li>
-            {% endif %}
-            {% if page.in_menu %}
-            <li class="menu__item{% if page.has_children_in_menu %}dropdown{% endif %}{% if page.is_current_or_ascendant %} active{% endif %}" id="{{ page.html_id }}">
-                <a href="{{ page.get_absolute_url }}" class="menu__item__link" {% if page.has_children_in_menu %} data-toggle="dropdown"{% endif %}>{{ page.title }}{% if page.has_children_in_menu %}<b class="caret"></b>{% endif %}</a>
-                {% if page.has_children_in_menu %}{% page_menu page %}{% endif %}
-            </li>
-            {% endif %}
-            {% endfor %}
-        </ul>
-        {% else %}
-        <ul class="dropdown-menu">
-            {% for page in page_branch %}
-            {% if page.in_menu %}
-            <li class="{% if page.has_children_in_menu %}dropdown-submenu{% endif %}{% if page.is_current_or_ascendant %} active{% endif %}"id="{{ page.html_id }}">
-                <a href="{{ page.get_absolute_url }}">{{ page.title }}</a>
-                {% if page.has_children_in_menu %}{% page_menu page %}{% endif %}
-            </li>
-            {% endif %}
-            {% endfor %}
-        </ul>
-    {% 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 %}
+        <ul class="menu">
+            {% for page in page_branch %}
+            {% if not has_home and page.is_primary and forloop.first %}
+            <li class="menu__item{% if on_home %} active{% endif %}">
+                <a href="{% url "home" %}" class="menu__item__link">{% trans "Home" %}</a>
+            </li>
+            {% endif %}
+            {% if page.in_menu %}
+            <li class="menu__item{% if page.has_children_in_menu %}header{% endif %}{% if page.is_current_or_ascendant %} active{% endif %}" id="{{ page.html_id }}">
+                <a href="{{ page.get_absolute_url }}" class="menu__item__link" {% if page.has_children_in_menu %} data-toggle="header"{% endif %}>{{ page.title }}{% if page.has_children_in_menu %}<b class="caret"></b>{% endif %}</a>
+                {% if page.has_children_in_menu %}{% page_menu page %}{% endif %}
+            </li>
+            {% endif %}
+            {% endfor %}
+        </ul>
+        {% else %}
+        <ul class="header-menu">
+            {% for page in page_branch %}
+            {% if page.in_menu %}
+            <li class="{% if page.has_children_in_menu %}header-submenu{% endif %}{% if page.is_current_or_ascendant %} active{% endif %}"id="{{ page.html_id }}">
+                <a href="{{ page.get_absolute_url }}">{{ page.title }}</a>
+                {% if page.has_children_in_menu %}{% page_menu page %}{% endif %}
+            </li>
+            {% endif %}
+            {% endfor %}
+        </ul>
+    {% endif %}
+{% endif %}
+{% endspaceless %}
-- 
2.39.5