Fix a lot of templates

diff --git a/app/static/src/sass/global/_helpers.scss b/app/static/src/sass/global/_helpers.scss
index 130269d695f2a3749477750a7709fe2aa47da35a..d4b9e5f4fc94987b0efdf5b0b59279e311e0414a 100755 (executable)
--- a/app/static/src/sass/global/_helpers.scss
+++ b/app/static/src/sass/global/_helpers.scss
@@ -52,6 +52,21 @@
 .pl1 {
     @include padding-left(1);
 }
+.p2 {
+    @include padding(2);
+}
+.pt2 {
+    @include padding-top(2);
+}
+.pb2 {
+    @include padding-bottom(2);
+}
+.pr2 {
+    @include padding-right(2);
+}
+.pl2 {
+    @include padding-left(2);
+}
 .bg {
     background-color: $color-main;
 }

diff --git a/app/templates/magazine/article/article_detail.html b/app/templates/magazine/article/article_detail.html
index 81572133756f4d05e1a1d1429f8cc7b4524ad785..ec2e817fc97c9b14144cf12e300969e414c1f219 100644 (file)
--- a/app/templates/magazine/article/article_detail.html
+++ b/app/templates/magazine/article/article_detail.html
@@ -16,30 +16,48 @@
     article
 {% endblock %}
 
+{% block body_class %}
+    {% if department_parent %}
+        pattern pattern-bg {{ department_parent.weaving_css_class }}
+    {% endif %}
+{% endblock %}
+
 {% block breadcrumb_menu %}
     {{ block.super }}
     {% if topic_parent %}
-    <li class="breadcrumb__item"><a href="{% url "topic-detail" parent_topic.slug %}" class="breadcrumb__link" title="{{ parent_topic.title }}">{{ parent_topic.title }}</a></li>
+        <li class="breadcrumb__item">{% trans "Magazine" %}</li>
+        <li class="breadcrumb__item"><a href="{% url "topic-detail" parent_topic.slug %}" class="breadcrumb__link" title="{{ parent_topic.title }}">{{ parent_topic.title }}</a></li>
     {% endif %}
     {% if department_parent %}
-    <li class="breadcrumb__item"><a href="{% url "page" department_parent.slug %}" class="breadcrumb__link" title="{{ department_parent.title }}">{{ department_parent.title }}</a></li>
+        <li class="breadcrumb__item"><a href="{% url "page" department_parent.slug %}" class="breadcrumb__link" title="{{ department_parent.title }}">{{ department_parent.title }}</a></li>
     {% endif %}
 
     <li class="breadcrumb__item active">{{ article.title }}</li>
 {% endblock %}
 
-{% block page_title %}
+{% block page_tags %}
 
+    <div class="tag tag--category">
+        {% trans 'News' %}
+    </div>
     {% if article.keywords %}
-      {{ article.keywords.first }} | {{ article.model_name }}
+        <div class="tag dashed dashed--gray">
+          {{ article.keywords.first }}
+        </div>
     {% endif %}
 
+{% endblock %}
+
+{% block page_title %}
+
     {% editable article.title %}
-        <h1>{{ article.title }}</h1>
+        <h1 class="dotted">{{ article.title }}</h1>
     {% endeditable %}
 
     {% editable article.sub_title %}
-        <h2>{{ article.sub_title }}</h2>
+        <div class="chapo">
+            {{ article.sub_title }}
+        </div>
     {% endeditable %}
 
 {% endblock %}
@@ -60,22 +78,24 @@
   {% endif %}
 {% endblock %}
 
-{% block page_sub_content %}
+{% block page_related_content %}
 
     {% if article.related_articles.all %}
 
-        <div class="container">
-            <div class="row tac">
-                <div class="col-xs-12">
-                    <h2 class="dashed dashed--center">{% trans "Also discover" %}</h2>
-                </div>
-            </div>
-            <div class="row tac">
-                {% for article in article.related_articles.all %}
-                    <div class="col-lg-3 col-md-4 col-sm-4 col-xs-6">
-                        {% include 'magazine/article/includes/article_card.html' %}
+        <div class="white-bg pb2">
+            <div class="container">
+                <div class="row tac">
+                    <div class="col-xs-12">
+                        <h2 class="dashed dashed--center">{% trans "Also discover" %}</h2>
                     </div>
