From: Jérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Date: Mon, 10 Oct 2016 08:05:42 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=148c68eace33d08a036932656bfc3a6caf9e1dc3;p=mezzo.git

Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

# Conflicts:
#	app/templates/shop/includes/product_list_square_style.html
---

148c68eace33d08a036932656bfc3a6caf9e1dc3
diff --cc app/templates/pages/custompage.html
index f3dc328f,ef0235d8..cfb3b245
--- a/app/templates/pages/custompage.html
+++ b/app/templates/pages/custompage.html
@@@ -114,16 -114,18 +114,20 @@@
    {% endwith %}
  {% endblock %}
  
+ {% block page_related_content %}
+     {{ block.super }}
+ {% 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 --cc app/templates/shop/includes/product_list_square_style.html
index 45697021,90877fdd..eda5f3b6
--- a/app/templates/shop/includes/product_list_square_style.html
+++ b/app/templates/shop/includes/product_list_square_style.html
@@@ -17,27 -17,29 +17,27 @@@
              <div class="row tac">
                  {% for product_inline in list.products.all %}
                    {% with product_inline.product as product %}
 -                    {% with product.links.all|get_type_link:"link" as links %}
 -                        <div class="col-lg-2 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">
 -                                        <a href="{{ links.0 }}" target="_blank" title="{{ product.title }}">
 -                                            <figure class="article-box__image">
 -                                                <img class="lazyload" src="{{ MEDIA_URL }}{% thumbnail product.images.all.0 427 500 top=0.5 %}" alt="product"/>
 -                                            </figure>
 -                                        </a>
 -                                    </div>
 -                                {% endif %}
 -                                <div class="article-box__content tal">
 -                                    <a href="{{ links.0 }}" target="_blank" title="{{ product.title }}"><h3 class="article-box__title">{{ product.title }}</h3></a>
 -                                    {% if product.description %}
 -                                        <div class="article-box__desc">{{ product.description|richtext_filters|safe|truncatechars_html:255 }}</div>
 -                                    {% elif product.content %}
 -                                        <div class="article-box__desc">{{ product.content|richtext_filters|safe|truncatechars_html:255 }}</div>
 -                                    {% endif %}
 +                    <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">
 +                                    <a href="{{ product.get_absolute_url }}" title="{{ product.title }}">
 +                                        <figure class="article-box__image">
 +                                            <img class="lazyload" src="{{ MEDIA_URL }}{% thumbnail product.images.all.0 427 500 top=0.5 %}" alt="product"/>
 +                                        </figure>
 +                                    </a>
                                  </div>
 +                            {% endif %}
 +                            <div class="article-box__content tal">
 +                                <a href="{{ product.get_absolute_url }}" title="{{ product.title }}"><h3 class="article-box__title">{{ product.title }}</h3></a>
 +                                {% if product.description %}
 +                                    <div class="article-box__desc">{{ product.description|richtext_filters|safe|truncatechars_html:255 }}</div>
 +                                {% elif product.content %}
 +                                    <div class="article-box__desc">{{ product.content|richtext_filters|safe|truncatechars_html:255 }}</div>
 +                                {% endif %}
                              </div>
                          </div>
-                     </div>
+                     {% endwith %}
                    {% endwith %}
                  {% endfor %}
              </div>