add prices and agenda migrations

diff --git a/app/festival/templates/festival/video_detail.html b/app/festival/templates/festival/video_detail.html
index 94a3b082f716a2a028f241cca17fefc2edcd66e7..df77f05cb2e1df8fc69534b94a987657df5fbc45 100644 (file)
--- a/app/festival/templates/festival/video_detail.html
+++ b/app/festival/templates/festival/video_detail.html
@@ -8,10 +8,6 @@
 
 {% block main %}
 
-<div class="video-description">
-    {{ video.description }}
-</div>
-
 <div class="video-html">
     {{ video.content|safe }}
 </div>

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 (file)
index 0000000..8a2c376
--- /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 d922e3c8ed7595bbeb5974095b5574441ba05057..73c8ceb983380775b757eee5e51be7d5703d87ac 100644 (file)
--- a/app/templates/agenda/event_detail.html
+++ b/app/templates/agenda/event_detail.html
@@ -154,21 +154,25 @@
 {% block event_related %}
 
 <hr style="margin-top: 3rem;">
-<h2 class="section__title">{% trans "Also discover" %}</h2> <br>
+<h2 class="section__title">{% trans "Also discover" %}</h2>
 
+{% if event.artists.all %}
 <h3 class="section__title">{% trans "Artists" %}</h3>
 <div class="row">
     {% for artist in event.artists.all %}
         {% include "festival/inc/artist_card.html" %}
     {% endfor %}
 </div>
+{% endif %}
 
+{% if event.videos.all %}}
 <h3 class="section__title">{% trans "Videos" %}</h3>
 <div class="row">
     {% for video in event.videos.all %}
         {% include 'festival/inc/video_card.html' %}
     {% endfor %}
 </div>
+{% endif %}
 
 {% endblock %}
 

diff --git a/app/templates/agenda/includes/event_metainfo.html b/app/templates/agenda/includes/event_metainfo.html
index 4030c549cc53412492a74e69d6da679f8ba160e3..15bbd16efb772888b2e3a0be06297961dd964cf2 100644 (file)
--- 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 %} 
             <a href="{% url 'event_booking' event.slug %}" class="event__meta__btn">
                 {% trans "Booking" %}
             </a>