From 4a4ddfda36af3825d8f2e78a10bc9cb8d956e82e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Je=CC=81re=CC=81my=20Fabre?= <blackmagik88@gmail.com>
Date: Mon, 25 Jul 2016 12:52:24 +0200
Subject: [PATCH] Basicpage template now extends page template. Summary menu
 first implementation.

---
 app/templates/pages/basicpage.html            | 51 ++++++++-----------
 ...nt_tree.html => current_tree_primary.html} |  0
 .../pages/menus/current_tree_secondary.html   | 43 ++++++++++++++++
 .../pages/menus/current_tree_summary.html     | 48 ++---------------
 app/templates/pages/page.html                 | 32 ++++++++++--
 5 files changed, 93 insertions(+), 81 deletions(-)
 rename app/templates/pages/menus/{current_tree.html => current_tree_primary.html} (100%)
 create mode 100644 app/templates/pages/menus/current_tree_secondary.html

diff --git a/app/templates/pages/basicpage.html b/app/templates/pages/basicpage.html
index 9a954091..1f8fccb8 100644
--- a/app/templates/pages/basicpage.html
+++ b/app/templates/pages/basicpage.html
@@ -1,5 +1,4 @@
-{% extends "base.html" %}
-
+{% extends "pages/page.html" %}
 {% load i18n mezzanine_tags keyword_tags featured_tags pages_tags %}
 
 {% block meta_title %}{{ page.meta_title }}{% endblock %}
@@ -26,34 +25,24 @@
     {% endeditable %}
 {% endblock %}
 
-{% block main %}
-
-    <div class="row">
-        <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
-            {% editable page.basicpage.title %}
-                <h1 class="dotted">{{ page.basicpage.title }}</h1>
-            {% endeditable %}
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-sm-3 col-lg-2">
-            {% if page.get_ascendants|length < 2 %}
-                {% page_menu "pages/menus/current_tree.html" %}
-            {% endif %}
-            {% if page.get_ascendants|length == 2 %}
-                {% page_menu "pages/menus/current_tree_summary.html" %}
-            {% endif %}
-        </div>
-        <div class="col-sm-9 col-lg-8">
-            {% editable page.basicpage.content %}
-                {{ page.basicpage.content|richtext_filters|safe }}
-            {% endeditable %}
-
-            {% comment %}
-                Add the slider here
-            {% endcomment %}
-        </div>
-    </div>
+
+
+{% block page_title %}
+
+    {% editable page.basicpage.title %}
+        <h1 class="dotted">{{ page.basicpage.title }}</h1>
+    {% endeditable %}
+
+{% endblock %}
+
+{% block page_content %}
+
+    {% editable page.basicpage.content %}
+        {{ page.basicpage.content|richtext_filters|safe }}
+    {% endeditable %}
+
+    {% comment %}
+        Add the slider here
+    {% endcomment %}
 
 {% endblock %}
diff --git a/app/templates/pages/menus/current_tree.html b/app/templates/pages/menus/current_tree_primary.html
similarity index 100%
rename from app/templates/pages/menus/current_tree.html
rename to app/templates/pages/menus/current_tree_primary.html
diff --git a/app/templates/pages/menus/current_tree_secondary.html b/app/templates/pages/menus/current_tree_secondary.html
new file mode 100644
index 00000000..b8dd8311
--- /dev/null
+++ b/app/templates/pages/menus/current_tree_secondary.html
@@ -0,0 +1,43 @@
+{% 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="row" data-sticky-offset="100" data-sticky-detach-at="971">
+                {% 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 %}
+            {% if page.is_current_or_ascendant and page.has_children_in_menu %}
+                <li class="nav-tree__item">
+                    <a class="nav-tree__link" href="{{ page.get_absolute_url }}">{% trans 'Accueil' %}</a>
+                </li>
+                {% page_menu page %}
+            {% endif %}
+        {% endfor %}
+    {% endif %}
+    {% if branch_level == 2 %}
+        {% 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>
+            </li>
+            {% if page.is_current_or_ascendant %}
+                {% include "pages/menus/current_tree_summary.html" %}
+            {% endif %}
+        {% endfor %}
+    {% endif %}
+{% endif %}
+{% endspaceless %}
diff --git a/app/templates/pages/menus/current_tree_summary.html b/app/templates/pages/menus/current_tree_summary.html
index bb7de2a0..da5b1ab2 100644
--- a/app/templates/pages/menus/current_tree_summary.html
+++ b/app/templates/pages/menus/current_tree_summary.html
@@ -1,45 +1,3 @@
-{% 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="row" data-sticky-offset="100" data-sticky-detach-at="971">
-                {% 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 %}
-            {% if page.is_current_or_ascendant and page.has_children_in_menu %}
-                <li class="nav-tree__item">
-                    <a class="nav-tree__link" href="{{ page.get_absolute_url }}">{% trans 'Accueil' %}</a>
-                </li>
-                {% page_menu page %}
-            {% endif %}
-        {% endfor %}
-    {% endif %}
-    {% if branch_level == 2 %}
-        {% 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>
-            </li>
-            {% if page.is_current_or_ascendant %}
-                {% if page.has_children_in_menu %}
-                    {% page_menu page %}
-                {% endif %}
-            {% endif %}
-        {% endfor %}
-    {% endif %}
-{% endif %}
-{% endspaceless %}
+{% comment %}
+We will use JS to populate the menu
+{% endcomment %}
diff --git a/app/templates/pages/page.html b/app/templates/pages/page.html
index b56657f4..f6183ccc 100644
--- a/app/templates/pages/page.html
+++ b/app/templates/pages/page.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n mezzanine_tags keyword_tags featured_tags %}
+{% load i18n mezzanine_tags keyword_tags featured_tags pages_tags %}
 
 {% block meta_title %}{{ page.meta_title }}{% endblock %}
 
@@ -15,9 +15,31 @@
 {{ page.description }}
 {% endmetablock %}{% endblock %}
 
-{% block title %}
-{% editable page.title %}{{ page.title }}{% endeditable %}
-{% endblock %}
-
 {% block main %}
+
+    <div class="row">
+        <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
+            {% block page_title %}
+                {{ page.title }}
+            {% endblock %}
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-sm-3 col-lg-2">
+            {% block page_sidebar %}
+                {% if page.get_ascendants|length < 2 %}
+                    {% page_menu "pages/menus/current_tree_primary.html" %}
+                {% endif %}
+                {% if page.get_ascendants|length == 2 %}
+                    {% page_menu "pages/menus/current_tree_secondary.html" %}
+                {% endif %}
+            {% endblock %}
+        </div>
+        <div class="col-sm-9 col-lg-8">
+            {% block page_content %}
+                {{ page.content }}
+            {% endblock %}
+        </div>
+    </div>
+
 {% endblock %}
-- 
2.39.5