From fc1a87d5df55fcc6e9c3312021aa34895ad99e29 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 4 Apr 2016 13:30:26 +0200
Subject: [PATCH] fix related events

---
 .../templates/festival/artist_detail.html     |  43 ++----------------
 app/locale/fr/LC_MESSAGES/django.mo           | Bin 1260 -> 1308 bytes
 app/locale/fr/LC_MESSAGES/django.po           |  30 +++++++-----
 3 files changed, 23 insertions(+), 50 deletions(-)

diff --git a/app/festival/templates/festival/artist_detail.html b/app/festival/templates/festival/artist_detail.html
index d4c2922e..4e8298af 100644
--- a/app/festival/templates/festival/artist_detail.html
+++ b/app/festival/templates/festival/artist_detail.html
@@ -18,44 +18,9 @@
     </p>
 </div>
 
+<h2 class="page__related__title--inverse">{% trans "Related events" %}</h2> <br>
+{% for event in artist.events.all %}
+ {% include 'agenda/includes/event_card.html' %}
+{% endfor %}
 
-<h2 class="page__related__title--inverse">Événement lié à {{ artist.name }} :</h2> <br>
-
-<div class="event__card">
-    <a href="/events/simplexity-la-beaut%C3%A9-du-geste/" class="event__thumbnail">
-        <img src="/media/uploads/images/events/.thumbnails/simplexity_featured.jpg/simplexity_featured-500x500.jpg">
-    </a>
-    <h3 class="event__name">
-        <a href="/events/simplexity-la-beaut%C3%A9-du-geste/">SIMPLEXITY - La beauté du geste</a>
-    </h3>
-    <div class="event__meta">
-        <div class="event__meta__inner">
-            2 juin 2016 20:30
-            <br> 3 juin 2016 22:00
-            <a href="/events/location/centre-pompidou-grande-salle/" class="event__meta__location">Centre Pompidou, Grande salle</a>
-        </div>
-    </div>
-    <a href="/events/simplexity-la-beaut%C3%A9-du-geste/" class="btn btn-full">
-        <i class="icon icon__bookmark"></i> Réserver
-    </a>
-</div>
-
-<div class="event__card">
-    <a href="/events/simplexity-la-beaut%C3%A9-du-geste/" class="event__thumbnail">
-        <img src="/media/uploads/images/events/.thumbnails/simplexity_featured.jpg/simplexity_featured-500x500.jpg">
-    </a>
-    <h3 class="event__name">
-        <a href="/events/simplexity-la-beaut%C3%A9-du-geste/">SIMPLEXITY - La beauté du geste</a>
-    </h3>
-    <div class="event__meta">
-        <div class="event__meta__inner">
-            2 juin 2016 20:30
-            <br> 3 juin 2016 22:00
-            <a href="/events/location/centre-pompidou-grande-salle/" class="event__meta__location">Centre Pompidou, Grande salle</a>
-        </div>
-    </div>
-    <a href="/events/simplexity-la-beaut%C3%A9-du-geste/" class="btn btn-full">
-        <i class="icon icon__bookmark"></i> Réserver
-    </a>
-</div>
 {% endblock %}
diff --git a/app/locale/fr/LC_MESSAGES/django.mo b/app/locale/fr/LC_MESSAGES/django.mo
index 06681426ecbfed0f8f693978b962db64dc3db0e9..785eb4f2094d57c607a520a45304016fb994aadb 100644
GIT binary patch
delta 435
zcmXZYze~eF6u|MjkW=H2w#G<N6xvlmQ3tW0e}LU|QVJrNp%QdxachJBfDVVa*y7T`
zxvNf{x+zXBg5V;!Ik|}6*WSU)C%kv}-X-6`-FW&Q`ZtOd5evj4u}D-j57sk|;*0am
z`GEoXFEsdrBlwFxDsNaf&MZowIh?}c&{VCu#5QIqlyMplQ5q&Vk2TEVmCLvBlwlnl
zBcEgHU;xU+ia3GGD1A0@5_eGcmC>k*Qu~7!r4CRI9^oujQ3j@%!)pxj-qpJ(`}??r
zuP*<GG9WT`SFZ$eRPGVlOPx3JWsz;^d?2mmN6gqK-OTL8$#FeCDa04?S-oaUUdOC$
Ul-9SppWdxDg{0bhu;+f`A1n<ncmMzZ

