diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 08a8e4630..b3b110266 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest services: postgres: - image: postgres:10 + image: postgres:13 ports: - 5432:5432 options: >- diff --git a/allies/migrations/0001_initial.py b/allies/migrations/0001_initial.py index bc0700787..36bfffca3 100644 --- a/allies/migrations/0001_initial.py +++ b/allies/migrations/0001_initial.py @@ -4,7 +4,7 @@ from django.db import migrations, models import django.db.models.deletion -import wagtail.core.fields +import wagtail.fields class Migration(migrations.Migration): @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('ally_category', models.CharField(choices=[('OH', 'Online Homework'), ('AC', 'Adaptive Courseware'), ('CT', 'Customized Tools')], max_length=2)), ('heading', models.CharField(max_length=255)), - ('description', wagtail.core.fields.RichTextField()), + ('description', wagtail.fields.RichTextField()), ('link_url', models.URLField(blank=True, help_text='Call to Action Link')), ('link_text', models.CharField(help_text='Call to Action Text', max_length=255)), ('logo', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), diff --git a/allies/migrations/0002_auto_20160222_1359.py b/allies/migrations/0002_auto_20160222_1359.py index dcbfb13c2..65583456f 100644 --- a/allies/migrations/0002_auto_20160222_1359.py +++ b/allies/migrations/0002_auto_20160222_1359.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import migrations -import wagtail.core.fields +import wagtail.fields class Migration(migrations.Migration): @@ -21,7 +21,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='ally', name='long_description', - field=wagtail.core.fields.RichTextField(default=''), + field=wagtail.fields.RichTextField(default=''), preserve_default=False, ), ] diff --git a/allies/models.py b/allies/models.py index 42624873e..d51265407 100644 --- a/allies/models.py +++ b/allies/models.py @@ -1,9 +1,9 @@ from django.db import models from modelcluster.fields import ParentalKey -from wagtail.admin.edit_handlers import (FieldPanel, InlinePanel, +from wagtail.admin.panels import (FieldPanel, InlinePanel, MultiFieldPanel) -from wagtail.core.fields import RichTextField -from wagtail.core.models import Page +from wagtail.fields import RichTextField +from wagtail.models import Page from wagtail.images.edit_handlers import ImageChooserPanel from openstax.functions import build_image_url diff --git a/books/models.py b/books/models.py index b77b39d58..8fcb9ddb7 100644 --- a/books/models.py +++ b/books/models.py @@ -11,7 +11,7 @@ from django.contrib.postgres.fields import ArrayField from modelcluster.fields import ParentalKey from modelcluster.models import ClusterableModel -from wagtail.admin.edit_handlers import (FieldPanel, +from wagtail.admin.panels import (FieldPanel, InlinePanel, PageChooserPanel, StreamFieldPanel) @@ -22,7 +22,7 @@ from wagtail.snippets.blocks import SnippetChooserBlock from wagtail.images.edit_handlers import ImageChooserPanel from wagtail.snippets.edit_handlers import SnippetChooserPanel -from wagtail.admin.edit_handlers import TabbedInterface, ObjectList +from wagtail.admin.panels import TabbedInterface, ObjectList from wagtail.api import APIField from wagtail.snippets.models import register_snippet from wagtail.models import Site @@ -503,7 +503,10 @@ class Book(Page): help_text='The book cover to be shown on the website.' ) def get_cover_url(self): - return build_document_url(self.cover.url) + if self.cover: + return build_document_url(self.cover.url) + else: + return '' cover_url = property(get_cover_url) title_image = models.ForeignKey( diff --git a/global_settings/__init__.py b/global_settings/__init__.py index 01ae52c87..8c26b66d6 100644 --- a/global_settings/__init__.py +++ b/global_settings/__init__.py @@ -1 +1 @@ -default_app_config = 'global_settings.apps.GlobalSettingsConfig' +#default_app_config = 'global_settings.apps.GlobalSettingsConfig' diff --git a/global_settings/apps.py b/global_settings/apps.py index ea7329b53..adc3f8fb6 100644 --- a/global_settings/apps.py +++ b/global_settings/apps.py @@ -1,8 +1,10 @@ from django.apps import AppConfig + class GlobalSettingsConfig(AppConfig): name = 'global_settings' verbose_name = 'global_settings' + default = True def ready(self): import global_settings.signals # noqa diff --git a/global_settings/migrations/0009_auto_20170912_1337.py b/global_settings/migrations/0009_auto_20170912_1337.py index d19484de5..c81ced1e3 100644 --- a/global_settings/migrations/0009_auto_20170912_1337.py +++ b/global_settings/migrations/0009_auto_20170912_1337.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import migrations -import wagtail.core.fields +import wagtail.fields class Migration(migrations.Migration): @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='footer', name='copyright', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), ] diff --git a/global_settings/models.py b/global_settings/models.py index e4a06f971..3c480bee7 100644 --- a/global_settings/models.py +++ b/global_settings/models.py @@ -1,9 +1,9 @@ from django.db import models -from wagtail.contrib.settings.models import BaseSetting, register_setting +from wagtail.contrib.settings.models import BaseSiteSetting, register_setting @register_setting(icon='doc-empty') -class StickyNote(BaseSetting): +class StickyNote(BaseSiteSetting): start = models.DateTimeField(null=True, help_text="Set the start date to override the content of the Give Sticky. Set the header and body below to change.") expires = models.DateTimeField(null=True, help_text="Set the date to expire overriding the content of the Give Sticky.") show_popup = models.BooleanField(default=False, help_text="Replaces the top banner with a popup, start and expire dates still control timing.") @@ -19,7 +19,7 @@ class Meta: @register_setting(icon='collapse-down') -class Footer(BaseSetting): +class Footer(BaseSiteSetting): supporters = models.TextField() copyright = models.TextField() ap_statement = models.TextField() @@ -31,7 +31,7 @@ class Meta: verbose_name = 'Footer' @register_setting(icon='cogs') -class CloudfrontDistribution(BaseSetting): +class CloudfrontDistribution(BaseSiteSetting): distribution_id = models.CharField(max_length=255, null=True, blank=True) class Meta: @@ -39,7 +39,7 @@ class Meta: @register_setting(icon='date') -class GiveToday(BaseSetting): +class GiveToday(BaseSiteSetting): give_link_text = models.CharField(max_length=255) give_link = models.URLField("Give link", blank=True, help_text="URL to Rice Give page or something similar") start = models.DateTimeField(null=True, diff --git a/global_settings/signals.py b/global_settings/signals.py index 3fed3c47e..191dbaadd 100644 --- a/global_settings/signals.py +++ b/global_settings/signals.py @@ -1,7 +1,7 @@ from django.db.models.signals import post_save from django.dispatch import receiver -from wagtail.core.signals import page_published +from wagtail.signals import page_published from .functions import invalidate_cloudfront_caches from .models import StickyNote, Footer, GiveToday diff --git a/global_settings/wagtail_hooks.py b/global_settings/wagtail_hooks.py index ad0423e55..cff2ebd74 100644 --- a/global_settings/wagtail_hooks.py +++ b/global_settings/wagtail_hooks.py @@ -1,6 +1,6 @@ import wagtail.admin.rich_text.editors.draftail.features as draftail_features from wagtail.admin.rich_text.converters.html_to_contentstate import InlineStyleElementHandler -from wagtail.core import hooks +from wagtail import hooks from django.urls import reverse from wagtail.admin.menu import MenuItem diff --git a/locked-requirements.txt b/locked-requirements.txt new file mode 100644 index 000000000..34148b120 --- /dev/null +++ b/locked-requirements.txt @@ -0,0 +1,242 @@ +appdirs==1.4.4 +chardet==4.0.0 +django-admin-rangefilter==0.8.4 +django-crontab==0.7.1 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 +django_debug_toolbar==3.8.1 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 + sqlparse==0.4.3 +django-extensions==3.2.1 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 +django-import-export==2.8.0 + diff-match-patch==20200713 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 + tablib==3.3.0 +django-libsass==0.9 + django-compressor==4.3.1 + django-appconf==1.0.5 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 + rcssmin==1.1.1 + rjsmin==1.2.1 + libsass==0.22.0 +django-rest-auth==0.9.5 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 + djangorestframework==3.14.0 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 + pytz==2022.7.1 + six==1.16.0 +django-reversion==5.0.0 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 +django-ses==3.0.1 + boto3==1.26.56 + botocore==1.29.56 + jmespath==1.0.1 + python-dateutil==2.8.2 + six==1.16.0 + urllib3==1.26.14 + jmespath==1.0.1 + s3transfer==0.6.0 + botocore==1.29.56 + jmespath==1.0.1 + python-dateutil==2.8.2 + six==1.16.0 + urllib3==1.26.14 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 + pytz==2022.7.1 +django-storages==1.12.3 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 +future==0.18.2 +html2text==2020.1.16 +jsonfield==3.1.0 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 +mapbox==0.18.1 + boto3==1.26.56 + botocore==1.29.56 + jmespath==1.0.1 + python-dateutil==2.8.2 + six==1.16.0 + urllib3==1.26.14 + jmespath==1.0.1 + s3transfer==0.6.0 + botocore==1.29.56 + jmespath==1.0.1 + python-dateutil==2.8.2 + six==1.16.0 + urllib3==1.26.14 + CacheControl==0.12.11 + msgpack==1.0.4 + requests==2.28.2 + certifi==2022.12.7 + charset-normalizer==3.0.1 + idna==3.4 + urllib3==1.26.14 + iso3166==2.1.1 + polyline==2.0.0 + python-dateutil==2.8.2 + six==1.16.0 + requests==2.28.2 + certifi==2022.12.7 + charset-normalizer==3.0.1 + idna==3.4 + urllib3==1.26.14 + uritemplate==4.1.1 +MarkupPy==1.14 +odfpy==1.4.1 + defusedxml==0.7.1 +openpyxl==3.0.10 + et-xmlfile==1.1.0 +pip==22.3.1 +pipdeptree==2.7.0 +psycopg2==2.9.5 +pycryptodome==3.14.1 +PyJWE==1.0.0 + cryptography==39.0.0 + cffi==1.15.1 + pycparser==2.21 +sentry-sdk==1.15.0 + certifi==2022.12.7 + urllib3==1.26.14 +setuptools==65.5.1 +simple-salesforce==1.11.6 + Authlib==1.2.0 + cryptography==39.0.0 + cffi==1.15.1 + pycparser==2.21 + requests==2.28.2 + certifi==2022.12.7 + charset-normalizer==3.0.1 + idna==3.4 + urllib3==1.26.14 + zeep==4.2.1 + attrs==22.2.0 + isodate==0.6.1 + six==1.16.0 + lxml==4.9.2 + platformdirs==2.6.2 + pytz==2022.7.1 + requests==2.28.2 + certifi==2022.12.7 + charset-normalizer==3.0.1 + idna==3.4 + urllib3==1.26.14 + requests-file==1.5.1 + requests==2.28.2 + certifi==2022.12.7 + charset-normalizer==3.0.1 + idna==3.4 + urllib3==1.26.14 + six==1.16.0 + requests-toolbelt==0.10.1 + requests==2.28.2 + certifi==2022.12.7 + charset-normalizer==3.0.1 + idna==3.4 + urllib3==1.26.14 +social-auth-app-django==5.0.0 + social-auth-core==4.3.0 + cryptography==39.0.0 + cffi==1.15.1 + pycparser==2.21 + defusedxml==0.7.1 + oauthlib==3.2.2 + PyJWT==2.6.0 + python3-openid==3.2.0 + defusedxml==0.7.1 + requests==2.28.2 + certifi==2022.12.7 + charset-normalizer==3.0.1 + idna==3.4 + urllib3==1.26.14 + requests-oauthlib==1.3.1 + oauthlib==3.2.2 + requests==2.28.2 + certifi==2022.12.7 + charset-normalizer==3.0.1 + idna==3.4 + urllib3==1.26.14 +ua-parser==0.16.1 +unicodecsv==0.14.1 +Unidecode==1.3.4 +vcrpy==4.1.1 + PyYAML==6.0 + six==1.16.0 + wrapt==1.14.1 + yarl==1.8.2 + idna==3.4 + multidict==6.0.4 +wagtail==4.0.4 + anyascii==0.3.1 + beautifulsoup4==4.9.3 + soupsieve==2.3.2.post1 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 + django-filter==21.1 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 + django-modelcluster==6.0 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 + pytz==2022.7.1 + django-permissionedforms==0.1 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 + django-taggit==3.1.0 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 + django-treebeard==4.6.0 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 + djangorestframework==3.14.0 + Django==4.1.7 + asgiref==3.6.0 + sqlparse==0.4.3 + pytz==2022.7.1 + draftjs-exporter==2.1.7 + html5lib==1.1 + six==1.16.0 + webencodings==0.5.1 + l18n==2021.3 + pytz==2022.7.1 + six==1.16.0 + Pillow==9.4.0 + requests==2.28.2 + certifi==2022.12.7 + charset-normalizer==3.0.1 + idna==3.4 + urllib3==1.26.14 + tablib==3.3.0 + telepath==0.3 + Willow==1.4.1 + XlsxWriter==3.0.7 +Wand==0.6.7 +whitenoise==6.1.0 +xlrd==2.0.1 +xlwt==1.3.0 diff --git a/news/migrations/0037_newsarticle_collections.py b/news/migrations/0037_newsarticle_collections.py index 6ecf76fc8..afe3973dd 100644 --- a/news/migrations/0037_newsarticle_collections.py +++ b/news/migrations/0037_newsarticle_collections.py @@ -1,8 +1,8 @@ # Generated by Django 3.2.9 on 2022-04-20 18:22 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.snippets.blocks @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='newsarticle', name='collections', - field=wagtail.core.fields.StreamField([('collection', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('collection', wagtail.snippets.blocks.SnippetChooserBlock(label='Blog Collection', required=True, target_model='BlogCollection')), ('featured', wagtail.core.blocks.BooleanBlock(label='Featured')), ('popular', wagtail.core.blocks.BooleanBlock(label='Popular'))])))], null=True), + field=wagtail.fields.StreamField([('collection', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('collection', wagtail.snippets.blocks.SnippetChooserBlock(label='Blog Collection', required=True, target_model='BlogCollection')), ('featured', wagtail.blocks.BooleanBlock(label='Featured')), ('popular', wagtail.blocks.BooleanBlock(label='Popular'))])))], null=True), ), ] diff --git a/news/migrations/0038_auto_20220420_1547.py b/news/migrations/0038_auto_20220420_1547.py index 005a82546..ffb7f3dc3 100644 --- a/news/migrations/0038_auto_20220420_1547.py +++ b/news/migrations/0038_auto_20220420_1547.py @@ -2,8 +2,8 @@ from django.db import migrations import news.models -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -16,11 +16,11 @@ class Migration(migrations.Migration): migrations.AddField( model_name='newsarticle', name='article_subjects', - field=wagtail.core.fields.StreamField([('subject', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('subject', news.models.BlogCollectionChooserBlock(label='Blog Subject', required=True, target_model='snippets.Subject'))])))], null=True), + field=wagtail.fields.StreamField([('subject', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('subject', news.models.BlogCollectionChooserBlock(label='Blog Subject', required=True, target_model='snippets.Subject'))])))], null=True), ), migrations.AlterField( model_name='newsarticle', name='collections', - field=wagtail.core.fields.StreamField([('collection', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('collection', news.models.BlogCollectionChooserBlock(label='Blog Collection', required=True, target_model='snippets.BlogCollection')), ('featured', wagtail.core.blocks.BooleanBlock(label='Featured', required=False)), ('popular', wagtail.core.blocks.BooleanBlock(label='Popular', required=False))])))], null=True), + field=wagtail.fields.StreamField([('collection', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('collection', news.models.BlogCollectionChooserBlock(label='Blog Collection', required=True, target_model='snippets.BlogCollection')), ('featured', wagtail.blocks.BooleanBlock(label='Featured', required=False)), ('popular', wagtail.blocks.BooleanBlock(label='Popular', required=False))])))], null=True), ), ] diff --git a/news/migrations/0039_auto_20220427_1107.py b/news/migrations/0039_auto_20220427_1107.py index 239a770f1..d9eef867c 100644 --- a/news/migrations/0039_auto_20220427_1107.py +++ b/news/migrations/0039_auto_20220427_1107.py @@ -2,8 +2,8 @@ from django.db import migrations import news.models -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -20,7 +20,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='newsarticle', name='content_types', - field=wagtail.core.fields.StreamField([('content_type', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('conte_type', news.models.ContentTypeChooserBlock(label='Blog Content Type', required=True, target_model='snippets.BlogContentType'))])))], null=True), + field=wagtail.fields.StreamField([('content_type', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('conte_type', news.models.ContentTypeChooserBlock(label='Blog Content Type', required=True, target_model='snippets.BlogContentType'))])))], null=True), ), migrations.DeleteModel( name='BlogType', diff --git a/news/migrations/0040_alter_newsarticle_content_types.py b/news/migrations/0040_alter_newsarticle_content_types.py index 210cac4f4..bed965adc 100644 --- a/news/migrations/0040_alter_newsarticle_content_types.py +++ b/news/migrations/0040_alter_newsarticle_content_types.py @@ -2,8 +2,8 @@ from django.db import migrations import news.models -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='newsarticle', name='content_types', - field=wagtail.core.fields.StreamField([('content_type', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('content_type', news.models.ContentTypeChooserBlock(label='Blog Content Type', required=True, target_model='snippets.BlogContentType'))])))], null=True), + field=wagtail.fields.StreamField([('content_type', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('content_type', news.models.ContentTypeChooserBlock(label='Blog Content Type', required=True, target_model='snippets.BlogContentType'))])))], null=True), ), ] diff --git a/news/migrations/0041_auto_20220517_1353.py b/news/migrations/0041_auto_20220517_1353.py index 03bdd4a8b..29612345a 100644 --- a/news/migrations/0041_auto_20220517_1353.py +++ b/news/migrations/0041_auto_20220517_1353.py @@ -1,8 +1,8 @@ # Generated by Django 3.2.5 on 2022-05-17 18:53 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -23,6 +23,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='newsindex', name='interest_block', - field=wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('button_text', wagtail.core.blocks.CharBlock()), ('button_href', wagtail.core.blocks.URLBlock())], null=True), + field=wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('button_text', wagtail.blocks.CharBlock()), ('button_href', wagtail.blocks.URLBlock())], null=True), ), ] diff --git a/news/migrations/0042_auto_20220520_0855.py b/news/migrations/0042_auto_20220520_0855.py index 6fbaa1f47..6e2f209e7 100644 --- a/news/migrations/0042_auto_20220520_0855.py +++ b/news/migrations/0042_auto_20220520_0855.py @@ -2,8 +2,8 @@ from django.db import migrations, models import news.models -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.documents.blocks import wagtail.embeds.blocks @@ -18,7 +18,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='newsarticle', name='featured_video', - field=wagtail.core.fields.StreamField([('video', wagtail.core.blocks.RawHTMLBlock())], null=True), + field=wagtail.fields.StreamField([('video', wagtail.blocks.RawHTMLBlock())], null=True), ), migrations.AddField( model_name='newsarticle', @@ -28,11 +28,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='newsarticle', name='body', - field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.core.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.core.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.core.blocks.StructBlock([('quote', wagtail.core.blocks.TextBlock('quote title')), ('attribution', wagtail.core.blocks.CharBlock())])), ('aligned_html', wagtail.core.blocks.RawHTMLBlock(icon='code', label='Raw HTML')), ('document', wagtail.documents.blocks.DocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL')), ('blog_cta', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('button_text', wagtail.core.blocks.CharBlock()), ('button_href', wagtail.core.blocks.URLBlock()), ('alignment', news.models.CTAAlignmentChoiceBlock())], icon='form', label='Call to Action block'))]), + field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.blocks.StructBlock([('quote', wagtail.blocks.TextBlock('quote title')), ('attribution', wagtail.blocks.CharBlock())])), ('aligned_html', wagtail.blocks.RawHTMLBlock(icon='code', label='Raw HTML')), ('document', wagtail.documents.blocks.DocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL')), ('blog_cta', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('button_text', wagtail.blocks.CharBlock()), ('button_href', wagtail.blocks.URLBlock()), ('alignment', news.models.CTAAlignmentChoiceBlock())], icon='form', label='Call to Action block'))]), ), migrations.AlterField( model_name='pressrelease', name='body', - field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.core.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.core.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.core.blocks.StructBlock([('quote', wagtail.core.blocks.TextBlock('quote title')), ('attribution', wagtail.core.blocks.CharBlock())])), ('aligned_html', wagtail.core.blocks.RawHTMLBlock(icon='code', label='Raw HTML')), ('document', wagtail.documents.blocks.DocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL')), ('blog_cta', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('button_text', wagtail.core.blocks.CharBlock()), ('button_href', wagtail.core.blocks.URLBlock()), ('alignment', news.models.CTAAlignmentChoiceBlock())], icon='form', label='Call to Action block'))]), + field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.blocks.StructBlock([('quote', wagtail.blocks.TextBlock('quote title')), ('attribution', wagtail.blocks.CharBlock())])), ('aligned_html', wagtail.blocks.RawHTMLBlock(icon='code', label='Raw HTML')), ('document', wagtail.documents.blocks.DocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL')), ('blog_cta', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('button_text', wagtail.blocks.CharBlock()), ('button_href', wagtail.blocks.URLBlock()), ('alignment', news.models.CTAAlignmentChoiceBlock())], icon='form', label='Call to Action block'))]), ), ] diff --git a/news/migrations/0043_alter_newsarticle_featured_video.py b/news/migrations/0043_alter_newsarticle_featured_video.py index 2ec1aa658..e025fe941 100644 --- a/news/migrations/0043_alter_newsarticle_featured_video.py +++ b/news/migrations/0043_alter_newsarticle_featured_video.py @@ -1,8 +1,8 @@ # Generated by Django 3.2.5 on 2022-05-20 16:07 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='newsarticle', name='featured_video', - field=wagtail.core.fields.StreamField([('video', wagtail.core.blocks.RawHTMLBlock())], blank=True, null=True), + field=wagtail.fields.StreamField([('video', wagtail.blocks.RawHTMLBlock())], blank=True, null=True), ), ] diff --git a/news/migrations/0044_auto_20220520_1158.py b/news/migrations/0044_auto_20220520_1158.py index e40b64240..aa9639819 100644 --- a/news/migrations/0044_auto_20220520_1158.py +++ b/news/migrations/0044_auto_20220520_1158.py @@ -2,8 +2,8 @@ from django.db import migrations import news.models -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.embeds.blocks @@ -17,11 +17,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='newsarticle', name='body', - field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.core.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.core.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.core.blocks.StructBlock([('quote', wagtail.core.blocks.TextBlock('quote title')), ('attribution', wagtail.core.blocks.CharBlock())])), ('aligned_html', wagtail.core.blocks.RawHTMLBlock(icon='code', label='Raw HTML')), ('document', news.models.BlogDocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL')), ('blog_cta', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('button_text', wagtail.core.blocks.CharBlock()), ('button_href', wagtail.core.blocks.URLBlock()), ('alignment', news.models.CTAAlignmentChoiceBlock())], icon='form', label='Call to Action block'))]), + field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.blocks.StructBlock([('quote', wagtail.blocks.TextBlock('quote title')), ('attribution', wagtail.blocks.CharBlock())])), ('aligned_html', wagtail.blocks.RawHTMLBlock(icon='code', label='Raw HTML')), ('document', news.models.BlogDocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL')), ('blog_cta', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('button_text', wagtail.blocks.CharBlock()), ('button_href', wagtail.blocks.URLBlock()), ('alignment', news.models.CTAAlignmentChoiceBlock())], icon='form', label='Call to Action block'))]), ), migrations.AlterField( model_name='pressrelease', name='body', - field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.core.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.core.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.core.blocks.StructBlock([('quote', wagtail.core.blocks.TextBlock('quote title')), ('attribution', wagtail.core.blocks.CharBlock())])), ('aligned_html', wagtail.core.blocks.RawHTMLBlock(icon='code', label='Raw HTML')), ('document', news.models.BlogDocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL')), ('blog_cta', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('button_text', wagtail.core.blocks.CharBlock()), ('button_href', wagtail.core.blocks.URLBlock()), ('alignment', news.models.CTAAlignmentChoiceBlock())], icon='form', label='Call to Action block'))]), + field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.blocks.StructBlock([('quote', wagtail.blocks.TextBlock('quote title')), ('attribution', wagtail.blocks.CharBlock())])), ('aligned_html', wagtail.blocks.RawHTMLBlock(icon='code', label='Raw HTML')), ('document', news.models.BlogDocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL')), ('blog_cta', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('button_text', wagtail.blocks.CharBlock()), ('button_href', wagtail.blocks.URLBlock()), ('alignment', news.models.CTAAlignmentChoiceBlock())], icon='form', label='Call to Action block'))]), ), ] diff --git a/news/migrations/0046_auto_20220616_1349.py b/news/migrations/0046_auto_20220616_1349.py index 07cfa6ef7..169342f97 100644 --- a/news/migrations/0046_auto_20220616_1349.py +++ b/news/migrations/0046_auto_20220616_1349.py @@ -2,8 +2,8 @@ from django.db import migrations import news.models -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -16,16 +16,16 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='newsarticle', name='article_subjects', - field=wagtail.core.fields.StreamField([('subject', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('subject', news.models.BlogCollectionChooserBlock(label='Blog Subject', required=True, target_model='snippets.Subject')), ('featured', wagtail.core.blocks.BooleanBlock(label='Featured', required=False))])))], blank=True, null=True), + field=wagtail.fields.StreamField([('subject', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('subject', news.models.BlogCollectionChooserBlock(label='Blog Subject', required=True, target_model='snippets.Subject')), ('featured', wagtail.blocks.BooleanBlock(label='Featured', required=False))])))], blank=True, null=True), ), migrations.AlterField( model_name='newsarticle', name='collections', - field=wagtail.core.fields.StreamField([('collection', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('collection', news.models.BlogCollectionChooserBlock(label='Blog Collection', required=True, target_model='snippets.BlogCollection')), ('featured', wagtail.core.blocks.BooleanBlock(label='Featured', required=False)), ('popular', wagtail.core.blocks.BooleanBlock(label='Popular', required=False))])))], blank=True, null=True), + field=wagtail.fields.StreamField([('collection', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('collection', news.models.BlogCollectionChooserBlock(label='Blog Collection', required=True, target_model='snippets.BlogCollection')), ('featured', wagtail.blocks.BooleanBlock(label='Featured', required=False)), ('popular', wagtail.blocks.BooleanBlock(label='Popular', required=False))])))], blank=True, null=True), ), migrations.AlterField( model_name='newsarticle', name='content_types', - field=wagtail.core.fields.StreamField([('content_type', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('content_type', news.models.ContentTypeChooserBlock(label='Blog Content Type', required=True, target_model='snippets.BlogContentType'))])))], blank=True, null=True), + field=wagtail.fields.StreamField([('content_type', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('content_type', news.models.ContentTypeChooserBlock(label='Blog Content Type', required=True, target_model='snippets.BlogContentType'))])))], blank=True, null=True), ), ] diff --git a/news/models.py b/news/models.py index 28ea225c4..3a875822f 100644 --- a/news/models.py +++ b/news/models.py @@ -7,7 +7,7 @@ from wagtail.models import Page, Orderable from wagtail.fields import RichTextField, StreamField -from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel, InlinePanel +from wagtail.admin.panels import FieldPanel, StreamFieldPanel, InlinePanel from wagtail.images.edit_handlers import ImageChooserPanel from wagtail.documents.edit_handlers import DocumentChooserPanel from wagtail.embeds.blocks import EmbedBlock diff --git a/openstax/urls.py b/openstax/urls.py index ea54c7886..d1a15114d 100644 --- a/openstax/urls.py +++ b/openstax/urls.py @@ -4,7 +4,7 @@ from django.contrib import admin from django.views.generic.base import RedirectView from wagtail.admin import urls as wagtailadmin_urls -from wagtail.core import urls as wagtail_urls +from wagtail import urls as wagtail_urls from wagtail.documents import urls as wagtaildocs_urls from wagtail.images.views.serve import ServeView from accounts import urls as accounts_urls @@ -17,6 +17,7 @@ from api import urls as api_urls from global_settings.views import throw_error, clear_entire_cache from wagtail.contrib.sitemaps.views import sitemap +#from wagtailimportexport import urls as wagtailimportexport_urls admin.site.site_header = 'OpenStax' @@ -54,6 +55,7 @@ # route everything to /api/spike also... path('apps/cms/api/spike/', include(wagtail_urls)), path('sitemap.xml', sitemap), + #path(r'', include(wagtailimportexport_urls)), # For anything not caught by a more specific rule above, hand over to Wagtail's serving mechanism path('', include(wagtail_urls)), diff --git a/pages/custom_fields.py b/pages/custom_fields.py index 55a844faf..868d65f49 100644 --- a/pages/custom_fields.py +++ b/pages/custom_fields.py @@ -2,7 +2,7 @@ from wagtail import blocks from wagtail.fields import RichTextField, StreamField -from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel +from wagtail.admin.panels import FieldPanel, StreamFieldPanel from wagtail.images.edit_handlers import ImageChooserPanel from .custom_blocks import APIImageChooserBlock diff --git a/pages/migrations/0001_initial_squashed_0232_auto_20200623_0848.py b/pages/migrations/0001_initial_squashed_0232_auto_20200623_0848.py index 09d7f463c..212d2b811 100644 --- a/pages/migrations/0001_initial_squashed_0232_auto_20200623_0848.py +++ b/pages/migrations/0001_initial_squashed_0232_auto_20200623_0848.py @@ -5,8 +5,8 @@ import django.db.models.deletion import modelcluster.fields import pages.models -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.documents.blocks import wagtail.images.blocks @@ -48,7 +48,7 @@ class Migration(migrations.Migration): name='AboutUs', fields=[ ('intro_heading', models.CharField(default='', max_length=255)), - ('intro_paragraph', wagtail.core.fields.RichTextField()), + ('intro_paragraph', wagtail.fields.RichTextField()), ('our_team_heading', models.CharField(default='', max_length=255)), ('tagline', models.CharField(default='', max_length=255)), ], @@ -63,7 +63,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('link_external', models.URLField(blank=True, verbose_name='External link')), ('heading', models.CharField(max_length=255)), - ('description', wagtail.core.fields.RichTextField()), + ('description', wagtail.fields.RichTextField()), ('link_url', models.URLField(blank=True, help_text='Call to Action Link')), ('link_text', models.CharField(help_text='Call to Action Text', max_length=255)), ], @@ -87,7 +87,7 @@ class Migration(migrations.Migration): name='GeneralPage', 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')), - ('body', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock(classname='full title')), ('tagline', wagtail.core.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.core.blocks.RichTextBlock()), ('image', pages.models.APIImageChooserBlock()), ('html', wagtail.core.blocks.RawHTMLBlock())])), + ('body', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock(classname='full title')), ('tagline', wagtail.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.blocks.RichTextBlock()), ('image', pages.models.APIImageChooserBlock()), ('html', wagtail.blocks.RawHTMLBlock())])), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -114,9 +114,9 @@ class Migration(migrations.Migration): ('get_started_step_2_heading', models.CharField(default='', max_length=255)), ('get_started_step_3_cta', models.CharField(default='', max_length=255)), ('get_started_step_3_heading', models.CharField(default='', max_length=255)), - ('row_1', wagtail.core.fields.StreamField([('column', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.RichTextBlock(required=False)), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False))]))])), - ('row_2', wagtail.core.fields.StreamField([('column', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.RichTextBlock(required=False)), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False))]))])), - ('row_3', wagtail.core.fields.StreamField([('column', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.RichTextBlock(required=False)), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False))]))])), + ('row_1', wagtail.fields.StreamField([('column', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.RichTextBlock(required=False)), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False))]))])), + ('row_2', wagtail.fields.StreamField([('column', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.RichTextBlock(required=False)), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False))]))])), + ('row_3', wagtail.fields.StreamField([('column', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.RichTextBlock(required=False)), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False))]))])), ('get_started_step_2_logged_out_cta', models.CharField(default='', max_length=255)), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], @@ -129,13 +129,13 @@ class Migration(migrations.Migration): name='HomePage', 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')), - ('row_1', wagtail.core.fields.StreamField([('column', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.RichTextBlock(required=False)), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False))]))])), - ('row_2', wagtail.core.fields.StreamField([('column', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.RichTextBlock(required=False)), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False))]))])), - ('row_3', wagtail.core.fields.StreamField([('column', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.RichTextBlock(required=False)), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False))]))])), - ('row_4', wagtail.core.fields.StreamField([('column', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.RichTextBlock(required=False)), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False))]))])), - ('row_5', wagtail.core.fields.StreamField([('column', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.RichTextBlock(required=False)), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False))]))])), - ('banner_images', wagtail.core.fields.StreamField([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))]))], null=True)), - ('mobile_banner_images', wagtail.core.fields.StreamField([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))]))], blank=True, null=True)), + ('row_1', wagtail.fields.StreamField([('column', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.RichTextBlock(required=False)), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False))]))])), + ('row_2', wagtail.fields.StreamField([('column', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.RichTextBlock(required=False)), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False))]))])), + ('row_3', wagtail.fields.StreamField([('column', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.RichTextBlock(required=False)), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False))]))])), + ('row_4', wagtail.fields.StreamField([('column', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.RichTextBlock(required=False)), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False))]))])), + ('row_5', wagtail.fields.StreamField([('column', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.RichTextBlock(required=False)), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False))]))])), + ('banner_images', wagtail.fields.StreamField([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))]))], null=True)), + ('mobile_banner_images', wagtail.fields.StreamField([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))]))], blank=True, null=True)), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -159,7 +159,7 @@ class Migration(migrations.Migration): name='Quote', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('quote_text', wagtail.core.fields.RichTextField()), + ('quote_text', wagtail.fields.RichTextField()), ('quote_image_alignment', models.CharField(blank=True, choices=[('L', 'left'), ('R', 'right'), ('F', 'full')], max_length=1, null=True)), ('quote_link', models.URLField(blank=True, null=True)), ('quote_link_text', models.CharField(blank=True, max_length=255, null=True)), @@ -214,10 +214,10 @@ class Migration(migrations.Migration): name='ContactUs', 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')), - ('mailing_address', wagtail.core.fields.RichTextField(default='')), + ('mailing_address', wagtail.fields.RichTextField(default='')), ('mailing_header', models.CharField(default='', max_length=255)), ('tagline', models.CharField(default='', max_length=255)), - ('customer_service', wagtail.core.fields.RichTextField(default='')), + ('customer_service', wagtail.fields.RichTextField(default='')), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -279,7 +279,7 @@ class Migration(migrations.Migration): ('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')), ('intro_heading', models.CharField(max_length=255)), ('intro_description', models.TextField()), - ('row_1', wagtail.core.fields.StreamField([('column', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.RichTextBlock(required=False)), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False))]))])), + ('row_1', wagtail.fields.StreamField([('column', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.RichTextBlock(required=False)), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False))]))])), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -305,7 +305,7 @@ class Migration(migrations.Migration): 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')), ('intro_heading', models.CharField(max_length=255)), - ('terms_of_service_content', wagtail.core.fields.RichTextField()), + ('terms_of_service_content', wagtail.fields.RichTextField()), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -321,13 +321,13 @@ class Migration(migrations.Migration): ('intro_description', models.TextField()), ('other_payment_methods_heading', models.CharField(max_length=255)), ('payment_method_1_heading', models.CharField(max_length=255)), - ('payment_method_1_content', wagtail.core.fields.RichTextField()), + ('payment_method_1_content', wagtail.fields.RichTextField()), ('payment_method_2_heading', models.CharField(max_length=255)), - ('payment_method_2_content', wagtail.core.fields.RichTextField()), + ('payment_method_2_content', wagtail.fields.RichTextField()), ('payment_method_3_heading', models.CharField(max_length=255)), - ('payment_method_3_content', wagtail.core.fields.RichTextField()), + ('payment_method_3_content', wagtail.fields.RichTextField()), ('payment_method_4_heading', models.CharField(blank=True, max_length=255, null=True)), - ('payment_method_4_content', wagtail.core.fields.RichTextField(blank=True, null=True)), + ('payment_method_4_content', wagtail.fields.RichTextField(blank=True, null=True)), ('give_cta', models.CharField(max_length=255)), ('give_cta_link', models.URLField()), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), @@ -342,8 +342,8 @@ class Migration(migrations.Migration): 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')), ('intro_heading', models.CharField(max_length=255)), - ('intro_description', wagtail.core.fields.RichTextField()), - ('questions', wagtail.core.fields.StreamField([('question', wagtail.core.blocks.StructBlock([('question', wagtail.core.blocks.RichTextBlock(required=True)), ('slug', wagtail.core.blocks.CharBlock(required=True)), ('answer', wagtail.core.blocks.RichTextBlock(required=True)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False))]))])), + ('intro_description', wagtail.fields.RichTextField()), + ('questions', wagtail.fields.StreamField([('question', wagtail.blocks.StructBlock([('question', wagtail.blocks.RichTextBlock(required=True)), ('slug', wagtail.blocks.CharBlock(required=True)), ('answer', wagtail.blocks.RichTextBlock(required=True)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False))]))])), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -368,7 +368,7 @@ class Migration(migrations.Migration): 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')), ('intro_heading', models.CharField(max_length=255)), - ('accessibility_content', wagtail.core.fields.RichTextField()), + ('accessibility_content', wagtail.fields.RichTextField()), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -381,7 +381,7 @@ class Migration(migrations.Migration): 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')), ('intro_heading', models.CharField(max_length=255)), - ('licensing_content', wagtail.core.fields.RichTextField()), + ('licensing_content', wagtail.fields.RichTextField()), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -394,7 +394,7 @@ class Migration(migrations.Migration): 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')), ('intro_heading', models.CharField(max_length=255)), - ('intro_description', wagtail.core.fields.RichTextField()), + ('intro_description', wagtail.fields.RichTextField()), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -407,7 +407,7 @@ class Migration(migrations.Migration): 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')), ('intro_heading', models.CharField(max_length=255)), - ('intro_description', wagtail.core.fields.RichTextField()), + ('intro_description', wagtail.fields.RichTextField()), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -420,7 +420,7 @@ class Migration(migrations.Migration): 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')), ('intro_heading', models.CharField(max_length=255)), - ('intro_description', wagtail.core.fields.RichTextField()), + ('intro_description', wagtail.fields.RichTextField()), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -434,8 +434,8 @@ class Migration(migrations.Migration): ('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')), ('intro_heading', models.CharField(max_length=255)), ('intro_description', models.TextField()), - ('row_1', wagtail.core.fields.StreamField([('column', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.RichTextBlock(required=False)), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False))]))])), - ('row_2', wagtail.core.fields.StreamField([('column', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.RichTextBlock(required=False)), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False))]))])), + ('row_1', wagtail.fields.StreamField([('column', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.RichTextBlock(required=False)), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False))]))])), + ('row_2', wagtail.fields.StreamField([('column', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.RichTextBlock(required=False)), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False))]))])), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -448,8 +448,8 @@ class Migration(migrations.Migration): 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')), ('intro_heading', models.CharField(max_length=255)), - ('intro_description', wagtail.core.fields.RichTextField()), - ('row_1', wagtail.core.fields.StreamField([('column', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.RichTextBlock(required=False)), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False))]))])), + ('intro_description', wagtail.fields.RichTextField()), + ('row_1', wagtail.fields.StreamField([('column', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.RichTextBlock(required=False)), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], help_text='Callout boxes 940x400, Home page boxes 1464x640', required=False)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False)), ('cta', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False))]))])), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -463,19 +463,19 @@ class Migration(migrations.Migration): ('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')), ('section_1_heading', models.CharField(max_length=255)), ('section_1_subheading', models.CharField(max_length=255)), - ('section_1_paragraph', wagtail.core.fields.RichTextField()), + ('section_1_paragraph', wagtail.fields.RichTextField()), ('section_1_cta_link', models.URLField()), ('section_1_cta_text', models.CharField(max_length=255)), ('section_2_heading', models.CharField(max_length=255)), ('section_2_subheading', models.CharField(max_length=255)), - ('section_2_paragraph', wagtail.core.fields.RichTextField()), + ('section_2_paragraph', wagtail.fields.RichTextField()), ('section_3_heading', models.CharField(max_length=255)), - ('section_3_paragraph', wagtail.core.fields.RichTextField()), + ('section_3_paragraph', wagtail.fields.RichTextField()), ('section_4_heading', models.CharField(max_length=255)), ('section_4_book_heading', models.CharField(max_length=255)), ('section_5_heading', models.CharField(max_length=255)), - ('section_5_paragraph', wagtail.core.fields.RichTextField()), - ('faqs', wagtail.core.fields.StreamField([('faq', wagtail.core.blocks.StructBlock([('question', wagtail.core.blocks.RichTextBlock(required=True)), ('slug', wagtail.core.blocks.CharBlock(required=True)), ('answer', wagtail.core.blocks.RichTextBlock(required=True)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False))]))])), + ('section_5_paragraph', wagtail.fields.RichTextField()), + ('faqs', wagtail.fields.StreamField([('faq', wagtail.blocks.StructBlock([('question', wagtail.blocks.RichTextBlock(required=True)), ('slug', wagtail.blocks.CharBlock(required=True)), ('answer', wagtail.blocks.RichTextBlock(required=True)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False))]))])), ('section_7_heading', models.CharField(max_length=255)), ('section_7_subheading', models.CharField(max_length=255)), ('section_7_cta_text_1', models.CharField(max_length=255)), @@ -495,7 +495,7 @@ class Migration(migrations.Migration): ('icon_3_subheading', models.CharField(default='Two-step questions', max_length=255)), ('icon_4_paragraph', models.CharField(default='$10 per course saves students money', max_length=255)), ('icon_4_subheading', models.CharField(default='Low cost', max_length=255)), - ('section_4_paragraph', wagtail.core.fields.RichTextField(default='Thousands of students have piloted OpenStax Tutor Beta. Here are the features we’ve prioritized, and more are on the way. Have suggestions for future development? Send us an email at info@openstaxtutor.org.')), + ('section_4_paragraph', wagtail.fields.RichTextField(default='Thousands of students have piloted OpenStax Tutor Beta. Here are the features we’ve prioritized, and more are on the way. Have suggestions for future development? Send us an email at info@openstaxtutor.org.')), ('section_4_resource_fine_print', models.CharField(default='*Available for OpenStax Tutor Beta for College Physics', max_length=255)), ('floating_footer_button_1_caption', models.CharField(default='Preview and create a course.', max_length=255)), ('floating_footer_button_1_cta', models.CharField(default='Get Started', max_length=255)), @@ -504,16 +504,16 @@ class Migration(migrations.Migration): ('floating_footer_button_2_cta', models.CharField(default='Join A Webinar', max_length=255)), ('floating_footer_button_2_link', models.URLField(default='https://openstax.org/blog/upcoming-openstax-webinars')), ('section_6_heading', models.CharField(default='Frequently asked questions', max_length=255)), - ('section_6_knowledge_base_copy', wagtail.core.fields.RichTextField(default='Knowledge base copy goes here.')), + ('section_6_knowledge_base_copy', wagtail.fields.RichTextField(default='Knowledge base copy goes here.')), ('icon_1_image', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtaildocs.Document')), ('icon_2_image', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtaildocs.Document')), ('icon_3_image', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtaildocs.Document')), ('icon_4_image', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtaildocs.Document')), - ('pop_up_text', wagtail.core.fields.RichTextField(default='')), + ('pop_up_text', wagtail.fields.RichTextField(default='')), ('section_4_coming_soon_heading', models.CharField(default='', max_length=255)), - ('section_4_coming_soon_text', wagtail.core.fields.RichTextField(default='')), + ('section_4_coming_soon_text', wagtail.fields.RichTextField(default='')), ('section_5_science_heading', models.CharField(default='', max_length=255)), - ('section_5_science_paragraph', wagtail.core.fields.RichTextField(default='')), + ('section_5_science_paragraph', wagtail.fields.RichTextField(default='')), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -574,7 +574,7 @@ class Migration(migrations.Migration): 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')), ('intro_heading', models.CharField(max_length=255)), - ('intro_description', wagtail.core.fields.RichTextField()), + ('intro_description', wagtail.fields.RichTextField()), ('banner_cta', models.CharField(max_length=255)), ('select_tech_heading', models.CharField(max_length=255)), ('select_tech_step_1', models.CharField(max_length=255)), @@ -582,7 +582,7 @@ class Migration(migrations.Migration): ('select_tech_step_3', models.CharField(max_length=255)), ('new_frontier_heading', models.CharField(max_length=255)), ('new_frontier_subheading', models.CharField(max_length=255)), - ('new_frontier_description', wagtail.core.fields.RichTextField()), + ('new_frontier_description', wagtail.fields.RichTextField()), ('new_frontier_cta_1', models.CharField(max_length=255)), ('new_frontier_cta_2', models.CharField(max_length=255)), ('banner_cta_link', models.URLField(blank=True, null=True)), @@ -599,10 +599,10 @@ class Migration(migrations.Migration): name='ErrataList', 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')), - ('correction_schedule', wagtail.core.fields.RichTextField()), + ('correction_schedule', wagtail.fields.RichTextField()), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), - ('deprecated_errata_message', wagtail.core.fields.RichTextField(default='All OpenStax textbooks undergo a rigorous review process. However, like any professional-grade textbook, errors sometimes occur. This book has a new edition available, and errata are no longer being accepted for the old edition. Please find the newest edition of this book on openstax.org/subjects.', help_text='Errata message for deprecated books, controlled via the book state field.')), - ('new_edition_errata_message', wagtail.core.fields.RichTextField(default='This book has a new edition available. This version is no longer being updated. Please find the newest edition of this book on openstax.org/subjects.', help_text='Errata message for books with new editions, controlled via the book state field.')), + ('deprecated_errata_message', wagtail.fields.RichTextField(default='All OpenStax textbooks undergo a rigorous review process. However, like any professional-grade textbook, errors sometimes occur. This book has a new edition available, and errata are no longer being accepted for the old edition. Please find the newest edition of this book on openstax.org/subjects.', help_text='Errata message for deprecated books, controlled via the book state field.')), + ('new_edition_errata_message', wagtail.fields.RichTextField(default='This book has a new edition available. This version is no longer being updated. Please find the newest edition of this book on openstax.org/subjects.', help_text='Errata message for books with new editions, controlled via the book state field.')), ], options={ 'abstract': False, @@ -614,7 +614,7 @@ class Migration(migrations.Migration): 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')), ('intro_heading', models.CharField(max_length=255)), - ('privacy_content', wagtail.core.fields.RichTextField()), + ('privacy_content', wagtail.fields.RichTextField()), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -628,10 +628,10 @@ class Migration(migrations.Migration): ('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')), ('intro_heading', models.CharField(max_length=255)), ('intro_description', models.TextField()), - ('providers', wagtail.core.fields.StreamField([('provider', wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.CharBlock()), ('blurb', wagtail.core.blocks.TextBlock(required=False)), ('icon', wagtail.images.blocks.ImageChooserBlock()), ('cta', wagtail.core.blocks.CharBlock()), ('url', wagtail.core.blocks.URLBlock()), ('canadian', wagtail.core.blocks.BooleanBlock(required=False))], icon='document'))])), + ('providers', wagtail.fields.StreamField([('provider', wagtail.blocks.StructBlock([('name', wagtail.blocks.CharBlock()), ('blurb', wagtail.blocks.TextBlock(required=False)), ('icon', wagtail.images.blocks.ImageChooserBlock()), ('cta', wagtail.blocks.CharBlock()), ('url', wagtail.blocks.URLBlock()), ('canadian', wagtail.blocks.BooleanBlock(required=False))], icon='document'))])), ('featured_provider_intro_blurb', models.TextField(default='')), ('other_providers_intro_blurb', models.TextField(default='')), - ('featured_providers', wagtail.core.fields.StreamField([('provider', wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.CharBlock()), ('blurb', wagtail.core.blocks.TextBlock(required=False)), ('icon', wagtail.images.blocks.ImageChooserBlock()), ('cta', wagtail.core.blocks.CharBlock()), ('url', wagtail.core.blocks.URLBlock()), ('canadian', wagtail.core.blocks.BooleanBlock(required=False))], icon='document'))], null=True)), + ('featured_providers', wagtail.fields.StreamField([('provider', wagtail.blocks.StructBlock([('name', wagtail.blocks.CharBlock()), ('blurb', wagtail.blocks.TextBlock(required=False)), ('icon', wagtail.images.blocks.ImageChooserBlock()), ('cta', wagtail.blocks.CharBlock()), ('url', wagtail.blocks.URLBlock()), ('canadian', wagtail.blocks.BooleanBlock(required=False))], icon='document'))], null=True)), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -647,7 +647,7 @@ class Migration(migrations.Migration): ('who_paragraph', models.TextField()), ('what_heading', models.CharField(max_length=255)), ('what_paragraph', models.TextField()), - ('what_cards', wagtail.core.fields.StreamField([('card', wagtail.core.blocks.StreamBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('paragraph', wagtail.core.blocks.TextBlock())], icon='placeholder'))])), + ('what_cards', wagtail.fields.StreamField([('card', wagtail.blocks.StreamBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('paragraph', wagtail.blocks.TextBlock())], icon='placeholder'))])), ('where_heading', models.CharField(max_length=255)), ('where_paragraph', models.TextField()), ('where_map', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), @@ -693,11 +693,11 @@ class Migration(migrations.Migration): ('projects_header', models.CharField(max_length=255)), ('people_header', models.CharField(max_length=255)), ('publication_header', models.CharField(max_length=255)), - ('current_members', wagtail.core.fields.StreamField([('person', wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.CharBlock()), ('title', wagtail.core.blocks.CharBlock()), ('photo', pages.models.APIImageChooserBlock(required=False)), ('website', wagtail.core.blocks.URLBlock(required=False))], icon='user'))], blank=True, null=True)), - ('publications', wagtail.core.fields.StreamField([('publication', wagtail.core.blocks.StructBlock([('authors', wagtail.core.blocks.CharBlock()), ('date', wagtail.core.blocks.DateBlock()), ('title', wagtail.core.blocks.CharBlock()), ('excerpt', wagtail.core.blocks.CharBlock()), ('download_url', wagtail.core.blocks.URLBlock())], icon='user'))], blank=True, null=True)), - ('alumni', wagtail.core.fields.StreamField([('person', wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.CharBlock()), ('title', wagtail.core.blocks.CharBlock()), ('website', wagtail.core.blocks.URLBlock(required=False))], icon='user'))], blank=True, null=True)), - ('external_collaborators', wagtail.core.fields.StreamField([('person', wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.CharBlock()), ('title', wagtail.core.blocks.CharBlock()), ('photo', pages.models.APIImageChooserBlock(required=False)), ('website', wagtail.core.blocks.URLBlock(required=False))], icon='user'))], blank=True, null=True)), - ('projects', wagtail.core.fields.StreamField([('project', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock()), ('blurb', wagtail.core.blocks.TextBlock()), ('link', wagtail.core.blocks.URLBlock(help_text='Optional link to project.', required=False))], icon='user'))], blank=True, null=True)), + ('current_members', wagtail.fields.StreamField([('person', wagtail.blocks.StructBlock([('name', wagtail.blocks.CharBlock()), ('title', wagtail.blocks.CharBlock()), ('photo', pages.models.APIImageChooserBlock(required=False)), ('website', wagtail.blocks.URLBlock(required=False))], icon='user'))], blank=True, null=True)), + ('publications', wagtail.fields.StreamField([('publication', wagtail.blocks.StructBlock([('authors', wagtail.blocks.CharBlock()), ('date', wagtail.blocks.DateBlock()), ('title', wagtail.blocks.CharBlock()), ('excerpt', wagtail.blocks.CharBlock()), ('download_url', wagtail.blocks.URLBlock())], icon='user'))], blank=True, null=True)), + ('alumni', wagtail.fields.StreamField([('person', wagtail.blocks.StructBlock([('name', wagtail.blocks.CharBlock()), ('title', wagtail.blocks.CharBlock()), ('website', wagtail.blocks.URLBlock(required=False))], icon='user'))], blank=True, null=True)), + ('external_collaborators', wagtail.fields.StreamField([('person', wagtail.blocks.StructBlock([('name', wagtail.blocks.CharBlock()), ('title', wagtail.blocks.CharBlock()), ('photo', pages.models.APIImageChooserBlock(required=False)), ('website', wagtail.blocks.URLBlock(required=False))], icon='user'))], blank=True, null=True)), + ('projects', wagtail.fields.StreamField([('project', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('blurb', wagtail.blocks.TextBlock()), ('link', wagtail.blocks.URLBlock(help_text='Optional link to project.', required=False))], icon='user'))], blank=True, null=True)), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -762,7 +762,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('heading', models.CharField(max_length=255)), - ('people', wagtail.core.fields.StreamField([('person', wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.CharBlock()), ('title', wagtail.core.blocks.CharBlock(required=False)), ('bio', wagtail.core.blocks.CharBlock(required=False)), ('photo', pages.models.APIImageChooserBlock(required=False))], icon='user'))])), + ('people', wagtail.fields.StreamField([('person', wagtail.blocks.StructBlock([('name', wagtail.blocks.CharBlock()), ('title', wagtail.blocks.CharBlock(required=False)), ('bio', wagtail.blocks.CharBlock(required=False)), ('photo', pages.models.APIImageChooserBlock(required=False))], icon='user'))])), ], ), migrations.CreateModel( @@ -783,7 +783,7 @@ class Migration(migrations.Migration): 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')), ('intro_heading', models.CharField(max_length=255)), - ('careers_content', wagtail.core.fields.RichTextField()), + ('careers_content', wagtail.fields.RichTextField()), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -812,25 +812,25 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('heading', models.CharField(max_length=255)), ('description', models.TextField(blank=True, null=True)), - ('cards', wagtail.core.fields.StreamField([('card', wagtail.core.blocks.StructBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('headline', wagtail.core.blocks.TextBlock(required=False)), ('description', wagtail.core.blocks.TextBlock(required=False)), ('button_text', wagtail.core.blocks.CharBlock(required=False)), ('button_url', wagtail.core.blocks.CharBlock(required=False))], icon='document'))])), + ('cards', wagtail.fields.StreamField([('card', wagtail.blocks.StructBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('headline', wagtail.blocks.TextBlock(required=False)), ('description', wagtail.blocks.TextBlock(required=False)), ('button_text', wagtail.blocks.CharBlock(required=False)), ('button_url', wagtail.blocks.CharBlock(required=False))], icon='document'))])), ], ), migrations.CreateModel( name='AnnualReportPage', 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')), - ('improving_access', wagtail.core.fields.StreamField([('background_image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('give_text', wagtail.core.blocks.CharBlock())], null=True)), - ('revolution', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('letter_body', wagtail.core.blocks.RichTextBlock()), ('signature_image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('signature_alt_text', wagtail.core.blocks.CharBlock()), ('signature_text', wagtail.core.blocks.RichTextBlock()), ('portrait', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('portrait_alt_text', wagtail.core.blocks.CharBlock())], null=True)), - ('founding', wagtail.core.fields.StreamField([('caption', wagtail.core.blocks.RichTextBlock()), ('portrait', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('portrait_alt_text', wagtail.core.blocks.CharBlock()), ('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock())], null=True)), - ('reach', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('facts', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('number', wagtail.core.blocks.DecimalBlock()), ('unit', wagtail.core.blocks.CharBlock()), ('text', wagtail.core.blocks.CharBlock())])))], null=True)), - ('disruption', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('graph', wagtail.core.blocks.StructBlock([('top_caption', wagtail.core.blocks.CharBlock()), ('bottom_caption', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('image_alt_text', wagtail.core.blocks.CharBlock(required=False))]))], null=True)), - ('sustainability', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('partners', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('image_alt_text', wagtail.core.blocks.CharBlock())])))], null=True)), - ('testimonials', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('testimonials', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('image_alt_text', wagtail.core.blocks.CharBlock()), ('quote', wagtail.core.blocks.CharBlock()), ('link', wagtail.core.blocks.URLBlock()), ('link_text', wagtail.core.blocks.CharBlock())])))], null=True)), - ('giving', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('link', wagtail.core.blocks.CharBlock()), ('link_text', wagtail.core.blocks.CharBlock())], null=True)), - ('looking_ahead', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))]))], null=True)), - ('map', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('link', wagtail.core.blocks.CharBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('background_image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('image_1', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('image_2', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))]))], null=True)), - ('philanthropic_partners', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('image_alt_text', wagtail.core.blocks.CharBlock()), ('link_1', wagtail.core.blocks.CharBlock()), ('link_1_text', wagtail.core.blocks.CharBlock()), ('link_2', wagtail.core.blocks.CharBlock()), ('link_2_text', wagtail.core.blocks.CharBlock()), ('quote', wagtail.core.blocks.TextBlock()), ('attribution_name', wagtail.core.blocks.CharBlock()), ('attribution_title', wagtail.core.blocks.CharBlock())], null=True)), - ('tutor', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('link', wagtail.core.blocks.CharBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('right_image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('bottom_image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))]))], null=True)), + ('improving_access', wagtail.fields.StreamField([('background_image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('give_text', wagtail.blocks.CharBlock())], null=True)), + ('revolution', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('letter_body', wagtail.blocks.RichTextBlock()), ('signature_image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('signature_alt_text', wagtail.blocks.CharBlock()), ('signature_text', wagtail.blocks.RichTextBlock()), ('portrait', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('portrait_alt_text', wagtail.blocks.CharBlock())], null=True)), + ('founding', wagtail.fields.StreamField([('caption', wagtail.blocks.RichTextBlock()), ('portrait', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('portrait_alt_text', wagtail.blocks.CharBlock()), ('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock())], null=True)), + ('reach', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('facts', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('number', wagtail.blocks.DecimalBlock()), ('unit', wagtail.blocks.CharBlock()), ('text', wagtail.blocks.CharBlock())])))], null=True)), + ('disruption', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('graph', wagtail.blocks.StructBlock([('top_caption', wagtail.blocks.CharBlock()), ('bottom_caption', wagtail.blocks.RichTextBlock()), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('image_alt_text', wagtail.blocks.CharBlock(required=False))]))], null=True)), + ('sustainability', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('partners', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('image_alt_text', wagtail.blocks.CharBlock())])))], null=True)), + ('testimonials', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('testimonials', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('image_alt_text', wagtail.blocks.CharBlock()), ('quote', wagtail.blocks.CharBlock()), ('link', wagtail.blocks.URLBlock()), ('link_text', wagtail.blocks.CharBlock())])))], null=True)), + ('giving', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('link', wagtail.blocks.CharBlock()), ('link_text', wagtail.blocks.CharBlock())], null=True)), + ('looking_ahead', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))]))], null=True)), + ('map', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('link', wagtail.blocks.CharBlock()), ('link_text', wagtail.blocks.CharBlock()), ('background_image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('image_1', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('image_2', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))]))], null=True)), + ('philanthropic_partners', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('image_alt_text', wagtail.blocks.CharBlock()), ('link_1', wagtail.blocks.CharBlock()), ('link_1_text', wagtail.blocks.CharBlock()), ('link_2', wagtail.blocks.CharBlock()), ('link_2_text', wagtail.blocks.CharBlock()), ('quote', wagtail.blocks.TextBlock()), ('attribution_name', wagtail.blocks.CharBlock()), ('attribution_title', wagtail.blocks.CharBlock())], null=True)), + ('tutor', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('link', wagtail.blocks.CharBlock()), ('link_text', wagtail.blocks.CharBlock()), ('right_image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('bottom_image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))]))], null=True)), ], options={ 'abstract': False, @@ -841,11 +841,11 @@ class Migration(migrations.Migration): name='HeroJourneyPage', 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')), - ('books', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('subheading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('book_heading', wagtail.core.blocks.CharBlock()), ('book_description', wagtail.core.blocks.TextBlock()), ('books_link', wagtail.core.blocks.CharBlock()), ('books_link_text', wagtail.core.blocks.CharBlock()), ('skip_html', wagtail.core.blocks.RichTextBlock())], null=True)), - ('quiz', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('skip_link', wagtail.core.blocks.CharBlock()), ('skip_link_text', wagtail.core.blocks.CharBlock()), ('complete_message', wagtail.core.blocks.CharBlock()), ('questions', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('question', wagtail.core.blocks.CharBlock()), ('answers', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.CharBlock()), ('correct', wagtail.core.blocks.BooleanBlock(required=False))])))])))], null=True)), - ('quiz_complete', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('instructions', wagtail.core.blocks.TextBlock()), ('link_url', wagtail.core.blocks.CharBlock()), ('link_text', wagtail.core.blocks.CharBlock())], null=True)), - ('share', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('instructions', wagtail.core.blocks.TextBlock())], null=True)), - ('thanks', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.TextBlock()), ('description', wagtail.core.blocks.TextBlock())], null=True)), + ('books', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('subheading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('book_heading', wagtail.blocks.CharBlock()), ('book_description', wagtail.blocks.TextBlock()), ('books_link', wagtail.blocks.CharBlock()), ('books_link_text', wagtail.blocks.CharBlock()), ('skip_html', wagtail.blocks.RichTextBlock())], null=True)), + ('quiz', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('skip_link', wagtail.blocks.CharBlock()), ('skip_link_text', wagtail.blocks.CharBlock()), ('complete_message', wagtail.blocks.CharBlock()), ('questions', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('question', wagtail.blocks.CharBlock()), ('answers', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('text', wagtail.blocks.CharBlock()), ('correct', wagtail.blocks.BooleanBlock(required=False))])))])))], null=True)), + ('quiz_complete', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('instructions', wagtail.blocks.TextBlock()), ('link_url', wagtail.blocks.CharBlock()), ('link_text', wagtail.blocks.CharBlock())], null=True)), + ('share', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('instructions', wagtail.blocks.TextBlock())], null=True)), + ('thanks', wagtail.fields.StreamField([('heading', wagtail.blocks.TextBlock()), ('description', wagtail.blocks.TextBlock())], null=True)), ], options={ 'abstract': False, @@ -867,7 +867,7 @@ class Migration(migrations.Migration): ('application_quote_author', models.CharField(blank=True, max_length=255, null=True)), ('application_quote_school', models.CharField(blank=True, max_length=255, null=True)), ('application_quote_title', models.CharField(blank=True, max_length=255, null=True)), - ('program_tab_content', wagtail.core.fields.StreamField([('tab', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock())])))], null=True)), + ('program_tab_content', wagtail.fields.StreamField([('tab', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock())])))], null=True)), ], options={ 'abstract': False, @@ -879,7 +879,7 @@ class Migration(migrations.Migration): 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')), ('section_1_heading', models.CharField(max_length=255)), - ('section_1_description', wagtail.core.fields.RichTextField()), + ('section_1_description', wagtail.fields.RichTextField()), ('section_1_link_text', models.CharField(max_length=255)), ('section_1_link', models.URLField()), ('quote', models.TextField()), @@ -887,24 +887,24 @@ class Migration(migrations.Migration): ('quote_title', models.CharField(max_length=255)), ('quote_school', models.CharField(max_length=255)), ('section_2_heading', models.CharField(max_length=255)), - ('section_2_description', wagtail.core.fields.RichTextField()), + ('section_2_description', wagtail.fields.RichTextField()), ('section_2_image_alt', models.CharField(max_length=255)), ('section_3_heading', models.CharField(max_length=255)), ('section_3_description', models.TextField()), - ('section_3_wide_cards', wagtail.core.fields.StreamField([('card', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('icon', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('html', wagtail.core.blocks.RichTextBlock())])))])), - ('section_3_tall_cards', wagtail.core.fields.StreamField([('card', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('html', wagtail.core.blocks.RichTextBlock()), ('link', wagtail.core.blocks.URLBlock()), ('link_text', wagtail.core.blocks.CharBlock())])))])), + ('section_3_wide_cards', wagtail.fields.StreamField([('card', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('icon', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('html', wagtail.blocks.RichTextBlock())])))])), + ('section_3_tall_cards', wagtail.fields.StreamField([('card', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('html', wagtail.blocks.RichTextBlock()), ('link', wagtail.blocks.URLBlock()), ('link_text', wagtail.blocks.CharBlock())])))])), ('section_4_quote_text', models.TextField()), ('section_4_quote_name', models.CharField(max_length=255)), ('section_4_quote_title', models.CharField(max_length=255)), ('section_5_heading', models.CharField(max_length=255)), - ('section_5_description', wagtail.core.fields.RichTextField()), + ('section_5_description', wagtail.fields.RichTextField()), ('section_5_image_alt', models.CharField(max_length=255)), ('section_6_heading', models.CharField(max_length=255)), ('section_6_description', models.TextField()), - ('section_6_cards', wagtail.core.fields.StreamField([('card', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('heading_number', wagtail.core.blocks.CharBlock()), ('heading_unit', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.CharBlock())])))])), + ('section_6_cards', wagtail.fields.StreamField([('card', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('heading_number', wagtail.blocks.CharBlock()), ('heading_unit', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.CharBlock())])))])), ('section_7_heading', models.CharField(max_length=255)), ('section_7_subheading', models.CharField(max_length=255)), - ('section_7_icons', wagtail.core.fields.StreamField([('card', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('image_alt_text', wagtail.core.blocks.CharBlock()), ('current_cohort', wagtail.core.blocks.BooleanBlock(required=False))])))])), + ('section_7_icons', wagtail.fields.StreamField([('card', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('image_alt_text', wagtail.blocks.CharBlock()), ('current_cohort', wagtail.blocks.BooleanBlock(required=False))])))])), ('section_7_link_text', models.CharField(max_length=255)), ('section_7_link_target', models.URLField()), ('section_8_quote_text', models.TextField()), @@ -915,7 +915,7 @@ class Migration(migrations.Migration): ('section_9_submit_url', models.URLField()), ('section_9_form_prompt', models.CharField(max_length=255)), ('section_9_button_text', models.CharField(max_length=255)), - ('section_9_contact_html', wagtail.core.fields.RichTextField()), + ('section_9_contact_html', wagtail.fields.RichTextField()), ('section_2_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ('section_5_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ('section_4_quote_school', models.CharField(max_length=255, null=True)), @@ -948,7 +948,7 @@ class Migration(migrations.Migration): ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ('section_2_image_1', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ('section_2_image_2', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), - ('section_1_cards', wagtail.core.fields.StreamField([('card', wagtail.core.blocks.StructBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('number', wagtail.core.blocks.CharBlock(required=False)), ('unit', wagtail.core.blocks.CharBlock(required=False)), ('description', wagtail.core.blocks.TextBlock(required=False))], icon='document'))], null=True)), + ('section_1_cards', wagtail.fields.StreamField([('card', wagtail.blocks.StructBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('number', wagtail.blocks.CharBlock(required=False)), ('unit', wagtail.blocks.CharBlock(required=False)), ('description', wagtail.blocks.TextBlock(required=False))], icon='document'))], null=True)), ('map_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -960,17 +960,17 @@ class Migration(migrations.Migration): name='RoverPage', 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')), - ('section_1', wagtail.core.fields.StreamField([('access_button_link', wagtail.core.blocks.URLBlock()), ('access_button_cta', wagtail.core.blocks.CharBlock()), ('image', pages.models.APIImageChooserBlock()), ('blurb', wagtail.core.blocks.TextBlock()), ('button_link', wagtail.core.blocks.URLBlock()), ('button_cta', wagtail.core.blocks.CharBlock()), ('nav_text', wagtail.core.blocks.CharBlock(required=False))])), - ('section_2', wagtail.core.fields.StreamField([('video', wagtail.core.blocks.RawHTMLBlock()), ('heading', wagtail.core.blocks.CharBlock()), ('subheading', wagtail.core.blocks.TextBlock()), ('blurb', wagtail.core.blocks.TextBlock()), ('nav_text', wagtail.core.blocks.CharBlock(required=False))])), - ('section_3', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('subheading', wagtail.core.blocks.TextBlock()), ('cards', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('icon', pages.models.APIImageChooserBlock()), ('blurb', wagtail.core.blocks.TextBlock())]))), ('button_link', wagtail.core.blocks.URLBlock()), ('button_cta', wagtail.core.blocks.CharBlock()), ('nav_text', wagtail.core.blocks.CharBlock(required=False))])), - ('section_4', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('blurb', wagtail.core.blocks.TextBlock()), ('cards', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('blurb', wagtail.core.blocks.TextBlock()), ('image', pages.models.APIImageChooserBlock()), ('image_alt_text', wagtail.core.blocks.CharBlock())]))), ('nav_text', wagtail.core.blocks.CharBlock(required=False))])), - ('section_5', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('blurb', wagtail.core.blocks.TextBlock()), ('cards', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('video', wagtail.core.blocks.RawHTMLBlock()), ('heading', wagtail.core.blocks.CharBlock()), ('blurb', wagtail.core.blocks.TextBlock())]))), ('nav_text', wagtail.core.blocks.CharBlock(required=False)), ('see_more_text', wagtail.core.blocks.CharBlock(required=False)), ('see_more_url', wagtail.core.blocks.URLBlock(required=False))], blank=True, null=True)), - ('section_6', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('blurb', wagtail.core.blocks.RichTextBlock()), ('image', pages.models.APIImageChooserBlock()), ('image_alt_text', wagtail.core.blocks.CharBlock()), ('caption', wagtail.core.blocks.CharBlock()), ('nav_text', wagtail.core.blocks.CharBlock(required=False))])), - ('section_7', wagtail.core.fields.StreamField([('faqs', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('question', wagtail.core.blocks.CharBlock()), ('answer', wagtail.core.blocks.TextBlock())]))), ('webinar_button_url', wagtail.core.blocks.URLBlock()), ('webinar_button_cta', wagtail.core.blocks.CharBlock()), ('signup_button_url', wagtail.core.blocks.URLBlock()), ('signup_button_cta', wagtail.core.blocks.CharBlock()), ('nav_text', wagtail.core.blocks.CharBlock(required=False))])), + ('section_1', wagtail.fields.StreamField([('access_button_link', wagtail.blocks.URLBlock()), ('access_button_cta', wagtail.blocks.CharBlock()), ('image', pages.models.APIImageChooserBlock()), ('blurb', wagtail.blocks.TextBlock()), ('button_link', wagtail.blocks.URLBlock()), ('button_cta', wagtail.blocks.CharBlock()), ('nav_text', wagtail.blocks.CharBlock(required=False))])), + ('section_2', wagtail.fields.StreamField([('video', wagtail.blocks.RawHTMLBlock()), ('heading', wagtail.blocks.CharBlock()), ('subheading', wagtail.blocks.TextBlock()), ('blurb', wagtail.blocks.TextBlock()), ('nav_text', wagtail.blocks.CharBlock(required=False))])), + ('section_3', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('subheading', wagtail.blocks.TextBlock()), ('cards', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('icon', pages.models.APIImageChooserBlock()), ('blurb', wagtail.blocks.TextBlock())]))), ('button_link', wagtail.blocks.URLBlock()), ('button_cta', wagtail.blocks.CharBlock()), ('nav_text', wagtail.blocks.CharBlock(required=False))])), + ('section_4', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('blurb', wagtail.blocks.TextBlock()), ('cards', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('blurb', wagtail.blocks.TextBlock()), ('image', pages.models.APIImageChooserBlock()), ('image_alt_text', wagtail.blocks.CharBlock())]))), ('nav_text', wagtail.blocks.CharBlock(required=False))])), + ('section_5', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('blurb', wagtail.blocks.TextBlock()), ('cards', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('video', wagtail.blocks.RawHTMLBlock()), ('heading', wagtail.blocks.CharBlock()), ('blurb', wagtail.blocks.TextBlock())]))), ('nav_text', wagtail.blocks.CharBlock(required=False)), ('see_more_text', wagtail.blocks.CharBlock(required=False)), ('see_more_url', wagtail.blocks.URLBlock(required=False))], blank=True, null=True)), + ('section_6', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('blurb', wagtail.blocks.RichTextBlock()), ('image', pages.models.APIImageChooserBlock()), ('image_alt_text', wagtail.blocks.CharBlock()), ('caption', wagtail.blocks.CharBlock()), ('nav_text', wagtail.blocks.CharBlock(required=False))])), + ('section_7', wagtail.fields.StreamField([('faqs', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('question', wagtail.blocks.CharBlock()), ('answer', wagtail.blocks.TextBlock())]))), ('webinar_button_url', wagtail.blocks.URLBlock()), ('webinar_button_cta', wagtail.blocks.CharBlock()), ('signup_button_url', wagtail.blocks.URLBlock()), ('signup_button_cta', wagtail.blocks.CharBlock()), ('nav_text', wagtail.blocks.CharBlock(required=False))])), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ('nav_title', models.CharField(blank=True, max_length=255, null=True)), - ('popup', wagtail.core.fields.StreamField([('content', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('headline', wagtail.core.blocks.CharBlock()), ('instructions', wagtail.core.blocks.TextBlock()), ('sign_in_text', wagtail.core.blocks.CharBlock()), ('other_option_text', wagtail.core.blocks.CharBlock()), ('other_option_url', wagtail.core.blocks.URLBlock()), ('background_image', pages.models.APIImageChooserBlock())])))], null=True)), - ('office_hours', wagtail.core.fields.StreamField([('content', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('more_info', wagtail.core.blocks.RichTextBlock()), ('image', pages.models.APIImageChooserBlock()), ('link_url', wagtail.core.blocks.URLBlock()), ('link_text', wagtail.core.blocks.CharBlock())])))], blank=True, null=True)), + ('popup', wagtail.fields.StreamField([('content', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('headline', wagtail.blocks.CharBlock()), ('instructions', wagtail.blocks.TextBlock()), ('sign_in_text', wagtail.blocks.CharBlock()), ('other_option_text', wagtail.blocks.CharBlock()), ('other_option_url', wagtail.blocks.URLBlock()), ('background_image', pages.models.APIImageChooserBlock())])))], null=True)), + ('office_hours', wagtail.fields.StreamField([('content', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('more_info', wagtail.blocks.RichTextBlock()), ('image', pages.models.APIImageChooserBlock()), ('link_url', wagtail.blocks.URLBlock()), ('link_text', wagtail.blocks.CharBlock())])))], blank=True, null=True)), ], options={ 'abstract': False, @@ -982,10 +982,10 @@ class Migration(migrations.Migration): 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')), ('banner_headline', models.CharField(max_length=255)), - ('banner_content', wagtail.core.fields.RichTextField()), - ('register', wagtail.core.fields.StreamField([('box', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('headline', wagtail.core.blocks.CharBlock()), ('address', wagtail.core.blocks.RichTextBlock()), ('button_url', wagtail.core.blocks.URLBlock()), ('button_text', wagtail.core.blocks.CharBlock())])))])), - ('navigator', wagtail.core.fields.StreamField([('menu_item', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.CharBlock()), ('slug', wagtail.core.blocks.CharBlock())])))], null=True)), - ('page_panels', wagtail.core.fields.StreamField([('panel', wagtail.core.blocks.StructBlock([('superheading', wagtail.core.blocks.CharBlock(required=False)), ('heading', wagtail.core.blocks.CharBlock()), ('background_image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('embed', wagtail.core.blocks.RawHTMLBlock(required=False)), ('paragraph', wagtail.core.blocks.RichTextBlock(required=False)), ('cards', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('icon', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('headline', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock())], null=True)))]))], null=True)), + ('banner_content', wagtail.fields.RichTextField()), + ('register', wagtail.fields.StreamField([('box', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('headline', wagtail.blocks.CharBlock()), ('address', wagtail.blocks.RichTextBlock()), ('button_url', wagtail.blocks.URLBlock()), ('button_text', wagtail.blocks.CharBlock())])))])), + ('navigator', wagtail.fields.StreamField([('menu_item', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('text', wagtail.blocks.CharBlock()), ('slug', wagtail.blocks.CharBlock())])))], null=True)), + ('page_panels', wagtail.fields.StreamField([('panel', wagtail.blocks.StructBlock([('superheading', wagtail.blocks.CharBlock(required=False)), ('heading', wagtail.blocks.CharBlock()), ('background_image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('embed', wagtail.blocks.RawHTMLBlock(required=False)), ('paragraph', wagtail.blocks.RichTextBlock(required=False)), ('cards', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('icon', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('headline', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock())], null=True)))]))], null=True)), ('banner_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -998,7 +998,7 @@ class Migration(migrations.Migration): 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')), ('heading', models.CharField(max_length=255)), - ('description', wagtail.core.fields.RichTextField()), + ('description', wagtail.fields.RichTextField()), ('partner_landing_page_link', models.CharField(blank=True, help_text='Link text to partner landing page.', max_length=255, null=True)), ('partner_request_info_link', models.CharField(blank=True, help_text='Forstack form link text', max_length=255, null=True)), ], @@ -1029,7 +1029,7 @@ class Migration(migrations.Migration): ('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')), ('heading', models.CharField(max_length=255)), ('description', models.TextField()), - ('results', wagtail.core.fields.StreamField([('result', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('headline', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('partners', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('partner', pages.models.PartnerChooserBlock())])))])))])), + ('results', wagtail.fields.StreamField([('result', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('headline', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('partners', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('partner', pages.models.PartnerChooserBlock())])))])))])), ], options={ 'abstract': False, diff --git a/pages/migrations/0002_auto_20200813_1540.py b/pages/migrations/0002_auto_20200813_1540.py index 8e4891456..027484b58 100644 --- a/pages/migrations/0002_auto_20200813_1540.py +++ b/pages/migrations/0002_auto_20200813_1540.py @@ -1,7 +1,7 @@ # Generated by Django 3.0.4 on 2020-08-13 20:40 from django.db import migrations, models -import wagtail.core.fields +import wagtail.fields class Migration(migrations.Migration): @@ -14,12 +14,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='contactus', name='customer_service', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), migrations.AlterField( model_name='contactus', name='mailing_address', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), migrations.AlterField( model_name='contactus', @@ -34,12 +34,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='erratalist', name='deprecated_errata_message', - field=wagtail.core.fields.RichTextField(help_text='Errata message for deprecated books, controlled via the book state field.'), + field=wagtail.fields.RichTextField(help_text='Errata message for deprecated books, controlled via the book state field.'), ), migrations.AlterField( model_name='erratalist', name='new_edition_errata_message', - field=wagtail.core.fields.RichTextField(help_text='Errata message for books with new editions, controlled via the book state field.'), + field=wagtail.fields.RichTextField(help_text='Errata message for books with new editions, controlled via the book state field.'), ), migrations.AlterField( model_name='giveform', @@ -179,7 +179,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='marketing', name='pop_up_text', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), migrations.AlterField( model_name='marketing', @@ -189,12 +189,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='marketing', name='section_4_coming_soon_text', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), migrations.AlterField( model_name='marketing', name='section_4_paragraph', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), migrations.AlterField( model_name='marketing', @@ -209,7 +209,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='marketing', name='section_5_science_paragraph', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), migrations.AlterField( model_name='marketing', @@ -219,7 +219,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='marketing', name='section_6_knowledge_base_copy', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), migrations.AlterField( model_name='printorder', diff --git a/pages/migrations/0002_auto_20200928_1405.py b/pages/migrations/0002_auto_20200928_1405.py index 841510a28..3f7b3529d 100644 --- a/pages/migrations/0002_auto_20200928_1405.py +++ b/pages/migrations/0002_auto_20200928_1405.py @@ -1,7 +1,7 @@ # Generated by Django 3.0.4 on 2020-09-28 19:05 from django.db import migrations, models -import wagtail.core.fields +import wagtail.fields class Migration(migrations.Migration): @@ -14,12 +14,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='contactus', name='customer_service', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), migrations.AlterField( model_name='contactus', name='mailing_address', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), migrations.AlterField( model_name='contactus', @@ -34,12 +34,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='erratalist', name='deprecated_errata_message', - field=wagtail.core.fields.RichTextField(help_text='Errata message for deprecated books, controlled via the book state field.'), + field=wagtail.fields.RichTextField(help_text='Errata message for deprecated books, controlled via the book state field.'), ), migrations.AlterField( model_name='erratalist', name='new_edition_errata_message', - field=wagtail.core.fields.RichTextField(help_text='Errata message for books with new editions, controlled via the book state field.'), + field=wagtail.fields.RichTextField(help_text='Errata message for books with new editions, controlled via the book state field.'), ), migrations.AlterField( model_name='giveform', @@ -179,7 +179,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='marketing', name='pop_up_text', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), migrations.AlterField( model_name='marketing', @@ -189,12 +189,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='marketing', name='section_4_coming_soon_text', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), migrations.AlterField( model_name='marketing', name='section_4_paragraph', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), migrations.AlterField( model_name='marketing', @@ -209,7 +209,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='marketing', name='section_5_science_paragraph', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), migrations.AlterField( model_name='marketing', @@ -219,7 +219,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='marketing', name='section_6_knowledge_base_copy', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), migrations.AlterField( model_name='printorder', diff --git a/pages/migrations/0005_auto_20201105_1414.py b/pages/migrations/0005_auto_20201105_1414.py index c6e79715c..1146b3416 100644 --- a/pages/migrations/0005_auto_20201105_1414.py +++ b/pages/migrations/0005_auto_20201105_1414.py @@ -2,7 +2,7 @@ from django.db import migrations, models import django.db.models.deletion -import wagtail.core.fields +import wagtail.fields class Migration(migrations.Migration): @@ -35,6 +35,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='llphpage', name='book_description', - field=wagtail.core.fields.RichTextField(), + field=wagtail.fields.RichTextField(), ), ] diff --git a/pages/migrations/0008_tutormarketing.py b/pages/migrations/0008_tutormarketing.py index 616cbd639..abe041b05 100644 --- a/pages/migrations/0008_tutormarketing.py +++ b/pages/migrations/0008_tutormarketing.py @@ -3,8 +3,8 @@ from django.db import migrations, models import django.db.models.deletion import pages.models -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.documents.blocks import wagtail.images.blocks @@ -27,13 +27,13 @@ class Migration(migrations.Migration): ('description', models.TextField()), ('header_cta_button_text', models.CharField(max_length=255)), ('header_cta_button_link', models.URLField()), - ('quote', wagtail.core.fields.RichTextField()), + ('quote', wagtail.fields.RichTextField()), ('features_header', models.CharField(max_length=255)), - ('features_cards', wagtail.core.fields.StreamField([('card', wagtail.core.blocks.StreamBlock([('icon', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('title', wagtail.core.blocks.TextBlock()), ('description', wagtail.core.blocks.TextBlock())], icon='placeholder'))])), + ('features_cards', wagtail.fields.StreamField([('card', wagtail.blocks.StreamBlock([('icon', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('title', wagtail.blocks.TextBlock()), ('description', wagtail.blocks.TextBlock())], icon='placeholder'))])), ('available_books_header', models.CharField(max_length=255)), ('cost_header', models.CharField(max_length=255)), ('cost_description', models.TextField()), - ('cost_cards', wagtail.core.fields.StreamField([('card', wagtail.core.blocks.StreamBlock([('title', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock())], icon='placeholder'))])), + ('cost_cards', wagtail.fields.StreamField([('card', wagtail.blocks.StreamBlock([('title', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock())], icon='placeholder'))])), ('cost_institution_message', models.CharField(max_length=255)), ('feedback_heading', models.CharField(max_length=255)), ('feedback_quote', models.TextField()), @@ -42,7 +42,7 @@ class Migration(migrations.Migration): ('feedback_organization', models.CharField(max_length=255)), ('webinars_header', models.CharField(max_length=255)), ('faq_header', models.CharField(max_length=255)), - ('faqs', wagtail.core.fields.StreamField([('faq', wagtail.core.blocks.StructBlock([('question', wagtail.core.blocks.RichTextBlock(required=True)), ('slug', wagtail.core.blocks.CharBlock(required=True)), ('answer', wagtail.core.blocks.RichTextBlock(required=True)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False))]))])), + ('faqs', wagtail.fields.StreamField([('faq', wagtail.blocks.StructBlock([('question', wagtail.blocks.RichTextBlock(required=True)), ('slug', wagtail.blocks.CharBlock(required=True)), ('answer', wagtail.blocks.RichTextBlock(required=True)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False))]))])), ('demo_cta_text', models.CharField(max_length=255)), ('demo_cta_link', models.URLField()), ('tutor_login_link', models.URLField()), diff --git a/pages/migrations/0009_auto_20201204_1518.py b/pages/migrations/0009_auto_20201204_1518.py index 1a6e3dee5..a69b4b7b0 100644 --- a/pages/migrations/0009_auto_20201204_1518.py +++ b/pages/migrations/0009_auto_20201204_1518.py @@ -2,8 +2,8 @@ from django.db import migrations, models import django.db.models.deletion -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -18,12 +18,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='tutormarketing', name='cost_cards', - field=wagtail.core.fields.StreamField([('cards', wagtail.core.blocks.StructBlock([('icon', wagtail.images.blocks.ImageChooserBlock(required=False)), ('title', wagtail.core.blocks.CharBlock(required=True)), ('description', wagtail.core.blocks.RichTextBlock(required=True))]))]), + field=wagtail.fields.StreamField([('cards', wagtail.blocks.StructBlock([('icon', wagtail.images.blocks.ImageChooserBlock(required=False)), ('title', wagtail.blocks.CharBlock(required=True)), ('description', wagtail.blocks.RichTextBlock(required=True))]))]), ), migrations.AlterField( model_name='tutormarketing', name='features_cards', - field=wagtail.core.fields.StreamField([('cards', wagtail.core.blocks.StructBlock([('icon', wagtail.images.blocks.ImageChooserBlock(required=False)), ('title', wagtail.core.blocks.CharBlock(required=True)), ('description', wagtail.core.blocks.RichTextBlock(required=True))]))]), + field=wagtail.fields.StreamField([('cards', wagtail.blocks.StructBlock([('icon', wagtail.images.blocks.ImageChooserBlock(required=False)), ('title', wagtail.blocks.CharBlock(required=True)), ('description', wagtail.blocks.RichTextBlock(required=True))]))]), ), migrations.AlterField( model_name='tutormarketing', diff --git a/pages/migrations/0010_auto_20201204_1520.py b/pages/migrations/0010_auto_20201204_1520.py index ea20a3df4..d3a43a209 100644 --- a/pages/migrations/0010_auto_20201204_1520.py +++ b/pages/migrations/0010_auto_20201204_1520.py @@ -1,8 +1,8 @@ # Generated by Django 3.0.4 on 2020-12-04 21:20 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='tutormarketing', name='cost_cards', - field=wagtail.core.fields.StreamField([('cards', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('description', wagtail.core.blocks.RichTextBlock(required=True))]))]), + field=wagtail.fields.StreamField([('cards', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=True)), ('description', wagtail.blocks.RichTextBlock(required=True))]))]), ), ] diff --git a/pages/migrations/0011_auto_20201204_1524.py b/pages/migrations/0011_auto_20201204_1524.py index e6d9e3dff..1c992a273 100644 --- a/pages/migrations/0011_auto_20201204_1524.py +++ b/pages/migrations/0011_auto_20201204_1524.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.models -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='tutormarketing', name='features_cards', - field=wagtail.core.fields.StreamField([('cards', wagtail.core.blocks.StructBlock([('icon', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('title', wagtail.core.blocks.CharBlock(required=True)), ('description', wagtail.core.blocks.RichTextBlock(required=True))]))]), + field=wagtail.fields.StreamField([('cards', wagtail.blocks.StructBlock([('icon', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('title', wagtail.blocks.CharBlock(required=True)), ('description', wagtail.blocks.RichTextBlock(required=True))]))]), ), ] diff --git a/pages/migrations/0012_auto_20201204_1525.py b/pages/migrations/0012_auto_20201204_1525.py index 79a01b514..af18ed14d 100644 --- a/pages/migrations/0012_auto_20201204_1525.py +++ b/pages/migrations/0012_auto_20201204_1525.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.models -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='tutormarketing', name='features_cards', - field=wagtail.core.fields.StreamField([('cards', wagtail.core.blocks.StructBlock([('icon', pages.models.APIImageChooserBlock(required=False)), ('title', wagtail.core.blocks.CharBlock(required=True)), ('description', wagtail.core.blocks.RichTextBlock(required=True))]))]), + field=wagtail.fields.StreamField([('cards', wagtail.blocks.StructBlock([('icon', pages.models.APIImageChooserBlock(required=False)), ('title', wagtail.blocks.CharBlock(required=True)), ('description', wagtail.blocks.RichTextBlock(required=True))]))]), ), ] diff --git a/pages/migrations/0017_tutorlanding.py b/pages/migrations/0017_tutorlanding.py index a884c190c..57b44a9e2 100644 --- a/pages/migrations/0017_tutorlanding.py +++ b/pages/migrations/0017_tutorlanding.py @@ -3,8 +3,8 @@ from django.db import migrations, models import django.db.models.deletion import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -26,7 +26,7 @@ class Migration(migrations.Migration): ('available_books_header', models.CharField(max_length=255)), ('case_study_cta', models.CharField(max_length=255)), ('features_header', models.CharField(max_length=255)), - ('features_cards', wagtail.core.fields.StreamField([('cards', wagtail.core.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('title', wagtail.core.blocks.CharBlock(required=True)), ('description', wagtail.core.blocks.RichTextBlock(required=True))]))])), + ('features_cards', wagtail.fields.StreamField([('cards', wagtail.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('title', wagtail.blocks.CharBlock(required=True)), ('description', wagtail.blocks.RichTextBlock(required=True))]))])), ('other_resources_text', models.TextField()), ('other_resources_cta', models.CharField(max_length=255)), ('other_resources_link', models.URLField()), diff --git a/pages/migrations/0019_auto_20210126_1056.py b/pages/migrations/0019_auto_20210126_1056.py index 744c215e2..ebbb90dcc 100644 --- a/pages/migrations/0019_auto_20210126_1056.py +++ b/pages/migrations/0019_auto_20210126_1056.py @@ -3,8 +3,8 @@ from django.db import migrations, models import django.db.models.deletion import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -22,13 +22,13 @@ class Migration(migrations.Migration): name='Impact', 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')), - ('improving_access', wagtail.core.fields.StreamField([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('button_text', wagtail.core.blocks.CharBlock()), ('button_href', wagtail.core.blocks.URLBlock())], blank=True)), - ('reach', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('cards', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('title', wagtail.core.blocks.CharBlock(required=True)), ('description', wagtail.core.blocks.RichTextBlock(required=True))])))], blank=True)), - ('quote', wagtail.core.fields.StreamField([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('quote', wagtail.core.blocks.RichTextBlock())], blank=True)), - ('making_a_difference', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('stories', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.core.blocks.TextBlock(required=False)), ('embeded_video', wagtail.core.blocks.RawHTMLBlock(required=False))])))], blank=True)), - ('disruption', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('graph', wagtail.core.blocks.StructBlock([('top_caption', wagtail.core.blocks.CharBlock()), ('bottom_caption', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('image_alt_text', wagtail.core.blocks.CharBlock(required=False))]))], blank=True)), - ('supporter_community', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('quote', wagtail.core.blocks.RichTextBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('link_href', wagtail.core.blocks.URLBlock())], blank=True)), - ('giving', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('link', wagtail.core.blocks.CharBlock()), ('link_text', wagtail.core.blocks.CharBlock())], blank=True)), + ('improving_access', wagtail.fields.StreamField([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('button_text', wagtail.blocks.CharBlock()), ('button_href', wagtail.blocks.URLBlock())], blank=True)), + ('reach', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('cards', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('title', wagtail.blocks.CharBlock(required=True)), ('description', wagtail.blocks.RichTextBlock(required=True))])))], blank=True)), + ('quote', wagtail.fields.StreamField([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('quote', wagtail.blocks.RichTextBlock())], blank=True)), + ('making_a_difference', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('stories', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.blocks.TextBlock(required=False)), ('embeded_video', wagtail.blocks.RawHTMLBlock(required=False))])))], blank=True)), + ('disruption', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('graph', wagtail.blocks.StructBlock([('top_caption', wagtail.blocks.CharBlock()), ('bottom_caption', wagtail.blocks.RichTextBlock()), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('image_alt_text', wagtail.blocks.CharBlock(required=False))]))], blank=True)), + ('supporter_community', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('quote', wagtail.blocks.RichTextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_href', wagtail.blocks.URLBlock())], blank=True)), + ('giving', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('link', wagtail.blocks.CharBlock()), ('link_text', wagtail.blocks.CharBlock())], blank=True)), ], options={ 'abstract': False, diff --git a/pages/migrations/0020_auto_20210126_1314.py b/pages/migrations/0020_auto_20210126_1314.py index 272f4e4ea..a721ed4c1 100644 --- a/pages/migrations/0020_auto_20210126_1314.py +++ b/pages/migrations/0020_auto_20210126_1314.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='improving_access', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StreamBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('button_text', wagtail.core.blocks.CharBlock()), ('button_href', wagtail.core.blocks.URLBlock())], max_num=1), blank=True))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.ListBlock(wagtail.blocks.StreamBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('button_text', wagtail.blocks.CharBlock()), ('button_href', wagtail.blocks.URLBlock())], max_num=1), blank=True))]), ), ] diff --git a/pages/migrations/0021_auto_20210126_1318.py b/pages/migrations/0021_auto_20210126_1318.py index 6c8a1496e..f0b72be07 100644 --- a/pages/migrations/0021_auto_20210126_1318.py +++ b/pages/migrations/0021_auto_20210126_1318.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='improving_access', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('button_text', wagtail.core.blocks.CharBlock()), ('button_href', wagtail.core.blocks.URLBlock())], max_num=1))], blank=True), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('button_text', wagtail.blocks.CharBlock()), ('button_href', wagtail.blocks.URLBlock())], max_num=1))], blank=True), ), ] diff --git a/pages/migrations/0022_auto_20210126_1323.py b/pages/migrations/0022_auto_20210126_1323.py index 2aea2c77e..436bf244f 100644 --- a/pages/migrations/0022_auto_20210126_1323.py +++ b/pages/migrations/0022_auto_20210126_1323.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -17,31 +17,31 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='disruption', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('graph', wagtail.core.blocks.StructBlock([('top_caption', wagtail.core.blocks.CharBlock()), ('bottom_caption', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('image_alt_text', wagtail.core.blocks.CharBlock(required=False))]))], max_num=1))], blank=True), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('graph', wagtail.blocks.StructBlock([('top_caption', wagtail.blocks.CharBlock()), ('bottom_caption', wagtail.blocks.RichTextBlock()), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('image_alt_text', wagtail.blocks.CharBlock(required=False))]))], max_num=1))], blank=True), ), migrations.AlterField( model_name='impact', name='giving', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('link', wagtail.core.blocks.CharBlock()), ('link_text', wagtail.core.blocks.CharBlock())], max_num=1))], blank=True), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('link', wagtail.blocks.CharBlock()), ('link_text', wagtail.blocks.CharBlock())], max_num=1))], blank=True), ), migrations.AlterField( model_name='impact', name='making_a_difference', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('stories', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.core.blocks.TextBlock(required=False)), ('embeded_video', wagtail.core.blocks.RawHTMLBlock(required=False))])))], max_num=1))], blank=True), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('stories', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.blocks.TextBlock(required=False)), ('embeded_video', wagtail.blocks.RawHTMLBlock(required=False))])))], max_num=1))], blank=True), ), migrations.AlterField( model_name='impact', name='quote', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('quote', wagtail.core.blocks.RichTextBlock())], max_num=1))], blank=True), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('quote', wagtail.blocks.RichTextBlock())], max_num=1))], blank=True), ), migrations.AlterField( model_name='impact', name='reach', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('cards', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('title', wagtail.core.blocks.CharBlock(required=True)), ('description', wagtail.core.blocks.RichTextBlock(required=True))])))], max_num=1))], blank=True), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('cards', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('title', wagtail.blocks.CharBlock(required=True)), ('description', wagtail.blocks.RichTextBlock(required=True))])))], max_num=1))], blank=True), ), migrations.AlterField( model_name='impact', name='supporter_community', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('quote', wagtail.core.blocks.RichTextBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('link_href', wagtail.core.blocks.URLBlock())], max_num=1))], blank=True), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('quote', wagtail.blocks.RichTextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_href', wagtail.blocks.URLBlock())], max_num=1))], blank=True), ), ] diff --git a/pages/migrations/0023_auto_20210126_1333.py b/pages/migrations/0023_auto_20210126_1333.py index 4f1de6ee3..f0f12c05c 100644 --- a/pages/migrations/0023_auto_20210126_1333.py +++ b/pages/migrations/0023_auto_20210126_1333.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='improving_access', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('button_text', wagtail.core.blocks.CharBlock()), ('button_href', wagtail.core.blocks.URLBlock())]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('button_text', wagtail.blocks.CharBlock()), ('button_href', wagtail.blocks.URLBlock())]))]), ), ] diff --git a/pages/migrations/0024_auto_20210126_1336.py b/pages/migrations/0024_auto_20210126_1336.py index eff19a13a..ce6341407 100644 --- a/pages/migrations/0024_auto_20210126_1336.py +++ b/pages/migrations/0024_auto_20210126_1336.py @@ -22,26 +22,26 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='giving', - field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('link', wagtail.core.blocks.CharBlock()), ('link_text', wagtail.core.blocks.CharBlock())]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('link', wagtail.blocks.CharBlock()), ('link_text', wagtail.blocks.CharBlock())]))]), ), migrations.AlterField( model_name='impact', name='making_a_difference', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('stories', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.core.blocks.TextBlock(required=False)), ('embeded_video', wagtail.core.blocks.RawHTMLBlock(required=False))])))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('stories', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.blocks.TextBlock(required=False)), ('embeded_video', wagtail.blocks.RawHTMLBlock(required=False))])))]))]), ), migrations.AlterField( model_name='impact', name='quote', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('quote', wagtail.core.blocks.RichTextBlock())]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('quote', wagtail.blocks.RichTextBlock())]))]), ), migrations.AlterField( model_name='impact', name='reach', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('cards', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('title', wagtail.core.blocks.CharBlock(required=True)), ('description', wagtail.core.blocks.RichTextBlock(required=True))])))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('cards', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('title', wagtail.blocks.CharBlock(required=True)), ('description', wagtail.blocks.RichTextBlock(required=True))])))]))]), ), migrations.AlterField( model_name='impact', name='supporter_community', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('quote', wagtail.core.blocks.RichTextBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('link_href', wagtail.core.blocks.URLBlock())]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('quote', wagtail.blocks.RichTextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_href', wagtail.blocks.URLBlock())]))]), ), ] diff --git a/pages/migrations/0025_auto_20210126_1519.py b/pages/migrations/0025_auto_20210126_1519.py index 4f6c26a92..56cb9b83d 100644 --- a/pages/migrations/0025_auto_20210126_1519.py +++ b/pages/migrations/0025_auto_20210126_1519.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='making_a_difference', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('stories', wagtail.core.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.core.blocks.TextBlock(required=False)), ('embeded_video', wagtail.core.blocks.RawHTMLBlock(required=False))]))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('stories', wagtail.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.blocks.TextBlock(required=False)), ('embeded_video', wagtail.blocks.RawHTMLBlock(required=False))]))]))]), ), ] diff --git a/pages/migrations/0026_auto_20210126_1521.py b/pages/migrations/0026_auto_20210126_1521.py index 0ca6f6fef..501f7f431 100644 --- a/pages/migrations/0026_auto_20210126_1521.py +++ b/pages/migrations/0026_auto_20210126_1521.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='making_a_difference', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('stories', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StreamBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.core.blocks.TextBlock(required=False)), ('embeded_video', wagtail.core.blocks.RawHTMLBlock(required=False))])))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('stories', wagtail.blocks.ListBlock(wagtail.blocks.StreamBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.blocks.TextBlock(required=False)), ('embeded_video', wagtail.blocks.RawHTMLBlock(required=False))])))]))]), ), ] diff --git a/pages/migrations/0027_auto_20210126_1607.py b/pages/migrations/0027_auto_20210126_1607.py index 77be00836..b5e645c3a 100644 --- a/pages/migrations/0027_auto_20210126_1607.py +++ b/pages/migrations/0027_auto_20210126_1607.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='reach', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('cards', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StreamBlock([('image', pages.custom_blocks.APIImageChooserBlock()), ('description', wagtail.core.blocks.CharBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('link_href', wagtail.core.blocks.URLBlock())])))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('cards', wagtail.blocks.ListBlock(wagtail.blocks.StreamBlock([('image', pages.custom_blocks.APIImageChooserBlock()), ('description', wagtail.blocks.CharBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_href', wagtail.blocks.URLBlock())])))]))]), ), ] diff --git a/pages/migrations/0028_auto_20210127_1109.py b/pages/migrations/0028_auto_20210127_1109.py index b5a13aef2..9f6d38504 100644 --- a/pages/migrations/0028_auto_20210127_1109.py +++ b/pages/migrations/0028_auto_20210127_1109.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='reach', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('cards', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StreamBlock([('image', pages.custom_blocks.APIImageChooserBlock()), ('description', wagtail.core.blocks.CharBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('link_href', wagtail.core.blocks.URLBlock())])))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('cards', wagtail.blocks.ListBlock(wagtail.blocks.StreamBlock([('image', pages.custom_blocks.APIImageChooserBlock()), ('description', wagtail.blocks.CharBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_href', wagtail.blocks.URLBlock())])))]))]), ), ] diff --git a/pages/migrations/0029_auto_20210127_1300.py b/pages/migrations/0029_auto_20210127_1300.py index 27fa70081..15829a4c7 100644 --- a/pages/migrations/0029_auto_20210127_1300.py +++ b/pages/migrations/0029_auto_20210127_1300.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='reach', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('cards', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock()), ('description', wagtail.core.blocks.CharBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('link_href', wagtail.core.blocks.URLBlock())])))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('cards', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock()), ('description', wagtail.blocks.CharBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_href', wagtail.blocks.URLBlock())])))]))]), ), ] diff --git a/pages/migrations/0031_auto_20210127_1304.py b/pages/migrations/0031_auto_20210127_1304.py index dd4dd6560..e39a2d5c3 100644 --- a/pages/migrations/0031_auto_20210127_1304.py +++ b/pages/migrations/0031_auto_20210127_1304.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='reach', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('cards', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('description', wagtail.core.blocks.CharBlock()), ('link_text', wagtail.core.blocks.CharBlock(required=False)), ('link_href', wagtail.core.blocks.URLBlock(required=False))])))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))])), ('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('cards', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('description', wagtail.blocks.CharBlock()), ('link_text', wagtail.blocks.CharBlock(required=False)), ('link_href', wagtail.blocks.URLBlock(required=False))])))]))]), ), ] diff --git a/pages/migrations/0032_auto_20210127_1347.py b/pages/migrations/0032_auto_20210127_1347.py index 2b8cff68c..36b491af9 100644 --- a/pages/migrations/0032_auto_20210127_1347.py +++ b/pages/migrations/0032_auto_20210127_1347.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='making_a_difference', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('stories', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.core.blocks.TextBlock(required=False)), ('embeded_video', wagtail.core.blocks.RawHTMLBlock(required=False))])))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('stories', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.blocks.TextBlock(required=False)), ('embeded_video', wagtail.blocks.RawHTMLBlock(required=False))])))]))]), ), ] diff --git a/pages/migrations/0033_auto_20210127_1356.py b/pages/migrations/0033_auto_20210127_1356.py index a5d0c467d..59ada071c 100644 --- a/pages/migrations/0033_auto_20210127_1356.py +++ b/pages/migrations/0033_auto_20210127_1356.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='making_a_difference', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('stories', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.core.blocks.TextBlock(required=False)), ('embedded_video', wagtail.core.blocks.RawHTMLBlock(required=False))])))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('stories', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.blocks.TextBlock(required=False)), ('embedded_video', wagtail.blocks.RawHTMLBlock(required=False))])))]))]), ), ] diff --git a/pages/migrations/0034_auto_20210127_1550.py b/pages/migrations/0034_auto_20210127_1550.py index 7771c4042..ce880db90 100644 --- a/pages/migrations/0034_auto_20210127_1550.py +++ b/pages/migrations/0034_auto_20210127_1550.py @@ -4,8 +4,8 @@ import django.db.models.deletion import news.models import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.documents.blocks import wagtail.embeds.blocks @@ -22,7 +22,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='making_a_difference', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.RichTextBlock()), ('stories', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.core.blocks.TextBlock(required=False)), ('linked_story', wagtail.core.blocks.PageChooserBlock(page_type=['pages.ImpactStory'])), ('embedded_video', wagtail.core.blocks.RawHTMLBlock(required=False))])))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.RichTextBlock()), ('stories', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('story_text', wagtail.blocks.TextBlock(required=False)), ('linked_story', wagtail.blocks.PageChooserBlock(page_type=['pages.ImpactStory'])), ('embedded_video', wagtail.blocks.RawHTMLBlock(required=False))])))]))]), ), migrations.CreateModel( name='ImpactStory', @@ -33,7 +33,7 @@ class Migration(migrations.Migration): ('subheading', models.CharField(blank=True, max_length=250, null=True)), ('author', models.CharField(max_length=250)), ('featured_image_alt_text', models.CharField(blank=True, max_length=250, null=True)), - ('body', wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.core.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.core.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.core.blocks.StructBlock([('quote', wagtail.core.blocks.TextBlock('quote title')), ('attribution', wagtail.core.blocks.CharBlock())])), ('aligned_html', wagtail.core.blocks.RawHTMLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL'))])), + ('body', wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.blocks.StructBlock([('quote', wagtail.blocks.TextBlock('quote title')), ('attribution', wagtail.blocks.CharBlock())])), ('aligned_html', wagtail.blocks.RawHTMLBlock()), ('document', wagtail.documents.blocks.DocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL'))])), ('featured_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ diff --git a/pages/migrations/0035_auto_20210127_1612.py b/pages/migrations/0035_auto_20210127_1612.py index 601b04e5e..6afd4f888 100644 --- a/pages/migrations/0035_auto_20210127_1612.py +++ b/pages/migrations/0035_auto_20210127_1612.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -17,11 +17,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impact', name='disruption', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('graph', wagtail.core.blocks.StructBlock([('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.core.blocks.CharBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.core.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('image_alt_text', wagtail.core.blocks.CharBlock(required=False))]))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('graph', wagtail.blocks.StructBlock([('image', wagtail.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('alt_text', wagtail.blocks.CharBlock(required=False)), ('link', wagtail.blocks.URLBlock(required=False)), ('alignment', pages.custom_blocks.ImageFormatChoiceBlock()), ('identifier', wagtail.blocks.CharBlock(help_text='Used by the frontend for Google Analytics.', required=False))], required=False)), ('image_alt_text', wagtail.blocks.CharBlock(required=False))]))]))]), ), migrations.AlterField( model_name='impact', name='giving', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('link_href', wagtail.core.blocks.URLBlock())]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_href', wagtail.blocks.URLBlock())]))]), ), ] diff --git a/pages/migrations/0037_auto_20210426_1315.py b/pages/migrations/0037_auto_20210426_1315.py index 3921be696..00d14e0f8 100644 --- a/pages/migrations/0037_auto_20210426_1315.py +++ b/pages/migrations/0037_auto_20210426_1315.py @@ -2,8 +2,8 @@ from django.db import migrations, models import news.models -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.documents.blocks import wagtail.embeds.blocks @@ -52,6 +52,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impactstory', name='body', - field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.core.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.core.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.core.blocks.StructBlock([('quote', wagtail.core.blocks.TextBlock('quote title')), ('attribution', wagtail.core.blocks.CharBlock())])), ('aligned_html', wagtail.core.blocks.RawHTMLBlock(icon='code', label='Raw HTML')), ('document', wagtail.documents.blocks.DocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL'))]), + field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.blocks.StructBlock([('quote', wagtail.blocks.TextBlock('quote title')), ('attribution', wagtail.blocks.CharBlock())])), ('aligned_html', wagtail.blocks.RawHTMLBlock(icon='code', label='Raw HTML')), ('document', wagtail.documents.blocks.DocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL'))]), ), ] diff --git a/pages/migrations/0038_auto_20210427_1025.py b/pages/migrations/0038_auto_20210427_1025.py index 6778f35ec..a16215462 100644 --- a/pages/migrations/0038_auto_20210427_1025.py +++ b/pages/migrations/0038_auto_20210427_1025.py @@ -3,8 +3,8 @@ from django.db import migrations, models import django.db.models.deletion import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -105,7 +105,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='homepage', name='features_tab1_features', - field=wagtail.core.fields.StreamField([('resources', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('link_text', wagtail.core.blocks.CharBlock(required=False))])))], default=''), + field=wagtail.fields.StreamField([('resources', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('link_text', wagtail.blocks.CharBlock(required=False))])))], default=''), preserve_default=False, ), migrations.AddField( @@ -128,7 +128,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='homepage', name='features_tab2_features', - field=wagtail.core.fields.StreamField([('resources', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('link_text', wagtail.core.blocks.CharBlock(required=False))])))], default=''), + field=wagtail.fields.StreamField([('resources', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('link_text', wagtail.blocks.CharBlock(required=False))])))], default=''), preserve_default=False, ), migrations.AddField( @@ -140,7 +140,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='homepage', name='quotes', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('testimonial', wagtail.core.blocks.TextBlock()), ('author', wagtail.core.blocks.CharBlock())]))], default=''), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('testimonial', wagtail.blocks.TextBlock()), ('author', wagtail.blocks.CharBlock())]))], default=''), preserve_default=False, ), migrations.AddField( @@ -190,7 +190,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='homepage', name='tutor_features_cards', - field=wagtail.core.fields.StreamField([('cards', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('description', wagtail.core.blocks.RichTextBlock(required=True))]))], default=''), + field=wagtail.fields.StreamField([('cards', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=True)), ('description', wagtail.blocks.RichTextBlock(required=True))]))], default=''), preserve_default=False, ), migrations.AddField( diff --git a/pages/migrations/0039_auto_20210427_1415.py b/pages/migrations/0039_auto_20210427_1415.py index 9dd432afb..c4ddd8ac5 100644 --- a/pages/migrations/0039_auto_20210427_1415.py +++ b/pages/migrations/0039_auto_20210427_1415.py @@ -1,8 +1,8 @@ # Generated by Django 3.0.4 on 2021-04-27 19:15 from django.db import migrations, models -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -70,7 +70,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='homepage', name='quotes', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('testimonial', wagtail.core.blocks.TextBlock(required=False)), ('author', wagtail.core.blocks.CharBlock(Required=False))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('testimonial', wagtail.blocks.TextBlock(required=False)), ('author', wagtail.blocks.CharBlock(Required=False))]))]), ), migrations.AlterField( model_name='homepage', diff --git a/pages/migrations/0040_auto_20210505_1339.py b/pages/migrations/0040_auto_20210505_1339.py index f36477a99..01969435a 100644 --- a/pages/migrations/0040_auto_20210505_1339.py +++ b/pages/migrations/0040_auto_20210505_1339.py @@ -1,8 +1,8 @@ # Generated by Django 3.0.4 on 2021-05-05 18:39 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='homepage', name='quotes', - field=wagtail.core.fields.StreamField([('quote', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('testimonial', wagtail.core.blocks.TextBlock(required=False)), ('author', wagtail.core.blocks.CharBlock(Required=False))])))]), + field=wagtail.fields.StreamField([('quote', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('testimonial', wagtail.blocks.TextBlock(required=False)), ('author', wagtail.blocks.CharBlock(Required=False))])))]), ), ] diff --git a/pages/migrations/0041_auto_20210506_1329.py b/pages/migrations/0041_auto_20210506_1329.py index 842afba8f..bc510d336 100644 --- a/pages/migrations/0041_auto_20210506_1329.py +++ b/pages/migrations/0041_auto_20210506_1329.py @@ -2,7 +2,7 @@ from django.db import migrations import wagtail.blocks -import wagtail.core.fields +import wagtail.fields class Migration(migrations.Migration): @@ -25,11 +25,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='homepage', name='features_tab1_features', - field=wagtail.core.fields.StreamField([('resources', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('link_text', wagtail.core.blocks.CharBlock(required=False))])))]), + field=wagtail.fields.StreamField([('resources', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('link_text', wagtail.blocks.CharBlock(required=False))])))]), ), migrations.AlterField( model_name='homepage', name='features_tab2_features', - field=wagtail.core.fields.StreamField([('resources', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('link_text', wagtail.core.blocks.CharBlock(required=False))])))]), + field=wagtail.fields.StreamField([('resources', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('link_text', wagtail.blocks.CharBlock(required=False))])))]), ), ] diff --git a/pages/migrations/0042_auto_20210506_1347.py b/pages/migrations/0042_auto_20210506_1347.py index f858334ff..865b3b7cf 100644 --- a/pages/migrations/0042_auto_20210506_1347.py +++ b/pages/migrations/0042_auto_20210506_1347.py @@ -1,8 +1,8 @@ # Generated by Django 3.0.4 on 2021-05-06 18:47 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -15,11 +15,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='homepage', name='features_tab1_features', - field=wagtail.core.fields.StreamField([('feature_text', wagtail.core.blocks.CharBlock())]), + field=wagtail.fields.StreamField([('feature_text', wagtail.blocks.CharBlock())]), ), migrations.AlterField( model_name='homepage', name='features_tab2_features', - field=wagtail.core.fields.StreamField([('feature_text', wagtail.core.blocks.CharBlock())]), + field=wagtail.fields.StreamField([('feature_text', wagtail.blocks.CharBlock())]), ), ] diff --git a/pages/migrations/0043_auto_20210506_1453.py b/pages/migrations/0043_auto_20210506_1453.py index 99c4619ba..365f48336 100644 --- a/pages/migrations/0043_auto_20210506_1453.py +++ b/pages/migrations/0043_auto_20210506_1453.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -20,7 +20,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='homepage', name='tutor_features', - field=wagtail.core.fields.StreamField([('features', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('title', wagtail.core.blocks.CharBlock(required=False))])))], default=''), + field=wagtail.fields.StreamField([('features', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('title', wagtail.blocks.CharBlock(required=False))])))], default=''), preserve_default=False, ), ] diff --git a/pages/migrations/0044_auto_20210513_1515.py b/pages/migrations/0044_auto_20210513_1515.py index ac864f54b..57db34eac 100644 --- a/pages/migrations/0044_auto_20210513_1515.py +++ b/pages/migrations/0044_auto_20210513_1515.py @@ -1,8 +1,8 @@ # Generated by Django 3.0.4 on 2021-05-13 20:15 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -19,7 +19,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='tutormarketing', name='feedback_video', - field=wagtail.core.fields.StreamField([('html', wagtail.core.blocks.RawHTMLBlock())], default=''), + field=wagtail.fields.StreamField([('html', wagtail.blocks.RawHTMLBlock())], default=''), preserve_default=False, ), ] diff --git a/pages/migrations/0048_auto_20210830_1133.py b/pages/migrations/0048_auto_20210830_1133.py index f8c8808d2..5277ad807 100644 --- a/pages/migrations/0048_auto_20210830_1133.py +++ b/pages/migrations/0048_auto_20210830_1133.py @@ -1,7 +1,7 @@ # Generated by Django 3.2.4 on 2021-08-30 16:33 from django.db import migrations, models -import wagtail.core.fields +import wagtail.fields class Migration(migrations.Migration): @@ -20,13 +20,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='erratalist', name='about_popup', - field=wagtail.core.fields.RichTextField(default='Errata received from March through...', help_text='Instructor and student resources..." the stuff that will be in the popup'), + field=wagtail.fields.RichTextField(default='Errata received from March through...', help_text='Instructor and student resources..." the stuff that will be in the popup'), preserve_default=False, ), migrations.AddField( model_name='erratalist', name='about_text', - field=wagtail.core.fields.RichTextField(default='Instructor and student resources...', help_text='Errata received from March through..." the stuff that will show on the page'), + field=wagtail.fields.RichTextField(default='Instructor and student resources...', help_text='Errata received from March through..." the stuff that will show on the page'), preserve_default=False, ), ] diff --git a/pages/migrations/0051_auto_20220207_1342.py b/pages/migrations/0051_auto_20220207_1342.py index 6d2b46fba..88e4b0ce6 100644 --- a/pages/migrations/0051_auto_20220207_1342.py +++ b/pages/migrations/0051_auto_20220207_1342.py @@ -2,8 +2,8 @@ from django.db import migrations, models import django.db.models.deletion -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -23,7 +23,7 @@ class Migration(migrations.Migration): ('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')), ('banner_heading', models.CharField(default='', max_length=255)), ('banner_description', models.TextField(default='')), - ('funder_groups', wagtail.core.fields.StreamField([('groups', wagtail.core.blocks.StructBlock([('funders', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('funder_name', wagtail.core.blocks.CharBlock(required=True)), ('url', wagtail.core.blocks.URLBlock(required=False))])))]))])), + ('funder_groups', wagtail.fields.StreamField([('groups', wagtail.blocks.StructBlock([('funders', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('funder_name', wagtail.blocks.CharBlock(required=True)), ('url', wagtail.blocks.URLBlock(required=False))])))]))])), ('banner_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')), ], diff --git a/pages/migrations/0051_subjects.py b/pages/migrations/0051_subjects.py index 070653cfa..e2ebd255b 100644 --- a/pages/migrations/0051_subjects.py +++ b/pages/migrations/0051_subjects.py @@ -3,8 +3,8 @@ from django.db import migrations, models import django.db.models.deletion import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -22,11 +22,11 @@ class Migration(migrations.Migration): ('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')), ('heading', models.CharField(max_length=255)), ('description', models.TextField(blank=True, null=True)), - ('tutor_ad', wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('image', pages.custom_blocks.APIImageChooserBlock()), ('ad_html', wagtail.core.blocks.TextBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('link_href', wagtail.core.blocks.URLBlock())]))])), - ('about_os', wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('image', pages.custom_blocks.APIImageChooserBlock()), ('os_text', wagtail.core.blocks.TextBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('link_href', wagtail.core.blocks.URLBlock())]))])), - ('info_boxes', wagtail.core.fields.StreamField([('info_box', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock()), ('heading', wagtail.core.blocks.CharBlock()), ('text', wagtail.core.blocks.CharBlock())])))])), + ('tutor_ad', wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('image', pages.custom_blocks.APIImageChooserBlock()), ('ad_html', wagtail.blocks.TextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_href', wagtail.blocks.URLBlock())]))])), + ('about_os', wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('image', pages.custom_blocks.APIImageChooserBlock()), ('os_text', wagtail.blocks.TextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_href', wagtail.blocks.URLBlock())]))])), + ('info_boxes', wagtail.fields.StreamField([('info_box', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock()), ('heading', wagtail.blocks.CharBlock()), ('text', wagtail.blocks.CharBlock())])))])), ('philanthropic_support', models.TextField(blank=True, null=True)), - ('translations', wagtail.core.fields.StreamField([('translation', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('locale', wagtail.core.blocks.CharBlock()), ('slug', wagtail.core.blocks.CharBlock())])))], blank=True, null=True)), + ('translations', wagtail.fields.StreamField([('translation', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('locale', wagtail.blocks.CharBlock()), ('slug', wagtail.blocks.CharBlock())])))], blank=True, null=True)), ('heading_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')), ], diff --git a/pages/migrations/0052_alter_supporters_funder_groups.py b/pages/migrations/0052_alter_supporters_funder_groups.py index e583b3e99..3ea66dae1 100644 --- a/pages/migrations/0052_alter_supporters_funder_groups.py +++ b/pages/migrations/0052_alter_supporters_funder_groups.py @@ -1,8 +1,8 @@ # Generated by Django 3.2.9 on 2022-02-07 20:34 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='supporters', name='funder_groups', - field=wagtail.core.fields.StreamField([('grouplist', wagtail.core.blocks.StructBlock([('funders', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('funder_name', wagtail.core.blocks.CharBlock(required=True)), ('url', wagtail.core.blocks.URLBlock(required=False))])))]))]), + field=wagtail.fields.StreamField([('grouplist', wagtail.blocks.StructBlock([('funders', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('funder_name', wagtail.blocks.CharBlock(required=True)), ('url', wagtail.blocks.URLBlock(required=False))])))]))]), ), ] diff --git a/pages/migrations/0052_subject_subjectorderable.py b/pages/migrations/0052_subject_subjectorderable.py index 535777c6f..542319972 100644 --- a/pages/migrations/0052_subject_subjectorderable.py +++ b/pages/migrations/0052_subject_subjectorderable.py @@ -4,8 +4,8 @@ import django.db.models.deletion import modelcluster.fields import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -22,15 +22,15 @@ class Migration(migrations.Migration): name='Subject', 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')), - ('tutor_ad', wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('image', pages.custom_blocks.APIImageChooserBlock()), ('ad_html', wagtail.core.blocks.TextBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('link_href', wagtail.core.blocks.URLBlock())]))])), - ('blog_header', wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('blog_description', wagtail.core.blocks.TextBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('link_href', wagtail.core.blocks.URLBlock())]))])), - ('webinar_header', wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('webinar_description', wagtail.core.blocks.TextBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('link_href', wagtail.core.blocks.URLBlock())]))])), + ('tutor_ad', wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('image', pages.custom_blocks.APIImageChooserBlock()), ('ad_html', wagtail.blocks.TextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_href', wagtail.blocks.URLBlock())]))])), + ('blog_header', wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('blog_description', wagtail.blocks.TextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_href', wagtail.blocks.URLBlock())]))])), + ('webinar_header', wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('webinar_description', wagtail.blocks.TextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_href', wagtail.blocks.URLBlock())]))])), ('os_textbook_heading', models.TextField(blank=True, null=True)), - ('os_textbook_categories', wagtail.core.fields.StreamField([('category', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('text', wagtail.core.blocks.TextBlock())])))], blank=True, null=True)), - ('about_os', wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('image', pages.custom_blocks.APIImageChooserBlock()), ('os_text', wagtail.core.blocks.TextBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('link_href', wagtail.core.blocks.URLBlock())]))])), - ('info_boxes', wagtail.core.fields.StreamField([('info_box', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock()), ('heading', wagtail.core.blocks.CharBlock()), ('text', wagtail.core.blocks.CharBlock())])))])), + ('os_textbook_categories', wagtail.fields.StreamField([('category', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('text', wagtail.blocks.TextBlock())])))], blank=True, null=True)), + ('about_os', wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('image', pages.custom_blocks.APIImageChooserBlock()), ('os_text', wagtail.blocks.TextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_href', wagtail.blocks.URLBlock())]))])), + ('info_boxes', wagtail.fields.StreamField([('info_box', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock()), ('heading', wagtail.blocks.CharBlock()), ('text', wagtail.blocks.CharBlock())])))])), ('philanthropic_support', models.TextField(blank=True, null=True)), - ('translations', wagtail.core.fields.StreamField([('translation', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('locale', wagtail.core.blocks.CharBlock()), ('slug', wagtail.core.blocks.CharBlock())])))], blank=True, null=True)), + ('translations', wagtail.fields.StreamField([('translation', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('locale', wagtail.blocks.CharBlock()), ('slug', wagtail.blocks.CharBlock())])))], blank=True, null=True)), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')), ], options={ diff --git a/pages/migrations/0053_alter_supporters_funder_groups.py b/pages/migrations/0053_alter_supporters_funder_groups.py index 9467bbd4d..7a7dba9f9 100644 --- a/pages/migrations/0053_alter_supporters_funder_groups.py +++ b/pages/migrations/0053_alter_supporters_funder_groups.py @@ -1,8 +1,8 @@ # Generated by Django 3.2.9 on 2022-02-07 20:36 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='supporters', name='funder_groups', - field=wagtail.core.fields.StreamField([('funder_info', wagtail.core.blocks.StructBlock([])), ('grouplist', wagtail.core.blocks.StructBlock([('funders', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('funder_name', wagtail.core.blocks.CharBlock(required=True)), ('url', wagtail.core.blocks.URLBlock(required=False))])))]))]), + field=wagtail.fields.StreamField([('funder_info', wagtail.blocks.StructBlock([])), ('grouplist', wagtail.blocks.StructBlock([('funders', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('funder_name', wagtail.blocks.CharBlock(required=True)), ('url', wagtail.blocks.URLBlock(required=False))])))]))]), ), ] diff --git a/pages/migrations/0054_alter_supporters_funder_groups.py b/pages/migrations/0054_alter_supporters_funder_groups.py index 0059a23cd..fd92e42fe 100644 --- a/pages/migrations/0054_alter_supporters_funder_groups.py +++ b/pages/migrations/0054_alter_supporters_funder_groups.py @@ -1,8 +1,8 @@ # Generated by Django 3.2.9 on 2022-02-07 20:53 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='supporters', name='funder_groups', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('group_title', wagtail.core.blocks.CharBlock(form_classname='name of funder group')), ('description', wagtail.core.blocks.TextBlock(form_classname='description of funder group')), ('funders', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('funder_name', wagtail.core.blocks.CharBlock(required=True)), ('url', wagtail.core.blocks.URLBlock(required=False))])))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('group_title', wagtail.blocks.CharBlock(form_classname='name of funder group')), ('description', wagtail.blocks.TextBlock(form_classname='description of funder group')), ('funders', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('funder_name', wagtail.blocks.CharBlock(required=True)), ('url', wagtail.blocks.URLBlock(required=False))])))]))]), ), ] diff --git a/pages/migrations/0058_alter_subject_tutor_ad.py b/pages/migrations/0058_alter_subject_tutor_ad.py index 597b5410f..31b3c28e1 100644 --- a/pages/migrations/0058_alter_subject_tutor_ad.py +++ b/pages/migrations/0058_alter_subject_tutor_ad.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='subject', name='tutor_ad', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('image', pages.custom_blocks.APIImageChooserBlock()), ('ad_html', wagtail.core.blocks.TextBlock()), ('link_text', wagtail.core.blocks.CharBlock()), ('link_href', wagtail.core.blocks.URLBlock())]))], blank=True, null=True), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('image', pages.custom_blocks.APIImageChooserBlock()), ('ad_html', wagtail.blocks.TextBlock()), ('link_text', wagtail.blocks.CharBlock()), ('link_href', wagtail.blocks.URLBlock())]))], blank=True, null=True), ), ] diff --git a/pages/migrations/0059_alter_supporters_funder_groups.py b/pages/migrations/0059_alter_supporters_funder_groups.py index 950c2edd9..ab985c5a6 100644 --- a/pages/migrations/0059_alter_supporters_funder_groups.py +++ b/pages/migrations/0059_alter_supporters_funder_groups.py @@ -2,8 +2,8 @@ from django.db import migrations import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='supporters', name='funder_groups', - field=wagtail.core.fields.StreamField([('content', wagtail.core.blocks.StructBlock([('group_title', wagtail.core.blocks.CharBlock(form_classname='name of funder group')), ('description', wagtail.core.blocks.TextBlock(form_classname='description of funder group')), ('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('funders', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('funder_name', wagtail.core.blocks.CharBlock(required=True)), ('url', wagtail.core.blocks.URLBlock(required=False))])))]))]), + field=wagtail.fields.StreamField([('content', wagtail.blocks.StructBlock([('group_title', wagtail.blocks.CharBlock(form_classname='name of funder group')), ('description', wagtail.blocks.TextBlock(form_classname='description of funder group')), ('image', pages.custom_blocks.APIImageChooserBlock(required=False)), ('funders', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('funder_name', wagtail.blocks.CharBlock(required=True)), ('url', wagtail.blocks.URLBlock(required=False))])))]))]), ), ] diff --git a/pages/migrations/0061_alter_impactstory_body.py b/pages/migrations/0061_alter_impactstory_body.py index cf937c5f2..5d8f95708 100644 --- a/pages/migrations/0061_alter_impactstory_body.py +++ b/pages/migrations/0061_alter_impactstory_body.py @@ -2,8 +2,8 @@ from django.db import migrations import news.models -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.documents.blocks import wagtail.embeds.blocks @@ -18,6 +18,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impactstory', name='body', - field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.core.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.core.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.core.blocks.StructBlock([('quote', wagtail.core.blocks.TextBlock('quote title')), ('attribution', wagtail.core.blocks.CharBlock())])), ('aligned_html', wagtail.core.blocks.RawHTMLBlock(icon='code', label='Raw HTML')), ('document', wagtail.documents.blocks.DocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL')), ('blog_cta', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('button_text', wagtail.core.blocks.CharBlock()), ('button_href', wagtail.core.blocks.URLBlock()), ('alignment', news.models.CTAAlignmentChoiceBlock())], icon='form', label='Call to Action block'))]), + field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.blocks.StructBlock([('quote', wagtail.blocks.TextBlock('quote title')), ('attribution', wagtail.blocks.CharBlock())])), ('aligned_html', wagtail.blocks.RawHTMLBlock(icon='code', label='Raw HTML')), ('document', wagtail.documents.blocks.DocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL')), ('blog_cta', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('button_text', wagtail.blocks.CharBlock()), ('button_href', wagtail.blocks.URLBlock()), ('alignment', news.models.CTAAlignmentChoiceBlock())], icon='form', label='Call to Action block'))]), ), ] diff --git a/pages/migrations/0062_alter_impactstory_body.py b/pages/migrations/0062_alter_impactstory_body.py index 0483c13ec..b49ac90b0 100644 --- a/pages/migrations/0062_alter_impactstory_body.py +++ b/pages/migrations/0062_alter_impactstory_body.py @@ -2,8 +2,8 @@ from django.db import migrations import news.models -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.embeds.blocks @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='impactstory', name='body', - field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.core.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.core.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.core.blocks.StructBlock([('quote', wagtail.core.blocks.TextBlock('quote title')), ('attribution', wagtail.core.blocks.CharBlock())])), ('aligned_html', wagtail.core.blocks.RawHTMLBlock(icon='code', label='Raw HTML')), ('document', news.models.BlogDocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL')), ('blog_cta', wagtail.core.blocks.StructBlock([('heading', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.TextBlock()), ('button_text', wagtail.core.blocks.CharBlock()), ('button_href', wagtail.core.blocks.URLBlock()), ('alignment', news.models.CTAAlignmentChoiceBlock())], icon='form', label='Call to Action block'))]), + field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock(icon='pilcrow')), ('aligned_image', wagtail.blocks.StructBlock([('image', news.models.ImageChooserBlock()), ('caption', wagtail.blocks.RichTextBlock()), ('alignment', news.models.ImageFormatChoiceBlock()), ('alt_text', wagtail.blocks.CharBlock(required=False))], icon='image', label='Aligned image')), ('pullquote', wagtail.blocks.StructBlock([('quote', wagtail.blocks.TextBlock('quote title')), ('attribution', wagtail.blocks.CharBlock())])), ('aligned_html', wagtail.blocks.RawHTMLBlock(icon='code', label='Raw HTML')), ('document', news.models.BlogDocumentChooserBlock(icon='doc-full-inverse')), ('embed', wagtail.embeds.blocks.EmbedBlock(icon='media', label='Embed Media URL')), ('blog_cta', wagtail.blocks.StructBlock([('heading', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.TextBlock()), ('button_text', wagtail.blocks.CharBlock()), ('button_href', wagtail.blocks.URLBlock()), ('alignment', news.models.CTAAlignmentChoiceBlock())], icon='form', label='Call to Action block'))]), ), ] diff --git a/pages/migrations/0064_formheadings.py b/pages/migrations/0064_formheadings.py index b49804a7e..32ea692ca 100644 --- a/pages/migrations/0064_formheadings.py +++ b/pages/migrations/0064_formheadings.py @@ -2,7 +2,7 @@ from django.db import migrations, models import django.db.models.deletion -import wagtail.core.fields +import wagtail.fields class Migration(migrations.Migration): @@ -19,9 +19,9 @@ class Migration(migrations.Migration): 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')), ('adoption_intro_heading', models.CharField(max_length=255)), - ('adoption_intro_description', wagtail.core.fields.RichTextField()), + ('adoption_intro_description', wagtail.fields.RichTextField()), ('interest_intro_heading', models.CharField(max_length=255)), - ('interest_intro_description', wagtail.core.fields.RichTextField()), + ('interest_intro_description', wagtail.fields.RichTextField()), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')), ], options={ diff --git a/pages/migrations/0066_allylogos.py b/pages/migrations/0066_allylogos.py index 789203791..dc4e27338 100644 --- a/pages/migrations/0066_allylogos.py +++ b/pages/migrations/0066_allylogos.py @@ -3,8 +3,8 @@ from django.db import migrations, models import django.db.models.deletion import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -21,16 +21,16 @@ class Migration(migrations.Migration): 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')), ('heading', models.CharField(max_length=255)), - ('description', wagtail.core.fields.RichTextField()), + ('description', wagtail.fields.RichTextField()), ('ally_logos_heading', models.CharField(max_length=255)), - ('ally_logos_description', wagtail.core.fields.RichTextField()), - ('ally_logos', wagtail.core.fields.StreamField([('ally_logo', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock())])))])), + ('ally_logos_description', wagtail.fields.RichTextField()), + ('ally_logos', wagtail.fields.StreamField([('ally_logo', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock())])))])), ('openstax_logos_heading', models.CharField(max_length=255)), - ('openstax_logos_description', wagtail.core.fields.RichTextField()), - ('openstax_logos', wagtail.core.fields.StreamField([('openstax_logo', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock())])))])), + ('openstax_logos_description', wagtail.fields.RichTextField()), + ('openstax_logos', wagtail.fields.StreamField([('openstax_logo', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock())])))])), ('book_ally_logos_heading', models.CharField(max_length=255)), - ('book_ally_logos_description', wagtail.core.fields.RichTextField()), - ('book_ally_logos', wagtail.core.fields.StreamField([('book_ally_logo', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock())])))])), + ('book_ally_logos_description', wagtail.fields.RichTextField()), + ('book_ally_logos', wagtail.fields.StreamField([('book_ally_logo', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('image', pages.custom_blocks.APIImageChooserBlock())])))])), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')), ], options={ diff --git a/pages/migrations/0067_learningresearchpage.py b/pages/migrations/0067_learningresearchpage.py index caf9e3f4c..6ea7a3259 100644 --- a/pages/migrations/0067_learningresearchpage.py +++ b/pages/migrations/0067_learningresearchpage.py @@ -3,8 +3,8 @@ from django.db import migrations, models import django.db.models.deletion import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields class Migration(migrations.Migration): @@ -27,14 +27,14 @@ class Migration(migrations.Migration): ('bannerCTA', models.TextField(blank=True, default='')), ('bannerURL', models.URLField(blank=True, default='')), ('research_area_header', models.CharField(max_length=255)), - ('research_area_description_mobile', wagtail.core.fields.RichTextField(default='', help_text='Research Area Description (Mobile Only)')), - ('research_areas_list', wagtail.core.fields.StreamField([('research_area_section', wagtail.core.blocks.StructBlock([('research_area_title', wagtail.core.blocks.CharBlock()), ('research_area_blurb', wagtail.core.blocks.RichTextBlock()), ('research_area_blurb_mobile', wagtail.core.blocks.RichTextBlock()), ('research_areas', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('header', wagtail.core.blocks.CharBlock()), ('description', wagtail.core.blocks.CharBlock()), ('short_description', wagtail.core.blocks.CharBlock(help_text='Short Description (Mobile Only)', label='Short Description (Mobile Only)')), ('photo', pages.custom_blocks.APIImageChooserBlock(required=False)), ('cta_text', wagtail.core.blocks.CharBlock(required=False)), ('cta_link', wagtail.core.blocks.URLBlock(required=False)), ('publication', wagtail.core.blocks.URLBlock(required=False)), ('github', wagtail.core.blocks.URLBlock(required=False))])))]))], default='')), + ('research_area_description_mobile', wagtail.fields.RichTextField(default='', help_text='Research Area Description (Mobile Only)')), + ('research_areas_list', wagtail.fields.StreamField([('research_area_section', wagtail.blocks.StructBlock([('research_area_title', wagtail.blocks.CharBlock()), ('research_area_blurb', wagtail.blocks.RichTextBlock()), ('research_area_blurb_mobile', wagtail.blocks.RichTextBlock()), ('research_areas', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('header', wagtail.blocks.CharBlock()), ('description', wagtail.blocks.CharBlock()), ('short_description', wagtail.blocks.CharBlock(help_text='Short Description (Mobile Only)', label='Short Description (Mobile Only)')), ('photo', pages.custom_blocks.APIImageChooserBlock(required=False)), ('cta_text', wagtail.blocks.CharBlock(required=False)), ('cta_link', wagtail.blocks.URLBlock(required=False)), ('publication', wagtail.blocks.URLBlock(required=False)), ('github', wagtail.blocks.URLBlock(required=False))])))]))], default='')), ('people_header', models.CharField(max_length=255)), - ('current_members', wagtail.core.fields.StreamField([('person', wagtail.core.blocks.StructBlock([('first_name', wagtail.core.blocks.CharBlock()), ('last_name', wagtail.core.blocks.CharBlock()), ('title', wagtail.core.blocks.CharBlock()), ('long_title', wagtail.core.blocks.CharBlock(required=False)), ('bio', wagtail.core.blocks.CharBlock()), ('education', wagtail.core.blocks.CharBlock(required=False)), ('specialization', wagtail.core.blocks.CharBlock(required=False)), ('research_interest', wagtail.core.blocks.CharBlock(required=False)), ('photo', pages.custom_blocks.APIImageChooserBlock(required=False)), ('website', wagtail.core.blocks.URLBlock(required=False)), ('linked_in', wagtail.core.blocks.URLBlock(required=False)), ('google_scholar', wagtail.core.blocks.URLBlock(required=False))], icon='user'))], blank=True, null=True)), - ('collaborating_researchers', wagtail.core.fields.StreamField([('person', wagtail.core.blocks.StructBlock([('first_name', wagtail.core.blocks.CharBlock()), ('last_name', wagtail.core.blocks.CharBlock()), ('title', wagtail.core.blocks.CharBlock()), ('long_title', wagtail.core.blocks.CharBlock(required=False)), ('bio', wagtail.core.blocks.CharBlock()), ('education', wagtail.core.blocks.CharBlock(required=False)), ('specialization', wagtail.core.blocks.CharBlock(required=False)), ('research_interest', wagtail.core.blocks.CharBlock(required=False)), ('photo', pages.custom_blocks.APIImageChooserBlock(required=False)), ('website', wagtail.core.blocks.URLBlock(required=False)), ('linked_in', wagtail.core.blocks.URLBlock(required=False)), ('google_scholar', wagtail.core.blocks.URLBlock(required=False))], icon='user'))], blank=True, null=True)), - ('alumni', wagtail.core.fields.StreamField([('person', wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.CharBlock()), ('title', wagtail.core.blocks.CharBlock()), ('linked_in', wagtail.core.blocks.URLBlock(required=False))], icon='user'))], blank=True, null=True)), + ('current_members', wagtail.fields.StreamField([('person', wagtail.blocks.StructBlock([('first_name', wagtail.blocks.CharBlock()), ('last_name', wagtail.blocks.CharBlock()), ('title', wagtail.blocks.CharBlock()), ('long_title', wagtail.blocks.CharBlock(required=False)), ('bio', wagtail.blocks.CharBlock()), ('education', wagtail.blocks.CharBlock(required=False)), ('specialization', wagtail.blocks.CharBlock(required=False)), ('research_interest', wagtail.blocks.CharBlock(required=False)), ('photo', pages.custom_blocks.APIImageChooserBlock(required=False)), ('website', wagtail.blocks.URLBlock(required=False)), ('linked_in', wagtail.blocks.URLBlock(required=False)), ('google_scholar', wagtail.blocks.URLBlock(required=False))], icon='user'))], blank=True, null=True)), + ('collaborating_researchers', wagtail.fields.StreamField([('person', wagtail.blocks.StructBlock([('first_name', wagtail.blocks.CharBlock()), ('last_name', wagtail.blocks.CharBlock()), ('title', wagtail.blocks.CharBlock()), ('long_title', wagtail.blocks.CharBlock(required=False)), ('bio', wagtail.blocks.CharBlock()), ('education', wagtail.blocks.CharBlock(required=False)), ('specialization', wagtail.blocks.CharBlock(required=False)), ('research_interest', wagtail.blocks.CharBlock(required=False)), ('photo', pages.custom_blocks.APIImageChooserBlock(required=False)), ('website', wagtail.blocks.URLBlock(required=False)), ('linked_in', wagtail.blocks.URLBlock(required=False)), ('google_scholar', wagtail.blocks.URLBlock(required=False))], icon='user'))], blank=True, null=True)), + ('alumni', wagtail.fields.StreamField([('person', wagtail.blocks.StructBlock([('name', wagtail.blocks.CharBlock()), ('title', wagtail.blocks.CharBlock()), ('linked_in', wagtail.blocks.URLBlock(required=False))], icon='user'))], blank=True, null=True)), ('publication_header', models.CharField(max_length=255)), - ('publications', wagtail.core.fields.StreamField([('publication', wagtail.core.blocks.StructBlock([('authors', wagtail.core.blocks.CharBlock()), ('date', wagtail.core.blocks.CharBlock()), ('title', wagtail.core.blocks.CharBlock()), ('excerpt', wagtail.core.blocks.CharBlock()), ('pdf', wagtail.core.blocks.URLBlock()), ('github', wagtail.core.blocks.URLBlock(required=False))], icon='document'))], blank=True, null=True)), + ('publications', wagtail.fields.StreamField([('publication', wagtail.blocks.StructBlock([('authors', wagtail.blocks.CharBlock()), ('date', wagtail.blocks.CharBlock()), ('title', wagtail.blocks.CharBlock()), ('excerpt', wagtail.blocks.CharBlock()), ('pdf', wagtail.blocks.URLBlock()), ('github', wagtail.blocks.URLBlock(required=False))], icon='document'))], blank=True, null=True)), ('promote_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')), ], options={ diff --git a/pages/migrations/0068_k12mainpage_k12subject.py b/pages/migrations/0068_k12mainpage_k12subject.py index 44f33d9ac..a8ac3c370 100644 --- a/pages/migrations/0068_k12mainpage_k12subject.py +++ b/pages/migrations/0068_k12mainpage_k12subject.py @@ -3,8 +3,8 @@ from django.db import migrations, models import django.db.models.deletion import pages.custom_blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.documents.blocks @@ -23,11 +23,11 @@ class Migration(migrations.Migration): ('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')), ('subheader', models.TextField(default='HIGH SCHOOL')), ('books_heading', models.TextField(default='')), - ('books_short_desc', wagtail.core.fields.RichTextField(default='')), + ('books_short_desc', wagtail.fields.RichTextField(default='')), ('about_books_heading', models.TextField(default='About the Books')), ('about_books_text', models.CharField(blank=True, default='FIND SUPPLEMENTAL RESOURCES', max_length=255)), ('adoption_heading', models.TextField(default='Using an OpenStax resource in your classroom? Let us know!')), - ('adoption_text', wagtail.core.fields.RichTextField(default="

Help us continue to make high-quality educational materials accessible by letting us know you've adopted! Our future grant funding is based on educator adoptions and the number of students we impact.

")), + ('adoption_text', wagtail.fields.RichTextField(default="

Help us continue to make high-quality educational materials accessible by letting us know you've adopted! Our future grant funding is based on educator adoptions and the number of students we impact.

")), ('adoption_link_text', models.CharField(default='Report Your Adoption', max_length=255)), ('adoption_link', models.URLField(blank=True, default='/adoption')), ('quote_heading', models.TextField(blank=True, default='What Our Teachers Say')), @@ -49,17 +49,17 @@ class Migration(migrations.Migration): ('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')), ('banner_headline', models.CharField(blank=True, default='', max_length=255)), ('banner_description', models.TextField(blank=True, default='')), - ('features_cards', wagtail.core.fields.StreamField([('features_cards', wagtail.core.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('title', wagtail.core.blocks.CharBlock(required=True)), ('description', wagtail.core.blocks.RichTextBlock(required=True))]))])), - ('highlights_header', wagtail.core.fields.RichTextField(blank=True, default='')), - ('highlights', wagtail.core.fields.StreamField([('highlight', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('highlight_subheader', wagtail.core.blocks.TextBlock(required=False)), ('highlight_text', wagtail.core.blocks.CharBlock(Required=False))])))])), - ('stats_grid', wagtail.core.fields.StreamField([('stat', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('bold_stat_text', wagtail.core.blocks.TextBlock(required=False)), ('normal_stat_text', wagtail.core.blocks.CharBlock(required=False))])))])), + ('features_cards', wagtail.fields.StreamField([('features_cards', wagtail.blocks.StructBlock([('icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('title', wagtail.blocks.CharBlock(required=True)), ('description', wagtail.blocks.RichTextBlock(required=True))]))])), + ('highlights_header', wagtail.fields.RichTextField(blank=True, default='')), + ('highlights', wagtail.fields.StreamField([('highlight', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('highlight_subheader', wagtail.blocks.TextBlock(required=False)), ('highlight_text', wagtail.blocks.CharBlock(Required=False))])))])), + ('stats_grid', wagtail.fields.StreamField([('stat', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('bold_stat_text', wagtail.blocks.TextBlock(required=False)), ('normal_stat_text', wagtail.blocks.CharBlock(required=False))])))])), ('subject_library_header', models.CharField(blank=True, default='', max_length=255)), ('subject_library_description', models.TextField(blank=True, default='')), ('testimonials_header', models.CharField(blank=True, default='', max_length=255)), ('testimonials_description', models.TextField(blank=True, default='')), - ('testimonials', wagtail.core.fields.StreamField([('testimonials', wagtail.core.blocks.StructBlock([('author_icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('author', wagtail.core.blocks.CharBlock(required=True)), ('testimonial', wagtail.core.blocks.RichTextBlock(required=True))]))])), + ('testimonials', wagtail.fields.StreamField([('testimonials', wagtail.blocks.StructBlock([('author_icon', pages.custom_blocks.APIImageChooserBlock(required=False)), ('author', wagtail.blocks.CharBlock(required=True)), ('testimonial', wagtail.blocks.RichTextBlock(required=True))]))])), ('faq_header', models.CharField(blank=True, default='', max_length=255)), - ('faqs', wagtail.core.fields.StreamField([('faq', wagtail.core.blocks.StructBlock([('question', wagtail.core.blocks.RichTextBlock(required=True)), ('slug', wagtail.core.blocks.CharBlock(required=True)), ('answer', wagtail.core.blocks.RichTextBlock(required=True)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False))]))])), + ('faqs', wagtail.fields.StreamField([('faq', wagtail.blocks.StructBlock([('question', wagtail.blocks.RichTextBlock(required=True)), ('slug', wagtail.blocks.CharBlock(required=True)), ('answer', wagtail.blocks.RichTextBlock(required=True)), ('document', wagtail.documents.blocks.DocumentChooserBlock(required=False))]))])), ('rfi_header', models.CharField(blank=True, default='', max_length=255)), ('rfi_description', models.TextField(blank=True, default='')), ('sticky_header', models.CharField(blank=True, default='', max_length=255)), diff --git a/pages/models.py b/pages/models.py index 45b0c7664..e4326698d 100644 --- a/pages/models.py +++ b/pages/models.py @@ -2,7 +2,7 @@ from django.db import models from modelcluster.fields import ParentalKey -from wagtail.admin.edit_handlers import FieldPanel, InlinePanel, MultiFieldPanel +from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel from wagtail import blocks from wagtail.fields import RichTextField, StreamField from wagtail.models import Orderable, Page diff --git a/requirements/base.txt b/requirements/base.txt index 3211d4cac..434643371 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,14 +1,16 @@ appdirs==1.4.4 chardet==4.0.0 -django==4.0.8 +django==4.1.7 django-admin-rangefilter==0.8.4 django-crontab==0.7.1 +django-extensions==3.2.1 django-import-export==2.8.0 django-libsass==0.9 django-rest-auth==0.9.5 django-reversion==5.0.0 django-ses==3.0.1 django-storages==1.12.3 +django-taggit>=3.0.0 future==0.18.2 html2text==2020.1.16 # used in news feed jsonfield==3.1.0 @@ -27,7 +29,7 @@ ua_parser==0.16.1 unicodecsv==0.14.1 Unidecode==1.3.4 vcrpy==4.1.1 # for recording test interactions with third-party APIs -wagtail==3.0.3 +wagtail==4.0.4 Wand==0.6.7 # for supporting animated gifs whitenoise==6.1.0 xlrd==2.0.1 diff --git a/salesforce/models.py b/salesforce/models.py index 668346695..0d579e851 100644 --- a/salesforce/models.py +++ b/salesforce/models.py @@ -3,7 +3,7 @@ from django.core.validators import MaxValueValidator, MinValueValidator from django.core.exceptions import ValidationError -from wagtail.core import hooks +from wagtail import hooks from wagtail.admin.menu import MenuItem from books.models import Book diff --git a/snippets/migrations/0001_initial_squashed_0022_subject_page_content.py b/snippets/migrations/0001_initial_squashed_0022_subject_page_content.py index 3d817cc23..8c9d8fb6f 100644 --- a/snippets/migrations/0001_initial_squashed_0022_subject_page_content.py +++ b/snippets/migrations/0001_initial_squashed_0022_subject_page_content.py @@ -2,7 +2,7 @@ from django.db import migrations, models import django.db.models.deletion -import wagtail.core.fields +import wagtail.fields import wagtail.search.index @@ -20,7 +20,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('heading', models.CharField(max_length=255)), - ('description', wagtail.core.fields.RichTextField(blank=True, null=True)), + ('description', wagtail.fields.RichTextField(blank=True, null=True)), ('unlocked_resource', models.BooleanField(default=False)), ('creator_fest_resource', models.BooleanField(default=False)), ], @@ -30,7 +30,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('heading', models.CharField(max_length=255)), - ('description', wagtail.core.fields.RichTextField(blank=True, null=True)), + ('description', wagtail.fields.RichTextField(blank=True, null=True)), ('unlocked_resource', models.BooleanField(default=True)), ], ), diff --git a/snippets/migrations/0011_auto_20210715_1317.py b/snippets/migrations/0011_auto_20210715_1317.py index bf60395dd..4f2b2fed2 100644 --- a/snippets/migrations/0011_auto_20210715_1317.py +++ b/snippets/migrations/0011_auto_20210715_1317.py @@ -1,7 +1,7 @@ # Generated by Django 3.2.4 on 2021-07-15 18:17 from django.db import migrations -from wagtail.core.models import BootstrapTranslatableModel +from wagtail.models import BootstrapTranslatableModel class Migration(migrations.Migration): diff --git a/snippets/migrations/0024_k12subject.py b/snippets/migrations/0024_k12subject.py index c994936e8..2b8b1a16b 100644 --- a/snippets/migrations/0024_k12subject.py +++ b/snippets/migrations/0024_k12subject.py @@ -3,7 +3,7 @@ from django.db import migrations, models import django.db.models.deletion import uuid -import wagtail.core.fields +import wagtail.fields class Migration(migrations.Migration): @@ -21,7 +21,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('translation_key', models.UUIDField(default=uuid.uuid4, editable=False)), ('name', models.CharField(max_length=255)), - ('intro_text', wagtail.core.fields.RichTextField(blank=True, null=True)), + ('intro_text', wagtail.fields.RichTextField(blank=True, null=True)), ('subject_category', models.CharField(choices=[('math', 'Math'), ('social-studies', 'Social Studies'), ('science', 'Science'), ('english', 'English Language Areas & Reading'), ('career-technical', 'Career and Technical Education'), ('college_readiness', 'College Readiness'), ('fine_arts', 'Fine Arts'), ('health', 'Health Education'), ('languages', 'Languages other than English'), ('physical_education', 'Physical Education'), ('technology_applications', 'Technology Applications'), ('other', 'Other'), ('none', 'None')], default='none', help_text='The category used in the K12 subjects listings', max_length=255)), ('subject_color', models.CharField(choices=[('blue', 'Blue'), ('deep-green', 'Deep Green'), ('gold', 'Gold'), ('gray', 'Gray'), ('green', 'Green'), ('light-blue', 'Light Blue'), ('light-gray', 'Light Gray'), ('medium-blue', 'Medium Blue'), ('orange', 'Orange'), ('red', 'Red'), ('yellow', 'Yellow')], default='blue', help_text='The color of the vertical stripe on Subject page.', max_length=255)), ('subject_link', models.CharField(blank=True, max_length=255, null=True)), diff --git a/snippets/models.py b/snippets/models.py index 82020a703..f67f09893 100644 --- a/snippets/models.py +++ b/snippets/models.py @@ -1,10 +1,7 @@ from django.db import models from django.core.exceptions import ValidationError -from modelcluster.fields import ParentalKey from wagtail.search import index -from wagtail.admin.edit_handlers import FieldPanel, InlinePanel -from wagtail.snippets.edit_handlers import SnippetChooserPanel -from wagtail.images.edit_handlers import ImageChooserPanel +from wagtail.admin.panels import FieldPanel, InlinePanel from wagtail.fields import RichTextField from wagtail.models import TranslatableMixin, Orderable from wagtail.snippets.models import register_snippet @@ -75,7 +72,7 @@ def get_subject_image(self): panels = [ FieldPanel('name'), FieldPanel('intro_text'), - ImageChooserPanel('image'), + FieldPanel('image'), FieldPanel('subject_category'), FieldPanel('subject_color'), FieldPanel('subject_link'), @@ -113,10 +110,11 @@ def get_resource_icon(self): FieldPanel('description'), FieldPanel('unlocked_resource'), FieldPanel('creator_fest_resource'), - ImageChooserPanel('icon'), + FieldPanel('icon'), FieldPanel('resource_category') ] + search_fields = [ index.SearchField('heading', partial_match=True), index.FilterField('locale_id'), @@ -152,7 +150,7 @@ def get_resource_icon(self): FieldPanel('heading'), FieldPanel('description'), FieldPanel('unlocked_resource'), - ImageChooserPanel('icon'), + FieldPanel('icon'), FieldPanel('resource_category') ] diff --git a/versions/wagtail_hooks.py b/versions/wagtail_hooks.py index b457f619a..4fdedfa29 100644 --- a/versions/wagtail_hooks.py +++ b/versions/wagtail_hooks.py @@ -1,7 +1,7 @@ from django.urls import path from django.urls import reverse -from wagtail.core import hooks +from wagtail import hooks from wagtail.admin.menu import MenuItem from versions import views diff --git a/wagtailimportexport/__init__.py b/wagtailimportexport/__init__.py index 42b552161..27dd626de 100644 --- a/wagtailimportexport/__init__.py +++ b/wagtailimportexport/__init__.py @@ -1 +1 @@ -default_app_config = 'wagtailimportexport.apps.WagtailImportExportAppConfig' \ No newline at end of file +#default_app_config = 'wagtailimportexport.apps.WagtailImportExportAppConfig' \ No newline at end of file diff --git a/wagtailimportexport/apps.py b/wagtailimportexport/apps.py index 7bf5db38a..bce1cd0a0 100644 --- a/wagtailimportexport/apps.py +++ b/wagtailimportexport/apps.py @@ -1,6 +1,8 @@ from django.apps import AppConfig + class WagtailImportExportAppConfig(AppConfig): name = 'wagtailimportexport' label = 'wagtailimportexport' verbose_name = "Import/Export Tool" + default = True diff --git a/wagtailimportexport/exporting.py b/wagtailimportexport/exporting.py index 63091918d..554fa9a06 100644 --- a/wagtailimportexport/exporting.py +++ b/wagtailimportexport/exporting.py @@ -8,8 +8,8 @@ from django.db.models.base import ModelState from django.db.models.fields.files import FieldFile -from wagtail.core.models import Page -from wagtail.core.blocks import StreamValue +from wagtail.models import Page +from wagtail.blocks import StreamValue from wagtail.images.models import Image from wagtailimportexport import functions diff --git a/wagtailimportexport/forms.py b/wagtailimportexport/forms.py index 43cd6a5a3..048a7fefb 100644 --- a/wagtailimportexport/forms.py +++ b/wagtailimportexport/forms.py @@ -1,7 +1,7 @@ from django import forms from wagtail.admin.widgets import AdminPageChooser -from wagtail.core.models import Page +from wagtail.models import Page from wagtail.admin import widgets as wagtailadmin_widgets diff --git a/wagtailimportexport/functions.py b/wagtailimportexport/functions.py index f18e62b4b..563540df0 100644 --- a/wagtailimportexport/functions.py +++ b/wagtailimportexport/functions.py @@ -11,7 +11,7 @@ from django.db.models.fields.reverse_related import ManyToOneRel from django.contrib.contenttypes.models import ContentType -from wagtail.core.fields import StreamField +from wagtail.fields import StreamField from wagtail.documents.models import Document diff --git a/wagtailimportexport/importing.py b/wagtailimportexport/importing.py index 7afcb3e86..7296e6bf4 100644 --- a/wagtailimportexport/importing.py +++ b/wagtailimportexport/importing.py @@ -12,7 +12,7 @@ from modelcluster.models import get_all_child_relations -from wagtail.core.models import Page +from wagtail.models import Page from wagtail.images.models import Image from wagtailimportexport import functions diff --git a/wagtailimportexport/wagtail_hooks.py b/wagtailimportexport/wagtail_hooks.py index fe3338e14..a47b59588 100644 --- a/wagtailimportexport/wagtail_hooks.py +++ b/wagtailimportexport/wagtail_hooks.py @@ -1,7 +1,7 @@ from django.urls import include, path from django.urls import reverse -from wagtail.core import hooks +from wagtail import hooks from wagtail.admin.menu import MenuItem from wagtailimportexport import admin_urls