WIP 941 header nav

django-verdant/rca/blocks.py

@@ -0,0 +1,140 @@
+from django.core.exceptions import ValidationError
+from django.db.models import Min
+from django.forms.utils import ErrorList
+
+from wagtail.wagtailcore import blocks
+from wagtail.wagtailcore.blocks.stream_block import StreamBlockValidationError
+from wagtail.wagtailcore.blocks.struct_block import StructValue
+from wagtail.wagtailcore.models import Page
+from wagtail.wagtailembeds import blocks as embed_blocks
+from wagtail.wagtailimages import blocks as image_blocks
+
+
+class ShowcaseBlock(blocks.StructBlock):
+    title = blocks.CharBlock()
+    pages = blocks.StreamBlock([(
+        'Page', blocks.PageChooserBlock()
+    )])
+
+    class Meta:
+        icon = 'list-ul'
+        template = 'rca/blocks/showcase_block.html'
+
+    def clean(self, value):
+        result = []
+        errors = {}
+        for name, val in value.items():
+            try:
+                result.append((name, self.child_blocks[name].clean(val)))
+
+                # can be removed when updated to Wagtail 1.12 or above
+                # https://docs.wagtail.io/en/v1.12.6/topics/streamfield.html#streamblock
+                if name == 'pages' and len(val) < 5:
+                    raise StreamBlockValidationError(
+                        non_block_errors=['Please choose a minumum of 5 pages']
+                    )
+            except ValidationError as e:
+                errors[name] = ErrorList([e])
+
+        if errors:
+            raise ValidationError(
+                'Validation error in StructBlock', params=errors)
+
+        return StructValue(self, result)
+
+    def get_context(self, value):
+        context = super(ShowcaseBlock, self).get_context(value)
+        context['showcase_pages'] = [
+            child.value.specific for child in value['pages']
+        ]
+        return context
+
+
+class VideoBlock(blocks.StructBlock):
+    title = blocks.CharBlock()
+    video = embed_blocks.EmbedBlock()
+    poster_image = image_blocks.ImageChooserBlock(required=False)
+
+    class Meta:
+        icon = 'media'
+        template = 'rca/blocks/video_block.html'
+
+
+class TestimonialBlock(blocks.StructBlock):
+    image = image_blocks.ImageChooserBlock()
+    quote = blocks.CharBlock()
+    further_description = blocks.CharBlock(required=False)
+    reference = blocks.CharBlock(required=False)
+
+    class Meta:
+        template = 'rca/blocks/testimonial_block.html'
+
+
+class TestimonialsBlock(blocks.StructBlock):
+    title = blocks.CharBlock()
+    testimonials = blocks.StreamBlock([(
+        'Testimonial', TestimonialBlock()
+    )])
+
+    class Meta:
+        icon = 'group'
+        template = 'rca/blocks/testimonials_block.html'
+
+
+class NewsBlock(blocks.StructBlock):
+    featured_page = blocks.PageChooserBlock()
+    more_news_link = blocks.PageChooserBlock()
+
+    def get_context(self, value):
+        from rca.models import NewsItem, PressRelease, RcaBlogPage
+        context = super(NewsBlock, self).get_context(value)
+        pages = Page.objects.type(NewsItem) | Page.objects.type(PressRelease) \
+            | Page.objects.type(RcaBlogPage)
+        pages = pages.not_page(value['featured_page']).live().specific()
+        context['pages'] = sorted(
+            pages, key=lambda p: p.date, reverse=True
+        )[:4]
+        return context
+
+    class Meta:
+        icon = 'list-ul'
+        template = 'rca/blocks/news_block.html'
+
+
+class EventsBlock(blocks.StructBlock):
+    more_events_link = blocks.PageChooserBlock()
+
+    def get_context(self, value):
+        from rca.models import EventItem
+        context = super(EventsBlock, self).get_context(value)
+        context['events'] = EventItem.future_not_current_objects.live() \
+            .annotate(start_date=Min('dates_times__date_from')) \
+            .order_by('start_date')
+        return context
+
+    class Meta:
+        icon = 'date'
+        template = 'rca/blocks/events_block.html'
+
+
+class TwoColumnBlock(blocks.StructBlock):
+    title = blocks.CharBlock()
+    column_one_image = image_blocks.ImageChooserBlock()
+    column_one_link_text = blocks.CharBlock()
+    column_one_link_page = blocks.PageChooserBlock()
+    column_two_image = image_blocks.ImageChooserBlock()
+    column_two_link_text = blocks.CharBlock()
+    column_two_link_page = blocks.PageChooserBlock()
+
+    class Meta:
+        icon = 'grip'
+        template = 'rca/blocks/two_column_block.html'
+
+
+class HomepageBody(blocks.StreamBlock):
+    showcase = ShowcaseBlock(help_text='Please choose 5 pages')
+    video = VideoBlock()
+    testimonials = TestimonialsBlock()
+    news = NewsBlock()
+    events = EventsBlock()
+    two_column_block = TwoColumnBlock()

