From 3dd57541d046be1a22c0ae2150eaff108aabd57a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Je=CC=81re=CC=81my=20Fabre?= <Jeremy@iMac-de-Jeremy.local>
Date: Tue, 11 Oct 2016 16:34:57 +0200
Subject: [PATCH] Circle person style in event details

---
 app/templates/agenda/event_detail.html        | 17 ++++---
 .../network/inc/person/list_circle_style.html | 44 ++-----------------
 .../network/inc/person/list_square_style.html |  8 ++--
 .../inc/person/person_card_circle.html        | 43 ++++++++++++++++++
 .../inc/person/person_card_square.html        | 38 ++++++++--------
 5 files changed, 77 insertions(+), 73 deletions(-)
 create mode 100644 app/templates/network/inc/person/person_card_circle.html

diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html
index ed865c08..0fe29e57 100644
--- a/app/templates/agenda/event_detail.html
+++ b/app/templates/agenda/event_detail.html
@@ -157,25 +157,24 @@
 
             </div>
 
-            <div class="container-fluid">
+            <div class="container">
 
-                <div class="row tac">
+                <div class="row">
 
-                    {% for person in event.persons.all %}
+                    <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
 
-                        <div class="col-lg-2 col-md-3 col-sm-4 col-xs-6">
+                        {% for person in event.persons.all %}
 
-                            <div class="article-box article-box--person" >
                                 {% with person.person as person %}
-                                    {% include "network/inc/person/person_card_square.html" %}
+                                    {% include "network/inc/person/person_card_circle.html" %}
                                 {% endwith %}
-                            </div>
 
-                        </div>
+                        {% endfor %}
 
-                    {% endfor %}
+                    </div>
 
                 </div>
+
             </div>
 
         </div>
diff --git a/app/templates/network/inc/person/list_circle_style.html b/app/templates/network/inc/person/list_circle_style.html
index 08e4a94e..eedfa2eb 100644
--- a/app/templates/network/inc/person/list_circle_style.html
+++ b/app/templates/network/inc/person/list_circle_style.html
@@ -30,49 +30,11 @@
                     {% for person_list_block_inline in person_list_block.person_list_block_inlines.all %}
                         {% with person_list_block_inline.person as person %}
 
-                            <div class="row">
-
-                                <div class="person-list-box">
-
-                                    <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3 tac">
-
-                                        <a href="{{ person.get_absolute_url }}" title="{{ person.first_name }}&nbsp;{{ person.last_name }}">
-                                            <figure class="person-list-box__image">
-
-                                                {% with person.images.all|get_type:'card' as card_images %}
-                                                    {% if card_images %}
-                                                        <img src="{{ MEDIA_URL }}{% thumbnail card_images.first 135 135 top=0.5 %}" alt="person"/>
-                                                    {% endif %}
-                                                {% endwith %}
-
-                                            </figure>
-                                        </a>
-
-                                    </div>
-
-                                    <div class="col-lg-9 col-md-9 col-sm-9 col-xs-9">
-
-                                        <h3 class="mt0 fsxl">{{ person.first_name }}&nbsp;{{ person.last_name }}</h3>
-
-                                        {% if person.description %}
-                                            <div class="person-list-box__desc">{{ person.description|richtext_filters|safe }}</div>
-                                        {% elif person.bio %}
-                                            <div class="person-list-box__desc">{{ person.bio|richtext_filters|safe }}</div>
-                                        {% endif %}
-                                        {% if person.files.first %}
-                                            <a href="{{ person.files.first.file.url }}" class="button button--small">{% trans "resume" %}</a>
-                                        {% endif %}
-                                        {% for link in person.links.all %}
-                                            {% if link %}
-                                                <a href="{{ link }}" title="Site Web" class="button button--small"><i class="fa fa-{{ link.link_type.name }}"></i> {{ link.link_type.name }}</a>
-                                            {% endif %}
-                                        {% endfor %}
-
-                                    </div>
+                        {% with person_list_block_inline.person as person %}
 
-                                </div>
+                                {% include "network/inc/person/person_card_square.html" %}
 
-                            </div>
+                        {% endwith %}
 
                         {% endwith %}
                     {% endfor %}
diff --git a/app/templates/network/inc/person/list_square_style.html b/app/templates/network/inc/person/list_square_style.html
index fef07cc6..3fd44fbc 100644
--- a/app/templates/network/inc/person/list_square_style.html
+++ b/app/templates/network/inc/person/list_square_style.html
@@ -29,13 +29,11 @@
 
                     <div class="col-lg-2 col-md-3 col-sm-4 col-xs-6">
 
-                        <div class="article-box article-box--person" >
-                            {% with person_list_block_inline.person as person %}
+                        {% with person_list_block_inline.person as person %}
 
-                                    {% include "network/inc/person/person_card_square.html" %}
+                                {% include "network/inc/person/person_card_square.html" %}
 