delta 398
zcmXZXze_?<6u|L&-w*YsVm=8Y3U^5f(M1<$(XGj;*`@jidV}CDmk6OPw`j6Iphky+
zMi&=d0*4w}TJn4HUO4Y_IrrUj&b{B;n0Oflw~AFDj)`aDgy?EMtQSn;t8?!BKtq0k
zA+9iipBUhmJO6S1q0}*+Qd!LJj8(}cDwyY>g;J=8M|h4oyma{(2NWA&iu|{~EBuQx
zkVp44W>D%JVg^en1Dv7^T>rPLRFjQdY~ulTP#RufgjX&<MEP%mWqfe?ca*~G!1i_3
q$W`gD>{u7WeKrOAq>D!0CJ&G7o4&DqZyKJ}n)Sxa_wTfQ46e5h9wy2F

diff --git a/app/locale/fr/LC_MESSAGES/django.po b/app/locale/fr/LC_MESSAGES/django.po
index 48676428..e12cac01 100644
--- a/app/locale/fr/LC_MESSAGES/django.po
+++ b/app/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-04 02:45+0200\n"
+"POT-Creation-Date: 2016-04-04 13:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -118,17 +118,21 @@ msgstr ""
 msgid "audios"
 msgstr ""
 
+#: festival/templates/festival/artist_detail.html:21
+msgid "Related events"
+msgstr "Événements liés"
+
 #: festival/templates/festival/artist_list.html:6
-#: templates/agenda/event_detail.html:165
+#: templates/agenda/event_detail.html:155
 msgid "Artists"
 msgstr "Artistes"
 
 #: festival/templates/festival/video_detail.html:24
 msgid "Related event"
-msgstr "Événements liés"
+msgstr "Événement lié"
 
 #: festival/templates/festival/video_list.html:6
-#: templates/agenda/event_detail.html:170
+#: templates/agenda/event_detail.html:160
 msgid "Videos"
 msgstr "Vidéos"
 
@@ -241,18 +245,21 @@ msgstr ""
 msgid "Sign up"
 msgstr ""
 
-#: templates/agenda/event_detail.html:44 templates/agenda/event_list.html:107
+#: templates/agenda/event_detail.html:34
+#: templates/agenda/includes/event_card.html:38
 msgid "Booking"
 msgstr "Réserver"
 
-#: templates/agenda/event_detail.html:54 templates/agenda/event_list.html:130
+#: templates/agenda/event_detail.html:44
+#: templates/agenda/includes/event_card.html:61
 #: templates/blog/blog_post_detail.html:43
 #: templates/blog/blog_post_list.html:136
 #: templates/generic/includes/comments.html:3
 msgid "Comments"
 msgstr ""
 
-#: templates/agenda/event_detail.html:57 templates/agenda/event_list.html:134
+#: templates/agenda/event_detail.html:47
+#: templates/agenda/includes/event_card.html:65
 #: templates/blog/blog_post_detail.html:46
 #: templates/blog/blog_post_list.html:140
 #, python-format
@@ -261,19 +268,20 @@ msgid_plural "%(comments_count)s comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/agenda/event_detail.html:85
+#: templates/agenda/event_detail.html:75
 #: templates/blog/blog_post_detail.html:94
 msgid "Share on Facebook"
 msgstr "Partagez sur Facebook"
 
-#: templates/agenda/event_detail.html:86
+#: templates/agenda/event_detail.html:76
 #: templates/blog/blog_post_detail.html:93
 #, fuzzy
 #| msgid "Share on Facebook"
 msgid "Share on Twitter"
 msgstr "Partagez sur Facebook"
 
-#: templates/agenda/event_detail.html:113 templates/agenda/event_list.html:116
+#: templates/agenda/event_detail.html:103
+#: templates/agenda/includes/event_card.html:47
 #: templates/agenda/includes/filter_panel.html:74
 #: templates/blog/blog_post_detail.html:74
 #: templates/blog/blog_post_list.html:121
@@ -281,7 +289,7 @@ msgstr "Partagez sur Facebook"
 msgid "Tags"
 msgstr ""
 
-#: templates/agenda/event_detail.html:181 templates/agenda/event_list.html:146
+#: templates/agenda/event_detail.html:171 templates/agenda/event_list.html:77
 msgid "Subscribe to all events in"
 msgstr "Abonnez-vous à tous les événements dans"
 
-- 
2.39.5