django-verdant/rca/context_processors.py

@@ -2,14 +2,32 @@
 
 from taxonomy.models import Programme, School, Area
 
-from .models import EVENT_LOCATION_CHOICES, EVENT_AUDIENCE_CHOICES, RESEARCH_TYPES_CHOICES, WORK_THEME_CHOICES, WORK_TYPES_CHOICES, STAFF_TYPES_CHOICES, INNOVATIONRCA_PROJECT_TYPES_CHOICES, SUSTAINRCA_CATEGORY_CHOICES
+from .models import (
+    EVENT_LOCATION_CHOICES, EVENT_AUDIENCE_CHOICES,
+    RESEARCH_TYPES_CHOICES, WORK_THEME_CHOICES, WORK_TYPES_CHOICES,
+    STAFF_TYPES_CHOICES, INNOVATIONRCA_PROJECT_TYPES_CHOICES,
+    SUSTAINRCA_CATEGORY_CHOICES, HeaderSettings, HomePage
+)
 from .reachout_choices import REACHOUT_PROJECT_CHOICES, REACHOUT_PARTICIPANTS_CHOICES, REACHOUT_THEMES_CHOICES, REACHOUT_PARTNERSHIPS_CHOICES
 
 
 def global_vars(request):
     all_areas = Area.objects.all()
     all_schools = School.objects.all()
     all_programmes = Programme.objects.all()
+    header_settings = HeaderSettings.for_site(request.site)
+
+    try:
+        header_navigation_links = {
+            'navigation_link_1_text': header_settings.navigation_link_1_text,
+            'navigation_link_1_url': header_settings.navigation_link_1_page.url,
+            'navigation_link_2_text': header_settings.navigation_link_2_text,
+            'navigation_link_2_url': header_settings.navigation_link_2_page.url,
+            'strapline_link_url': header_settings.strapline_link.url,
+        }
+    except AttributeError:
+        header_navigation_links = {}
+
 
     return {
         'global_all_schools': all_schools.values_list('slug', 'display_name'),
@@ -33,4 +51,6 @@ def global_vars(request):
         'GOOGLE_ANALYTICS_ACCOUNT': settings.GOOGLE_ANALYTICS_ACCOUNT,
         'SILVERPOP_ID': settings.SILVERPOP_ID,
         'SILVERPOP_BRANDEDDOMAINS': settings.SILVERPOP_BRANDEDDOMAINS,
+        'use_2018_redesign_template': HomePage.objects.first().use_2018_redesign_template,
+        'header_navigation_links': header_navigation_links,
     }

django-verdant/rca/help_text.py