-                            {% endwith %}
-                        </div>
+                        {% endwith %}
 
                     </div>
 
diff --git a/app/templates/network/inc/person/person_card_circle.html b/app/templates/network/inc/person/person_card_circle.html
new file mode 100644
index 00000000..384b424a
--- /dev/null
+++ b/app/templates/network/inc/person/person_card_circle.html
@@ -0,0 +1,43 @@
+{% load organization_tags mezzanine_tags i18n %}
+
+<div class="row">
+    <div class="person-list-box">
+
+        <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3 tac">
+
+            <a href="{{ person.get_absolute_url }}" title="{{ person.first_name }}&nbsp;{{ person.last_name }}">
+                <figure class="person-list-box__image">
+
+                    {% with person.images.all|get_type:'card' as card_images %}
+                        {% if card_images %}
+                            <img src="{{ MEDIA_URL }}{% thumbnail card_images.first 135 135 top=0.5 %}" alt="person"/>
+                        {% endif %}
+                    {% endwith %}
+
+                </figure>
+            </a>
+
+        </div>
+
+        <div class="col-lg-9 col-md-9 col-sm-9 col-xs-9">
+
+            <h3 class="mt0 fsxl">{{ person.first_name }}&nbsp;{{ person.last_name }}</h3>
+
+            {% if person.description %}
+                <div class="person-list-box__desc">{{ person.description|richtext_filters|safe }}</div>
+            {% elif person.bio %}
+                <div class="person-list-box__desc">{{ person.bio|richtext_filters|safe }}</div>
+            {% endif %}
+            {% if person.files.first %}
+                <a href="{{ person.files.first.file.url }}" class="button button--small">{% trans "resume" %}</a>
+            {% endif %}
+            {% for link in person.links.all %}
+                {% if link %}
+                    <a href="{{ link }}" title="Site Web" class="button button--small"><i class="fa fa-{{ link.link_type.name }}"></i> {{ link.link_type.name }}</a>
+                {% endif %}
+            {% endfor %}
+
+        </div>
+
+    </div>
+</div>
diff --git a/app/templates/network/inc/person/person_card_square.html b/app/templates/network/inc/person/person_card_square.html
index aa8b3d22..ec146f8d 100644
--- a/app/templates/network/inc/person/person_card_square.html
+++ b/app/templates/network/inc/person/person_card_square.html
@@ -1,25 +1,27 @@
 {% load organization_tags mezzanine_tags %}
 
-{% with person.images.all|get_type:'card' as card_images %}
-    {% if card_images %}
-        <div class="article-box__header">
-            <a href="{{ person.get_absolute_url }}" title="{{ person.first_name }}&nbsp;{{ person.last_name }}">
-                <figure class="article-box__image">
-                    <img class="lazyload" src="{{ MEDIA_URL }}{% thumbnail card_images.first 427 500 top=0.5 %}" alt="person"/>
-                </figure>
-            </a>
-        </div>
-    {% endif %}
-{% endwith %}
+<div class="article-box article-box--person" >
+    {% with person.images.all|get_type:'card' as card_images %}
+        {% if card_images %}
+            <div class="article-box__header">
+                <a href="{{ person.get_absolute_url }}" title="{{ person.first_name }}&nbsp;{{ person.last_name }}">
+                    <figure class="article-box__image">
+                        <img class="lazyload" src="{{ MEDIA_URL }}{% thumbnail card_images.first 427 500 top=0.5 %}" alt="person"/>
+                    </figure>
+                </a>
+            </div>
+        {% endif %}
+    {% endwith %}
 
-<div class="article-box__content tal">
+    <div class="article-box__content tal">
 
-    <a href="{{ person.get_absolute_url }}" title="{{ person.first_name }}&nbsp;{{ person.last_name }}"><h3 class="article-box__title">{{ person.first_name }}&nbsp;{{ person.last_name }}</h3></a>
+        <a href="{{ person.get_absolute_url }}" title="{{ person.first_name }}&nbsp;{{ person.last_name }}"><h3 class="article-box__title">{{ person.first_name }}&nbsp;{{ person.last_name }}</h3></a>
 
-    {% if person.description %}
-        <div class="article-box__desc">{{ person.description|richtext_filters|safe|truncatechars_html:255 }}</div>
-    {% elif person.bio %}
-        <div class="article-box__desc">{{ person.bio|richtext_filters|safe|truncatechars_html:255 }}</div>
-    {% endif %}
+        {% if person.description %}
+            <div class="article-box__desc">{{ person.description|richtext_filters|safe|truncatechars_html:255 }}</div>
+        {% elif person.bio %}
+            <div class="article-box__desc">{{ person.bio|richtext_filters|safe|truncatechars_html:255 }}</div>
+        {% endif %}
 
+    </div>
 </div>
-- 
2.39.5