From d04d2403d0ad853bfb303becab647cb8920f31d1 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 10 May 2016 12:52:35 +0200
Subject: [PATCH] merge multiple event dates

---
 .../agenda/includes/event_metainfo_slider.html         | 10 ++++++++--
 app/templates/base.html                                |  5 -----
 lib/mezzanine-agenda                                   |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/templates/agenda/includes/event_metainfo_slider.html b/app/templates/agenda/includes/event_metainfo_slider.html
index 9b395abd..a62fc489 100644
--- a/app/templates/agenda/includes/event_metainfo_slider.html
+++ b/app/templates/agenda/includes/event_metainfo_slider.html
@@ -7,17 +7,23 @@
                 {% if event.end %}
                 {% if event.end|date == event.start|date and event.end.hour|subtract:event.start.hour > 3 %}{{ event.end|time:"TIME_FORMAT" }}{% endif %}
                 {% endif %}
+                {% for child in event.children.all %}
+                 {% with child as event %}
+                    / {{ event.start }}
+                     {% if event.end %}
+                     {% if event.end|date == event.start|date and event.end.hour|subtract:event.start.hour > 3 %}{{ event.end|time:"TIME_FORMAT" }}{% endif %}
+                     {% endif %}
+                 {% endwith %}
+                {% endfor %}
                 {% if event.location %}
                 <a href="{% url "event_list_location" event.location.slug %}" class="event__meta__location">{{ event.location }}</a>
                 {% endif %}
             </div>
-            {% if not event.parent %}
             <div class="split-right">
                 <a href="{{ event.get_absolute_url }}" class="btn">
                     <i class="icon icon__bookmark"></i> {% trans "Booking" %}
                 </a>
             </div>
-            {% endif %}
         </div>
     </div>
 </div>
diff --git a/app/templates/base.html b/app/templates/base.html
index 2f4ecc0a..d5d8c66f 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -97,11 +97,6 @@
                           <a href="{{ event.get_absolute_url }}">{{ event.title }}</a>
                       </p>
                       {% include "agenda/includes/event_metainfo_slider.html" %}
-                      {% for child in event.children.all %}
-                       {% with child as event %}
-                        {% include "agenda/includes/event_metainfo_slider.html" %}
-                       {% endwith %}
-                      {% endfor %}
                     </div>
                   </div>
               </li>
diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index ea6a3c0c..c96a36c6 160000
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit ea6a3c0c9e0c3cf1809d084b47efdca90e1779d4
+Subproject commit c96a36c651c3299ede1c9ca094e31a9593b6c052
-- 
2.39.5