From: Guillaume Pellerin Date: Sun, 10 Apr 2016 20:35:47 +0000 (+0200) Subject: add location infos and pages X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dfc5ee074f60f668ca14b03ae9b87c8bd4c635ea;p=mezzo.git add location infos and pages --- diff --git a/app/festival/migrations/0019_auto_20160410_2148.py b/app/festival/migrations/0019_auto_20160410_2148.py new file mode 100644 index 00000000..0dea9bbe --- /dev/null +++ b/app/festival/migrations/0019_auto_20160410_2148.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-04-10 19:48 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('festival', '0018_auto_20160407_2301'), + ] + + operations = [ + migrations.AlterField( + model_name='featured', + name='blogposts', + field=models.ManyToManyField(blank=True, related_name='featured', to='blog.BlogPost', verbose_name='blog posts'), + ), + migrations.AlterField( + model_name='featured', + name='pages', + field=models.ManyToManyField(blank=True, related_name='featured', to='pages.Page', verbose_name='pages'), + ), + ] diff --git a/app/festival/urls.py b/app/festival/urls.py index 61e51e07..686b4770 100644 --- a/app/festival/urls.py +++ b/app/festival/urls.py @@ -14,5 +14,4 @@ urlpatterns = [ url(r'^artists/(?P.*)/$', ArtistDetailView.as_view(), name="festival-artist-detail"), url(r'^videos/$', VideoListView.as_view(), name="festival-video-list"), url(r'^videos/(?P.*)/$', VideoDetailView.as_view(), name="festival-video-detail"), - url(r'^locations/$', LocationListView.as_view(), name="festival-location-list"), ] diff --git a/app/festival/views.py b/app/festival/views.py index 500fd961..cb494191 100644 --- a/app/festival/views.py +++ b/app/festival/views.py @@ -54,13 +54,3 @@ class VideoDetailView(SlugMixin, DetailView): def get_context_data(self, **kwargs): context = super(VideoDetailView, self).get_context_data(**kwargs) return context - - -class LocationListView(ListView): - - model = EventLocation - template_name='agenda/event_location_list.html' - - def get_context_data(self, **kwargs): - context = super(LocationListView, self).get_context_data(**kwargs) - return context diff --git a/app/migrations/mezzanine_agenda/0007_auto_20160410_2148.py b/app/migrations/mezzanine_agenda/0007_auto_20160410_2148.py new file mode 100644 index 00000000..bfe547d1 --- /dev/null +++ b/app/migrations/mezzanine_agenda/0007_auto_20160410_2148.py @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-04-10 19:48 +from __future__ import unicode_literals + +from django.db import migrations, models +import mezzanine.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('mezzanine_agenda', '0006_remove_event_featured'), + ] + + operations = [ + migrations.CreateModel( + name='EventPrice', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('price', models.FloatField(verbose_name='price')), + ('unit', models.CharField(blank=True, max_length=16, verbose_name='Unit')), + ], + options={ + 'verbose_name': 'Event price', + 'verbose_name_plural': 'Event pricies', + }, + ), + migrations.AlterModelOptions( + name='event', + options={'ordering': ('start',), 'verbose_name': 'Event', 'verbose_name_plural': 'Events'}, + ), + migrations.AddField( + model_name='eventlocation', + name='description', + field=mezzanine.core.fields.RichTextField(blank=True, verbose_name='description'), + ), + migrations.AddField( + model_name='eventlocation', + name='link', + field=models.URLField(blank=True, max_length=512), + ), + migrations.AddField( + model_name='event', + name='prices', + field=models.ManyToManyField(blank=True, related_name='events', to='mezzanine_agenda.EventPrice', verbose_name='prices'), + ), + ] diff --git a/app/migrations/mezzanine_agenda/0008_auto_20160410_2149.py b/app/migrations/mezzanine_agenda/0008_auto_20160410_2149.py new file mode 100644 index 00000000..cf8aff9e --- /dev/null +++ b/app/migrations/mezzanine_agenda/0008_auto_20160410_2149.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-04-10 19:49 +from __future__ import unicode_literals + +from django.db import migrations +import mezzanine.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('mezzanine_agenda', '0007_auto_20160410_2148'), + ] + + operations = [ + migrations.AddField( + model_name='eventlocation', + name='description_en', + field=mezzanine.core.fields.RichTextField(blank=True, null=True, verbose_name='description'), + ), + migrations.AddField( + model_name='eventlocation', + name='description_fr', + field=mezzanine.core.fields.RichTextField(blank=True, null=True, verbose_name='description'), + ), + ] diff --git a/app/migrations/mezzanine_agenda/0009_auto_20160410_2154.py b/app/migrations/mezzanine_agenda/0009_auto_20160410_2154.py new file mode 100644 index 00000000..fd2605cf --- /dev/null +++ b/app/migrations/mezzanine_agenda/0009_auto_20160410_2154.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-04-10 19:54 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mezzanine_agenda', '0008_auto_20160410_2149'), + ] + + operations = [ + migrations.AddField( + model_name='eventlocation', + name='featured_name', + field=models.CharField(blank=True, max_length=512, null=True, verbose_name='fearured name'), + ), + migrations.AlterField( + model_name='eventlocation', + name='link', + field=models.URLField(blank=True, max_length=512, null=True), + ), + ] diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html index aa18efba..d922e3c8 100644 --- a/app/templates/agenda/event_detail.html +++ b/app/templates/agenda/event_detail.html @@ -89,10 +89,11 @@ {% endblock %} +{% comment %} {% if event.location %}

