From: Emilie <zawadzki@ircam.fr>
Date: Tue, 14 Feb 2017 15:46:52 +0000 (+0100)
Subject: [Page Block] : add white style
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2687870f61753f37eb937e9fe1a2d800e0f71135;p=mezzo.git

[Page Block] : add white style
---

diff --git a/app/organization/agenda/migrations/0023_auto_20170214_1643.py b/app/organization/agenda/migrations/0023_auto_20170214_1643.py
new file mode 100644
index 00000000..a6d3ed01
--- /dev/null
+++ b/app/organization/agenda/migrations/0023_auto_20170214_1643.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-02-14 15:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-agenda', '0022_auto_20170105_1743'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='eventblock',
+            name='background_color',
+            field=models.CharField(blank=True, choices=[('black', 'black'), ('yellow', 'yellow'), ('red', 'red'), ('white', 'white')], max_length=32, verbose_name='background color'),
+        ),
+    ]
diff --git a/app/organization/core/models.py b/app/organization/core/models.py
index 5c57aae6..cd227ae3 100644
--- a/app/organization/core/models.py
+++ b/app/organization/core/models.py
@@ -33,7 +33,7 @@ from mezzanine.core.models import Displayable, Slugged, Orderable
 from django_countries.fields import CountryField
 
 
-COLOR_CHOICES = (('black', _('black')), ('yellow', _('yellow')), ('red', _('red')))
+COLOR_CHOICES = (('black', _('black')), ('yellow', _('yellow')), ('red', _('red')), ('white', _('white')),)
 ALIGNMENT_CHOICES = (('left', _('left')), ('center', _('center')), ('right', _('right')))
 IMAGE_TYPE_CHOICES = (('logo', _('logo')), ('logo_white', _('logo white')), ('logo_black', _('logo black')), ('logo_header', _('logo header')), ('logo_footer', _('logo footer')), ('slider', _('slider')), ('card', _('card')), ('page_slider', _('page - slider')), ('page_featured', _('page - featured')))
 
diff --git a/app/organization/network/migrations/0087_auto_20170214_1643.py b/app/organization/network/migrations/0087_auto_20170214_1643.py
new file mode 100644
index 00000000..4de6dc42
--- /dev/null
+++ b/app/organization/network/migrations/0087_auto_20170214_1643.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-02-14 15:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-network', '0086_auto_20170118_1247'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='organizationblock',
+            name='background_color',
+            field=models.CharField(blank=True, choices=[('black', 'black'), ('yellow', 'yellow'), ('red', 'red'), ('white', 'white')], max_length=32, verbose_name='background color'),
+        ),
+        migrations.AlterField(
+            model_name='personblock',
+            name='background_color',
+            field=models.CharField(blank=True, choices=[('black', 'black'), ('yellow', 'yellow'), ('red', 'red'), ('white', 'white')], max_length=32, verbose_name='background color'),
+        ),
+    ]
diff --git a/app/organization/pages/migrations/0019_auto_20170214_1643.py b/app/organization/pages/migrations/0019_auto_20170214_1643.py
new file mode 100644
index 00000000..293b7776
--- /dev/null
+++ b/app/organization/pages/migrations/0019_auto_20170214_1643.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-02-14 15:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-pages', '0018_auto_20170105_1743'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='pageblock',
+            name='background_color',
+            field=models.CharField(blank=True, choices=[('black', 'black'), ('yellow', 'yellow'), ('red', 'red'), ('white', 'white')], max_length=32, verbose_name='background color'),
+        ),
+    ]
diff --git a/app/organization/projects/migrations/0043_auto_20170214_1643.py b/app/organization/projects/migrations/0043_auto_20170214_1643.py
new file mode 100644
index 00000000..f13b953c
--- /dev/null
+++ b/app/organization/projects/migrations/0043_auto_20170214_1643.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-02-14 15:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-projects', '0042_auto_20170118_1239'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='projectblock',
+            name='background_color',
+            field=models.CharField(blank=True, choices=[('black', 'black'), ('yellow', 'yellow'), ('red', 'red'), ('white', 'white')], max_length=32, verbose_name='background color'),
+        ),
+    ]