@@ -157,6 +157,9 @@
     ('rca.StreamPage', 'twitter_feed'): 'Replace the default Twitter feed by providing an alternative Twitter handle (without the @ symbol)',
     ('rca.StreamPage', 'feed_image'): 'The image displayed in content feeds, such as the news carousel. Should be 16:9 ratio.',
     ('rca.ContactUsPageGeneralEnquiries', 'text'): 'You can specify custom text, if you don\'t want to use a Contact snippet.',
+    ('shortcourses.ShortCoursePage', 'twitter_feed'): 'Replace the default Twitter feed by providing an alternative Twitter handle (without the @ symbol)',
+    ('shortcourses.ShortCoursePage', 'feed_image'): 'The image displayed in content feeds, such as the news carousel. Should be 16:9 ratio.',
+    ('shortcourses.ShortCoursePage', 'tags'): 'Use the "student-story" or "alumni-story" tags to make this page appear in the homepage packery (if "Show on homepage" is ticked too).',
 }
 
 

django-verdant/rca/migrations/0093_auto_20180808_1231.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2018-08-08 11:31
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import modelcluster.contrib.taggit
+import modelcluster.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('taggit', '0002_auto_20150616_2121'),
+        ('taxonomy', '0022_degreelevel'),
+        ('wagtailcore', '0029_unicode_slugfield_dj19'),
+        ('rca', '0092_programmepage_poster_image'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProgrammeFinderPage',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
+                ('collapse_upcoming_events', models.BooleanField(default=False, help_text=b'')),
+                ('social_text', models.CharField(blank=True, help_text=b'', max_length=255)),
+                ('introduction', models.TextField()),
+                ('social_image', models.ForeignKey(blank=True, help_text=b'', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='rca.RcaImage')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('wagtailcore.page', models.Model),
+        ),
+        migrations.CreateModel(
+            name='ProgrammePageKeyword',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.AddField(
+            model_name='programmepage',
+            name='degree_level',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='degree_programme_pages', to='taxonomy.DegreeLevel'),
+        ),
+        migrations.AddField(
+            model_name='programmepage',
+            name='programme_finder_exclude',
+            field=models.BooleanField(default=False, help_text=b'Tick to exclude this page from the programme finder.', verbose_name=b'Exclude from programme finder'),
+        ),
+        migrations.AddField(
+            model_name='programmepagekeyword',
+            name='content_object',
+            field=modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, to='rca.ProgrammePage'),
+        ),
+        migrations.AddField(
+            model_name='programmepagekeyword',
+            name='tag',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rca_programmepagekeyword_items', to='taggit.Tag'),
+        ),
+        migrations.AddField(
+            model_name='programmepage',
+            name='programme_finder_keywords',
+            field=modelcluster.contrib.taggit.ClusterTaggableManager(blank=True, help_text=b'A comma-separated list of keywords.', through='rca.ProgrammePageKeyword', to='taggit.Tag', verbose_name=b'Keywords'),
+        ),
+    ]

django-verdant/rca/migrations/0093_homepage_use_2018_redesign_template.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2018-09-17 10:08
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rca', '0092_programmepage_poster_image'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='homepage',
+            name='use_2018_redesign_template',
+            field=models.BooleanField(default=False),
+        ),
+    ]

