Skip to content
This repository was archived by the owner on Jun 18, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
157 commits
Select commit Hold shift + click to select a range
d2fbdcc
[927] add programme finder view to search by title and exclude by new…
Aug 6, 2018
ea5ebf7
[927] add keyword tagging and search to programme finder
Aug 6, 2018
6029e0f
[927] remove migration during development
Aug 6, 2018
d998215
[927] add thumbnail image info the programme finder search output
Aug 7, 2018
d3e35e9
[927] fix for error when programme page doesn't have an image
Aug 7, 2018
3f2286a
[927] add recently viewed programme to home page
Aug 7, 2018
d6bd7bf
[927] add code comment
Aug 7, 2018
6a6ab15
[927] add programme count to home page
Aug 7, 2018
d2fa65c
[927] add degree level taxonomy models
Aug 7, 2018
ec7717d
[927] add degree level field to programme page
Aug 7, 2018
eac84a5
[927] add basic programme search input
Aug 8, 2018
f1d34a3
[927] add basic template and filtering to programme finder page
Aug 8, 2018
6cae129
[927] add introduction to programme finder page template
Aug 8, 2018
4fedde2
[927] exclude programmes from programme finder page based on exclude …
Aug 8, 2018
731ff2d
[927] add link to programme finder page to homepage
Aug 8, 2018
06573bc
[927] add migrations
Aug 8, 2018
4121c70
[928] add short course page and update programme finder, add start of…
Aug 13, 2018
40cfade
[968] adds field to homepage to indicate using the new homepage template
Sep 17, 2018
92c4a9c
Add option for full width pages with no sidebar
helenb Sep 17, 2018
21b9375
Merge pull request #139 from torchbox/2018-homepage-fe
richbrennan Sep 17, 2018
68b0ba1
[949] add header settings for navigation links
Sep 17, 2018
b5269ce
[949] add header setting output to template, fix merge conflict
Sep 17, 2018
bbef432
[950] merge in prevous programme finder work
Sep 17, 2018
d51e132
[950] add hero fields
Sep 17, 2018
4f7d8ca
[950 952] add new homepage hero fields and showcase block
Sep 17, 2018
c8ce522
[954] add video block
Sep 18, 2018
041862e
[954] update video block
Sep 18, 2018
359163d
[959] add testimonials block
Sep 18, 2018
63cbf1c
[959] add testimonials block templates
Sep 18, 2018
dd40910
Styling for new twitter feed
helenb Sep 18, 2018
487e1ff
Merge branch '2018-hompage-be' into 2018-homepage-fe
helenb Sep 18, 2018
0223359
fix stray line from earlier merge conflict
helenb Sep 18, 2018
b2aba41
[960] add news block
Sep 18, 2018
9f46cb6
[960] add comment to news block template
Sep 18, 2018
0a8945c
[960] add comment to news block template
Sep 18, 2018
b2273ad
[963] add events block
Sep 18, 2018
6c3a2ae
add migration for homepage changes
Sep 19, 2018
895097b
[956] add two column block, change homepage rendering to not load pac…
Sep 19, 2018
d4891aa
[956] add migration
Sep 19, 2018
00cf8f7
Showcase WIP
helenb Sep 19, 2018
b8e3859
Merge branch '2018-hompage-be' into 2018-homepage-fe
helenb Sep 19, 2018
25ed451
Merge branch '2018-hompage-be' into 953-showcase-fe
helenb Sep 19, 2018
78a72ee
Add a new typography style for the homepage
helenb Sep 19, 2018
305b06f
Merge pull request #140 from torchbox/2018-homepage-fe
helenb Sep 20, 2018
4490e8f
Merge pull request #141 from torchbox/953-showcase-fe
helenb Sep 20, 2018
02e3a11
video block frontend
Sep 20, 2018
a409940
Showcase styling
helenb Sep 20, 2018
0c73af2
add sprite sheet with svg icons
Sep 20, 2018
efad971
remove commented out code
helenb Sep 20, 2018
24dfacb
Merge pull request #143 from torchbox/973-svg
helenb Sep 20, 2018
7350a4b
Merge remote-tracking branch 'origin/2018-hompage-be' into 953-showca…
helenb Sep 20, 2018
f4d06ed
Merge remote-tracking branch 'origin/2018-hompage-be' into 955-video-…
Sep 20, 2018
643a587
video block styles
Sep 20, 2018
53a3bb6
two column block fe
Sep 20, 2018
25efe05
Merge pull request #142 from torchbox/953-showcase-fe
helenb Sep 20, 2018
4b96468
add hover states
Sep 21, 2018
b874f60
change font style on mobile
Sep 21, 2018
57d06fd
address code review
Sep 21, 2018
ee21fc8
add showcase homepage block validation
Sep 21, 2018
f279901
Merge pull request #145 from torchbox/957-two-col-block
Sep 21, 2018
5a0d6e0
Merge remote-tracking branch 'origin/2018-hompage-be' into 955-video-…
Sep 21, 2018
79a8cc0
Merge pull request #144 from torchbox/955-video-block
Sep 21, 2018
515e570
hero frontend
Sep 21, 2018
0f8a266
News block styling for home page
helenb Sep 23, 2018
f9da553
Use new svg sprite for carousel buttons instead of the old png sprite.
helenb Sep 24, 2018
ac84f75
Merge remote-tracking branch 'origin/2018-hompage-be' into 953-showca…
helenb Sep 24, 2018
2eed5fe
Merge remote-tracking branch 'origin/2018-hompage-be' into 961-news-b…
helenb Sep 24, 2018
adda023
Add components folder and refactor heading styles
helenb Sep 24, 2018
e5bb524
Merge pull request #148 from torchbox/953-showcase-fe
helenb Sep 24, 2018
436f04b
Merge remote-tracking branch 'origin/2018-hompage-be' into 962-events
helenb Sep 24, 2018
671ab45
Swap vendor-prefixed grid properties with default ones
helenb Sep 24, 2018
27dde3a
Merge pull request #151 from torchbox/refactor-heading-styles
helenb Sep 24, 2018
bc012e0
Merge pull request #149 from torchbox/961-news-block-styling
helenb Sep 24, 2018
5397811
Merge remote-tracking branch 'origin/2018-hompage-be' into 962-events
helenb Sep 24, 2018
265ce63
Merge remote-tracking branch 'origin/2018-hompage-be' into 951-hero
Sep 24, 2018
d647d57
change events listing block query
Sep 24, 2018
6337453
fine tune mobile, hover states, fix code review issues
Sep 24, 2018
17a2b4d
more code review fixes
Sep 24, 2018
ed2177a
small change to video block to fit new mobile design
Sep 24, 2018
7222390
Merge pull request #147 from torchbox/951-hero
helenb Sep 25, 2018
751761d
Events block styling
helenb Sep 25, 2018
e932a1f
Merge remote-tracking branch 'origin/2018-hompage-be' into 962-events
helenb Sep 25, 2018
8989f0e
events block - arrow size and positioning, plus title and more link s…
helenb Sep 25, 2018
accb392
Homepage - move inline js into separate files
helenb Sep 25, 2018
54d4b71
Homepage - updates to heading styles
helenb Sep 25, 2018
5e0cfcc
testimonial block frontend
Sep 25, 2018
22082c8
Merge remote-tracking branch 'origin/2018-hompage-be' into 958-testim…
Sep 25, 2018
2b293eb
fix title margin
Sep 25, 2018
471ffd5
split out js
Sep 25, 2018
ca36080
add consistent spacing between blocks, on titles
Sep 25, 2018
48f2282
code review feedback
helenb Sep 26, 2018
b67ac92
Merge pull request #153 from torchbox/homepage-heading-variations
helenb Sep 26, 2018
4eebaf8
Merge remote-tracking branch 'origin/2018-hompage-be' into 962-events
Sep 26, 2018
2488829
Merge pull request #152 from torchbox/962-events
Sep 26, 2018
2849b5d
Merge remote-tracking branch 'origin/2018-hompage-be' into 958-testim…
Sep 26, 2018
19ca876
Merge pull request #154 from torchbox/958-testimonial
Sep 26, 2018
841bcea
managed to remove most of this merging conflicts, adding block spacin…
Sep 26, 2018
71ef9ad
Comment out code relating to the 'inside' button so Beth can see what…
helenb Sep 26, 2018
5be3be9
Merge pull request #155 from torchbox/974-spacing
helenb Sep 26, 2018
5976577
Reorder the css imports so block styling trumps component styling
helenb Sep 26, 2018
83a9b00
Show the more news link at mobile and tweak vertical postitioning
helenb Sep 26, 2018
2add440
Adjust styling of featured news item at mobile to match latest designs
helenb Sep 26, 2018
ff285ea
add priority menu
Sep 26, 2018
440ab80
Merge pull request #156 from torchbox/961-news-mobile-changes
Sep 26, 2018
90acc6d
sort out carousel spacing
Sep 26, 2018
d8ad239
tidy spacing, add hover/focus states
Sep 26, 2018
63a8be8
Merge pull request #157 from torchbox/980-spacing
helenb Sep 27, 2018
8727448
adjust events carousel centerPadding to line up with title, and repos…
helenb Sep 27, 2018
efa302f
Tweaks to carousel spacing and arrow positioning
helenb Sep 27, 2018
e4e1432
Show text at mobile for the showcase block
helenb Sep 27, 2018
4d8958d
Merge pull request #158 from torchbox/953-showcase-mobile-amends
helenb Sep 27, 2018
2844f89
Quick'n'dirty bold textifying of asterisks
helenb Sep 27, 2018
42aa471
Merge pull request #159 from torchbox/951-bold-text
helenb Sep 27, 2018
87483b7
Merge remote-tracking branch 'origin/2018-hompage-be' into for-refere…
helenb Sep 28, 2018
9917e21
start restyling header
Sep 28, 2018
e1ac2d8
Change behaviour of sidebar at mobile and remove js sticky header
helenb Sep 28, 2018
f368048
markup changes
Sep 28, 2018
89ce164
Merge pull request #160 from torchbox/2018-move-sidebar-mobile
helenb Sep 28, 2018
cb0f348
Merge my changes to remove the inside button to Beth's branch
helenb Sep 28, 2018
2e514cd
set up priority nav
Oct 1, 2018
eda57bc
Adapt the existing js to use the new markup and allow the js-showmenu…
helenb Oct 1, 2018
b623593
Merge remote-tracking branch 'origin/941-header-nav' into 941-js-changes
helenb Oct 1, 2018
c67bb7d
desktop nav
Oct 3, 2018
e7a50c3
tidy html
Oct 3, 2018
fe3838f
remove breadcrumb from js
Oct 3, 2018
49bd391
mobile nav styles
Oct 3, 2018
6eb3348
remove temp styles
Oct 3, 2018
dfcb742
WIP on nav menu
helenb Oct 4, 2018
7e288a2
WIP - fix mobile nav
helenb Oct 4, 2018
ca474be
add sprites to base
Oct 4, 2018
647b5d3
Various changes to make changing from desktop to mobile and vice vers…
helenb Oct 4, 2018
5fad7d5
Merge remote-tracking branch 'origin/941-header-nav' into 941-js-changes
helenb Oct 4, 2018
4bb3a05
search
Oct 4, 2018
48a39d3
Merge remote-tracking branch 'origin/941-js-changes' into 941-header-nav
Oct 4, 2018
71be07c
tidy up mobile nav
Oct 4, 2018
af6a225
Merge remote-tracking branch 'origin/941-header-nav' into 941-js-changes
helenb Oct 4, 2018
245dbf2
Get the priority nav working - split up code into separate functions …
helenb Oct 5, 2018
c232f51
Sort out when the mobile / desktop menus are initiated, and remove so…
helenb Oct 5, 2018
4c8efe1
Ensure the burger menu closes when a priority nav is opened
helenb Oct 5, 2018
4fc7755
Remove open class on priority menu trigger on mouse out
helenb Oct 5, 2018
486489b
less tweaks
Oct 5, 2018
ba25705
Merge remote-tracking branch 'origin/941-js-changes' into 941-header-nav
Oct 5, 2018
2ba74e6
move width to subnav
Oct 5, 2018
631fe2d
add expanded class to showmenu butotn on desktop
Oct 5, 2018
a8b24a0
sort out subnav heights
Oct 5, 2018
9e05467
fix mobile nav bugs
Oct 5, 2018
0dad63e
increase click area on back button
Oct 5, 2018
acf7202
sticky header js, add wagtail fields for cta button
Oct 5, 2018
2ea30a2
sticky header
Oct 5, 2018
b55f357
fix weird margin on header
Oct 5, 2018
c2335e3
add spacer for fixed header
Oct 5, 2018
15d11d0
remove unused include
helenb Oct 9, 2018
1e0f9f1
Merge pull request #164 from torchbox/941-header-nav-tidy
helenb Oct 10, 2018
d0fbcb1
replace logo with svg, reduce header height
Oct 17, 2018
a49ae94
fix logo position
Oct 17, 2018
2e1f223
[1001] add header strapline link
Nov 1, 2018
94cfb6a
Add a custom class to the programme finder ui autocomplete so that it…
helenb Dec 10, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 140 additions & 0 deletions django-verdant/rca/blocks.py
Original file line number Diff line number Diff line change
@@ -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()
22 changes: 21 additions & 1 deletion django-verdant/rca/context_processors.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand All @@ -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,
}
3 changes: 3 additions & 0 deletions django-verdant/rca/help_text.py
Original file line number Diff line number Diff line change
Expand Up @@ -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).',
}


Expand Down
69 changes: 69 additions & 0 deletions django-verdant/rca/migrations/0093_auto_20180808_1231.py
Original file line number Diff line number Diff line change
@@ -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'),
),
]
Original file line number Diff line number Diff line change
@@ -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),
),
]
31 changes: 31 additions & 0 deletions django-verdant/rca/migrations/0094_headersettings.py
Original file line number Diff line number Diff line change
@@ -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,
},
),
]
16 changes: 16 additions & 0 deletions django-verdant/rca/migrations/0095_merge.py
Original file line number Diff line number Diff line change
@@ -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 = [
]
35 changes: 35 additions & 0 deletions django-verdant/rca/migrations/0096_auto_20180917_1727.py
Original file line number Diff line number Diff line change
@@ -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,
),
]
24 changes: 24 additions & 0 deletions django-verdant/rca/migrations/0097_auto_20180919_1117.py
Original file line number Diff line number Diff line change
@@ -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())]))]),
),
]
Loading