From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 4 Apr 2016 00:37:08 +0000 (+0200)
Subject: add event booking
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6c64d51cf010c8f51e3ce4f19450a04250b30220;p=mezzo.git

add event booking
---

diff --git a/app/festival/templates/festival/artist_list.html b/app/festival/templates/festival/artist_list.html
index 01359d2e..ba6e6a63 100644
--- a/app/festival/templates/festival/artist_list.html
+++ b/app/festival/templates/festival/artist_list.html
@@ -10,23 +10,7 @@
 <div class="artist__list msry__container">
     <div class="msry__sizer"></div>
      {% for artist in object_list %}
-        <div class="artist__item msry__item">
-            <div class="artist__item__inner">
-                <a href="{% url 'festival-artist-detail' artist.slug %}" class="artist__item__inner">
-                    <figure class="artist__img">
-                        <img src="{% if artist.photo_featured %}{{ MEDIA_URL }}/{{ artist.photo_featured }}{% elif artist.photo %}{{ MEDIA_URL }}/{{ artist.photo }}{% else %}{% endif %}" alt="Portrait {{ artist.name }}">
-                        <figcaption class="artist__img__copyright">
-                           {{ artist.photo_credits }}
-                        </figcaption>
-                    </figure>
-                    <h3 class="artist__item__name">
-                        <span>
-                            {{ artist.name }}
-                        </span>
-                    </h3>
-                </a>
-            </div>
-        </div>
+        {% include "festival/inc/artist_card.html" %}
      {% endfor %}
 </div>
 {% endblock %}
diff --git a/app/festival/templates/festival/inc/artist_card.html b/app/festival/templates/festival/inc/artist_card.html
new file mode 100644
index 00000000..af3b6a87
--- /dev/null
+++ b/app/festival/templates/festival/inc/artist_card.html
@@ -0,0 +1,17 @@
+<div class="artist__item msry__item">
+    <div class="artist__item__inner">
+        <a href="{% url 'festival-artist-detail' artist.slug %}" class="artist__item__inner">
+            <figure class="artist__img">
+                <img src="{% if artist.photo_featured %}{{ MEDIA_URL }}/{{ artist.photo_featured }}{% elif artist.photo %}{{ MEDIA_URL }}/{{ artist.photo }}{% else %}{% endif %}" alt="Portrait {{ artist.name }}">
+                <figcaption class="artist__img__copyright">
+                   {{ artist.photo_credits }}
+                </figcaption>
+            </figure>
+            <h3 class="artist__item__name">
+                <span>
+                    {{ artist.name }}
+                </span>
+            </h3>
+        </a>
+    </div>
+</div>
diff --git a/app/festival/templatetags/festival_tags.py b/app/festival/templatetags/festival_tags.py
index e42b10c7..e4032047 100644
--- a/app/festival/templatetags/festival_tags.py
+++ b/app/festival/templatetags/festival_tags.py
@@ -3,6 +3,7 @@ from mezzanine.pages.models import Page
 from mezzanine.template import Library
 from mezzanine_agenda.models import Event
 from festival.models import Artist
+from mezzanine.conf import settings
 
 register = Library()
 
@@ -28,7 +29,3 @@ def festival_event_featured(*args):
 @register.filter
 def subtract(value, arg):
     return value - arg
-
-@register.as_tag
-def festival_shop_url(*args):
-    return settings.EVENT_SHOP_URL
diff --git a/app/locale/fr/LC_MESSAGES/django.po b/app/locale/fr/LC_MESSAGES/django.po
index 7d26e785..606a5e3c 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 01:54+0200\n"
+"POT-Creation-Date: 2016-04-04 02:37+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"
@@ -119,7 +119,7 @@ msgid "audios"
 msgstr ""
 
 #: festival/templates/festival/artist_list.html:6
-#: templates/agenda/event_detail.html:160
+#: templates/agenda/event_detail.html:165
 msgid "Artists"
 msgstr "Artistes"
 
@@ -128,7 +128,7 @@ msgid "Related event"
 msgstr "Événements liés"
 
 #: festival/templates/festival/video_list.html:6
-#: templates/agenda/event_detail.html:164
+#: templates/agenda/event_detail.html:170
 msgid "Videos"
 msgstr "Vidéos"
 
@@ -241,14 +241,18 @@ msgstr ""
 msgid "Sign up"
 msgstr ""
 
-#: templates/agenda/event_detail.html:50 templates/agenda/event_list.html:128
+#: templates/agenda/event_detail.html:44
+msgid "Book"
+msgstr "Réserver"
+
+#: templates/agenda/event_detail.html:54 templates/agenda/event_list.html:128
 #: 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:53 templates/agenda/event_list.html:132
