]> git.parisson.com Git - mezzo.git/commitdiff
change sub app labels, reinit all migrations, reorder admin menu
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 14 Jul 2016 09:06:30 +0000 (11:06 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 14 Jul 2016 09:06:30 +0000 (11:06 +0200)
67 files changed:
app/local_settings.py
app/migrations/__init__.py [deleted file]
app/migrations/blog/0001_initial.py
app/migrations/blog/0002_auto_20150527_1555.py [deleted file]
app/migrations/blog/0003_auto_20151223_1313.py [deleted file]
app/migrations/conf/0001_initial.py
app/migrations/conf/0002_auto_20151223_1313.py [deleted file]
app/migrations/forms/0001_initial.py
app/migrations/forms/0002_auto_20141227_0224.py [deleted file]
app/migrations/forms/0003_emailfield.py [deleted file]
app/migrations/forms/0004_auto_20150517_0510.py [deleted file]
app/migrations/forms/0005_auto_20151223_1313.py [deleted file]
app/migrations/forms/0006_auto_20160407_2249.py [deleted file]
app/migrations/galleries/0001_initial.py
app/migrations/galleries/0002_auto_20141227_0224.py [deleted file]
app/migrations/galleries/0003_auto_20151223_1313.py [deleted file]
app/migrations/mezzanine_agenda/0001_initial.py [deleted file]
app/migrations/mezzanine_agenda/0002_auto_20160224_1142.py [deleted file]
app/migrations/mezzanine_agenda/0003_auto_20160309_1621.py [deleted file]
app/migrations/mezzanine_agenda/0004_auto_20160331_1832.py [deleted file]
app/migrations/mezzanine_agenda/0005_auto_20160404_0043.py [deleted file]
app/migrations/mezzanine_agenda/0006_remove_event_featured.py [deleted file]
app/migrations/mezzanine_agenda/0007_auto_20160410_2148.py [deleted file]
app/migrations/mezzanine_agenda/0008_auto_20160410_2149.py [deleted file]
app/migrations/mezzanine_agenda/0009_auto_20160410_2154.py [deleted file]
app/migrations/mezzanine_agenda/0010_eventlocation_external_id.py [deleted file]
app/migrations/mezzanine_agenda/0011_auto_20160410_2330.py [deleted file]
app/migrations/mezzanine_agenda/0012_auto_20160410_2336.py [deleted file]
app/migrations/mezzanine_agenda/0013_auto_20160510_1542.py [deleted file]
app/migrations/mezzanine_agenda/0014_event_brochure.py [deleted file]
app/migrations/mezzanine_agenda/__init__.py [deleted file]
app/migrations/pages/0001_initial.py
app/migrations/pages/0002_auto_20141227_0224.py [deleted file]
app/migrations/pages/0003_auto_20150527_1555.py [deleted file]
app/migrations/pages/0004_auto_20151223_1313.py [deleted file]
app/organization/core/apps.py
app/organization/core/migrations/0001_initial.py
app/organization/core/migrations/0002_auto_20160707_1614.py [deleted file]
app/organization/featured/__init__.py
app/organization/featured/apps.py
app/organization/featured/migrations/0001_initial.py
app/organization/featured/migrations/0002_auto_20160707_1614.py [deleted file]
app/organization/featured/migrations/0003_featured_briefs.py [deleted file]
app/organization/festival/apps.py
app/organization/festival/migrations/0001_initial.py
app/organization/magazine/apps.py
app/organization/magazine/migrations/0001_initial.py
app/organization/magazine/migrations/0002_article.py [deleted file]
app/organization/magazine/migrations/0003_auto_20160708_1236.py [deleted file]
app/organization/magazine/migrations/0003_brief.py [deleted file]
app/organization/magazine/migrations/0004_auto_20160707_1544.py [deleted file]
app/organization/magazine/migrations/0005_merge.py [deleted file]
app/organization/magazine/migrations/0006_auto_20160711_1200.py [deleted file]
app/organization/magazine/migrations/0007_auto_20160711_1416.py [deleted file]
app/organization/magazine/models.py
app/organization/media/apps.py
app/organization/media/migrations/0001_initial.py
app/organization/project/apps.py
app/organization/project/migrations/0001_initial.py
app/organization/project/migrations/0002_auto_20160707_1053.py [deleted file]
app/organization/project/migrations/0003_auto_20160713_1501.py [deleted file]
app/organization/team/apps.py
app/organization/team/migrations/0001_initial.py
app/organization/team/migrations/0002_auto_20160707_1614.py [deleted file]
app/organization/team/migrations/0003_auto_20160713_1504.py [deleted file]
app/settings.py
lib/mezzanine-agenda

index 20f6087e0619beace92390658535907707359595..0cc467575f8e61d4f97b83a95585d62052cfb7cd 100644 (file)
@@ -69,12 +69,13 @@ SITE_TAGLINE = 'Institut de Recherche et de Coordination Acoustique et Musique'
 SILENCED_SYSTEM_CHECKS = ['fields.W342',]
 
 ADMIN_MENU_ORDER = (
-    (_('Content'), ('pages.Page', 'blog.BlogPost', (_('Media Library'), 'fb_browse'), 'featured.Featured', "generic.ThreadedComment",)),
+    (_('Pages'), ('pages.Page', 'organization-featured.Featured',)),
+    (_('Media'), ('organization-media.Video', 'organization-media.VideoCategory', 'organization-media.Audio', 'organization-media.Playlist',  'organization-media.Photo', (_('Media Library'), 'fb_browse'),)),
     (_('Events'), ('mezzanine_agenda.Event', 'mezzanine_agenda.EventLocation', 'mezzanine_agenda.EventCategory', 'mezzanine_agenda.EventPrice',)),
-    (_('Magazine'), ('magazine.Article', 'magazine.Brief',)),
-    (_('Organization'), ('team.Organization', 'team.Team', 'team.Department', 'team.Person', 'team.Activity',)),
-    (_('Projects'), ('project.Project',)),
-    (_('Festival'), ('festival.Artist',)),
+    (_('Magazine'), ('organization-magazine.Article', 'organization-magazine.Brief',)),
+    (_('Organization'), ('organization-team.Organization', 'organization-team.OrganizationType', 'organization-team.Team', 'organization-team.Department', 'organization-team.Person', 'organization-team.Activity',)),
+    (_('Projects'), ('organization-project.Project',)),
+    (_('Festival'), ('organization-festival.Artist',)),
     (_('Users'), ('auth.User', 'auth.Group',)),
     (_('Site'), ('sites.Site', 'redirects.Redirect', 'conf.Setting')),
 )
diff --git a/app/migrations/__init__.py b/app/migrations/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000
index 1124f8b4969f589190964455bcdbcfced257e4f5..e5734a62cf4273530ca89a157ab4838b21caeb5f 100644 (file)
@@ -1,67 +1,80 @@
 # -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-14 08:58
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
 import mezzanine.core.fields
 import mezzanine.utils.models
-from django.conf import settings
 
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
-        ('sites', '0001_initial'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('sites', '0002_alter_domain_unique'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='BlogCategory',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('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)),
-                ('site', models.ForeignKey(editable=False, to='sites.Site')),
+                ('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(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL')),
+                ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
             ],
             options={
-                'ordering': ('title',),
                 'verbose_name': 'Blog Category',
+                'ordering': ('title',),
                 'verbose_name_plural': 'Blog Categories',
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='BlogPost',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('comments_count', models.IntegerField(default=0, editable=False)),
-                ('keywords_string', models.CharField(max_length=500, editable=False, blank=True)),
+                ('keywords_string', models.CharField(blank=True, editable=False, max_length=500)),
                 ('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')),
-                ('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)),
+                ('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(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL')),
+                ('_meta_title', models.CharField(blank=True, 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')),
+                ('_meta_title_fr', models.CharField(blank=True, 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')),
+                ('_meta_title_en', models.CharField(blank=True, 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')),
+                ('description', models.TextField(blank=True, verbose_name='Description')),
+                ('description_fr', models.TextField(blank=True, null=True, verbose_name='Description')),
+                ('description_en', models.TextField(blank=True, null=True, verbose_name='Description')),
                 ('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', 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)),
+                ('created', models.DateTimeField(editable=False, null=True)),
+                ('updated', models.DateTimeField(editable=False, null=True)),
+                ('status', models.IntegerField(choices=[(1, 'Draft'), (2, 'Published')], default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status')),
+                ('publish_date', models.DateTimeField(blank=True, db_index=True, help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from')),
+                ('expiry_date', models.DateTimeField(blank=True, help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on')),
+                ('short_url', models.URLField(blank=True, null=True)),
                 ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')),
                 ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
+                ('content_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
+                ('content_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
                 ('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)),
-                ('categories', models.ManyToManyField(related_name='blogposts', verbose_name='Categories', to='blog.BlogCategory', blank=True)),
-                ('related_posts', models.ManyToManyField(related_name='related_posts_rel_+', verbose_name='Related posts', to='blog.BlogPost', blank=True)),
-                ('site', models.ForeignKey(editable=False, to='sites.Site')),
-                ('user', models.ForeignKey(related_name='blogposts', verbose_name='Author', to=settings.AUTH_USER_MODEL)),
+                ('featured_image', mezzanine.core.fields.FileField(blank=True, max_length=255, null=True, verbose_name='Featured Image')),
+                ('categories', models.ManyToManyField(blank=True, related_name='blogposts', to='blog.BlogCategory', verbose_name='Categories')),
+                ('related_posts', models.ManyToManyField(blank=True, related_name='_blogpost_related_posts_+', to='blog.BlogPost', verbose_name='Related posts')),
+                ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='blogposts', to=settings.AUTH_USER_MODEL, verbose_name='Author')),
             ],
             options={
-                'ordering': ('-publish_date',),
                 'verbose_name': 'Blog post',
+                'ordering': ('-publish_date',),
                 'verbose_name_plural': 'Blog posts',
             },
             bases=(models.Model, mezzanine.utils.models.AdminThumbMixin),
diff --git a/app/migrations/blog/0002_auto_20150527_1555.py b/app/migrations/blog/0002_auto_20150527_1555.py
deleted file mode 100644 (file)
index a5cb65c..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index 2d1da52..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- 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'),
-        ),
-    ]
index ce02a03b26176ef2aef8e4caba3f08adad58ffdc..0713b0191dd76576de851172add5f4a38dc78891 100644 (file)
@@ -1,28 +1,33 @@
 # -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-14 08:58
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
-        ('sites', '0001_initial'),
+        ('sites', '0002_alter_domain_unique'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='Setting',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=50)),
                 ('value', models.CharField(max_length=2000)),
-                ('site', models.ForeignKey(editable=False, to='sites.Site')),
+                ('value_fr', models.CharField(max_length=2000, null=True)),
+                ('value_en', models.CharField(max_length=2000, null=True)),
+                ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
             ],
             options={
-                'verbose_name': 'Setting',
                 'verbose_name_plural': 'Settings',
+                'verbose_name': 'Setting',
             },
-            bases=(models.Model,),
         ),
     ]
diff --git a/app/migrations/conf/0002_auto_20151223_1313.py b/app/migrations/conf/0002_auto_20151223_1313.py
deleted file mode 100644 (file)
index fb2bf3c..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- 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),
-        ),
-    ]
index fa1e791c189b9892aa793cf3e25f651c2f69ac46..a64c78e30cd55b9492d0f0a8e7cd4472a41db9db 100644 (file)
@@ -1,12 +1,16 @@
 # -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-14 08:58
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
+import django.db.models.deletion
 import mezzanine.core.fields
 
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
         ('pages', '__first__'),
     ]
@@ -15,28 +19,37 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Field',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('_order', models.IntegerField(null=True, verbose_name='Order')),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('_order', mezzanine.core.fields.OrderField(null=True, verbose_name='Order')),
                 ('label', models.CharField(max_length=200, verbose_name='Label')),
-                ('field_type', models.IntegerField(verbose_name='Type', choices=[(1, 'Single line text'), (2, 'Multi line text'), (3, 'Email'), (13, 'Number'), (14, 'URL'), (4, 'Check box'), (5, 'Check boxes'), (6, 'Drop down'), (7, 'Multi select'), (8, 'Radio buttons'), (9, 'File upload'), (10, 'Date'), (11, 'Date/time'), (15, 'Date of birth'), (12, 'Hidden')])),
+                ('label_fr', models.CharField(max_length=200, null=True, verbose_name='Label')),
+                ('label_en', models.CharField(max_length=200, null=True, verbose_name='Label')),
+                ('field_type', models.IntegerField(choices=[(1, 'Single line text'), (2, 'Multi line text'), (3, 'Email'), (13, 'Number'), (14, 'URL'), (4, 'Check box'), (5, 'Check boxes'), (6, 'Drop down'), (7, 'Multi select'), (8, 'Radio buttons'), (9, 'File upload'), (10, 'Date'), (11, 'Date/time'), (15, 'Date of birth'), (12, 'Hidden')], verbose_name='Type')),
                 ('required', models.BooleanField(default=True, verbose_name='Required')),
                 ('visible', models.BooleanField(default=True, verbose_name='Visible')),
-                ('choices', models.CharField(help_text='Comma separated options where applicable. If an option itself contains commas, surround the option with `backticks`.', max_length=1000, verbose_name='Choices', blank=True)),
-                ('default', models.CharField(max_length=2000, verbose_name='Default value', blank=True)),
-                ('placeholder_text', models.CharField(verbose_name='Placeholder Text', max_length=100, editable=False, blank=True)),
-                ('help_text', models.CharField(max_length=100, verbose_name='Help text', blank=True)),
+                ('choices', models.CharField(blank=True, help_text='Comma separated options where applicable. If an option itself contains commas, surround the option with `backticks`.', max_length=1000, verbose_name='Choices')),
+                ('choices_fr', models.CharField(blank=True, 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')),
+                ('choices_en', models.CharField(blank=True, 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')),
+                ('default', models.CharField(blank=True, max_length=2000, verbose_name='Default value')),
+                ('default_fr', models.CharField(blank=True, max_length=2000, null=True, verbose_name='Default value')),
+                ('default_en', models.CharField(blank=True, max_length=2000, null=True, verbose_name='Default value')),
+                ('placeholder_text', models.CharField(blank=True, max_length=100, verbose_name='Placeholder Text')),
+                ('placeholder_text_fr', models.CharField(blank=True, max_length=100, null=True, verbose_name='Placeholder Text')),
+                ('placeholder_text_en', models.CharField(blank=True, max_length=100, null=True, verbose_name='Placeholder Text')),
+                ('help_text', models.CharField(blank=True, max_length=100, verbose_name='Help text')),
+                ('help_text_fr', models.CharField(blank=True, max_length=100, null=True, verbose_name='Help text')),
+                ('help_text_en', models.CharField(blank=True, max_length=100, null=True, verbose_name='Help text')),
             ],
             options={
-                'ordering': ('_order',),
                 'verbose_name': 'Field',
+                'ordering': ('_order',),
                 'verbose_name_plural': 'Fields',
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='FieldEntry',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('field_id', models.IntegerField()),
                 ('value', models.CharField(max_length=2000, null=True)),
             ],
@@ -44,24 +57,33 @@ class Migration(migrations.Migration):
                 'verbose_name': 'Form field entry',
                 'verbose_name_plural': 'Form field entries',
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Form',
             fields=[
-                ('page_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pages.Page')),
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='pages.Page')),
                 ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
-                ('button_text', models.CharField(default='Submit', max_length=50, verbose_name='Button text')),
+                ('content_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
+                ('content_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
+                ('button_text', models.CharField(blank=True, max_length=50, verbose_name='Button text')),
+                ('button_text_fr', models.CharField(blank=True, max_length=50, null=True, verbose_name='Button text')),
+                ('button_text_en', models.CharField(blank=True, max_length=50, null=True, verbose_name='Button text')),
                 ('response', mezzanine.core.fields.RichTextField(verbose_name='Response')),
+                ('response_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='Response')),
+                ('response_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Response')),
                 ('send_email', models.BooleanField(default=True, help_text='To send an email to the email address supplied in the form upon submission, check this box.', verbose_name='Send email to user')),
-                ('email_from', models.EmailField(help_text='The address the email will be sent from', max_length=75, verbose_name='From address', blank=True)),
-                ('email_copies', models.CharField(help_text='Provide a comma separated list of email addresses to be notified upon form submission. Leave blank to disable notifications.', max_length=200, verbose_name='Send email to others', blank=True)),
-                ('email_subject', models.CharField(max_length=200, verbose_name='Subject', blank=True)),
-                ('email_message', 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.', verbose_name='Message', blank=True)),
+                ('email_from', models.EmailField(blank=True, help_text='The address the email will be sent from', max_length=254, verbose_name='From address')),
+                ('email_copies', models.CharField(blank=True, help_text='Provide a comma separated list of email addresses to be notified upon form submission. Leave blank to disable notifications.', max_length=200, verbose_name='Send email to others')),
+                ('email_subject', models.CharField(blank=True, max_length=200, verbose_name='Subject')),
+                ('email_subject_fr', models.CharField(blank=True, max_length=200, null=True, verbose_name='Subject')),
+                ('email_subject_en', models.CharField(blank=True, max_length=200, null=True, verbose_name='Subject')),
+                ('email_message', models.TextField(blank=True, 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.', verbose_name='Message')),
+                ('email_message_fr', models.TextField(blank=True, 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')),
+                ('email_message_en', models.TextField(blank=True, 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')),
             ],
             options={
-                'ordering': ('_order',),
                 'verbose_name': 'Form',
+                'ordering': ('_order',),
                 'verbose_name_plural': 'Forms',
             },
             bases=('pages.page', models.Model),
@@ -69,26 +91,23 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='FormEntry',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('entry_time', models.DateTimeField(verbose_name='Date/time')),
-                ('form', models.ForeignKey(related_name='entries', to='forms.Form')),
+                ('form', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='entries', to='forms.Form')),
             ],
             options={
                 'verbose_name': 'Form entry',
                 'verbose_name_plural': 'Form entries',
             },
-            bases=(models.Model,),
         ),
         migrations.AddField(
             model_name='fieldentry',
             name='entry',
-            field=models.ForeignKey(related_name='fields', to='forms.FormEntry'),
-            preserve_default=True,
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fields', to='forms.FormEntry'),
         ),
         migrations.AddField(
             model_name='field',
             name='form',
-            field=models.ForeignKey(related_name='fields', to='forms.Form'),
-            preserve_default=True,
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fields', to='forms.Form'),
         ),
     ]
diff --git a/app/migrations/forms/0002_auto_20141227_0224.py b/app/migrations/forms/0002_auto_20141227_0224.py
deleted file mode 100644 (file)
index 8e8905e..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index 9f826c6..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index b7cb552..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index 852552a..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index c8af308..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- 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'),
-        ),
-    ]
index 11f1937e16fbf9cff1135c9e2c992c658bbfd803..e434b347bb9125f37e4f9f2fe235710f945267e1 100644 (file)
@@ -1,12 +1,16 @@
 # -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-14 08:58
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
+import django.db.models.deletion
 import mezzanine.core.fields
 
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
         ('pages', '__first__'),
     ]
@@ -15,9 +19,11 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Gallery',
             fields=[
-                ('page_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pages.Page')),
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='pages.Page')),
                 ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
-                ('zip_import', models.FileField(help_text="Upload a zip file containing images, and they'll be imported into this gallery.", upload_to='galleries', verbose_name='Zip import', blank=True)),
+                ('content_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
+                ('content_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
+                ('zip_import', models.FileField(blank=True, help_text="Upload a zip file containing images, and they'll be imported into this gallery.", upload_to='galleries', verbose_name='Zip import')),
             ],
             options={
                 'ordering': ('_order',),
@@ -29,17 +35,18 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='GalleryImage',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('_order', models.IntegerField(null=True, verbose_name='Order')),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('_order', mezzanine.core.fields.OrderField(null=True, verbose_name='Order')),
                 ('file', mezzanine.core.fields.FileField(max_length=200, verbose_name='File')),
-                ('description', models.CharField(max_length=1000, verbose_name='Description', blank=True)),
-                ('gallery', models.ForeignKey(related_name='images', to='galleries.Gallery')),
+                ('description', models.CharField(blank=True, max_length=1000, verbose_name='Description')),
+                ('description_fr', models.CharField(blank=True, max_length=1000, null=True, verbose_name='Description')),
+                ('description_en', models.CharField(blank=True, max_length=1000, null=True, verbose_name='Description')),
+                ('gallery', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='galleries.Gallery')),
             ],
             options={
                 'ordering': ('_order',),
                 'verbose_name': 'Image',
                 'verbose_name_plural': 'Images',
             },
-            bases=(models.Model,),
         ),
     ]
diff --git a/app/migrations/galleries/0002_auto_20141227_0224.py b/app/migrations/galleries/0002_auto_20141227_0224.py
deleted file mode 100644 (file)
index 89bf633..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index 2a61852..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index 063a464..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index 7ef6f21..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index 51e65fe..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index d48289d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index 2d6da8c..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index f01b067..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index bfe547d..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index cf8aff9..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index fd2605c..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index 8a2c376..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index 53985ab..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index e7f9fac..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index dbe8de4..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index 8233168..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index e69de29..0000000
index 4429c29b922b834fa25b23ca42170fef52f90ad4..b9fb46c7fabbb62a38e780599dfd0eb17ff066ef 100644 (file)
@@ -1,83 +1,94 @@
 # -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-14 08:58
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
+import django.db.models.deletion
 import mezzanine.core.fields
 import mezzanine.pages.fields
 
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
-        ('sites', '0001_initial'),
+        ('sites', '0002_alter_domain_unique'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='Page',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('keywords_string', models.CharField(max_length=500, editable=False, blank=True)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('keywords_string', models.CharField(blank=True, editable=False, max_length=500)),
                 ('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)),
-                ('_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)),
+                ('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(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL')),
+                ('_meta_title', models.CharField(blank=True, 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')),
+                ('_meta_title_fr', models.CharField(blank=True, 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')),
+                ('_meta_title_en', models.CharField(blank=True, 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')),
+                ('description', models.TextField(blank=True, verbose_name='Description')),
+                ('description_fr', models.TextField(blank=True, null=True, verbose_name='Description')),
+                ('description_en', models.TextField(blank=True, null=True, verbose_name='Description')),
                 ('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', 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)),
+                ('created', models.DateTimeField(editable=False, null=True)),
+                ('updated', models.DateTimeField(editable=False, null=True)),
+                ('status', models.IntegerField(choices=[(1, 'Draft'), (2, 'Published')], default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status')),
+                ('publish_date', models.DateTimeField(blank=True, db_index=True, help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from')),
+                ('expiry_date', models.DateTimeField(blank=True, help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on')),
+                ('short_url', models.URLField(blank=True, null=True)),
                 ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')),
-                ('_order', models.IntegerField(null=True, verbose_name='Order')),
-                ('in_menus', mezzanine.pages.fields.MenusField(default=(1, 2, 3), choices=[(1, 'Top navigation bar'), (2, 'Left-hand tree'), (3, 'Footer')], max_length=100, blank=True, null=True, verbose_name='Show in menus')),
-                ('titles', models.CharField(max_length=1000, null=True, editable=False)),
-                ('content_model', models.CharField(max_length=50, null=True, editable=False)),
+                ('_order', mezzanine.core.fields.OrderField(null=True, verbose_name='Order')),
+                ('content_model', models.CharField(editable=False, max_length=50, null=True)),
+                ('in_menus', mezzanine.pages.fields.MenusField(blank=True, choices=[(1, 'Action'), (2, 'Departement'), (3, 'Footer')], max_length=100, null=True, verbose_name='Show in menus')),
+                ('titles', models.CharField(editable=False, max_length=1000, null=True)),
+                ('titles_fr', models.CharField(editable=False, max_length=1000, null=True)),
+                ('titles_en', models.CharField(editable=False, max_length=1000, null=True)),
                 ('login_required', models.BooleanField(default=False, help_text='If checked, only logged in users can view this page', verbose_name='Login required')),
             ],
             options={
-                'ordering': ('titles',),
-                'verbose_name': 'Page',
                 'verbose_name_plural': 'Pages',
+                'verbose_name': 'Page',
+                'ordering': ('titles',),
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Link',
             fields=[
-                ('page_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pages.Page')),
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='pages.Page')),
             ],
             options={
-                'ordering': ('_order',),
-                'verbose_name': 'Link',
                 'verbose_name_plural': 'Links',
+                'verbose_name': 'Link',
+                'ordering': ('_order',),
             },
             bases=('pages.page',),
         ),
         migrations.CreateModel(
             name='RichTextPage',
             fields=[
-                ('page_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pages.Page')),
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='pages.Page')),
                 ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
+                ('content_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
+                ('content_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
             ],
             options={
-                'ordering': ('_order',),
-                'verbose_name': 'Rich text page',
                 'verbose_name_plural': 'Rich text pages',
+                'verbose_name': 'Rich text page',
+                'ordering': ('_order',),
             },
             bases=('pages.page', models.Model),
         ),
         migrations.AddField(
             model_name='page',
             name='parent',
-            field=models.ForeignKey(related_name='children', blank=True, to='pages.Page', null=True),
-            preserve_default=True,
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='pages.Page'),
         ),
         migrations.AddField(
             model_name='page',
             name='site',
-            field=models.ForeignKey(editable=False, to='sites.Site'),
-            preserve_default=True,
+            field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site'),
         ),
     ]
diff --git a/app/migrations/pages/0002_auto_20141227_0224.py b/app/migrations/pages/0002_auto_20141227_0224.py
deleted file mode 100644 (file)
index 85bddb2..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index b0682fe..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- 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
deleted file mode 100644 (file)
index 6f0ca5e..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- 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'),
-        ),
-    ]
index b05d77a9ebf4dbb2af55eceb2276b19233de021b..510e34e94a7d2f96fb56d3cc97184616779d9c3e 100644 (file)
@@ -6,4 +6,4 @@ from django.core.checks import register
 class CoreConfig(AppConfig):
 
     name = 'organization.core'
-    label = 'organization core'
+    label = 'organization-core'
index 9f09456088a69a275e283d1706c0c64e9edbe208..8431f71c61968fbdc15ced68818b640dd7d552d2 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-06 16:48
+# Generated by Django 1.9.7 on 2016-07-14 09:02
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('pages', '0004_auto_20151223_1313'),
+        ('pages', '0001_initial'),
     ]
 
     operations = [
@@ -21,21 +21,13 @@ class Migration(migrations.Migration):
             fields=[
                 ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='pages.Page')),
                 ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
-                ('photo', mezzanine.core.fields.FileField(blank=True, max_length=1024, verbose_name='photo')),
-                ('photo_credits', models.CharField(blank=True, max_length=255, null=True, verbose_name='photo credits')),
-                ('photo_alignment', models.CharField(blank=True, choices=[('left', 'left'), ('center', 'center'), ('right', 'right')], default='left', max_length=32, verbose_name='photo alignment')),
-                ('photo_description', models.TextField(blank=True, verbose_name='photo description')),
-                ('photo_card', mezzanine.core.fields.FileField(blank=True, max_length=1024, verbose_name='card photo')),
-                ('photo_card_credits', models.CharField(blank=True, max_length=255, null=True, verbose_name='photo card credits')),
-                ('photo_slider', mezzanine.core.fields.FileField(blank=True, max_length=1024, verbose_name='slider photo')),
-                ('photo_slider_credits', models.CharField(blank=True, max_length=255, null=True, verbose_name='photo slider credits')),
                 ('sub_title', models.TextField(blank=True, max_length=1024, verbose_name='sub title')),
                 ('sub_title_fr', models.TextField(blank=True, max_length=1024, null=True, verbose_name='sub title')),
                 ('sub_title_en', models.TextField(blank=True, max_length=1024, null=True, verbose_name='sub title')),
             ],
             options={
-                'verbose_name': 'basic page',
                 'ordering': ('_order',),
+                'verbose_name': 'basic page',
             },
             bases=('pages.page', models.Model),
         ),
diff --git a/app/organization/core/migrations/0002_auto_20160707_1614.py b/app/organization/core/migrations/0002_auto_20160707_1614.py
deleted file mode 100644 (file)
index 5cebb5f..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-07 14:14
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization core', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='basicpage',
-            name='photo',
-        ),
-        migrations.RemoveField(
-            model_name='basicpage',
-            name='photo_alignment',
-        ),
-        migrations.RemoveField(
-            model_name='basicpage',
-            name='photo_card',
-        ),
-        migrations.RemoveField(
-            model_name='basicpage',
-            name='photo_card_credits',
-        ),
-        migrations.RemoveField(
-            model_name='basicpage',
-            name='photo_credits',
-        ),
-        migrations.RemoveField(
-            model_name='basicpage',
-            name='photo_description',
-        ),
-        migrations.RemoveField(
-            model_name='basicpage',
-            name='photo_slider',
-        ),
-        migrations.RemoveField(
-            model_name='basicpage',
-            name='photo_slider_credits',
-        ),
-    ]
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..da824c36f66594adcdb37e4c09c9fe43000c016e 100644 (file)
@@ -0,0 +1,7 @@
+"""
+Provides abstract models and admin features used throughout the various
+Mezzanine apps.
+"""
+from __future__ import unicode_literals
+
+default_app_config = 'organization.featured.apps.FeaturedConfig'
index 10cae19d4b1ed0f7ad53227e2c9158af71274b9e..ab457367733f9d917d29a2e758d2cc3240d0dca0 100644 (file)
@@ -4,4 +4,6 @@ from django.apps import AppConfig
 
 
 class FeaturedConfig(AppConfig):
-    name = 'featured'
+
+    name = 'organization.featured'
+    label = 'organization-featured'
index 00bd148ac601cebd6e0de41886dbd3cdca413844..21b261be29189cf8815306afb431cb640ef29db1 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-07 14:14
+# Generated by Django 1.9.7 on 2016-07-14 08:25
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -10,9 +10,10 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('organization magazine', '0002_article'),
-        ('mezzanine_agenda', '0014_event_brochure'),
-        ('organization core', '0002_auto_20160707_1614'),
+        ('mezzanine_agenda', '__first__'),
+        ('organization-core', '__first__'),
+        ('organization-magazine', '__first__'),
+        ('organization-media', '0001_initial'),
     ]
 
     operations = [
@@ -22,9 +23,12 @@ class Migration(migrations.Migration):
                 ('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')),