-                {% endfor %}
+                </div>
+                <div class="row tac">
+                    {% for article in article.related_articles.all %}
+                        <div class="col-lg-3 col-md-4 col-sm-4 col-xs-6">
+                            {% include 'magazine/article/includes/article_card.html' %}
+                        </div>
+                    {% endfor %}
+                </div>
             </div>
         </div>
 
@@ -83,7 +103,6 @@
 
 {% endblock %}
 
-
 {% block page_sidebar %}
 
     <div class="page__meta">

diff --git a/app/templates/magazine/topic/topic_detail.html b/app/templates/magazine/topic/topic_detail.html
index b21aaf2846aa28984230f52c2134327e34a30d7c..3a4a3f610baa77657939896dcf83588b5b0c18d1 100644 (file)
--- a/app/templates/magazine/topic/topic_detail.html
+++ b/app/templates/magazine/topic/topic_detail.html
@@ -27,7 +27,7 @@
 
 {% block breadcrumb_menu %}
     {{ block.super }}
-    <li class="breadcrumb__item"><a class="breadcrumb__link" href="{% url 'magazine-article-list' %}">{% trans "News" %}</a></li>
+    <li class="breadcrumb__item">{% trans "Magazine" %}</li>
     <li class="breadcrumb__item active">{{ topic.title }}</li>
 {% endblock %}
 

diff --git a/app/templates/pages/basicpage.html b/app/templates/pages/basicpage.html
index d8d30c02d34d87dea924de26aba392f11078bbef..674de2cd64f3b7e23170c1d753c69e51f473dd79 100644 (file)
--- a/app/templates/pages/basicpage.html
+++ b/app/templates/pages/basicpage.html
@@ -54,10 +54,6 @@
         {% endif %}
     {% endif %}
 
-    {% comment %}
-        Add the slider here
-    {% endcomment %}
-
 {% endblock %}
 
 {% block page_sub_content %}

diff --git a/app/templates/pages/department.html b/app/templates/pages/department.html
index f0887c97eee0c678d4168222f69efd0c070275d5..66ddbe616739b52ae7c9db13b2a1b35091716aca 100644 (file)
--- a/app/templates/pages/department.html
+++ b/app/templates/pages/department.html
@@ -44,10 +44,6 @@
         {{ page.department.content|richtext_filters|safe }}
     {% endeditable %}
 
-    {% comment %}
-        Add the slider here
-    {% endcomment %}
-
 {% endblock %}
 
 {% block page_slider %}
@@ -61,17 +57,17 @@
 {% block page_sub_content %}
 
     {% if page.department.pageblock_set.all %}
-        <div class="white-bg">
+        <div class="white-bg pb2">
             <div class="container">
                 <div class="row">
                     <div class="col-sm-12">
                         <hr class="mt0" />
                         {% for pageblock in page.department.pageblock_set.all %}
+                            {% if not forloop.first and pageblock.with_separator %}
+                                <hr />
+                            {% endif %}
                             <div class="row" data-summary-content>
                                 <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2 white-bg">
-                                    {% if not forloop.first and pageblock.with_separator %}
-                                        <hr />
-                                    {% endif %}
                                     <h2 class="dotted">{{ pageblock.title }}</h2>
                                     {{ pageblock.content|richtext_filters|safe }}
                                 </div>
@@ -88,19 +84,21 @@
 {% block page_related_content %}
 
     {% if page.department.articles_related.all %}
-
-        <div class="container">
-            <div class="row tac">
-                <div class="col-xs-12">
-                    <h2 class="dashed dashed--center">{% trans "Also discover" %}</h2>
-                </div>
-            </div>
-            <div class="row tac">
-                {% for article in page.department.articles_related.all %}
-                    <div class="col-lg-3 col-md-4 col-sm-4 col-xs-6">
-                        {% include 'magazine/article/includes/article_card.html' %}
+    
+        <div class="white-bg pb2">
+            <div class="container">
+                <div class="row tac">
+                    <div class="col-xs-12">
+                        <h2 class="dashed dashed--center">{% trans "Also discover" %}</h2>
                     </div>
-                {% endfor %}
+                </div>
+                <div class="row tac">
+                    {% for article in page.department.articles_related.all %}
+                        <div class="col-lg-3 col-md-4 col-sm-4 col-xs-6">
+                            {% include 'magazine/article/includes/article_card.html' %}
+                        </div>
+                    {% endfor %}
+                </div>
             </div>
         </div>
 

