From afa775f0cdad4d5f5d4d0218e7c2b9246f3b51d1 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 5 Oct 2016 18:43:28 +0200
Subject: [PATCH] Cleanup video_detail.html

---
 app/templates/agenda/includes/event_date.html | 46 +++++++++----------
 .../agenda/includes/event_metainfo.html       |  3 --
 app/templates/media/video/video_detail.html   | 26 -----------
 docker-compose.yml                            |  2 +-
 lib/mezzanine-agenda                          |  2 +-
 5 files changed, 25 insertions(+), 54 deletions(-)

diff --git a/app/templates/agenda/includes/event_date.html b/app/templates/agenda/includes/event_date.html
index 378c5b78..6c09e331 100644
--- a/app/templates/agenda/includes/event_date.html
+++ b/app/templates/agenda/includes/event_date.html
@@ -2,43 +2,43 @@
 
 <!-- Start date only  -->
 {% if event.start and not event.end %}
-
     {{ event.start|date:"l j F" }}
-
     <!-- Start date with hour  -->
-    {% if event.start|date:"H:i" != "23:59" %}
+    {% if event.start|date:"H:i" != "00:00" %}
         {% trans "at" %}
         {{ event.start|date:"H\hi" }}
     {% endif %}
 
 <!-- Start and end date  -->
 {% else %}
-
     <!-- Start and end date is the same day  -->
     {% if event.start|date:"d.m.y" == event.end|date:"d.m.y" %}
-
-        {{ event.start|date:"l j F" }}
-
-        <!-- Start date with hour  -->
-        {% if event.start|date:"H:i" != "23:59" %}
-            {% trans "from" %}
-            {{ event.start|date:"H\hi" }}
-            {% comment %}
-                {% if event.end|date:"H:i" != "23:59" %}
-                    {% trans "to" %}
-                    {{ event.end|date:"H\hi" }}
-                {% endif %}
-            {% endcomment %}
+        {% if not event.periods.all %}
+            {{ event.start|date:"l j F" }}
+            <!-- Start date with hour  -->
+            {% if event.start|date:"H:i" != "00:00" %}
+                {% trans "from" %}
+                {{ event.start|date:"H\hi" }}
+                {% comment %}
+                    {% if event.end|date:"H:i" != "00:00" %}
+                        {% trans "to" %}
+                        {{ event.end|date:"H\hi" }}
+                    {% endif %}
+                {% endcomment %}
+            {% endif %}
+        {% else %}
+            {{ event.start|date:"j F" }}<br>
+            {% for period in event.periods.all %}
+                {% trans "From" %} {{ period.date_from|date:"H:i" }} {% trans "to" %} {{ period.date_to|date:"H:i" }}
+            {% endfor %}
         {% endif %}
 
     <!-- Start and end date are the same month  -->
     {% elif event.start|date:"m.y" == event.end|date:"m.y" %}
-
-        {% trans "From" %}
-        {{ event.start|date:"j" }}
-        {% trans "to" %}
-        {{ event.end|date:"j F" }}
-
+        {% for period in event.periods.all %}
+            {% trans "From" %} {{ period.date_from|date:"j H:i" }} {% trans "to" %} {{ period.date_to|date:"j F H:i" }}
+        {% endfor %}
+        
     <!-- Start and end date are completely different  -->
     {% else %}
 
diff --git a/app/templates/agenda/includes/event_metainfo.html b/app/templates/agenda/includes/event_metainfo.html
index f73e138d..994a1bca 100644
--- a/app/templates/agenda/includes/event_metainfo.html
+++ b/app/templates/agenda/includes/event_metainfo.html
@@ -2,9 +2,6 @@
 
 <div class="page__meta-date">
     {% include 'agenda/includes/event_date.html' %}
-    {% if event.date_text %}
-        <span>{{event.date_text}}</span>
-    {% endif %}
 </div>
 
 <div class="page__meta-separator"></div>
diff --git a/app/templates/media/video/video_detail.html b/app/templates/media/video/video_detail.html
index b954cc14..014c7b0c 100644
--- a/app/templates/media/video/video_detail.html
+++ b/app/templates/media/video/video_detail.html
@@ -23,30 +23,4 @@
   {% include "includes/share_buttons.html" %}
 {% endwith %}
 
-{% if video.event %}
-<div class="video-event">
- <h2 class="section__title">{% trans 'Also discover' %}</h2>
-  <div class="msry__container">
-   <div class="msry__sizer"></div>
-    {% with video.event as event %}
-        {% include 'agenda/includes/event_card.html' %}
-    {% for artist in video.artists.all %}
-        {% include "festival/inc/artist_card.html" %}
-    {% endfor %}
-    {% for v in event.videos.all %}
-      {% if v != video %}
-       {% with v as video %}
-        {% include 'festival/inc/video_card.html' %}
-       {% endwith %}
-      {% endif %}
-    {% endfor %}
-    {% for post in event.blog_posts.all %}
-        {% include 'blog/includes/post_card.html' %}
-    {% endfor %}
-    {% endwith %}
-
-</div>
-</div>
-{% endif %}
-
 {% endblock %}
diff --git a/docker-compose.yml b/docker-compose.yml
index c7f27712..b8bd1ad4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ app:
   volumes:
     - ./app/:/srv/app
     - ./lib/mezzanine-agenda/:/srv/lib/mezzanine-agenda
-    # - ./lib/mezzanine/:/srv/lib/mezzanine
+    - ./lib/mezzanine/:/srv/lib/mezzanine
     - ./lib/grappelli-safe/:/srv/lib/grappelli-safe
   volumes_from:
     - data
diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index 3a58a1b3..6debdb55 160000
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit 3a58a1b343e3fd9f4cbad3a49d276e2d99bc0d01
+Subproject commit 6debdb55579fa65eed3ecf0c01ae02b63eb03587
-- 
2.39.5