-                ('articles', models.ManyToManyField(blank=True, related_name='featured', to='organization magazine.Article', verbose_name='articles')),
+                ('articles', models.ManyToManyField(blank=True, related_name='featured', to='organization-magazine.Article', verbose_name='articles')),
+                ('briefs', models.ManyToManyField(blank=True, related_name='featured', to='organization-magazine.Brief', verbose_name='briefs')),
                 ('events', models.ManyToManyField(blank=True, related_name='featured', to='mezzanine_agenda.Event', verbose_name='events')),
-                ('pages', models.ManyToManyField(blank=True, related_name='featured', to='organization core.BasicPage', verbose_name='pages')),
+                ('pages', models.ManyToManyField(blank=True, related_name='featured', to='organization-core.BasicPage', verbose_name='pages')),
+                ('playlists', models.ManyToManyField(blank=True, related_name='featured', to='organization-media.Playlist', verbose_name='playlists')),
+                ('videos', models.ManyToManyField(blank=True, related_name='featured', to='organization-media.Video', verbose_name='videos')),
             ],
             options={
                 'abstract': False,
diff --git a/app/organization/featured/migrations/0002_auto_20160707_1614.py b/app/organization/featured/migrations/0002_auto_20160707_1614.py
deleted file mode 100644 (file)
index 2816f5c..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-07 14:14
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('featured', '0001_initial'),
-        ('organization media', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='featured',
-            name='playlists',
-            field=models.ManyToManyField(blank=True, related_name='featured', to='organization media.Playlist', verbose_name='playlists'),
-        ),
-        migrations.AddField(
-            model_name='featured',
-            name='videos',
-            field=models.ManyToManyField(blank=True, related_name='featured', to='organization media.Video', verbose_name='videos'),
-        ),
-    ]
diff --git a/app/organization/featured/migrations/0003_featured_briefs.py b/app/organization/featured/migrations/0003_featured_briefs.py
deleted file mode 100644 (file)
index 8a8643f..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-11 10:00
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization magazine', '0006_auto_20160711_1200'),
-        ('featured', '0002_auto_20160707_1614'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='featured',
-            name='briefs',
-            field=models.ManyToManyField(blank=True, related_name='featured', to='organization magazine.Brief', verbose_name='briefs'),
-        ),
-    ]
index 0ab1f17ac778b812d2502becfe6b8e00c9df2180..4b52512194db8fea6285f3652a1932d46e6ce028 100644 (file)
@@ -4,4 +4,4 @@ from django.apps import AppConfig
 class FestivalConfig(AppConfig):
 
     name = 'organization.festival'
