add featured to index, cleanup

diff --git a/app/festival/migrations/0012_auto_20160405_2351.py b/app/festival/migrations/0012_auto_20160405_2351.py
new file mode 100644 (file)
index 0000000..71de6cb
--- /dev/null
+++ b/app/festival/migrations/0012_auto_20160405_2351.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2016-04-05 21:51
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('festival', '0011_auto_20160323_1159'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='artist',
+            options={'ordering': ['last_name'], 'verbose_name': 'artist'},
+        ),
+        migrations.AddField(
+            model_name='audio',
+            name='featured',
+            field=models.BooleanField(default=False, verbose_name='featured'),
+        ),
+        migrations.AddField(
+            model_name='video',
+            name='featured',
+            field=models.BooleanField(default=False, verbose_name='featured'),
+        ),
+    ]

diff --git a/app/festival/models.py b/app/festival/models.py
index 8dd28f7ae0b684e81ab6643bf1f3a7acb8bc24c9..51dd0fce71c6b357608dc4e86955ba9b9097a6a3 100644 (file)
--- a/app/festival/models.py
+++ b/app/festival/models.py
@@ -117,6 +117,7 @@ class Media(Displayable, RichText):
     media_id = models.CharField(_('media id'), max_length=128)
     open_source_url = models.URLField(_('open source URL'), max_length=1024, blank=True)
     closed_source_url = models.URLField(_('closed source URL'), max_length=1024, blank=True)
+    featured = models.BooleanField(_('featured'), default=False)
 
     class Meta(MetaCore):
         abstract = True

diff --git a/app/festival/templatetags/festival_tags.py b/app/festival/templatetags/festival_tags.py
index e40320470b858d9ca534f8c5cde57b6094a8f1e8..a3c398cd636bc3d39e2b229f730064344a96659e 100644 (file)
--- a/app/festival/templatetags/festival_tags.py
+++ b/app/festival/templatetags/festival_tags.py
@@ -2,7 +2,7 @@
 from mezzanine.pages.models import Page
 from mezzanine.template import Library
 from mezzanine_agenda.models import Event
-from festival.models import Artist
+from festival.models import *
 from mezzanine.conf import settings
 
 register = Library()
@@ -29,3 +29,11 @@ def festival_event_featured(*args):
 @register.filter
 def subtract(value, arg):
     return value - arg
+
+@register.as_tag
+def featured_artist(*args):
+    return Artist.objects.filter(featured=True).order_by('?').first()
+
+@register.as_tag
+def featured_video(*args):
+    return Video.objects.filter(featured=True).order_by('?').first()

diff --git a/app/templates/agenda/includes/event_metainfo_slider.html b/app/templates/agenda/includes/event_metainfo_slider.html
index ce9ec5fbf240cb9d1de77286fc454c48dd37c6ab..aa141ab9e03d0c9f5349b76c10deb300b77cfc04 100644 (file)
--- a/app/templates/agenda/includes/event_metainfo_slider.html
+++ b/app/templates/agenda/includes/event_metainfo_slider.html
@@ -1,5 +1,4 @@
 {% load i18n mezzanine_tags event_tags festival_tags %}
-{% editable event.start event.end event.location %}
 <div class="event__meta--alt">
     <div class="event__meta__inner">
         <div class="split-container">
@@ -20,4 +19,3 @@
         </div>
     </div>
 </div>
-{% endeditable %}

diff --git a/app/templates/index.html b/app/templates/index.html
index fc38f65dd497d06a26f1244f3ad2b800a65e9a97..806657aeeee9d5f253e77a7ad5f4aea2695436c2 100644 (file)
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -7,9 +7,12 @@
 <li class="active">{% trans "Home" %}</li>
 {% endblock %}
 
-{% block title %}{% trans "Edito" %}{% endblock %}
-
 {% block main %}
-{% festival_edito as edito %}
-{{ edito.content|safe }}
+
+{% featured_artist as artist %}
+{% include "festival/inc/artist_card.html" %}
+
+{% featured_video as video %}
+{% include 'festival/inc/video_card.html' %}
+
 {% endblock %}