Department and Team templates update

diff --git a/app/templates/pages/department.html b/app/templates/pages/department.html
index d16e0f0c3d9418665f57dce356933e8b18fb1be0..fa446fa07da7c1807c346bb6c51589dc74d47f65 100644 (file)
--- a/app/templates/pages/department.html
+++ b/app/templates/pages/department.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "pages/basicpage.html" %}
 {% load i18n mezzanine_tags keyword_tags featured_tags pages_tags %}
 
 {% block meta_title %}{{ page.meta_title }}{% endblock %}
@@ -15,41 +15,64 @@
 {{ page.description }}
 {% endmetablock %}{% endblock %}
 
-{% block title %}
-    {% editable page.title %}
-        {{ page.title }}
-    {% endeditable %}
+{% block page_class %}
+    department
+{% endblock %}
+
+{% block body_class %}
+    pattern pattern-bg pattern-bg--circles
+{% endblock %}
 
-    {% editable page.department.sub_title %}
-        {{ page.department.sub_title }}
+{% block page_title %}
+
+    {% editable page.department.title %}
+        <h1 class="dotted">{{ page.department.title }}</h1>
     {% endeditable %}
+
 {% endblock %}
 
-{% block main %}
+{% block page_content %}
 
-    <div class="row">
-        <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
-            {% editable page.department.title %}
-                <h1 class="dotted">{{ page.department.title }}</h1>
-            {% endeditable %}
-        </div>
-    </div>
+    {% if page.department.sub_title %}
+        {% editable page.department.sub_title %}
+            <div class="chapo">
+                {{ page.department.sub_title }}
+            </div>
+        {% endeditable %}
+    {% endif %}
 
-    <div class="row">
-        <div class="col-sm-3 col-lg-2">
-            {% page_menu "pages/menus/current_tree_summary.html" %}
-        </div>
-        <div class="col-sm-9 col-lg-8">
-            {% editable page.department.content %}
-                {{ page.department.content|richtext_filters|safe }}
-            {% endeditable %}
-        </div>
-    </div>
+    {% editable page.department.content %}
+        {{ page.department.content|richtext_filters|safe }}
+    {% endeditable %}
+
+    {% comment %}
+        Add the slider here
+    {% endcomment %}
 
-    {% for pageblock in page.department.pageblock_set.all %}
-     <div class="row">
-         {{ pageblock.content|richtext_filters|safe }}
-    </div>
-    {% endfor %}
+{% endblock %}
+
+{% block main %}
+    {{ block.super }}
 
+    {% if page.department.pageblock_set.all %}
+        <div class="white-bg">
+            <div class="container">
+                <div class="row">
+                    <div class="col-sm-12">
+                        {% block page_sub_content %}
+                            <hr class="mt0" />
+                            {% for pageblock in page.department.pageblock_set.all %}
+                                <div class="row">
+                                    <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2 white-bg">
+                                        <h2 class="dotted">{{ pageblock.title }}</h2>
+                                        {{ pageblock.content|richtext_filters|safe }}
+                                    </div>
+                                </div>
+                            {% endfor %}
+                        {% endblock %}
+                    </div>
+                </div>
+            </div>
+        </div>
+    {% endif %}
 {% endblock %}

diff --git a/app/templates/pages/team.html b/app/templates/pages/team.html
index ab3f9febe36f695c5bfe2cf1a8a758b898f9255a..72546feeb61649406c16110fcea55f2341d23818 100644 (file)
--- a/app/templates/pages/team.html
+++ b/app/templates/pages/team.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "pages/basicpage.html" %}
 {% load i18n mezzanine_tags keyword_tags featured_tags pages_tags %}
 
 {% block meta_title %}{{ page.meta_title }}{% endblock %}
@@ -15,46 +15,60 @@
 {{ page.description }}
 {% endmetablock %}{% endblock %}
 
-{% block title %}
-    {% editable page.title %}
-        {{ page.title }}
-    {% endeditable %}
+{% block page_class %}
+    department
+{% endblock %}
 
-    {% editable page.team.sub_title %}
-        {{ page.team.sub_title }}
+{% block page_title %}
+
+    {% editable page.team.title %}
+        <h1 class="dotted">{{ page.team.title }}</h1>
     {% endeditable %}
+
 {% endblock %}
 
-{% block main %}
+{% block page_content %}
 
-    <div class="row">
-        <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
-            {% editable page.team.title %}
-                <h1 class="dotted">{{ page.team.title }}</h1>
-            {% endeditable %}
-        </div>
-    </div>
+    {% if page.team.sub_title %}
+        {% editable page.team.sub_title %}
+            <div class="chapo">
+                {{ page.team.sub_title }}
+            </div>
+        {% endeditable %}
+    {% endif %}
 
-    <div class="row">
-        <div class="col-sm-3 col-lg-2">
-            {% page_menu "pages/menus/current_tree_summary.html" %}
-        </div>
-        <div class="col-sm-9 col-lg-8">
-            {% editable page.team.content %}
-                {{ page.team.content|richtext_filters|safe }}
-            {% endeditable %}
-        </div>
-    </div>
+    {% editable page.team.content %}
+        {{ page.team.content|richtext_filters|safe }}
+    {% endeditable %}
 
-    {% for pageblock in page.team.pageblock_set.all %}
-    <div class="row">
-        <div class="col-sm-3 col-lg-2">
-        </div>
-        <h2 class="dotted">{{ pageblock.title }}</h2>
-        <div class="col-sm-9 col-lg-8">
-         {{ pageblock.content|richtext_filters|safe }}
-        </div>
-    </div>
-    {% endfor %}
+    {% comment %}
+        Add the slider here
+    {% endcomment %}
+
+{% endblock %}
+
+{% block main %}
+    {{ block.super }}
 
+    {% if page.team.pageblock_set.all %}
+        <div class="white-bg">
+            <div class="container">
+                <div class="row">
+                    <div class="col-sm-12">
+                        {% block page_sub_content %}
+                            <hr class="mt0" />
+                            {% for pageblock in page.team.pageblock_set.all %}
+                                <div class="row">
+                                    <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2 white-bg">
+                                        <h2 class="dotted">{{ pageblock.title }}</h2>
+                                        {{ pageblock.content|richtext_filters|safe }}
+                                    </div>
+                                </div>
+                            {% endfor %}
+                        {% endblock %}
+                    </div>
+                </div>
+            </div>
+        </div>
+    {% endif %}
 {% endblock %}