Update event list template with tree menu and summary

diff --git a/app/templates/agenda/event_list.html b/app/templates/agenda/event_list.html
index f4113b042af7dc32f4ca9a34dff4da1c49f29965..f2f4f18bc48e13a160ce810239a76403fabb603b 100644 (file)
--- a/app/templates/agenda/event_list.html
+++ b/app/templates/agenda/event_list.html
@@ -1,9 +1,9 @@
 {% extends "pages/page.html" %}
-{% load i18n future mezzanine_tags event_tags keyword_tags disqus_tags organization_tags staticfiles %}
+{% load i18n future mezzanine_tags event_tags keyword_tags disqus_tags organization_tags staticfiles pages_tags %}
 
 {% block meta_title %}
     {% if page %}
-        {{ page.richtextpage.meta_title }}
+        {{ page.title }}
     {% else %}
         {% trans "Rendez-vous in Paris" %}
     {% endif %}
@@ -27,35 +27,7 @@
 
 {% block breadcrumb_menu %}
     {{ block.super }}
-    {% if tag and tag|tag_is_excluded %}
-    <li class="breadcrumb__item">
-        <a href="{% url 'event_list' %}" class="breadcrumb__link">{% trans "On Tour" %}</a>
-    </li>
-    {% elif tag or location or month or week or author %}
-        <li class="breadcrumb__item">
-            <a href="{% url 'event_list' %}" class="breadcrumb__link">{% trans "Rendez-vous in Paris" %}</a>
-        </li>
-        <li class="breadcrumb__item active">
-            {% if tag %}
-                {% trans "Tag:" %} {{ tag }}
-            {% elif location %}
-                {% trans "Location:" %} {{ location }}
-            {% elif month %}
-                {% if month %}{{ month }}, {% endif %}{{ year }}
-            {% elif week %}
-                {% for d in week|week_range:year %}
-                    {{ d|date:"d M" }}{% if forloop.first %} - {% endif %}
-                {% endfor %}
-                , {{ year }}
-            {% elif author %}
-                {% trans "Author:" %} {{ author.get_full_name|default:author.username }}
-            {% endif %}
-        </li>
-    {% else %}
-        <li class="breadcrumb__item active">
-            {% trans "Rendez-vous in Paris" %}
-        </li>
-    {% endif %}
+    
 {% endblock %}
 
 {% block main %}
@@ -68,19 +40,7 @@
                 <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
 
                     <h1 class="dotted">
-                        {% if page %}
-                            {{ page.richtextpage.meta_title }}
-                        {% else %}
-                            {% if tag and tag|tag_is_excluded %}
-                                {% trans "Tournées" %}
-                            {% else %}
-                                {% if is_archive %}
-                                    {% trans "Archives" %}
-                                {% else %}
-                                    {% trans "Rendez-vous in Paris" %}
-                                {% endif %}
-                            {% endif %}
-                        {% endif %}
+                        {{ page.title }}
                     </h1>
 
                 </div>
@@ -109,6 +69,9 @@
 
                         <div class="nav-tree-wrapper" data-sticky data-sticky-parent="row" data-sticky-offset="100" data-sticky-detach-at="971">
 
+                            {% page_menu "pages/menus/current_tree_event.html" %}
+
+                            {% comment %}
                             <ul class="nav-tree nav-tree--level-{{ branch_level }}">
                                 <li class="nav-tree__item">
                                     <a class="nav-tree__link active" href="{% url 'event_list' %}">
@@ -156,7 +119,9 @@
                                     </li>
                                 {% endif %}
 
-                                </ul>
+                            </ul>
+
+                        {% endcomment %}
 
                                 {% if tag and not tag|tag_is_excluded or not tag and not is_archive %}
 

diff --git a/app/templates/pages/menus/current_tree_event.html b/app/templates/pages/menus/current_tree_event.html
new file mode 100644 (file)
index 0000000..6dc13df
--- /dev/null
+++ b/app/templates/pages/menus/current_tree_event.html
@@ -0,0 +1,60 @@
+{% load i18n pages_tags %}
+
+{% spaceless %}
+{% if page_branch_in_menu %}
+    {% if branch_level == 0 %}
+        {% for page in page_branch %}
+            {% if page.in_menu and page.has_children_in_menu %}
+                {% if page.is_primary and page.is_current_or_ascendant %}
+                <ul class="nav-tree nav-tree--level-{{ branch_level }}" data-sticky data-sticky-parent="page" data-sticky-offset="100" data-sticky-detach-at="971">
+                    <li class="nav-tree__item">
+                        <a class="nav-tree__link{% if page.is_current %} active{% endif %}" href="{{ page.get_absolute_url }}">{{ page.title }}</a>
+                        {% if page.is_current %}
+                            <ul class="nav-tree" data-summary>
+                                {% include "pages/menus/current_tree_summary.html" %}
+                            </ul>
+                        {% endif %}
+                    </li>
+                {% endif %}
+                {% if page.is_current_or_ascendant %}
+                    {% if page.has_children_in_menu %}
+                        {% page_menu page %}
+                    {% endif %}
+                {% endif %}
+                {% if page.is_primary and page.is_current_or_ascendant %}
+                </ul>
+                {% endif %}
+            {% endif %}
+        {% endfor %}
+    {% endif %}
+    {% if branch_level == 1 %}
+        {% for page in page_branch %}
+            <li class="nav-tree__item">
+                <a class="nav-tree__link{% if page.is_current or page.is_current_or_ascendant %} active{% endif %}" href="{{ page.get_absolute_url }}">{{ page.title }}</a>
+                {% if page.is_current_or_ascendant and page.has_children_in_menu %}
+                    <ul class="nav-tree nav-tree--level-{{ branch_level }}">
+                        {% page_menu page %}
+                    </ul>
+                    <ul class="nav-tree" data-summary>
+                        {% include "pages/menus/current_tree_summary.html" %}
+                    </ul>
+                {% endif %}
+                {% if page.is_current_or_ascendant and not page.has_children_in_menu %}
+                    <ul class="nav-tree" data-summary>
+                        {% include "pages/menus/current_tree_summary.html" %}
+                    </ul>
+                {% endif %}
+            </li>
+        {% endfor %}
+    {% endif %}
+    {% if branch_level == 2 %}
+        {% for page in page_branch %}
+            {% comment %}
+            <li class="nav-tree__item nav-tree__item--sub">
+                <a class="nav-tree__link nav-tree__link--sub" href="{{ page.get_absolute_url }}">{{ page.title }}</a>
+            </li>
+            {% endcomment %}
+        {% endfor %}
+    {% endif %}
+{% endif %}
+{% endspaceless %}