From fbaa63b23ec9481bca7e70273c6715009c542cfb Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Sun, 10 Apr 2016 23:19:39 +0200 Subject: [PATCH] add prices and agenda migrations --- .../templates/festival/video_detail.html | 4 ---- .../0010_eventlocation_external_id.py | 20 +++++++++++++++++++ app/templates/agenda/event_detail.html | 6 +++++- .../agenda/includes/event_metainfo.html | 1 + 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 app/migrations/mezzanine_agenda/0010_eventlocation_external_id.py diff --git a/app/festival/templates/festival/video_detail.html b/app/festival/templates/festival/video_detail.html index 94a3b082..df77f05c 100644 --- a/app/festival/templates/festival/video_detail.html +++ b/app/festival/templates/festival/video_detail.html @@ -8,10 +8,6 @@ {% block main %} -
- {{ video.description }} -
-
{{ video.content|safe }}
diff --git a/app/migrations/mezzanine_agenda/0010_eventlocation_external_id.py b/app/migrations/mezzanine_agenda/0010_eventlocation_external_id.py new file mode 100644 index 00000000..8a2c376c --- /dev/null +++ b/app/migrations/mezzanine_agenda/0010_eventlocation_external_id.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-04-10 21:18 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mezzanine_agenda', '0009_auto_20160410_2154'), + ] + + operations = [ + migrations.AddField( + model_name='eventlocation', + name='external_id', + field=models.IntegerField(blank=True, null=True, verbose_name='external_id'), + ), + ] diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html index d922e3c8..73c8ceb9 100644 --- a/app/templates/agenda/event_detail.html +++ b/app/templates/agenda/event_detail.html @@ -154,21 +154,25 @@ {% block event_related %}
-

{% trans "Also discover" %}


+

{% trans "Also discover" %}

+{% if event.artists.all %}

{% trans "Artists" %}

{% for artist in event.artists.all %} {% include "festival/inc/artist_card.html" %} {% endfor %}
+{% endif %} +{% if event.videos.all %}}

{% trans "Videos" %}

{% for video in event.videos.all %} {% include 'festival/inc/video_card.html' %} {% endfor %}
+{% endif %} {% endblock %} diff --git a/app/templates/agenda/includes/event_metainfo.html b/app/templates/agenda/includes/event_metainfo.html index 4030c549..15bbd16e 100644 --- a/app/templates/agenda/includes/event_metainfo.html +++ b/app/templates/agenda/includes/event_metainfo.html @@ -5,6 +5,7 @@ {% 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 %} {% if unit_booking %} + | {% for price in event.prices.all %}{{ price|floatformat }} €{% if not forloop.last %} - {% endif %}{% endfor %} {% trans "Booking" %} -- 2.39.5