Fix init, add logo_header and logo_footer image property in order to feed header...

diff --git a/app/bin/app.sh b/app/bin/app.sh
index 4e830f330ddca7c25cdef528ef7c33ea5b740d0c..9b5ea8d14d4b014d1486b2ea53c43d0880b05ef9 100755 (executable)
--- a/app/bin/app.sh
+++ b/app/bin/app.sh
@@ -37,7 +37,7 @@ python $manage wait-for-db
 
 # initial setup
 if [ ! -f .init ]; then
-    bash init.sh
+    bash $app/bin/init.sh
     touch .init
 fi
 

diff --git a/app/organization/agenda/migrations/0022_auto_20170105_1743.py b/app/organization/agenda/migrations/0022_auto_20170105_1743.py
new file mode 100644 (file)
index 0000000..930c9ae
--- /dev/null
+++ b/app/organization/agenda/migrations/0022_auto_20170105_1743.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-01-05 16:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-agenda', '0021_eventblock_login_required'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='eventimage',
+            name='type',
+            field=models.CharField(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')], max_length=64, verbose_name='type'),
+        ),
+    ]

diff --git a/app/organization/core/models.py b/app/organization/core/models.py
index 05085f78157eb93c07ff3dee7e833b43a0ab08ff..5c57aae608f5882928d1caf775f506efa09cab84 100644 (file)
--- a/app/organization/core/models.py
+++ b/app/organization/core/models.py
@@ -35,7 +35,7 @@ from django_countries.fields import CountryField
 
 COLOR_CHOICES = (('black', _('black')), ('yellow', _('yellow')), ('red', _('red')))
 ALIGNMENT_CHOICES = (('left', _('left')), ('center', _('center')), ('right', _('right')))
-IMAGE_TYPE_CHOICES = (('logo', _('logo')), ('logo_white', _('logo white')), ('logo_black', _('logo black')), ('slider', _('slider')), ('card', _('card')), ('page_slider', _('page - slider')), ('page_featured', _('page - featured')))
+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')))
 
 
 class Description(models.Model):

diff --git a/app/organization/job/migrations/0011_auto_20170105_1743.py b/app/organization/job/migrations/0011_auto_20170105_1743.py
new file mode 100644 (file)
index 0000000..79460cc
--- /dev/null
+++ b/app/organization/job/migrations/0011_auto_20170105_1743.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-01-05 16:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-job', '0010_auto_20161205_1536'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='candidacyimage',
+            name='type',
+            field=models.CharField(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')], max_length=64, verbose_name='type'),
+        ),
+    ]

diff --git a/app/organization/magazine/migrations/0019_auto_20170105_1743.py b/app/organization/magazine/migrations/0019_auto_20170105_1743.py
new file mode 100644 (file)
index 0000000..70d49b0
--- /dev/null
+++ b/app/organization/magazine/migrations/0019_auto_20170105_1743.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-01-05 16:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-magazine', '0018_auto_20161205_1536'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='articleimage',
+            name='type',
+            field=models.CharField(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')], max_length=64, verbose_name='type'),
+        ),
+    ]

diff --git a/app/organization/network/migrations/0078_auto_20170105_1743.py b/app/organization/network/migrations/0078_auto_20170105_1743.py
new file mode 100644 (file)
index 0000000..fc6c3ca
--- /dev/null
+++ b/app/organization/network/migrations/0078_auto_20170105_1743.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-01-05 16:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-network', '0077_auto_20170103_1220'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='organizationimage',
+            name='type',
+            field=models.CharField(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')], max_length=64, verbose_name='type'),
+        ),
+        migrations.AlterField(
+            model_name='personimage',
+            name='type',
+            field=models.CharField(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')], max_length=64, verbose_name='type'),
+        ),
+    ]

diff --git a/app/organization/pages/migrations/0018_auto_20170105_1743.py b/app/organization/pages/migrations/0018_auto_20170105_1743.py
new file mode 100644 (file)
index 0000000..11a8bc0
--- /dev/null
+++ b/app/organization/pages/migrations/0018_auto_20170105_1743.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-01-05 16:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-pages', '0017_pageblock_login_required'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='pageimage',
+            name='type',
+            field=models.CharField(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')], max_length=64, verbose_name='type'),
+        ),
+    ]