diff --git a/app/templates/pages/page.html b/app/templates/pages/page.html
index 5de60ccf105e4a508c2ee898a0b0dc8c01098389..7391fe4718defc5cd64491a1e0bda77fdbdd93df 100644 (file)
--- a/app/templates/pages/page.html
+++ b/app/templates/pages/page.html
@@ -16,18 +16,30 @@
 {% endmetablock %}{% endblock %}
 
 {% block main %}
-    <div class="mb2 page page--{% spaceless %}{% block page_class %}{% endblock %}{% endspaceless %}">
+    <div class="page page--{% spaceless %}{% block page_class %}{% endblock %}{% endspaceless %}">
         <div class="container">
 
             <div class="row">
+
+                <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
+                    {% block page_tags %}
+                    {% endblock %}
+                </div>
+
+            </div>
+
+            <div class="row">
+
                 <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2 white-bg">
                     {% block page_title %}
                         {{ page.title }}
                     {% endblock %}
                 </div>
+
             </div>
 
             <div class="row">
+
                 <div class="col-sm-3 col-lg-2 page__sidebar">
                     {% block page_sidebar %}
                         {% if page.get_ascendants|length < 2 %}
@@ -38,20 +50,22 @@
                         {% endif %}
                     {% endblock %}
                 </div>
-                <div class="col-sm-9 col-lg-8 white-bg page__content" data-summary-content>
+                <div class="mb2 col-sm-9 col-lg-8 white-bg page__content" data-summary-content>
                     {% block page_content %}
                         {{ page.content }}
                     {% endblock %}
                 </div>
-                {% block page_slider %}
-                {% endblock %}
-                {% block page_sub_content %}
-                {% endblock %}
-                {% block page_related_content %}
-                {% endblock %}
+
             </div>
 
         </div>
 
+        {% block page_slider %}
+        {% endblock %}
+        {% block page_sub_content %}
+        {% endblock %}
+        {% block page_related_content %}
+        {% endblock %}
+
     </div>
 {% endblock %}

diff --git a/app/templates/pages/team.html b/app/templates/pages/team.html
index 5dbf4890f74c5feee6d4b42a1a1cddfec6771e35..e848fb2efa1edbb4b900e49541ac8fee00776bf8 100644 (file)
--- a/app/templates/pages/team.html
+++ b/app/templates/pages/team.html
@@ -27,6 +27,14 @@
 
 {% endblock %}
 
+{% block page_slider %}
+  {% if page.team.pageimage_set.all %}
+    {% with page.team.pageimage_set.all as slider_images %}
+        {% include 'core/inc/slider.html' %}
+    {% endwith %}
+  {% endif %}
+{% endblock %}
+
 {% block page_content %}
 
     {% if page.team.sub_title %}
@@ -54,54 +62,31 @@
         {% endif %}
     {% endif %}
 
-    {% comment %}
-        Add the slider here
-    {% endcomment %}
-
 {% endblock %}
 
-{% block main %}
-    {{ block.super }}
-
-    {% if page.get_ascendants|length == 1 %}
-        {% children_pages page.id as childrens %}
-        {% if childrens %}
-            <div class="container">
-                <div class="row">
-                    {% for children in childrens %}
-                        <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
-                            {% with children as object %}
-                                {% include "pages/includes/page_card.html" %}
-                            {% endwith %}
-                        </div>
-                    {% endfor %}
-                </div>
-            </div>
-        {% endif %}
-    {% endif %}
+{% block page_sub_content %}
 
     {% if page.team.pageblock_set.all %}
-        <div class="white-bg">
+        <div class="white-bg pb2">
             <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" data-summary-content>
-                                    <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2 white-bg">
-                                        {% if not forloop.first and pageblock.with_separator %}
-                                            <hr />
-                                        {% endif %}
-                                        <h2 class="dotted">{{ pageblock.title }}</h2>
-                                        {{ pageblock.content|richtext_filters|safe }}
-                                    </div>
+                        <hr class="mt0" />
+                        {% for pageblock in page.team.pageblock_set.all %}
+                            <div class="row" data-summary-content>
+                                <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2 white-bg">
+                                    {% if not forloop.first and pageblock.with_separator %}
+                                        <hr />
+                                    {% endif %}
+                                    <h2 class="dotted">{{ pageblock.title }}</h2>
+                                    {{ pageblock.content|richtext_filters|safe }}
                                 </div>
-                            {% endfor %}
-                        {% endblock %}
+                            </div>
+                        {% endfor %}
                     </div>
                 </div>
             </div>
         </div>
     {% endif %}
+
 {% endblock %}