Various fixes

diff --git a/app/static/src/sass/modules/_page.scss b/app/static/src/sass/modules/_page.scss
index 609712472382086bc8be2e0073016171d671fd5a..471673b350d7807baee05675a2a64ef6a7480e73 100644 (file)
--- a/app/static/src/sass/modules/_page.scss
+++ b/app/static/src/sass/modules/_page.scss
@@ -64,6 +64,15 @@ $module: ".page";
 
     }
 
+    &__meta-text {
+
+        font-size: 13px;
+        margin-top: 2px;
+        font-weight: weight(regular);
+        display: block;
+
+    }
+
     &__filters {
 
         @include margin(0 0 6 0);

diff --git a/app/static/src/sass/modules/_share-links.scss b/app/static/src/sass/modules/_share-links.scss
index 5df9ec5a23b8ab4100f06b6b33c50b781661039e..bd7a6ccc776e2192bc5798a71d8c9c50a9053d95 100644 (file)
--- a/app/static/src/sass/modules/_share-links.scss
+++ b/app/static/src/sass/modules/_share-links.scss
@@ -5,6 +5,7 @@ $module: ".share-links";
     list-style-type: none;
     padding: 0;
     margin: 0;
+    @include margin-top(2);
 
     &__item {
 

diff --git a/app/templates/core/inc/generic_card_variable_height.html b/app/templates/core/inc/generic_card_variable_height.html
new file mode 100644 (file)
index 0000000..e925331
--- /dev/null
+++ b/app/templates/core/inc/generic_card_variable_height.html
@@ -0,0 +1,6 @@
+{% extends "core/inc/generic_card.html" %}
+{% load i18n pages_tags mezzanine_tags media_tags organization_tags %}
+
+{% block image %}
+    <img src="{{ MEDIA_URL }}{% thumbnail images.first.file 427 0 %}" data-src="{{ MEDIA_URL }}{% thumbnail images.0.file 427 286 %}" class="lazyload" alt="" />
+{% endblock %}

diff --git a/app/templates/magazine/article/article_detail.html b/app/templates/magazine/article/article_detail.html
index ac5b2ad4c9907c8234b2153298fce0d7a9395690..d2b08876ac660b9eb94c7cea2c9d41edd574ad5e 100644 (file)
--- a/app/templates/magazine/article/article_detail.html
+++ b/app/templates/magazine/article/article_detail.html
@@ -101,7 +101,7 @@
             <div class="container">
                 <div class="row tac">
                     <div class="col-xs-12">
-                        <h2 class="dashed dashed--center mt2">{% trans "Also discover" %}</h2>
+                        <h2 class="dashed dashed--center mt2">{% trans "Go further" %}</h2>
                     </div>
                 </div>
                 <div class="row tac">
@@ -111,10 +111,10 @@
                                 {% include 'magazine/article/includes/article_card.html' %}
                             </div>
                         {% else %}
-                        <div class="col-lg-3 col-md-4 col-sm-4 col-xs-6">
-                            {% include "core/inc/generic_card.html" %}
-                        </div>
-                        {%endif%}
+                            <div class="col-lg-3 col-md-4 col-sm-4 col-xs-6">
+                                {% include "core/inc/generic_card.html" %}
+                            </div>
+                        {% endif %}
                     {% endfor %}
                 </div>
             </div>
@@ -130,18 +130,20 @@
                 {{ article.publish_date|date:"DATE_FORMAT" }}
             </div>
         {% endeditable %}
+
         <div class="page__meta-separator">
 
         </div>
-        {% if article.categories.all.length > 0 %}
-            <div class="page__meta-date">
+
+        {% if article.categories.all|length > 0 %}
+            <div class="page__meta-text">
                 {% for category in article.categories.all %}
-                    {% if forloop.first %} | {% endif %}
                     {% if not forloop.first %}, {% endif %}
                     <strong>{{ category }}</strong>
                 {% endfor %}
             </div>
         {% endif %}
+
         {% with article as object %}
             {% include "includes/share_buttons.html" %}
         {% endwith %}

diff --git a/app/templates/magazine/topic/topic_detail.html b/app/templates/magazine/topic/topic_detail.html
index b9f485048e701efb63915de8615b8a6eaba47230..c3a96b4b807a4db5563947359dfc37fe6f0c1f5d 100644 (file)
--- a/app/templates/magazine/topic/topic_detail.html
+++ b/app/templates/magazine/topic/topic_detail.html
@@ -63,7 +63,7 @@
         <div class="row">
             {% for article in articles %}
                 <div class="col-lg-3 col-md-4 col-sm-4 col-xs-6">
-                    {% include 'magazine/article/includes/article_card.html' %}
+                    {% include 'core/inc/generic_card.html' %}
                 </div>
             {% endfor %}
         </div>

diff --git a/app/templates/network/organization_list.html b/app/templates/network/organization_list.html
index 528a28dd73380f1aa72b1b0af4ed6beccd3c7831..552bde7bd69d23cafe6bdb85afee1c8afa19e20e 100644 (file)
--- a/app/templates/network/organization_list.html
+++ b/app/templates/network/organization_list.html
@@ -12,11 +12,15 @@
 {% endblock %}
 
 {% block page_title %}
-  <h1 class="dotted">{% trans "Network" %}</h1>
+    <h1 class="dotted">{% trans "Network" %}</h1>
 {% endblock %}
 
-{% block page_content %}
+{% block breadcrumb_menu %}
+    {{ block.super }}
+    <li class="breadcrumb__item active">{% trans "Network" %}</li>
+{% endblock %}
 
+{% block page_content %}
 
     {% for organization in organizations %}
 
@@ -43,6 +47,4 @@
 
     {% endfor %}
 
-
-
 {% endblock %}

diff --git a/app/templates/pages/custompage.html b/app/templates/pages/custompage.html
index 56a5b6d50ecbda31c4ab8ee8b4b9ea7a5c102985..f3dc328fc016870fa5636009c3d253594cd27671 100644 (file)
--- a/app/templates/pages/custompage.html
+++ b/app/templates/pages/custompage.html
@@ -115,13 +115,15 @@
 {% endblock %}
 
 {% block products %}
-    {% for page_product_list in page.custompage.product_lists.all %}
-      {% with page_product_list.list as list %}
-        {% with "shop/includes/product_list_"|add:list.style|add:"_style.html" as template %}
-          {% include template %}
-        {% endwith %}
-      {% endwith %}
-    {% endfor %}
+    {% if page.custompage.product_lists.all|length > 0 %}
+        {% for page_product_list in page.custompage.product_lists.all %}
+          {% with page_product_list.list as list %}
+            {% with "shop/includes/product_list_"|add:list.style|add:"_style.html" as template %}
+              {% include template %}
+            {% endwith %}
+          {% endwith %}
+        {% endfor %}
+    {% endif %}
 {% endblock %}
 
 {% block logo %}

diff --git a/app/templates/shop/includes/product_list_square_style.html b/app/templates/shop/includes/product_list_square_style.html
index d0e75d6f1ef0cda2a7d062ec13f734a3cb19223d..456970210c8a3e60d7fcbb75ca1d2670635fbf98 100644 (file)
--- a/app/templates/shop/includes/product_list_square_style.html
+++ b/app/templates/shop/includes/product_list_square_style.html
@@ -17,7 +17,7 @@
             <div class="row tac">
                 {% for product_inline in list.products.all %}
                   {% with product_inline.product as product %}
-                    <div class="col-lg-2 col-md-3 col-sm-4 col-xs-6">
+                    <div class="col-lg-3 col-md-3 col-sm-4 col-xs-6">
                         <div class="article-box article-box--person" >
                             {% if product.images.all %}
                                 <div class="article-box__header">