diff --git a/app/organization/projects/migrations/0040_auto_20170105_1743.py b/app/organization/projects/migrations/0040_auto_20170105_1743.py
new file mode 100644 (file)
index 0000000..22d7c83
--- /dev/null
+++ b/app/organization/projects/migrations/0040_auto_20170105_1743.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-01-05 16:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-projects', '0039_auto_20170104_1820'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='projectimage',
+            name='type',
+            field=models.CharField(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')], max_length=64, verbose_name='type'),
+        ),
+    ]

diff --git a/app/templates/includes/footer.html b/app/templates/includes/footer.html
index b26391ca25f93f79a06b8a64816bf4f2ae1e6556..7f85ebcae2dc448d83af3120262f938bf30036ac 100644 (file)
--- a/app/templates/includes/footer.html
+++ b/app/templates/includes/footer.html
@@ -18,7 +18,15 @@
     <div class="container">
         <div class="row">
             <div class="col-xs-3 col-sm-4 col-sm-push-1 tal">
-                <a href="{% url "home" %}" title="{% trans 'Home' %}"><img src="{% static "img/logo-ircam-white.png" %}" width="151" /></a>
+                <a href="{% url "home" %}" title="{% trans 'Home' %}">
+                    {% with host_organization.images|get_type:"logo_footer" as images %}
+                      {% if images %}
+                       {% with images|first as img %}
+                        <img src="{{ MEDIA_URL }}{{ img }}" title="{{ img.title }}" width="151" />
+                       {% endwith %}
+                      {% endif %}
+                    {% endwith %}
+                </a>
             </div>
             <div class="col-xs-3 col-sm-2 col-sm-push-1 tar-sm tal fsm">
                 <strong>{{ host_organization.name }}</strong><br />

diff --git a/app/templates/pages/menus/header.html b/app/templates/pages/menus/header.html
index 05dbc0cfc125bcea2c6ff4942b0a52416ed3521a..8818f8a3a5c64c60a791f7da2fc60f57b0a06482 100644 (file)
--- a/app/templates/pages/menus/header.html
+++ b/app/templates/pages/menus/header.html
@@ -1,4 +1,4 @@
-{% load i18n pages_tags staticfiles mezzanine_tags %}
+{% load i18n pages_tags staticfiles mezzanine_tags organization_tags %}
 {% get_language_info_list for LANGUAGES as languages %}
 
 {% spaceless %}
@@ -12,7 +12,15 @@
                         <span class="second"></span>
                     </li>
                     <li class="nav-header__item nav-header__item--image">
-                        <a href="{% url "home" %}" title="{% trans 'Home' %}"><img src="{% static "img/logo-ircam.png" %}" width="118" height="80" /></a>
+                        <a href="{% url "home" %}" title="{% trans 'Home' %}">
+                          {% with host_organization.images|get_type:"logo_header" as images %}
+                            {% if images %}
+                             {% with images|first as img %}
+                              <img src="{{ MEDIA_URL }}{{ img }}" title="{{ img.title }}" width="118" height="80" />
+                             {% endwith %}
+                            {% endif %}
+                          {% endwith %}
+                        </a>
                     </li>
             {% endif %}
         {% endif %}

diff --git a/app/templates/pages/teampage.html b/app/templates/pages/teampage.html
index fbd71ca8bdc222f5148e95d35394d95d6a61251f..f319940a53908d7764325ef28b3eb8ca7435ef85 100644 (file)
--- a/app/templates/pages/teampage.html
+++ b/app/templates/pages/teampage.html
@@ -1,5 +1,5 @@
 {% extends "pages/page.html" %}
-{% load i18n mezzanine_tags keyword_tags  pages_tags organization_tags %}
+{% load i18n mezzanine_tags keyword_tags pages_tags organization_tags %}
 
 {% block page_class %}
     department