From 7dc53a608d37d3fac9dc2be837bf63ddb8ed4984 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Je=CC=81re=CC=81my=20Fabre?= Date: Tue, 26 Jul 2016 16:33:30 +0200 Subject: [PATCH] Department and Team templates update --- app/templates/pages/department.html | 83 +++++++++++++++++----------- app/templates/pages/team.html | 84 +++++++++++++++++------------ 2 files changed, 102 insertions(+), 65 deletions(-) diff --git a/app/templates/pages/department.html b/app/templates/pages/department.html index d16e0f0c..fa446fa0 100644 --- 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 %} +

{{ page.department.title }}

{% endeditable %} + {% endblock %} -{% block main %} +{% block page_content %} -
-
- {% editable page.department.title %} -

{{ page.department.title }}

- {% endeditable %} -
-
+ {% if page.department.sub_title %} + {% editable page.department.sub_title %} +
+ {{ page.department.sub_title }} +
+ {% endeditable %} + {% endif %} -
-
- {% page_menu "pages/menus/current_tree_summary.html" %} -
-
- {% editable page.department.content %} - {{ page.department.content|richtext_filters|safe }} - {% endeditable %} -
-
+ {% 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 %} -
- {{ pageblock.content|richtext_filters|safe }} -
- {% endfor %} +{% endblock %} + +{% block main %} + {{ block.super }} + {% if page.department.pageblock_set.all %} +
+
+
+
+ {% block page_sub_content %} +
+ {% for pageblock in page.department.pageblock_set.all %} +
+
+

{{ pageblock.title }}

+ {{ pageblock.content|richtext_filters|safe }} +
+
+ {% endfor %} + {% endblock %} +
+
+
+
+ {% endif %} {% endblock %} diff --git a/app/templates/pages/team.html b/app/templates/pages/team.html index ab3f9feb..72546fee 100644 --- 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 %} +

{{ page.team.title }}

{% endeditable %} + {% endblock %} -{% block main %} +{% block page_content %} -
-
- {% editable page.team.title %} -

{{ page.team.title }}

- {% endeditable %} -
-
+ {% if page.team.sub_title %} + {% editable page.team.sub_title %} +
+ {{ page.team.sub_title }} +
+ {% endeditable %} + {% endif %} -
-
- {% page_menu "pages/menus/current_tree_summary.html" %} -
-
- {% editable page.team.content %} - {{ page.team.content|richtext_filters|safe }} - {% endeditable %} -
-
+ {% editable page.team.content %} + {{ page.team.content|richtext_filters|safe }} + {% endeditable %} - {% for pageblock in page.team.pageblock_set.all %} -
-
-
-

{{ pageblock.title }}

-
- {{ pageblock.content|richtext_filters|safe }} -
-
- {% endfor %} + {% comment %} + Add the slider here + {% endcomment %} + +{% endblock %} + +{% block main %} + {{ block.super }} + {% if page.team.pageblock_set.all %} +
+
+
+
+ {% block page_sub_content %} +
+ {% for pageblock in page.team.pageblock_set.all %} +
+
+

{{ pageblock.title }}

+ {{ pageblock.content|richtext_filters|safe }} +
+
+ {% endfor %} + {% endblock %} +
+
+
+
+ {% endif %} {% endblock %} -- 2.39.5