-    label = 'organization festival app'
+    label = 'organization-festival'
index f74881be15a170ba63b919ba263036710767037f..e3ce5b6e011ff056015d2fad3365fd767ddb3161 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-07 14:14
+# Generated by Django 1.9.7 on 2016-07-14 08:25
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -57,8 +57,8 @@ class Migration(migrations.Migration):
                 ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
             ],
             options={
-                'ordering': ['last_name'],
                 'verbose_name': 'artist',
+                'ordering': ['last_name'],
             },
             bases=(mezzanine.utils.models.AdminThumbMixin, models.Model),
         ),
index 78483d709e06a88dc3ffe8ddd64aaa071c433603..cc206ddb4ef30322393454bee17ee8d11281b434 100644 (file)
@@ -6,4 +6,4 @@ from django.apps import AppConfig
 class MagazineConfig(AppConfig):
 
     name = 'organization.magazine'
-    label = 'organization magazine'
+    label = 'organization-magazine'
index 683c85db79bbf2871e2276430d3ae7e049a4ebbd..942df5dec8f148baa3602a9369b2e4159297ff35 100644 (file)
@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-06 16:48
+# Generated by Django 1.9.7 on 2016-07-14 08:26
 from __future__ import unicode_literals
 
 from django.db import migrations, models
+import django.db.models.deletion
+import mezzanine.core.fields
 
 
 class Migration(migrations.Migration):
