From 8e6dd249ade0213bbff0ade572836c4072f46b80 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 14 Jul 2016 18:08:29 +0200 Subject: [PATCH] add migrations, cleanup --- app/migrations/__init__.py | 0 .../blog/0002_auto_20150527_1555.py | 19 +++ .../blog/0003_auto_20151223_1313.py | 65 ++++++++++ .../conf/0002_auto_20151223_1313.py | 24 ++++ .../forms/0002_auto_20141227_0224.py | 21 ++++ app/migrations/forms/0003_emailfield.py | 20 +++ .../forms/0004_auto_20150517_0510.py | 19 +++ .../forms/0005_auto_20151223_1313.py | 115 ++++++++++++++++++ .../forms/0006_auto_20160407_2249.py | 30 +++++ .../galleries/0002_auto_20141227_0224.py | 21 ++++ .../galleries/0003_auto_20151223_1313.py | 35 ++++++ .../mezzanine_agenda/0001_initial.py | 88 ++++++++++++++ .../0002_auto_20160224_1142.py | 25 ++++ .../0003_auto_20160309_1621.py | 64 ++++++++++ .../0004_auto_20160331_1832.py | 21 ++++ .../0005_auto_20160404_0043.py | 25 ++++ .../0006_remove_event_featured.py | 19 +++ .../0007_auto_20160410_2148.py | 47 +++++++ .../0008_auto_20160410_2149.py | 26 ++++ .../0009_auto_20160410_2154.py | 25 ++++ .../0010_eventlocation_external_id.py | 20 +++ .../0011_auto_20160410_2330.py | 30 +++++ .../0012_auto_20160410_2336.py | 20 +++ .../0013_auto_20160510_1542.py | 25 ++++ .../mezzanine_agenda/0014_event_brochure.py | 21 ++++ app/migrations/mezzanine_agenda/__init__.py | 0 .../pages/0002_auto_20141227_0224.py | 28 +++++ .../pages/0003_auto_20150527_1555.py | 19 +++ .../pages/0004_auto_20151223_1313.py | 65 ++++++++++ .../migrations/0002_auto_20160714_1756.py | 29 +++++ app/templates/pages/menus/dropdown.html | 35 ++++++ 31 files changed, 1001 insertions(+) create mode 100644 app/migrations/__init__.py create mode 100644 app/migrations/blog/0002_auto_20150527_1555.py create mode 100644 app/migrations/blog/0003_auto_20151223_1313.py create mode 100644 app/migrations/conf/0002_auto_20151223_1313.py create mode 100644 app/migrations/forms/0002_auto_20141227_0224.py create mode 100644 app/migrations/forms/0003_emailfield.py create mode 100644 app/migrations/forms/0004_auto_20150517_0510.py create mode 100644 app/migrations/forms/0005_auto_20151223_1313.py create mode 100644 app/migrations/forms/0006_auto_20160407_2249.py create mode 100644 app/migrations/galleries/0002_auto_20141227_0224.py create mode 100644 app/migrations/galleries/0003_auto_20151223_1313.py create mode 100644 app/migrations/mezzanine_agenda/0001_initial.py create mode 100644 app/migrations/mezzanine_agenda/0002_auto_20160224_1142.py create mode 100644 app/migrations/mezzanine_agenda/0003_auto_20160309_1621.py create mode 100644 app/migrations/mezzanine_agenda/0004_auto_20160331_1832.py create mode 100644 app/migrations/mezzanine_agenda/0005_auto_20160404_0043.py create mode 100644 app/migrations/mezzanine_agenda/0006_remove_event_featured.py create mode 100644 app/migrations/mezzanine_agenda/0007_auto_20160410_2148.py create mode 100644 app/migrations/mezzanine_agenda/0008_auto_20160410_2149.py create mode 100644 app/migrations/mezzanine_agenda/0009_auto_20160410_2154.py create mode 100644 app/migrations/mezzanine_agenda/0010_eventlocation_external_id.py create mode 100644 app/migrations/mezzanine_agenda/0011_auto_20160410_2330.py create mode 100644 app/migrations/mezzanine_agenda/0012_auto_20160410_2336.py create mode 100644 app/migrations/mezzanine_agenda/0013_auto_20160510_1542.py create mode 100644 app/migrations/mezzanine_agenda/0014_event_brochure.py create mode 100644 app/migrations/mezzanine_agenda/__init__.py create mode 100644 app/migrations/pages/0002_auto_20141227_0224.py create mode 100644 app/migrations/pages/0003_auto_20150527_1555.py create mode 100644 app/migrations/pages/0004_auto_20151223_1313.py create mode 100644 app/organization/team/migrations/0002_auto_20160714_1756.py create mode 100644 app/templates/pages/menus/dropdown.html diff --git a/app/migrations/__init__.py b/app/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/app/migrations/blog/0002_auto_20150527_1555.py b/app/migrations/blog/0002_auto_20150527_1555.py new file mode 100644 index 00000000..a5cb65cc --- /dev/null +++ b/app/migrations/blog/0002_auto_20150527_1555.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='blogpost', + name='publish_date', + field=models.DateTimeField(help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from', db_index=True, blank=True), + ), + ] diff --git a/app/migrations/blog/0003_auto_20151223_1313.py b/app/migrations/blog/0003_auto_20151223_1313.py new file mode 100644 index 00000000..2d1da523 --- /dev/null +++ b/app/migrations/blog/0003_auto_20151223_1313.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +import mezzanine.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0002_auto_20150527_1555'), + ] + + operations = [ + migrations.AddField( + model_name='blogcategory', + name='title_en', + field=models.CharField(max_length=500, null=True, verbose_name='Title'), + ), + migrations.AddField( + model_name='blogcategory', + name='title_fr', + field=models.CharField(max_length=500, null=True, verbose_name='Title'), + ), + migrations.AddField( + model_name='blogpost', + name='_meta_title_en', + field=models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True), + ), + migrations.AddField( + model_name='blogpost', + name='_meta_title_fr', + field=models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True), + ), + migrations.AddField( + model_name='blogpost', + name='content_en', + field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'), + ), + migrations.AddField( + model_name='blogpost', + name='content_fr', + field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'), + ), + migrations.AddField( + model_name='blogpost', + name='description_en', + field=models.TextField(null=True, verbose_name='Description', blank=True), + ), + migrations.AddField( + model_name='blogpost', + name='description_fr', + field=models.TextField(null=True, verbose_name='Description', blank=True), + ), + migrations.AddField( + model_name='blogpost', + name='title_en', + field=models.CharField(max_length=500, null=True, verbose_name='Title'), + ), + migrations.AddField( + model_name='blogpost', + name='title_fr', + field=models.CharField(max_length=500, null=True, verbose_name='Title'), + ), + ] diff --git a/app/migrations/conf/0002_auto_20151223_1313.py b/app/migrations/conf/0002_auto_20151223_1313.py new file mode 100644 index 00000000..fb2bf3c3 --- /dev/null +++ b/app/migrations/conf/0002_auto_20151223_1313.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('conf', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='setting', + name='value_en', + field=models.CharField(max_length=2000, null=True), + ), + migrations.AddField( + model_name='setting', + name='value_fr', + field=models.CharField(max_length=2000, null=True), + ), + ] diff --git a/app/migrations/forms/0002_auto_20141227_0224.py b/app/migrations/forms/0002_auto_20141227_0224.py new file mode 100644 index 00000000..8e8905e5 --- /dev/null +++ b/app/migrations/forms/0002_auto_20141227_0224.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import mezzanine.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('forms', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='field', + name='_order', + field=mezzanine.core.fields.OrderField(null=True, verbose_name='Order'), + preserve_default=True, + ), + ] diff --git a/app/migrations/forms/0003_emailfield.py b/app/migrations/forms/0003_emailfield.py new file mode 100644 index 00000000..9f826c6a --- /dev/null +++ b/app/migrations/forms/0003_emailfield.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import mezzanine.pages.managers + + +class Migration(migrations.Migration): + + dependencies = [ + ('forms', '0002_auto_20141227_0224'), + ] + + operations = [ + migrations.AlterField( + model_name='form', + name='email_from', + field=models.EmailField(help_text='The address the email will be sent from', max_length=254, verbose_name='From address', blank=True), + ), + ] diff --git a/app/migrations/forms/0004_auto_20150517_0510.py b/app/migrations/forms/0004_auto_20150517_0510.py new file mode 100644 index 00000000..b7cb5526 --- /dev/null +++ b/app/migrations/forms/0004_auto_20150517_0510.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('forms', '0003_emailfield'), + ] + + operations = [ + migrations.AlterField( + model_name='form', + name='button_text', + field=models.CharField(max_length=50, verbose_name='Button text', blank=True), + ), + ] diff --git a/app/migrations/forms/0005_auto_20151223_1313.py b/app/migrations/forms/0005_auto_20151223_1313.py new file mode 100644 index 00000000..852552ac --- /dev/null +++ b/app/migrations/forms/0005_auto_20151223_1313.py @@ -0,0 +1,115 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +import mezzanine.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('forms', '0004_auto_20150517_0510'), + ] + + operations = [ + migrations.AddField( + model_name='field', + name='choices_en', + field=models.CharField(help_text='Comma separated options where applicable. If an option itself contains commas, surround the option with `backticks`.', max_length=1000, null=True, verbose_name='Choices', blank=True), + ), + migrations.AddField( + model_name='field', + name='choices_fr', + field=models.CharField(help_text='Comma separated options where applicable. If an option itself contains commas, surround the option with `backticks`.', max_length=1000, null=True, verbose_name='Choices', blank=True), + ), + migrations.AddField( + model_name='field', + name='default_en', + field=models.CharField(max_length=2000, null=True, verbose_name='Default value', blank=True), + ), + migrations.AddField( + model_name='field', + name='default_fr', + field=models.CharField(max_length=2000, null=True, verbose_name='Default value', blank=True), + ), + migrations.AddField( + model_name='field', + name='help_text_en', + field=models.CharField(max_length=100, null=True, verbose_name='Help text', blank=True), + ), + migrations.AddField( + model_name='field', + name='help_text_fr', + field=models.CharField(max_length=100, null=True, verbose_name='Help text', blank=True), + ), + migrations.AddField( + model_name='field', + name='label_en', + field=models.CharField(max_length=200, null=True, verbose_name='Label'), + ), + migrations.AddField( + model_name='field', + name='label_fr', + field=models.CharField(max_length=200, null=True, verbose_name='Label'), + ), + migrations.AddField( + model_name='field', + name='placeholder_text_en', + field=models.CharField(verbose_name='Placeholder Text', max_length=100, null=True, editable=False, blank=True), + ), + migrations.AddField( + model_name='field', + name='placeholder_text_fr', + field=models.CharField(verbose_name='Placeholder Text', max_length=100, null=True, editable=False, blank=True), + ), + migrations.AddField( + model_name='form', + name='button_text_en', + field=models.CharField(max_length=50, null=True, verbose_name='Button text', blank=True), + ), + migrations.AddField( + model_name='form', + name='button_text_fr', + field=models.CharField(max_length=50, null=True, verbose_name='Button text', blank=True), + ), + migrations.AddField( + model_name='form', + name='content_en', + field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'), + ), + migrations.AddField( + model_name='form', + name='content_fr', + field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'), + ), + migrations.AddField( + model_name='form', + name='email_message_en', + field=models.TextField(help_text='Emails sent based on the above options will contain each of the form fields entered. You can also enter a message here that will be included in the email.', null=True, verbose_name='Message', blank=True), + ), + migrations.AddField( + model_name='form', + name='email_message_fr', + field=models.TextField(help_text='Emails sent based on the above options will contain each of the form fields entered. You can also enter a message here that will be included in the email.', null=True, verbose_name='Message', blank=True), + ), + migrations.AddField( + model_name='form', + name='email_subject_en', + field=models.CharField(max_length=200, null=True, verbose_name='Subject', blank=True), + ), + migrations.AddField( + model_name='form', + name='email_subject_fr', + field=models.CharField(max_length=200, null=True, verbose_name='Subject', blank=True), + ), + migrations.AddField( + model_name='form', + name='response_en', + field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Response'), + ), + migrations.AddField( + model_name='form', + name='response_fr', + field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Response'), + ), + ] diff --git a/app/migrations/forms/0006_auto_20160407_2249.py b/app/migrations/forms/0006_auto_20160407_2249.py new file mode 100644 index 00000000..c8af308a --- /dev/null +++ b/app/migrations/forms/0006_auto_20160407_2249.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-04-07 20:49 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('forms', '0005_auto_20151223_1313'), + ] + + operations = [ + migrations.AlterField( + model_name='field', + name='placeholder_text', + field=models.CharField(blank=True, max_length=100, verbose_name='Placeholder Text'), + ), + migrations.AlterField( + model_name='field', + name='placeholder_text_en', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Placeholder Text'), + ), + migrations.AlterField( + model_name='field', + name='placeholder_text_fr', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Placeholder Text'), + ), + ] diff --git a/app/migrations/galleries/0002_auto_20141227_0224.py b/app/migrations/galleries/0002_auto_20141227_0224.py new file mode 100644 index 00000000..89bf6338 --- /dev/null +++ b/app/migrations/galleries/0002_auto_20141227_0224.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import mezzanine.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('galleries', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='galleryimage', + name='_order', + field=mezzanine.core.fields.OrderField(null=True, verbose_name='Order'), + preserve_default=True, + ), + ] diff --git a/app/migrations/galleries/0003_auto_20151223_1313.py b/app/migrations/galleries/0003_auto_20151223_1313.py new file mode 100644 index 00000000..2a618524 --- /dev/null +++ b/app/migrations/galleries/0003_auto_20151223_1313.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +import mezzanine.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('galleries', '0002_auto_20141227_0224'), + ] + + operations = [ + migrations.AddField( + model_name='gallery', + name='content_en', + field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'), + ), + migrations.AddField( + model_name='gallery', + name='content_fr', + field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'), + ), + migrations.AddField( + model_name='galleryimage', + name='description_en', + field=models.CharField(max_length=1000, null=True, verbose_name='Description', blank=True), + ), + migrations.AddField( + model_name='galleryimage', + name='description_fr', + field=models.CharField(max_length=1000, null=True, verbose_name='Description', blank=True), + ), + ] diff --git a/app/migrations/mezzanine_agenda/0001_initial.py b/app/migrations/mezzanine_agenda/0001_initial.py new file mode 100644 index 00000000..063a464d --- /dev/null +++ b/app/migrations/mezzanine_agenda/0001_initial.py @@ -0,0 +1,88 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +import mezzanine.core.fields +import mezzanine.utils.models +from django.conf import settings + + +class Migration(migrations.Migration): + + dependencies = [ + ('sites', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Event', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('comments_count', models.IntegerField(default=0, editable=False)), + ('keywords_string', models.CharField(max_length=500, editable=False, blank=True)), + ('rating_count', models.IntegerField(default=0, editable=False)), + ('rating_sum', models.IntegerField(default=0, editable=False)), + ('rating_average', models.FloatField(default=0, editable=False)), + ('title', models.CharField(max_length=500, verbose_name='Title')), + ('title_fr', models.CharField(max_length=500, null=True, verbose_name='Title')), + ('title_en', models.CharField(max_length=500, null=True, verbose_name='Title')), + ('slug', models.CharField(help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL', blank=True)), + ('_meta_title', models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True)), + ('description', models.TextField(verbose_name='Description', blank=True)), + ('gen_description', models.BooleanField(default=True, help_text='If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description.', verbose_name='Generate description')), + ('created', models.DateTimeField(null=True, editable=False)), + ('updated', models.DateTimeField(null=True, editable=False)), + ('status', models.IntegerField(default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status', choices=[(1, 'Draft'), (2, 'Published')])), + ('publish_date', models.DateTimeField(help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from', db_index=True, blank=True)), + ('expiry_date', models.DateTimeField(help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on', blank=True)), + ('short_url', models.URLField(null=True, blank=True)), + ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')), + ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')), + ('start', models.DateTimeField(verbose_name='Start')), + ('end', models.DateTimeField(null=True, verbose_name='End', blank=True)), + ('facebook_event', models.BigIntegerField(null=True, verbose_name='Facebook', blank=True)), + ('allow_comments', models.BooleanField(default=True, verbose_name='Allow comments')), + ('featured_image', mezzanine.core.fields.FileField(max_length=255, null=True, verbose_name='Featured Image', blank=True)), + ], + options={ + 'ordering': ('-start',), + 'verbose_name': 'Event', + 'verbose_name_plural': 'Events', + }, + bases=(models.Model, mezzanine.utils.models.AdminThumbMixin), + ), + migrations.CreateModel( + name='EventLocation', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('title', models.CharField(max_length=500, verbose_name='Title')), + ('slug', models.CharField(help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL', blank=True)), + ('address', models.TextField()), + ('mappable_location', models.CharField(help_text='This address will be used to calculate latitude and longitude. Leave blank and set Latitude and Longitude to specify the location yourself, or leave all three blank to auto-fill from the Location field.', max_length=128, blank=True)), + ('lat', models.DecimalField(decimal_places=7, max_digits=10, blank=True, help_text='Calculated automatically if mappable location is set.', null=True, verbose_name='Latitude')), + ('lon', models.DecimalField(decimal_places=7, max_digits=10, blank=True, help_text='Calculated automatically if mappable location is set.', null=True, verbose_name='Longitude')), + ('site', models.ForeignKey(editable=False, to='sites.Site')), + ], + options={ + 'ordering': ('title',), + 'verbose_name': 'Event Location', + 'verbose_name_plural': 'Event Locations', + }, + ), + migrations.AddField( + model_name='event', + name='location', + field=models.ForeignKey(blank=True, to='mezzanine_agenda.EventLocation', null=True), + ), + migrations.AddField( + model_name='event', + name='site', + field=models.ForeignKey(editable=False, to='sites.Site'), + ), + migrations.AddField( + model_name='event', + name='user', + field=models.ForeignKey(related_name='events', verbose_name='Author', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/app/migrations/mezzanine_agenda/0002_auto_20160224_1142.py b/app/migrations/mezzanine_agenda/0002_auto_20160224_1142.py new file mode 100644 index 00000000..7ef6f217 --- /dev/null +++ b/app/migrations/mezzanine_agenda/0002_auto_20160224_1142.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +import mezzanine.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('mezzanine_agenda', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='content_en', + field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'), + ), + migrations.AddField( + model_name='event', + name='content_fr', + field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'), + ), + ] diff --git a/app/migrations/mezzanine_agenda/0003_auto_20160309_1621.py b/app/migrations/mezzanine_agenda/0003_auto_20160309_1621.py new file mode 100644 index 00000000..51e65fea --- /dev/null +++ b/app/migrations/mezzanine_agenda/0003_auto_20160309_1621.py @@ -0,0 +1,64 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-03-09 15:21 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import mezzanine.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('mezzanine_agenda', '0002_auto_20160224_1142'), + ] + + operations = [ + migrations.CreateModel( + name='EventCategory', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=512, verbose_name='name')), + ('description', models.TextField(blank=True, verbose_name='description')), + ], + options={ + 'verbose_name_plural': 'Event categories', + 'verbose_name': 'Event category', + }, + ), + migrations.AddField( + model_name='event', + name='external_id', + field=models.IntegerField(blank=True, null=True, verbose_name='external_id'), + ), + migrations.AddField( + model_name='event', + name='featured', + field=models.BooleanField(default=False, verbose_name='featured'), + ), + migrations.AddField( + model_name='event', + name='featured_image_description', + field=models.TextField(blank=True, verbose_name='featured image description'), + ), + migrations.AddField( + model_name='event', + name='featured_image_header', + field=mezzanine.core.fields.FileField(blank=True, max_length=1024, verbose_name='featured image header'), + ), + migrations.AddField( + model_name='event', + name='parent', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='children', to='mezzanine_agenda.Event', verbose_name='parent'), + ), + migrations.AlterField( + model_name='event', + name='allow_comments', + field=models.BooleanField(default=False, verbose_name='Allow comments'), + ), + migrations.AddField( + model_name='event', + name='category', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='events', to='mezzanine_agenda.EventCategory', verbose_name='category'), + ), + ] diff --git a/app/migrations/mezzanine_agenda/0004_auto_20160331_1832.py b/app/migrations/mezzanine_agenda/0004_auto_20160331_1832.py new file mode 100644 index 00000000..d48289d7 --- /dev/null +++ b/app/migrations/mezzanine_agenda/0004_auto_20160331_1832.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-03-31 16:32 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('mezzanine_agenda', '0003_auto_20160309_1621'), + ] + + operations = [ + migrations.AlterField( + model_name='event', + name='location', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='mezzanine_agenda.EventLocation'), + ), + ] diff --git a/app/migrations/mezzanine_agenda/0005_auto_20160404_0043.py b/app/migrations/mezzanine_agenda/0005_auto_20160404_0043.py new file mode 100644 index 00000000..2d6da8c7 --- /dev/null +++ b/app/migrations/mezzanine_agenda/0005_auto_20160404_0043.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-04-03 22:43 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mezzanine_agenda', '0004_auto_20160331_1832'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='description_en', + field=models.TextField(blank=True, null=True, verbose_name='Description'), + ), + migrations.AddField( + model_name='event', + name='description_fr', + field=models.TextField(blank=True, null=True, verbose_name='Description'), + ), + ] diff --git a/app/migrations/mezzanine_agenda/0006_remove_event_featured.py b/app/migrations/mezzanine_agenda/0006_remove_event_featured.py new file mode 100644 index 00000000..f01b0672 --- /dev/null +++ b/app/migrations/mezzanine_agenda/0006_remove_event_featured.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-04-07 20:49 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('mezzanine_agenda', '0005_auto_20160404_0043'), + ] + + operations = [ + migrations.RemoveField( + model_name='event', + name='featured', + ), + ] 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/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/migrations/mezzanine_agenda/0011_auto_20160410_2330.py b/app/migrations/mezzanine_agenda/0011_auto_20160410_2330.py new file mode 100644 index 00000000..53985ab1 --- /dev/null +++ b/app/migrations/mezzanine_agenda/0011_auto_20160410_2330.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-04-10 21:30 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mezzanine_agenda', '0010_eventlocation_external_id'), + ] + + operations = [ + migrations.RemoveField( + model_name='eventprice', + name='price', + ), + migrations.AddField( + model_name='eventprice', + name='value', + field=models.FloatField(default=0, verbose_name='value'), + preserve_default=False, + ), + migrations.AlterField( + model_name='eventlocation', + name='featured_name', + field=models.CharField(blank=True, max_length=512, null=True, verbose_name='featured name'), + ), + ] diff --git a/app/migrations/mezzanine_agenda/0012_auto_20160410_2336.py b/app/migrations/mezzanine_agenda/0012_auto_20160410_2336.py new file mode 100644 index 00000000..e7f9fac0 --- /dev/null +++ b/app/migrations/mezzanine_agenda/0012_auto_20160410_2336.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-04-10 21:36 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mezzanine_agenda', '0011_auto_20160410_2330'), + ] + + operations = [ + migrations.AlterField( + model_name='eventprice', + name='unit', + field=models.CharField(blank=True, max_length=16, null=True, verbose_name='Unit'), + ), + ] diff --git a/app/migrations/mezzanine_agenda/0013_auto_20160510_1542.py b/app/migrations/mezzanine_agenda/0013_auto_20160510_1542.py new file mode 100644 index 00000000..dbe8de4f --- /dev/null +++ b/app/migrations/mezzanine_agenda/0013_auto_20160510_1542.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-05-10 13:42 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0003_auto_20151223_1313'), + ('mezzanine_agenda', '0012_auto_20160410_2336'), + ] + + operations = [ + migrations.AlterModelOptions( + name='eventprice', + options={'ordering': ('-value',), 'verbose_name': 'Event price', 'verbose_name_plural': 'Event pricies'}, + ), + migrations.AddField( + model_name='event', + name='blog_posts', + field=models.ManyToManyField(blank=True, related_name='events', to='blog.BlogPost', verbose_name='blog posts'), + ), + ] diff --git a/app/migrations/mezzanine_agenda/0014_event_brochure.py b/app/migrations/mezzanine_agenda/0014_event_brochure.py new file mode 100644 index 00000000..82331688 --- /dev/null +++ b/app/migrations/mezzanine_agenda/0014_event_brochure.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-05-10 13:56 +from __future__ import unicode_literals + +from django.db import migrations +import mezzanine.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('mezzanine_agenda', '0013_auto_20160510_1542'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='brochure', + field=mezzanine.core.fields.FileField(blank=True, max_length=1024, verbose_name='brochure'), + ), + ] diff --git a/app/migrations/mezzanine_agenda/__init__.py b/app/migrations/mezzanine_agenda/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/app/migrations/pages/0002_auto_20141227_0224.py b/app/migrations/pages/0002_auto_20141227_0224.py new file mode 100644 index 00000000..85bddb26 --- /dev/null +++ b/app/migrations/pages/0002_auto_20141227_0224.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import mezzanine.pages.fields +import mezzanine.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('pages', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='page', + name='_order', + field=mezzanine.core.fields.OrderField(null=True, verbose_name='Order'), + preserve_default=True, + ), + migrations.AlterField( + model_name='page', + name='in_menus', + field=mezzanine.pages.fields.MenusField(max_length=100, null=True, verbose_name='Show in menus', blank=True), + preserve_default=True, + ), + ] diff --git a/app/migrations/pages/0003_auto_20150527_1555.py b/app/migrations/pages/0003_auto_20150527_1555.py new file mode 100644 index 00000000..b0682fee --- /dev/null +++ b/app/migrations/pages/0003_auto_20150527_1555.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('pages', '0002_auto_20141227_0224'), + ] + + operations = [ + migrations.AlterField( + model_name='page', + name='publish_date', + field=models.DateTimeField(help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from', db_index=True, blank=True), + ), + ] diff --git a/app/migrations/pages/0004_auto_20151223_1313.py b/app/migrations/pages/0004_auto_20151223_1313.py new file mode 100644 index 00000000..6f0ca5ec --- /dev/null +++ b/app/migrations/pages/0004_auto_20151223_1313.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +import mezzanine.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('pages', '0003_auto_20150527_1555'), + ] + + operations = [ + migrations.AddField( + model_name='page', + name='_meta_title_en', + field=models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True), + ), + migrations.AddField( + model_name='page', + name='_meta_title_fr', + field=models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True), + ), + migrations.AddField( + model_name='page', + name='description_en', + field=models.TextField(null=True, verbose_name='Description', blank=True), + ), + migrations.AddField( + model_name='page', + name='description_fr', + field=models.TextField(null=True, verbose_name='Description', blank=True), + ), + migrations.AddField( + model_name='page', + name='title_en', + field=models.CharField(max_length=500, null=True, verbose_name='Title'), + ), + migrations.AddField( + model_name='page', + name='title_fr', + field=models.CharField(max_length=500, null=True, verbose_name='Title'), + ), + migrations.AddField( + model_name='page', + name='titles_en', + field=models.CharField(max_length=1000, null=True, editable=False), + ), + migrations.AddField( + model_name='page', + name='titles_fr', + field=models.CharField(max_length=1000, null=True, editable=False), + ), + migrations.AddField( + model_name='richtextpage', + name='content_en', + field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'), + ), + migrations.AddField( + model_name='richtextpage', + name='content_fr', + field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'), + ), + ] diff --git a/app/organization/team/migrations/0002_auto_20160714_1756.py b/app/organization/team/migrations/0002_auto_20160714_1756.py new file mode 100644 index 00000000..d10085e7 --- /dev/null +++ b/app/organization/team/migrations/0002_auto_20160714_1756.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-07-14 15:56 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-team', '0001_initial'), + ] + + operations = [ + migrations.RemoveField( + model_name='department', + name='weaving_class', + ), + migrations.AddField( + model_name='department', + name='weaving_css_class', + field=models.CharField(blank=True, max_length=64, verbose_name='weaving CSS class'), + ), + migrations.AlterField( + model_name='address', + name='address', + field=models.TextField(blank=True, verbose_name='address'), + ), + ] diff --git a/app/templates/pages/menus/dropdown.html b/app/templates/pages/menus/dropdown.html new file mode 100644 index 00000000..8d9c3cff --- /dev/null +++ b/app/templates/pages/menus/dropdown.html @@ -0,0 +1,35 @@ +{% load i18n pages_tags %} +{% get_language_info_list for LANGUAGES as languages %} + +{% spaceless %} +{% if page_branch_in_menu %} + {% if branch_level == 0 %} + + {% else %} + + {% endif %} +{% endif %} +{% endspaceless %} -- 2.39.5