Le lieu :

{% block event_detail_location %} -{% editable event.location %} +{{ event.location }}

{{ event.location }} {{ event.location.address|linebreaksbr }}

@@ -102,9 +103,9 @@ {% google_static_map event 900 300 15 %} -{% endeditable %} {% endblock %} {% endif %} +{% endcomment %} {% block event_detail_keywords %} {% keywords_for event as tags %} diff --git a/app/templates/agenda/event_location_detail.html b/app/templates/agenda/event_location_detail.html new file mode 100644 index 00000000..7fa0b574 --- /dev/null +++ b/app/templates/agenda/event_location_detail.html @@ -0,0 +1,6 @@ +{% extends "agenda/event_location_list.html" %} +{% load i18n future mezzanine_tags event_tags keyword_tags disqus_tags %} + +{% block main %} + {% include "agenda/includes/event_location.html" %} +{% endblock %} diff --git a/app/templates/agenda/event_location_list.html b/app/templates/agenda/event_location_list.html index 414cd5ea..49f7b75e 100644 --- a/app/templates/agenda/event_location_list.html +++ b/app/templates/agenda/event_location_list.html @@ -27,34 +27,18 @@ {% endblock %} {% block main %} -
{% for location in object_list %} - {{ location.title }} + + {% if location.featured_name %}{{ location.featured_name }}{% else %}{{ location.title }}{% endif %} {% endfor %}
{% for location in object_list %}
-
-

{{ location.title }}

- {% block event_detail_location %} - {% editable event.location %} -

- {{ location.address }}
- {% trans "Click to get the interactive map" %} -

- - {% google_static_map location 900 300 15 %} - - {% endeditable %} - {% endblock %} -
+ {% include "agenda/includes/event_location.html" %}
{% endfor %} - - - {% endblock %} {% block right_panel %} diff --git a/app/templates/agenda/includes/event_location.html b/app/templates/agenda/includes/event_location.html new file mode 100644 index 00000000..20eebb9a --- /dev/null +++ b/app/templates/agenda/includes/event_location.html @@ -0,0 +1,16 @@ +{% load i18n future mezzanine_tags event_tags %} + +
+

{% if location.featured_name %}{{ location.featured_name }}{% else %}{{ location.title }}{% endif %}

+ {% block event_detail_location %} +

+ {{ location.address }}
+ {{ location.link }}
+

+ + {% google_static_map location 900 300 15 %} +
+ {% trans "Click to get the interactive map" %} +

{{ location.description|safe }}

+ {% endblock %} +
diff --git a/app/templates/agenda/includes/event_metainfo.html b/app/templates/agenda/includes/event_metainfo.html index 10a3be8f..4030c549 100644 --- a/app/templates/agenda/includes/event_metainfo.html +++ b/app/templates/agenda/includes/event_metainfo.html @@ -12,7 +12,8 @@ {% endif %} {% if event.location %} {# {{ event.location }}#} - {{ event.location }} +
+ {{ event.location }} {% endif %}
diff --git a/app/translations.py b/app/translations.py index 77a88440..202c1370 100644 --- a/app/translations.py +++ b/app/translations.py @@ -1,6 +1,6 @@ from modeltranslation.translator import register, TranslationOptions -from mezzanine_agenda.models import Event +from mezzanine_agenda.models import Event, EventLocation from festival.models import * @@ -9,6 +9,10 @@ class EventTranslationOptions(TranslationOptions): fields = ('title', 'description', 'content') +@register(EventLocation) +class EventLocationTranslationOptions(TranslationOptions): + + fields = ('description',) @register(Artist) class ArtistTranslationOptions(TranslationOptions):