@@ -10,9 +12,54 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('blog', '__first__'),
+        ('sites', '0002_alter_domain_unique'),
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Article',
+            fields=[
+                ('blogpost_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='blog.BlogPost')),
+                ('sub_title', models.CharField(blank=True, max_length=1000, verbose_name='sub title')),
+                ('sub_title_fr', models.CharField(blank=True, max_length=1000, null=True, verbose_name='sub title')),
+                ('sub_title_en', models.CharField(blank=True, max_length=1000, null=True, verbose_name='sub title')),
+            ],
+            options={
+                'verbose_name': 'article',
+            },
+            bases=('blog.blogpost',),
+        ),
+        migrations.CreateModel(
+            name='Brief',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('keywords_string', models.CharField(blank=True, editable=False, max_length=500)),
+                ('title', models.CharField(max_length=500, verbose_name='Title')),
+                ('slug', models.CharField(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL')),
+                ('_meta_title', models.CharField(blank=True, 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')),
+                ('description', models.TextField(blank=True, verbose_name='Description')),
+                ('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(editable=False, null=True)),
+                ('updated', models.DateTimeField(editable=False, null=True)),
+                ('status', models.IntegerField(choices=[(1, 'Draft'), (2, 'Published')], default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status')),
+                ('publish_date', models.DateTimeField(blank=True, db_index=True, help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from')),
+                ('expiry_date', models.DateTimeField(blank=True, help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on')),
+                ('short_url', models.URLField(blank=True, null=True)),
+                ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')),
+                ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
+                ('text_button', models.CharField(blank=True, max_length=150, verbose_name='text button')),
+                ('text_button_fr', models.CharField(blank=True, max_length=150, null=True, verbose_name='text button')),
+                ('text_button_en', models.CharField(blank=True, max_length=150, null=True, verbose_name='text button')),
+                ('local_content', models.URLField(max_length=1000, verbose_name='local content')),
+                ('local_content_fr', models.URLField(max_length=1000, null=True, verbose_name='local content')),
+                ('local_content_en', models.URLField(max_length=1000, null=True, verbose_name='local content')),
+                ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
+            ],
+            options={
+                'verbose_name': 'brief',
+            },
+        ),
         migrations.CreateModel(
             name='Category',
             fields=[
diff --git a/app/organization/magazine/migrations/0002_article.py b/app/organization/magazine/migrations/0002_article.py
deleted file mode 100644 (file)
index 6370480..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-07 10:01
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('blog', '0003_auto_20151223_1313'),
-        ('organization magazine', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Article',
-            fields=[
-                ('blogpost_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='blog.BlogPost')),
-                ('sub_title', models.CharField(blank=True, max_length=1000, verbose_name='sub title')),
-                ('sub_title_fr', models.CharField(blank=True, max_length=1000, null=True, verbose_name='sub title')),
-                ('sub_title_en', models.CharField(blank=True, max_length=1000, null=True, verbose_name='sub title')),
-            ],
-            options={
-                'verbose_name': 'article',
-            },
-            bases=('blog.blogpost',),
-        ),
-    ]
diff --git a/app/organization/magazine/migrations/0003_auto_20160708_1236.py b/app/organization/magazine/migrations/0003_auto_20160708_1236.py
deleted file mode 100644 (file)
index 4862a36..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-08 10:36
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization magazine', '0002_article'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='article',
-            options={'ordering': ('-publish_date',), 'verbose_name': 'article', 'verbose_name_plural': 'article'},
-        ),
-    ]
diff --git a/app/organization/magazine/migrations/0003_brief.py b/app/organization/magazine/migrations/0003_brief.py
deleted file mode 100644 (file)
index f918c82..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-07 11:23
-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 = [
-        ('sites', '0002_alter_domain_unique'),
-        ('organization magazine', '0002_article'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Brief',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('keywords_string', models.CharField(blank=True, editable=False, max_length=500)),
-                ('title', models.CharField(max_length=500, verbose_name='Title')),
-                ('slug', models.CharField(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL')),
-                ('_meta_title', models.CharField(blank=True, 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')),
-                ('description', models.TextField(blank=True, verbose_name='Description')),
-                ('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(editable=False, null=True)),
-                ('updated', models.DateTimeField(editable=False, null=True)),
-                ('status', models.IntegerField(choices=[(1, 'Draft'), (2, 'Published')], default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status')),
-                ('publish_date', models.DateTimeField(blank=True, db_index=True, help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from')),
-                ('expiry_date', models.DateTimeField(blank=True, help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on')),
-                ('short_url', models.URLField(blank=True, null=True)),
-                ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')),
-                ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
-                ('text_button', models.CharField(blank=True, max_length=150, verbose_name='text button')),
-                ('text_button_fr', models.CharField(blank=True, max_length=150, null=True, verbose_name='text button')),
-                ('text_button_en', models.CharField(blank=True, max_length=150, null=True, verbose_name='text button')),
-                ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
-            ],
-            options={
-                'verbose_name': 'brief',
-            },
-        ),
-    ]
diff --git a/app/organization/magazine/migrations/0004_auto_20160707_1544.py b/app/organization/magazine/migrations/0004_auto_20160707_1544.py
deleted file mode 100644 (file)
index c12f98c..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-07 13:44
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization magazine', '0003_brief'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='brief',
-            name='local_content',
-            field=models.CharField(blank=True, max_length=1000, verbose_name='local content'),
-        ),
-        migrations.AddField(
-            model_name='brief',
-            name='local_content_en',
-            field=models.CharField(blank=True, max_length=1000, null=True, verbose_name='local content'),
-        ),
-        migrations.AddField(
-            model_name='brief',
-            name='local_content_fr',
-            field=models.CharField(blank=True, max_length=1000, null=True, verbose_name='local content'),
-        ),
-    ]
diff --git a/app/organization/magazine/migrations/0005_merge.py b/app/organization/magazine/migrations/0005_merge.py
deleted file mode 100644 (file)
index 832b369..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-11 10:00
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization magazine', '0003_auto_20160708_1236'),
-        ('organization magazine', '0004_auto_20160707_1544'),
-    ]
-
-    operations = [
-    ]
diff --git a/app/organization/magazine/migrations/0006_auto_20160711_1200.py b/app/organization/magazine/migrations/0006_auto_20160711_1200.py
deleted file mode 100644 (file)
index 61676bd..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-11 10:00
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization magazine', '0005_merge'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='article',
-            options={'verbose_name': 'article'},
-        ),
-    ]
diff --git a/app/organization/magazine/migrations/0007_auto_20160711_1416.py b/app/organization/magazine/migrations/0007_auto_20160711_1416.py
deleted file mode 100644 (file)
index 50662d7..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-11 12:16
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization magazine', '0006_auto_20160711_1200'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='brief',
-            name='local_content',
-            field=models.URLField(max_length=1000, verbose_name='local content'),
-        ),
-        migrations.AlterField(
-            model_name='brief',
-            name='local_content_en',
-            field=models.URLField(max_length=1000, null=True, verbose_name='local content'),
-        ),
-        migrations.AlterField(
-            model_name='brief',
-            name='local_content_fr',
-            field=models.URLField(max_length=1000, null=True, verbose_name='local content'),
-        ),
-    ]
index 09d1abbfe183dfcc7a4aa9c9c1b5f12085fa9652..77b9955cd2b187b61483dc9fe4369f6a457b51c2 100644 (file)
@@ -18,6 +18,7 @@ class Article(BlogPost):
     class Meta:
         verbose_name = _('article')
 
+
 class Brief(Displayable, RichText):
 
     text_button = models.CharField(blank=True, max_length=150, null=False, verbose_name='text button')
index d5dd59ace3cd12a47db76dc0bedaf0abfb3946b7..8e3b17767d050eaa860c5afc1ea4def54f2d9d2c 100644 (file)
@@ -6,4 +6,4 @@ from django.apps import AppConfig
 class MediaConfig(AppConfig):
 
     name = 'organization.media'
-    label = 'organization media'
+    label = 'organization-media'
index 32ee5682e9aa596477bb16ed13da7a5ca1e07ff4..ee7f8296c118449832c1beeee22f11e644a7ca58 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-07 14:14
+# Generated by Django 1.9.7 on 2016-07-13 14:49
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -56,7 +56,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('title', models.CharField(max_length=512, verbose_name='title')),
                 ('description', models.TextField(blank=True, verbose_name='description')),
-                ('audios', models.ManyToManyField(blank=True, related_name='playlists', to='organization media.Audio', verbose_name='audios')),
+                ('audios', models.ManyToManyField(blank=True, related_name='playlists', to='organization-media.Audio', verbose_name='audios')),
             ],
             options={
                 'abstract': False,
@@ -110,7 +110,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='video',
             name='category',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='videos', to='organization media.VideoCategory', verbose_name='category'),
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='videos', to='organization-media.VideoCategory', verbose_name='category'),
         ),
         migrations.AddField(
             model_name='video',
index 34d023b2ff4a66aafda16238d586df0963f9b69d..95f7c465dead565278ee232b06a565a4556a9607 100644 (file)
@@ -6,4 +6,4 @@ from django.apps import AppConfig
 class ProjectConfig(AppConfig):
 
     name = 'organization.project'
-    label = 'organization project'
+    label = 'organization-project'
index c96edf5f91bded1485829ed08da6bb24633b88d6..400ebfd22b85bb412c3e0c36b406f9e826870bc8 100644 (file)
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-07 08:53
+# Generated by Django 1.9.7 on 2016-07-14 08:26
 from __future__ import unicode_literals
 
 from django.db import migrations, models
+import django.db.models.deletion
 import mezzanine.core.fields
 
 
@@ -11,6 +12,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('organization-team', '__first__'),
+        ('sites', '0002_alter_domain_unique'),
     ]
 
     operations = [
@@ -20,9 +23,13 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('keywords_string', models.CharField(blank=True, editable=False, max_length=500)),
                 ('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(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL')),
                 ('_meta_title', models.CharField(blank=True, 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')),
                 ('description', models.TextField(blank=True, verbose_name='Description')),
+                ('description_fr', models.TextField(blank=True, null=True, verbose_name='Description')),
+                ('description_en', models.TextField(blank=True, null=True, verbose_name='Description')),
                 ('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(editable=False, null=True)),
                 ('updated', models.DateTimeField(editable=False, null=True)),
@@ -32,6 +39,11 @@ class Migration(migrations.Migration):
                 ('short_url', models.URLField(blank=True, null=True)),
                 ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')),
                 ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
+                ('content_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
+                ('content_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
+                ('partners', models.ManyToManyField(to='organization-team.Organization', verbose_name='organizations')),
+                ('persons', models.ManyToManyField(to='organization-team.Person', verbose_name='persons')),
+                ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
             ],
             options={
                 'abstract': False,
diff --git a/app/organization/project/migrations/0002_auto_20160707_1053.py b/app/organization/project/migrations/0002_auto_20160707_1053.py
deleted file mode 100644 (file)
index 5d78ef1..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-07 08:53
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('sites', '0002_alter_domain_unique'),
-        ('organization project', '0001_initial'),
-        ('organization team', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='project',
-            name='partners',
-            field=models.ManyToManyField(to='organization team.Organization', verbose_name='organizations'),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='persons',
-            field=models.ManyToManyField(to='organization team.Person', verbose_name='persons'),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='site',
-            field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site'),
-        ),
-    ]
diff --git a/app/organization/project/migrations/0003_auto_20160713_1501.py b/app/organization/project/migrations/0003_auto_20160713_1501.py
deleted file mode 100644 (file)
index c0a2eb5..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-13 13:01
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization project', '0002_auto_20160707_1053'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='project',
-            name='content_en',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='content_fr',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='description_en',
-            field=models.TextField(blank=True, null=True, verbose_name='Description'),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='description_fr',
-            field=models.TextField(blank=True, null=True, verbose_name='Description'),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='title_en',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='title_fr',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-    ]
index 81f7caf5af2549426603be8c38aa145d1e4dfc18..38c45219a1e63ec0dd8e2dfb602d617c0cee32a2 100644 (file)
@@ -6,4 +6,4 @@ from django.apps import AppConfig
 class teamConfig(AppConfig):
 
     name = 'organization.team'
-    label  = 'organization team'
+    label  = 'organization-team'
index 4b4382b08064b494c455238ec1942aff2219776b..e34ed1ff64c15e8d3f12e14b4726ff7caef1ca33 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-07 08:53
+# Generated by Django 1.9.7 on 2016-07-14 08:26
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -15,8 +15,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('sites', '0002_alter_domain_unique'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('sites', '0002_alter_domain_unique'),
     ]
 
     operations = [
@@ -24,11 +24,19 @@ class Migration(migrations.Migration):
             name='Activity',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
+                ('content_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
+                ('content_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
                 ('date_begin', models.DateField(blank=True, null=True, verbose_name='begin date')),
                 ('date_end', models.DateField(blank=True, null=True, verbose_name='end date')),
                 ('role', models.CharField(blank=True, max_length=512, verbose_name='role')),
-                ('work', models.TextField(blank=True, verbose_name='work')),
+                ('description', models.TextField(blank=True, verbose_name='work')),
+                ('description_fr', models.TextField(blank=True, null=True, verbose_name='work')),
+                ('description_en', models.TextField(blank=True, null=True, verbose_name='work')),
             ],
+            options={
+                'abstract': False,
+            },
         ),
         migrations.CreateModel(
             name='Address',
@@ -44,7 +52,11 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=512, verbose_name='name')),
+                ('name_fr', models.CharField(max_length=512, null=True, verbose_name='name')),
+                ('name_en', models.CharField(max_length=512, null=True, verbose_name='name')),
                 ('description', models.TextField(blank=True, verbose_name='description')),
+                ('description_fr', models.TextField(blank=True, null=True, verbose_name='description')),
+                ('description_en', models.TextField(blank=True, null=True, verbose_name='description')),
                 ('url', models.URLField(blank=True, max_length=512, verbose_name='URL')),
                 ('weaving_class', models.CharField(blank=True, max_length=64, verbose_name='weaving class')),
             ],
@@ -71,12 +83,6 @@ class Migration(migrations.Migration):
                 'ordering': ['ordering'],
             },
         ),
-        migrations.CreateModel(
-            name='Modelname',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-            ],
-        ),
         migrations.CreateModel(
             name='Nationality',
             fields=[
@@ -112,7 +118,6 @@ class Migration(migrations.Migration):
                 ('expiry_date', models.DateTimeField(blank=True, help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on')),
                 ('short_url', models.URLField(blank=True, null=True)),
                 ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')),
-                ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
                 ('photo', mezzanine.core.fields.FileField(blank=True, max_length=1024, verbose_name='photo')),
                 ('photo_credits', models.CharField(blank=True, max_length=255, null=True, verbose_name='photo credits')),
                 ('photo_alignment', models.CharField(blank=True, choices=[('left', 'left'), ('center', 'center'), ('right', 'right')], default='left', max_length=32, verbose_name='photo alignment')),
@@ -126,11 +131,15 @@ class Migration(migrations.Migration):
                 ('first_name', models.CharField(blank=True, max_length=255, null=True, verbose_name='first name')),
                 ('last_name', models.CharField(blank=True, max_length=255, null=True, verbose_name='last name')),
                 ('birthday', models.DateField(blank=True, verbose_name='birthday')),
+                ('bio', mezzanine.core.fields.RichTextField(blank=True, verbose_name='biography')),
+                ('bio_fr', mezzanine.core.fields.RichTextField(blank=True, null=True, verbose_name='biography')),
+                ('bio_en', mezzanine.core.fields.RichTextField(blank=True, null=True, verbose_name='biography')),
                 ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
                 ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='user')),
             ],
             options={
-                'abstract': False,
+                'ordering': ['last_name'],
+                'verbose_name': 'person',
             },
             bases=(mezzanine.utils.models.AdminThumbMixin, models.Model),
         ),
@@ -139,8 +148,12 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=512, verbose_name='name')),
+                ('name_fr', models.CharField(max_length=512, null=True, verbose_name='name')),
+                ('name_en', models.CharField(max_length=512, null=True, verbose_name='name')),
                 ('description', models.TextField(blank=True, verbose_name='description')),
-                ('department', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization team.Department', verbose_name='department')),
+                ('description_fr', models.TextField(blank=True, null=True, verbose_name='description')),
+                ('description_en', models.TextField(blank=True, null=True, verbose_name='description')),
+                ('department', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-team.Department', verbose_name='department')),
             ],
             options={
                 'abstract': False,
@@ -149,45 +162,47 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Organization',
             fields=[
-                ('address_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='organization team.Address')),
+                ('address_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='organization-team.Address')),
                 ('name', models.CharField(max_length=512, verbose_name='name')),
                 ('description', models.TextField(blank=True, verbose_name='description')),
+                ('description_fr', models.TextField(blank=True, null=True, verbose_name='description')),
+                ('description_en', models.TextField(blank=True, null=True, verbose_name='description')),
                 ('url', models.URLField(blank=True, max_length=512, verbose_name='URL')),
-                ('type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization team.OrganizationType', verbose_name='organization type')),
+                ('type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-team.OrganizationType', verbose_name='organization type')),
             ],
             options={
                 'verbose_name': 'organization',
             },
-            bases=('organization team.address', models.Model),
+            bases=('organization-team.address', models.Model),
         ),
         migrations.AddField(
             model_name='link',
             name='link_type',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization team.LinkType', verbose_name='Link type'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization-team.LinkType', verbose_name='Link type'),
         ),
         migrations.AddField(
             model_name='link',
             name='person',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization team.Person', verbose_name='Person'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization-team.Person', verbose_name='Person'),
         ),
         migrations.AddField(
             model_name='activity',
             name='person',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization team.Person', verbose_name='person'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization-team.Person', verbose_name='person'),
         ),
         migrations.AddField(
             model_name='activity',
             name='teams',
-            field=models.ManyToManyField(to='organization team.Team', verbose_name='teams'),
+            field=models.ManyToManyField(to='organization-team.Team', verbose_name='teams'),
         ),
         migrations.AddField(
             model_name='person',
             name='organization',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization team.Organization', verbose_name='organization'),
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization-team.Organization', verbose_name='organization'),
         ),
         migrations.AddField(
             model_name='department',
             name='organization',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization team.Organization', verbose_name='organization'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization-team.Organization', verbose_name='organization'),
         ),
     ]
diff --git a/app/organization/team/migrations/0002_auto_20160707_1614.py b/app/organization/team/migrations/0002_auto_20160707_1614.py
deleted file mode 100644 (file)
index 28aa1de..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-07 14:14
-from __future__ import unicode_literals
-
-from django.db import migrations
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization team', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='Modelname',
-        ),
-        migrations.AlterModelOptions(
-            name='person',
-            options={'ordering': ['last_name'], 'verbose_name': 'person'},
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='bio',
-            field=mezzanine.core.fields.RichTextField(blank=True, verbose_name='biography'),
-        ),
-    ]
diff --git a/app/organization/team/migrations/0003_auto_20160713_1504.py b/app/organization/team/migrations/0003_auto_20160713_1504.py
deleted file mode 100644 (file)
index 012003c..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-13 13:04
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization team', '0002_auto_20160707_1614'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='activity',
-            old_name='work',
-            new_name='description',
-        ),
-        migrations.RemoveField(
-            model_name='person',
-            name='content',
-        ),
-        migrations.AddField(
-            model_name='activity',
-            name='content',
-            field=mezzanine.core.fields.RichTextField(default='', verbose_name='Content'),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='activity',
-            name='content_en',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='activity',
-            name='content_fr',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='activity',
-            name='description_en',
-            field=models.TextField(blank=True, null=True, verbose_name='work'),
-        ),
-        migrations.AddField(
-            model_name='activity',
-            name='description_fr',
-            field=models.TextField(blank=True, null=True, verbose_name='work'),
-        ),
-        migrations.AddField(
-            model_name='department',
-            name='description_en',
-            field=models.TextField(blank=True, null=True, verbose_name='description'),
-        ),
-        migrations.AddField(
-            model_name='department',
-            name='description_fr',
-            field=models.TextField(blank=True, null=True, verbose_name='description'),
-        ),
-        migrations.AddField(
-            model_name='department',
-            name='name_en',
-            field=models.CharField(max_length=512, null=True, verbose_name='name'),
-        ),
-        migrations.AddField(
-            model_name='department',
-            name='name_fr',
-            field=models.CharField(max_length=512, null=True, verbose_name='name'),
-        ),
-        migrations.AddField(
-            model_name='organization',
-            name='description_en',
-            field=models.TextField(blank=True, null=True, verbose_name='description'),
-        ),
-        migrations.AddField(
-            model_name='organization',
-            name='description_fr',
-            field=models.TextField(blank=True, null=True, verbose_name='description'),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='bio_en',
-            field=mezzanine.core.fields.RichTextField(blank=True, null=True, verbose_name='biography'),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='bio_fr',
-            field=mezzanine.core.fields.RichTextField(blank=True, null=True, verbose_name='biography'),
-        ),
-        migrations.AddField(
-            model_name='team',
-            name='description_en',
-            field=models.TextField(blank=True, null=True, verbose_name='description'),
-        ),
-        migrations.AddField(
-            model_name='team',
-            name='description_fr',
-            field=models.TextField(blank=True, null=True, verbose_name='description'),
-        ),
-        migrations.AddField(
-            model_name='team',
-            name='name_en',
-            field=models.CharField(max_length=512, null=True, verbose_name='name'),
-        ),
-        migrations.AddField(
-            model_name='team',
-            name='name_fr',
-            field=models.CharField(max_length=512, null=True, verbose_name='name'),
-        ),
-    ]
index 788d0eba077aa8a00ddd69e8395a4ac49430754b..036608a9a9fa2d8221e8b818381d0eb0f4dd8665 100644 (file)
@@ -242,7 +242,6 @@ MIGRATION_MODULES = {
     "galleries": "migrations.galleries",
     "pages": "migrations.pages",
     "conf": "migrations.conf",
-    "mezzanine_agenda": "migrations.mezzanine_agenda",
 }
 
 MODELTRANSLATION_TRANSLATION_FILES = (
index 5f6399bd68793c8a16048e59988ce4a60daa3c8e..110063bdfed543121c0c1d80c9c8bee74933e6b9 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 5f6399bd68793c8a16048e59988ce4a60daa3c8e
+Subproject commit 110063bdfed543121c0c1d80c9c8bee74933e6b9