+#: templates/agenda/event_detail.html:57 templates/agenda/event_list.html:132
 #: templates/blog/blog_post_detail.html:46
 #: templates/blog/blog_post_list.html:140
 #, python-format
@@ -257,19 +261,19 @@ msgid_plural "%(comments_count)s comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/agenda/event_detail.html:81
+#: templates/agenda/event_detail.html:85
 #: templates/blog/blog_post_detail.html:94
 msgid "Share on Facebook"
 msgstr "Partagez sur Facebook"
 
-#: templates/agenda/event_detail.html:82
+#: templates/agenda/event_detail.html:86
 #: 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:109 templates/agenda/event_list.html:114
+#: templates/agenda/event_detail.html:113 templates/agenda/event_list.html:114
 #: templates/agenda/includes/filter_panel.html:74
 #: templates/blog/blog_post_detail.html:74
 #: templates/blog/blog_post_list.html:121
@@ -277,7 +281,7 @@ msgstr "Partagez sur Facebook"
 msgid "Tags"
 msgstr ""
 
-#: templates/agenda/event_detail.html:173 templates/agenda/event_list.html:144
+#: templates/agenda/event_detail.html:181 templates/agenda/event_list.html:144
 msgid "Subscribe to all events in"
 msgstr "Abonnez-vous à tous les événements dans"
 
diff --git a/app/templates/agenda/event_book.html b/app/templates/agenda/event_book.html
new file mode 100644
index 00000000..79f31edf
--- /dev/null
+++ b/app/templates/agenda/event_book.html
@@ -0,0 +1,17 @@
+{% extends "agenda/event_detail.html" %}
+{% load mezzanine_tags comment_tags keyword_tags rating_tags i18n future disqus_tags event_tags festival_tags %}
+
+{% block book %}
+{% endblock %}
+
+{% block event_detail_content %}
+<iframe width="100%" height="1100px" scrolling="auto" src="{{ shop_url }}{{ event.external_id }}" frameborder="0" allowfullscreen=""></iframe>
+{% endblock %}
+
+{% block event_detail_sharebuttons %}
+{% endblock %}
+
+{% if event.location %}
+{% block event_detail_location %}
+{% endblock %}
+{% endif %}
diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html
index 491d9f28..947682f7 100644
--- a/app/templates/agenda/event_detail.html
+++ b/app/templates/agenda/event_detail.html
@@ -36,11 +36,15 @@
     </div>
     {% endif %}
 </div>
-<a href="{{ event.get_absolute_url }}" class="btn event__meta__btn">
-    <i class="icon icon__bookmark"></i> Réserver
-</a>
 {% endeditable %}
 {% endblock %}
+
+{% block book %}
+<a href="{% url 'event_book' event.slug %}" class="btn event__meta__btn">
+    <i class="icon icon__bookmark"></i> {% trans "Book" %}
+</a>
+{% endblock %}
+
 {% block event_detail_commentlink %}
 <p>
     {% if event.allow_comments %}
@@ -157,18 +161,23 @@
 {% endblock %}
 
 {% block event_related %}
+
 <h2>{% trans "Artists" %}</h2>
 {% for artist in event.artists.all %}
-<a href="{% url 'festival-artist-detail' artist.slug %}">{{ artist.name }}</a>
+    {% include "festival/inc/artist_card.html" %}
 {% endfor %}
+
 <h2>{% trans "Videos" %}</h2>
 {% for video in event.videos.all %}
 <a href="{% url 'festival-video-detail' video.slug %}">{{ video.title }}</a>
 {% endfor %}
+
 {% endblock %}
 
 {% block event_detail_comments %}
 {% if event.allow_comments %}{% comments_for event %}{% endif %}
 {% endblock %}
+
 <a href='{% icalendar_url %}' target="_blank" class="small push-ical">{% trans "Subscribe to all events in" %} Google Calendar/Outlook/iCal</a>
+
 {% endblock %}
diff --git a/app/templates/agenda/event_shop.html b/app/templates/agenda/event_shop.html
deleted file mode 100644
index 3851e7b7..00000000
--- a/app/templates/agenda/event_shop.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "agenda/event_detail.html" %}
-{% load mezzanine_tags comment_tags keyword_tags rating_tags i18n future disqus_tags event_tags festival_tags %}
-
-{% block event_detail_content %}
-<iframe src="{% festival_shop_url %}{{ event.external_id }}" frameborder="0" allowfullscreen=""></iframe>
-{% endblock %}