From 34af5dc7aba9d93eeb8559bfbb0fb4873b08899c Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 4 Apr 2016 13:12:23 +0200
Subject: [PATCH] add video and event cards

---
 .../templates/festival/inc/video_card.html    |  9 +++
 .../templates/festival/video_detail.html      |  4 +-
 .../templates/festival/video_list.html        | 10 +--
 app/templates/agenda/event_detail.html        |  2 +-
 app/templates/agenda/event_list.html          | 70 +-----------------
 app/templates/agenda/includes/event_card.html | 71 +++++++++++++++++++
 6 files changed, 86 insertions(+), 80 deletions(-)
 create mode 100644 app/festival/templates/festival/inc/video_card.html
 create mode 100644 app/templates/agenda/includes/event_card.html

diff --git a/app/festival/templates/festival/inc/video_card.html b/app/festival/templates/festival/inc/video_card.html
new file mode 100644
index 00000000..1b35317c
--- /dev/null
+++ b/app/festival/templates/festival/inc/video_card.html
@@ -0,0 +1,9 @@
+<div class="video__card">
+    <div class="video__card__thumbnail">
+        <img src="http://source.unsplash.com/9Vx-QeC0-9Q/400x400" alt="">
+    </div>
+    <div class="video__card__info">
+        <h3 class="video__card__name">{{ video.title }}</h3>
+    </div>
+    <a href="{% url 'festival-video-detail' video.slug %}" class="video__card__link">Lire la video</a>
+</div>
diff --git a/app/festival/templates/festival/video_detail.html b/app/festival/templates/festival/video_detail.html
index fcfe533a..404a80e6 100644
--- a/app/festival/templates/festival/video_detail.html
+++ b/app/festival/templates/festival/video_detail.html
@@ -22,7 +22,9 @@
 
 <div class="video-event">
     <h2>{% trans 'Related event' %}</h2>
-    <a href="{{ video.event.get_absolute_url }}">{{ video.event.title }}</a>
+    {% with video.event as event %}
+    {% include 'agenda/includes/event_card.html' %}
+    {% endwith %}
 </div>
 
 {% endblock %}
diff --git a/app/festival/templates/festival/video_list.html b/app/festival/templates/festival/video_list.html
index ca98f6b3..7365168b 100644
--- a/app/festival/templates/festival/video_list.html
+++ b/app/festival/templates/festival/video_list.html
@@ -9,15 +9,7 @@
 {% block main %}
 <div class="video__list">
     {% for video in object_list %}
-    <div class="video__card">
-        <div class="video__card__thumbnail">
-            <img src="http://source.unsplash.com/9Vx-QeC0-9Q/400x400" alt="">
-        </div>
-        <div class="video__card__info">
-            <h3 class="video__card__name">{{ video.title }}</h3>
-        </div>
-        <a href="{% url 'festival-video-detail' video.slug %}" class="video__card__link">Lire la video</a>
-    </div>
+     {% include 'festival/inc/video_card.html'}
     {% endfor %}
 </div>
 {% endblock %}
diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html
index ed619d52..4e1db0b3 100644
--- a/app/templates/agenda/event_detail.html
+++ b/app/templates/agenda/event_detail.html
@@ -169,7 +169,7 @@
 
 <h2>{% trans "Videos" %}</h2>
 {% for video in event.videos.all %}
-<a href="{% url 'festival-video-detail' video.slug %}">{{ video.title }}</a>
+    {% include 'festival/inc/video_card.html' %}
 {% endfor %}
 
 {% endblock %}
diff --git a/app/templates/agenda/event_list.html b/app/templates/agenda/event_list.html
index 627352b9..9ed2d398 100644
--- a/app/templates/agenda/event_list.html
+++ b/app/templates/agenda/event_list.html
@@ -69,75 +69,7 @@
 <div class="msry__container">
     <div class="msry__sizer">
 {% for event in events.object_list %}
