From: Jérémy Fabre <Jeremy@iMac-de-Jeremy.local>
Date: Thu, 22 Sep 2016 15:49:00 +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=852c37109a63a06fd38bdd4793e24f585181533a;p=mezzo.git

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

# Conflicts:
#	app/templates/projects/project_detail.html
---

852c37109a63a06fd38bdd4793e24f585181533a
diff --cc app/templates/projects/project_detail.html
index 32a5ccfb,ee3c42ad..96a92059
--- a/app/templates/projects/project_detail.html
+++ b/app/templates/projects/project_detail.html
@@@ -205,21 -70,35 +205,22 @@@
  {% endblock %}
  
  {% block logo %}
 -{% trans "Partners" %}<br>
 -{% for organization in project.organizations.all %}
 -  {% with organization.images.all|get_type:'logo' as images %}
 -    {% include 'core/inc/logo.html' %}
 -  {% endwith %}
 -{% endfor %}
 +    <div class="page__block{% if block.background_color %} page__block--{{ block.background_color }}{% endif %}">
 +        <div class="white-bg pb2">
 +            <div class="container">
 +                <div class="row" data-summary-content>
 +                    <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
++                        {% trans "Partners" %}
 +                        <ul class="partners-list">
 +                            {% for organization in project.organizations.all %}
 +                                {% with organization.images.all|get_type:'logo' as images %}
 +                                    {% include 'core/inc/logo.html' %}
 +                                {% endwith %}
 +                            {% endfor %}
 +                        </ul>
 +                    </div>
 +                </div>
 +            </div>
 +        </div>
 +    </div>
  {% endblock %}