django-verdant/rca/migrations/0094_headersettings.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2018-09-17 12:18
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wagtailcore', '0029_unicode_slugfield_dj19'),
+        ('rca', '0093_homepage_use_2018_redesign_template'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HeaderSettings',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('navigation_link_1_text', models.CharField(max_length=15, verbose_name=b'Text')),
+                ('navigation_link_2_text', models.CharField(max_length=15, verbose_name=b'Text')),
+                ('navigation_link_1_page', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailcore.Page', verbose_name=b'Page')),
+                ('navigation_link_2_page', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailcore.Page', verbose_name=b'Page')),
+                ('site', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.Site')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

django-verdant/rca/migrations/0095_merge.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2018-09-17 13:49
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rca', '0093_auto_20180808_1231'),
+        ('rca', '0094_headersettings'),
+    ]
+
+    operations = [
+    ]

django-verdant/rca/migrations/0096_auto_20180917_1727.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2018-09-17 16:27
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import wagtail.wagtailcore.blocks
+import wagtail.wagtailcore.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rca', '0095_merge'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='homepage',
+            name='body',
+            field=wagtail.wagtailcore.fields.StreamField([(b'showcase', wagtail.wagtailcore.blocks.StructBlock([(b'title', wagtail.wagtailcore.blocks.CharBlock()), (b'pages', wagtail.wagtailcore.blocks.StreamBlock([(b'Page', wagtail.wagtailcore.blocks.PageChooserBlock())]))]))], default=''),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='homepage',
+            name='hero_image',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='rca.RcaImage'),
+        ),
+        migrations.AddField(
+            model_name='homepage',
+            name='hero_text',
+            field=models.TextField(default='', help_text=b"Add asterisks around text to make it appear bold, e.g. 'Make *this* bold.'"),
+            preserve_default=False,
+        ),
+    ]

django-verdant/rca/migrations/0097_auto_20180919_1117.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2018-09-19 10:17
+from __future__ import unicode_literals
+
+from django.db import migrations
+import wagtail.wagtailcore.blocks
+import wagtail.wagtailcore.fields
+import wagtail.wagtailembeds.blocks
+import wagtail.wagtailimages.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rca', '0096_auto_20180917_1727'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='homepage',
+            name='body',
+            field=wagtail.wagtailcore.fields.StreamField([(b'showcase', wagtail.wagtailcore.blocks.StructBlock([(b'title', wagtail.wagtailcore.blocks.CharBlock()), (b'pages', wagtail.wagtailcore.blocks.StreamBlock([(b'Page', wagtail.wagtailcore.blocks.PageChooserBlock())]))])), (b'video', wagtail.wagtailcore.blocks.StructBlock([(b'title', wagtail.wagtailcore.blocks.CharBlock()), (b'video', wagtail.wagtailembeds.blocks.EmbedBlock()), (b'poster_image', wagtail.wagtailimages.blocks.ImageChooserBlock(required=False))])), (b'testimonials', wagtail.wagtailcore.blocks.StructBlock([(b'title', wagtail.wagtailcore.blocks.CharBlock()), (b'testimonials', wagtail.wagtailcore.blocks.StreamBlock([(b'Testimonial', wagtail.wagtailcore.blocks.StructBlock([(b'image', wagtail.wagtailimages.blocks.ImageChooserBlock()), (b'quote', wagtail.wagtailcore.blocks.CharBlock()), (b'further_description', wagtail.wagtailcore.blocks.CharBlock(required=False)), (b'reference', wagtail.wagtailcore.blocks.CharBlock(required=False))]))]))])), (b'news', wagtail.wagtailcore.blocks.StructBlock([(b'featured_page', wagtail.wagtailcore.blocks.PageChooserBlock()), (b'more_news_link', wagtail.wagtailcore.blocks.PageChooserBlock())])), (b'events', wagtail.wagtailcore.blocks.StructBlock([(b'more_events_link', wagtail.wagtailcore.blocks.PageChooserBlock())])), (b'two_column_block', wagtail.wagtailcore.blocks.StructBlock([(b'title', wagtail.wagtailcore.blocks.CharBlock()), (b'column_one_image', wagtail.wagtailimages.blocks.ImageChooserBlock()), (b'column_one_link_text', wagtail.wagtailcore.blocks.CharBlock()), (b'column_one_link_page', wagtail.wagtailcore.blocks.PageChooserBlock()), (b'column_two_image', wagtail.wagtailimages.blocks.ImageChooserBlock()), (b'column_two_link_text', wagtail.wagtailcore.blocks.CharBlock()), (b'column_two_link_page', wagtail.wagtailcore.blocks.PageChooserBlock())]))]),
+        ),
+    ]