-    {% block event_list_event_title %}
-        <div class="event__card msry__item">
-            {% if event.featured_image %}
-                {% block event_list_event_featured_image %}
-                    <a href="{{ event.get_absolute_url }}" class="event__thumbnail">
-                        <img src="{{ MEDIA_URL }}{% thumbnail event.featured_image 500 500 %}">
-                    </a>
-                {% endblock %}
-            {% endif %}
-            <h3 class="event__name">
-                <a href="{{ event.get_absolute_url }}">{{ event.title }}</a>
-            </h3>
-    {% endblock %}
-
-    {% block event_list_event_metainfo %}
-         {% include "agenda/includes/event_metainfo.html" %}
-        {% for child in event.children.all %}
-         {% with child as event %}
-          {% include "agenda/includes/event_metainfo.html" %}
-         {% endwith %}
-        {% endfor %}
-    {% endblock %}
-
-    {% block event_list_event_content %}
-            {% comment %}
-            <div class="event__description">
-                {{ event.description_from_content|safe }}
-                <a href="{{ event.get_absolute_url }}" class="event__meta__cta">{% trans "read more" %}</a>
-            </div>
-            {% endcomment %}
-    {% endblock %}
-
-    {% block booking %}
-    <a href="{{ event.get_absolute_url }}" class="btn btn-full">
-        <i class="icon icon__bookmark"></i> {% trans "Booking" %}
-    </a>
-    {% endblock %}
-
-{% block event_list_event_links %}
-<div class="event__detail">
-    {% keywords_for event as tags %}
-    {% if tags %}
-    <ul class="list-inline tags">
-    {% trans "Tags" %}:
-    {% spaceless %}
-    {% for tag in tags %}
-    <li><a href="{% url "event_list_tag" tag.slug %}" class="tag">{{ tag }}</a></li>
-    {% endfor %}
-    {% endspaceless %}
-    </ul>
-    {% endif %}
-    <p>
-    {% if event.allow_comments %}
-    /
-    {% if settings.COMMENTS_DISQUS_SHORTNAME %}
-    <a href="{{ event.get_absolute_url }}#disqus_thread"
-        data-disqus-identifier="{% disqus_id_for event %}">
-        {% trans "Comments" %}
-    </a>
-    {% else %}
-    <a href="{{ event.get_absolute_url }}#comments">
-        {% blocktrans count comments_count=event.comments_count %}{{ comments_count }} comment{% plural %}{{ comments_count }} comments{% endblocktrans %}
-    </a>
-    {% endif %}
-    {% endif %}
-    </p>
-</div>
-{% endblock %}
-</div>
+ {% include 'agenda/includes/event_card.html' %}
 {% endfor %}
     </div>
 </div>
diff --git a/app/templates/agenda/includes/event_card.html b/app/templates/agenda/includes/event_card.html
new file mode 100644
index 00000000..cb6e7d1d
--- /dev/null
+++ b/app/templates/agenda/includes/event_card.html
@@ -0,0 +1,71 @@
+{% load i18n future mezzanine_tags event_tags keyword_tags disqus_tags %}
+
+{% block event_list_event_title %}
+    <div class="event__card msry__item">
+        {% if event.featured_image %}
+            {% block event_list_event_featured_image %}
+                <a href="{{ event.get_absolute_url }}" class="event__thumbnail">
+                    <img src="{{ MEDIA_URL }}{% thumbnail event.featured_image 500 500 %}">
+                </a>
+            {% endblock %}
+        {% endif %}
+        <h3 class="event__name">
+            <a href="{{ event.get_absolute_url }}">{{ event.title }}</a>
+        </h3>
+{% endblock %}
+
+{% block event_list_event_metainfo %}
+     {% include "agenda/includes/event_metainfo.html" %}
+    {% for child in event.children.all %}
+     {% with child as event %}
+      {% include "agenda/includes/event_metainfo.html" %}
+     {% endwith %}
+    {% endfor %}
+{% endblock %}
+
+{% block event_list_event_content %}
+        {% comment %}
+        <div class="event__description">
+            {{ event.description_from_content|safe }}
+            <a href="{{ event.get_absolute_url }}" class="event__meta__cta">{% trans "read more" %}</a>
+        </div>
+        {% endcomment %}
+{% endblock %}
+
+{% block booking %}
+<a href="{{ event.get_absolute_url }}" class="btn btn-full">
+    <i class="icon icon__bookmark"></i> {% trans "Booking" %}
+</a>
+{% endblock %}
+
+{% block event_list_event_links %}
+<div class="event__detail">
+{% keywords_for event as tags %}
+{% if tags %}
+<ul class="list-inline tags">
+{% trans "Tags" %}:
+{% spaceless %}
+{% for tag in tags %}
+<li><a href="{% url "event_list_tag" tag.slug %}" class="tag">{{ tag }}</a></li>
+{% endfor %}
+{% endspaceless %}
+</ul>
+{% endif %}
+<p>
+{% if event.allow_comments %}
+/
+{% if settings.COMMENTS_DISQUS_SHORTNAME %}
+<a href="{{ event.get_absolute_url }}#disqus_thread"
+    data-disqus-identifier="{% disqus_id_for event %}">
+    {% trans "Comments" %}
+</a>
+{% else %}
+<a href="{{ event.get_absolute_url }}#comments">
+    {% blocktrans count comments_count=event.comments_count %}{{ comments_count }} comment{% plural %}{{ comments_count }} comments{% endblocktrans %}
+</a>
+{% endif %}
+{% endif %}
+</p>
+</div>
+{% endblock %}
+</div>
-- 
2.39.5