Add the optional header image to all pages

opentech/forms/migrations/0002_formpage_header_image.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.8 on 2018-01-05 15:03
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('images', '0001_initial'),
+        ('forms', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='formpage',
+            name='header_image',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='images.CustomImage'),
+        ),
+    ]

opentech/forms/models.py

@@ -2,7 +2,6 @@ from django.db import models
 
 from modelcluster.fields import ParentalKey
 
-from wagtail.wagtailcore.models import Page
 from wagtail.wagtailcore.fields import RichTextField
 from wagtail.wagtailadmin.edit_handlers import (
     FieldPanel, FieldRowPanel,
@@ -27,11 +26,11 @@ class FormPage(WagtailCaptchaEmailForm, BasePage):
     thank_you_text = RichTextField(blank=True, help_text="Text displayed to the user on successful submission of the form")
     action_text = models.CharField(max_length=32, blank=True, help_text="Form action text. Defaults to \"Submit\"")
 
-    search_fields = Page.search_fields + [
+    search_fields = BasePage.search_fields + [
         index.SearchField('introduction'),
     ]
 
-    content_panels = Page.content_panels + [
+    content_panels = BasePage.content_panels + [
         FieldPanel('introduction'),
         InlinePanel('form_fields', label="Form fields"),
         FieldPanel('action_text'),

opentech/home/migrations/0003_homepage_header_image.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.8 on 2018-01-05 15:03
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('images', '0001_initial'),
+        ('home', '0002_create_homepage'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='homepage',
+            name='header_image',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='images.CustomImage'),
+        ),
+    ]

opentech/home/models.py

 from django.db import models
 
 from wagtail.wagtailadmin.edit_handlers import FieldPanel
-from wagtail.wagtailcore.models import Page
 from wagtail.wagtailsearch import index
 from wagtail.wagtailsnippets.edit_handlers import SnippetChooserPanel
 
@@ -15,11 +14,11 @@ class HomePage(BasePage):
     strapline = models.CharField(blank=True, max_length=255)
     call_to_action = models.ForeignKey('utils.CallToActionSnippet', blank=True, null=True, on_delete=models.SET_NULL, related_name='+')
 
-    search_fields = Page.search_fields + [
+    search_fields = BasePage.search_fields + [
         index.SearchField('strapline'),
     ]
 
-    content_panels = Page.content_panels + [
+    content_panels = BasePage.content_panels + [
         FieldPanel('strapline'),
         SnippetChooserPanel('call_to_action'),
     ]

opentech/news/migrations/0002_add_header_image.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.8 on 2018-01-05 15:03
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('images', '0001_initial'),
+        ('news', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='newsindex',
+            name='header_image',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='images.CustomImage'),
+        ),
+        migrations.AddField(
+            model_name='newspage',
+            name='header_image',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='images.CustomImage'),
+        ),
+    ]

opentech/news/models.py

@@ -5,7 +5,6 @@ from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 
 from modelcluster.fields import ParentalKey
 
-from wagtail.wagtailcore.models import Page
 from wagtail.wagtailcore.fields import StreamField
 from wagtail.wagtailadmin.edit_handlers import (
     StreamFieldPanel, FieldPanel, InlinePanel
@@ -62,12 +61,12 @@ class NewsPage(BasePage):
     introduction = models.TextField(blank=True)
     body = StreamField(StoryBlock())
 
-    search_fields = Page.search_fields + [
+    search_fields = BasePage.search_fields + [
         index.SearchField('introduction'),
         index.SearchField('body')
     ]
 
-    content_panels = Page.content_panels + [
+    content_panels = BasePage.content_panels + [
         FieldPanel('publication_date'),
         FieldPanel('introduction'),
         StreamFieldPanel('body'),

opentech/people/migrations/0002_add_header_image.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.8 on 2018-01-05 15:03
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('images', '0001_initial'),
+        ('people', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='personindexpage',
+            name='header_image',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='images.CustomImage'),
+        ),
+        migrations.AddField(
+            model_name='personpage',
+            name='header_image',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='images.CustomImage'),
+        ),
+    ]

opentech/people/models.py

@@ -5,7 +5,6 @@ from django.conf import settings
 
 from modelcluster.fields import ParentalKey
 
-from wagtail.wagtailcore.models import Page
 from wagtail.wagtailcore.fields import StreamField
 from wagtail.wagtailadmin.edit_handlers import (
     FieldPanel,
@@ -97,7 +96,7 @@ class PersonPage(BasePage):
     biography = StreamField(StoryBlock(), blank=True)
     email = models.EmailField(blank=True)
 
-    content_panels = Page.content_panels + [
+    content_panels = BasePage.content_panels + [
         MultiFieldPanel([
             FieldPanel('first_name'),
             FieldPanel('last_name'),

opentech/standardpages/migrations/0002_add_header_image.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.8 on 2018-01-05 15:03
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('images', '0001_initial'),
+        ('standardpages', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='indexpage',
+            name='header_image',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='images.CustomImage'),
+        ),
+        migrations.AddField(
+            model_name='informationpage',
+            name='header_image',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='images.CustomImage'),
+        ),
+    ]

opentech/standardpages/models.py

@@ -9,7 +9,6 @@ from wagtail.wagtailadmin.edit_handlers import (
 )
 
 from wagtail.wagtailcore.fields import StreamField
-from wagtail.wagtailcore.models import Page
 from wagtail.wagtailsearch import index
 
 from opentech.utils.blocks import StoryBlock
@@ -27,12 +26,12 @@ class InformationPage(BasePage):
     introduction = models.TextField(blank=True)
     body = StreamField(StoryBlock())
 
-    search_fields = Page.search_fields + [
+    search_fields = BasePage.search_fields + [
         index.SearchField('introduction'),
         index.SearchField('body'),
     ]
 
-    content_panels = Page.content_panels + [
+    content_panels = BasePage.content_panels + [
         FieldPanel('introduction'),
         StreamFieldPanel('body'),
         InlinePanel('related_pages', label="Related pages"),
@@ -42,11 +41,11 @@ class InformationPage(BasePage):
 class IndexPage(BasePage):
     introduction = models.TextField(blank=True)
 
-    content_panels = Page.content_panels + [
+    content_panels = BasePage.content_panels + [
         FieldPanel('introduction'),
     ]
 
-    search_fields = Page.search_fields + [
+    search_fields = BasePage.search_fields + [
         index.SearchField('introduction'),
     ]
 

opentech/templates/base.html

@@ -69,7 +69,8 @@
         {% wagtailuserbar %}
 
         {# {% if page.header_image %} #}
-            <!-- <header class="header header--standard header--has-bg-image" style="background-image:url('')"> -->
+            {% image page.header_image original as header_image %}
+            <header class="header header--standard header--has-bg-image" style="background-image:url('{{ header_image.url }}')">
         {# {% else %} #}
             <header class="header header--standard">
         {# {% endif %} #}
@@ -167,4 +168,3 @@
         {% block extra_js %}{% endblock %}
     </body>
 </html>
-

opentech/utils/models.py

@@ -239,9 +239,22 @@ class SystemMessagesSettings(BaseSetting):
 class BasePage(SocialFields, ListingFields, Page):
     show_in_menus_default = True
 
+    header_image = models.ForeignKey(
+        'images.CustomImage',
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name='+'
+    )
+
     class Meta:
         abstract = True
 
+
+    content_panels = Page.content_panels + [
+        ImageChooserPanel('header_image')
+    ]
+
     promote_panels = (
         Page.promote_panels +
         SocialFields.promote_panels +