From 1acbd03df54023badeec3b04fbda60f94a33dae8 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 5 Jan 2017 18:05:28 +0100 Subject: [PATCH] Fix init, add logo_header and logo_footer image property in order to feed header and footer logos --- app/bin/app.sh | 2 +- .../migrations/0022_auto_20170105_1743.py | 20 +++++++++++++++ app/organization/core/models.py | 2 +- .../job/migrations/0011_auto_20170105_1743.py | 20 +++++++++++++++ .../migrations/0019_auto_20170105_1743.py | 20 +++++++++++++++ .../migrations/0078_auto_20170105_1743.py | 25 +++++++++++++++++++ .../migrations/0018_auto_20170105_1743.py | 20 +++++++++++++++ .../migrations/0040_auto_20170105_1743.py | 20 +++++++++++++++ app/templates/includes/footer.html | 10 +++++++- app/templates/pages/menus/header.html | 12 +++++++-- app/templates/pages/teampage.html | 2 +- 11 files changed, 147 insertions(+), 6 deletions(-) create mode 100644 app/organization/agenda/migrations/0022_auto_20170105_1743.py create mode 100644 app/organization/job/migrations/0011_auto_20170105_1743.py create mode 100644 app/organization/magazine/migrations/0019_auto_20170105_1743.py create mode 100644 app/organization/network/migrations/0078_auto_20170105_1743.py create mode 100644 app/organization/pages/migrations/0018_auto_20170105_1743.py create mode 100644 app/organization/projects/migrations/0040_auto_20170105_1743.py diff --git a/app/bin/app.sh b/app/bin/app.sh index 4e830f33..9b5ea8d1 100755 --- 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 index 00000000..930c9aec --- /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 05085f78..5c57aae6 100644 --- 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 index 00000000..79460ccc --- /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 index 00000000..70d49b07 --- /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 index 00000000..fc6c3caf --- /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 index 00000000..11a8bc05 --- /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 index 00000000..22d7c834 --- /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 b26391ca..7f85ebca 100644 --- a/app/templates/includes/footer.html +++ b/app/templates/includes/footer.html @@ -18,7 +18,15 @@
- + + {% with host_organization.images|get_type:"logo_footer" as images %} + {% if images %} + {% with images|first as img %} + + {% endwith %} + {% endif %} + {% endwith %} +
{{ host_organization.name }}
diff --git a/app/templates/pages/menus/header.html b/app/templates/pages/menus/header.html index 05dbc0cf..8818f8a3 100644 --- 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 @@
  • - + + {% with host_organization.images|get_type:"logo_header" as images %} + {% if images %} + {% with images|first as img %} + + {% endwith %} + {% endif %} + {% endwith %} +
    • {% endif %} {% endif %} diff --git a/app/templates/pages/teampage.html b/app/templates/pages/teampage.html index fbd71ca8..f319940a 100644 --- 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 -- 2.39.5