diff --git a/eureka/main/blocks.py b/eureka/main/blocks.py index faa1b1a2..c982d7a2 100644 --- a/eureka/main/blocks.py +++ b/eureka/main/blocks.py @@ -1,5 +1,5 @@ from wagtail.images.blocks import ImageChooserBlock -from wagtail.core.blocks import ( +from wagtail.blocks import ( CharBlock, TextBlock, RichTextBlock, StructBlock, StreamBlock, ListBlock, URLBlock ) diff --git a/eureka/main/migrations/0001_initial.py b/eureka/main/migrations/0001_initial.py index eab4f55c..d8bd653f 100644 --- a/eureka/main/migrations/0001_initial.py +++ b/eureka/main/migrations/0001_initial.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 @@ -22,7 +22,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')), ('repeat_in_subnav', models.BooleanField(default=False, help_text="If checked, a link to this page will be repeated alongside it's direct children when displaying a sub-navigation for this page.", verbose_name='repeat in sub-navigation')), ('repeated_item_text', models.CharField(blank=True, help_text="e.g. 'Section home' or 'Overview'. If left blank, the page title will be used.", max_length=255, verbose_name='repeated item link text')), - ('body', wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())])), + ('body', wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())])), ], options={ 'verbose_name': 'Basic Page', @@ -47,7 +47,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')), ('repeat_in_subnav', models.BooleanField(default=False, help_text="If checked, a link to this page will be repeated alongside it's direct children when displaying a sub-navigation for this page.", verbose_name='repeat in sub-navigation')), ('repeated_item_text', models.CharField(blank=True, help_text="e.g. 'Section home' or 'Overview'. If left blank, the page title will be used.", max_length=255, verbose_name='repeated item link text')), - ('body', wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())])), + ('body', wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())])), ], options={ 'verbose_name': 'Ear Training Element Page', @@ -72,7 +72,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')), ('repeat_in_subnav', models.BooleanField(default=False, help_text="If checked, a link to this page will be repeated alongside it's direct children when displaying a sub-navigation for this page.", verbose_name='repeat in sub-navigation')), ('repeated_item_text', models.CharField(blank=True, help_text="e.g. 'Section home' or 'Overview'. If left blank, the page title will be used.", max_length=255, verbose_name='repeated item link text')), - ('body', wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())])), + ('body', wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())])), ], options={ 'verbose_name': 'Ear Training Level Page', @@ -109,7 +109,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')), ('repeat_in_subnav', models.BooleanField(default=False, help_text="If checked, a link to this page will be repeated alongside it's direct children when displaying a sub-navigation for this page.", verbose_name='repeat in sub-navigation')), ('repeated_item_text', models.CharField(blank=True, help_text="e.g. 'Section home' or 'Overview'. If left blank, the page title will be used.", max_length=255, verbose_name='repeated item link text')), - ('body', wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())])), + ('body', wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())])), ], options={ 'verbose_name': 'Improvisation Combination Page', @@ -134,7 +134,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')), ('repeat_in_subnav', models.BooleanField(default=False, help_text="If checked, a link to this page will be repeated alongside it's direct children when displaying a sub-navigation for this page.", verbose_name='repeat in sub-navigation')), ('repeated_item_text', models.CharField(blank=True, help_text="e.g. 'Section home' or 'Overview'. If left blank, the page title will be used.", max_length=255, verbose_name='repeated item link text')), - ('body', wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())])), + ('body', wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())])), ], options={ 'verbose_name': 'Improvisation Type Page', diff --git a/eureka/main/migrations/0002_auto_20200623_1239.py b/eureka/main/migrations/0002_auto_20200623_1239.py index aa3db739..4eb5f15d 100644 --- a/eureka/main/migrations/0002_auto_20200623_1239.py +++ b/eureka/main/migrations/0002_auto_20200623_1239.py @@ -1,8 +1,8 @@ # Generated by Django 2.2.13 on 2020-06-23 16:39 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.documents.blocks import wagtail.images.blocks @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='eartrainingelementpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('music_example', wagtail.core.blocks.StructBlock([('file', wagtail.documents.blocks.DocumentChooserBlock()), ('caption', wagtail.core.blocks.CharBlock(required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('music_example', wagtail.blocks.StructBlock([('file', wagtail.documents.blocks.DocumentChooserBlock()), ('caption', wagtail.blocks.CharBlock(required=False))]))]), ), ] diff --git a/eureka/main/migrations/0003_auto_20200629_1752.py b/eureka/main/migrations/0003_auto_20200629_1752.py index bd597768..8fe78f28 100644 --- a/eureka/main/migrations/0003_auto_20200629_1752.py +++ b/eureka/main/migrations/0003_auto_20200629_1752.py @@ -1,8 +1,8 @@ # Generated by Django 2.2.13 on 2020-06-29 21:52 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.documents.blocks import wagtail.images.blocks @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='eartrainingelementpage', name='body', - field=wagtail.core.fields.StreamField([('topic', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock()), ('musical_elements', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('element_title', wagtail.core.blocks.CharBlock()), ('content', wagtail.core.blocks.StreamBlock([('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('music_example', wagtail.core.blocks.StructBlock([('file', wagtail.documents.blocks.DocumentChooserBlock()), ('caption', wagtail.core.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), + field=wagtail.fields.StreamField([('topic', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('musical_elements', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('element_title', wagtail.blocks.CharBlock()), ('content', wagtail.blocks.StreamBlock([('rich_text', wagtail.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('music_example', wagtail.blocks.StructBlock([('file', wagtail.documents.blocks.DocumentChooserBlock()), ('caption', wagtail.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), ), ] diff --git a/eureka/main/migrations/0004_auto_20200713_1509.py b/eureka/main/migrations/0004_auto_20200713_1509.py index b13e517a..fb50f596 100644 --- a/eureka/main/migrations/0004_auto_20200713_1509.py +++ b/eureka/main/migrations/0004_auto_20200713_1509.py @@ -1,8 +1,8 @@ # Generated by Django 2.2.14 on 2020-07-13 19:09 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.documents.blocks import wagtail.images.blocks @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='eartrainingelementpage', name='body', - field=wagtail.core.fields.StreamField([('topic', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock()), ('musical_elements', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('element_title', wagtail.core.blocks.CharBlock()), ('content', wagtail.core.blocks.StreamBlock([('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('music_example', wagtail.core.blocks.StructBlock([('file', wagtail.documents.blocks.DocumentChooserBlock()), ('caption', wagtail.core.blocks.CharBlock(required=False))])), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), + field=wagtail.fields.StreamField([('topic', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('musical_elements', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('element_title', wagtail.blocks.CharBlock()), ('content', wagtail.blocks.StreamBlock([('rich_text', wagtail.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('music_example', wagtail.blocks.StructBlock([('file', wagtail.documents.blocks.DocumentChooserBlock()), ('caption', wagtail.blocks.CharBlock(required=False))])), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), ), ] diff --git a/eureka/main/migrations/0007_auto_20200723_2341.py b/eureka/main/migrations/0007_auto_20200723_2341.py index 5784f730..e4ec134b 100644 --- a/eureka/main/migrations/0007_auto_20200723_2341.py +++ b/eureka/main/migrations/0007_auto_20200723_2341.py @@ -1,8 +1,8 @@ # Generated by Django 2.2.14 on 2020-07-24 03:41 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.documents.blocks import wagtail.images.blocks @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='eartrainingelementpage', name='body', - field=wagtail.core.fields.StreamField([('topic', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock()), ('musical_elements', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('element_title', wagtail.core.blocks.CharBlock()), ('content', wagtail.core.blocks.StreamBlock([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'li', 'hr', 'link', 'document_link'])), ('image', wagtail.images.blocks.ImageChooserBlock()), ('music_example', wagtail.core.blocks.StructBlock([('file', wagtail.documents.blocks.DocumentChooserBlock()), ('caption', wagtail.core.blocks.CharBlock(required=False))])), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), + field=wagtail.fields.StreamField([('topic', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('musical_elements', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('element_title', wagtail.blocks.CharBlock()), ('content', wagtail.blocks.StreamBlock([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'li', 'hr', 'link', 'document_link'])), ('image', wagtail.images.blocks.ImageChooserBlock()), ('music_example', wagtail.blocks.StructBlock([('file', wagtail.documents.blocks.DocumentChooserBlock()), ('caption', wagtail.blocks.CharBlock(required=False))])), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), ), ] diff --git a/eureka/main/migrations/0008_auto_20200724_0014.py b/eureka/main/migrations/0008_auto_20200724_0014.py index bab41454..e16dcf83 100644 --- a/eureka/main/migrations/0008_auto_20200724_0014.py +++ b/eureka/main/migrations/0008_auto_20200724_0014.py @@ -2,8 +2,8 @@ from django.db import migrations import wagtail.contrib.table_block.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='improvisationcombinationpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('table', wagtail.contrib.table_block.blocks.TableBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('table', wagtail.contrib.table_block.blocks.TableBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())]), ), ] diff --git a/eureka/main/migrations/0009_auto_20200724_0032.py b/eureka/main/migrations/0009_auto_20200724_0032.py index 9f81e670..17bfa0d4 100644 --- a/eureka/main/migrations/0009_auto_20200724_0032.py +++ b/eureka/main/migrations/0009_auto_20200724_0032.py @@ -2,8 +2,8 @@ from django.db import migrations import wagtail.contrib.table_block.blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.documents.blocks import wagtail.images.blocks @@ -18,26 +18,26 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='basicpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), ), migrations.AlterField( model_name='eartrainingelementpage', name='body', - field=wagtail.core.fields.StreamField([('topic', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock()), ('musical_elements', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('element_title', wagtail.core.blocks.CharBlock()), ('content', wagtail.core.blocks.StreamBlock([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'li', 'hr', 'link', 'document_link'])), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('music_example', wagtail.core.blocks.StructBlock([('file', wagtail.documents.blocks.DocumentChooserBlock()), ('caption', wagtail.core.blocks.CharBlock(required=False))])), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), + field=wagtail.fields.StreamField([('topic', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('musical_elements', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('element_title', wagtail.blocks.CharBlock()), ('content', wagtail.blocks.StreamBlock([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'li', 'hr', 'link', 'document_link'])), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('music_example', wagtail.blocks.StructBlock([('file', wagtail.documents.blocks.DocumentChooserBlock()), ('caption', wagtail.blocks.CharBlock(required=False))])), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), ), migrations.AlterField( model_name='eartraininglevelpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), ), migrations.AlterField( model_name='improvisationcombinationpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('table', wagtail.contrib.table_block.blocks.TableBlock(template='main/blocks/table_block.html')), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('table', wagtail.contrib.table_block.blocks.TableBlock(template='main/blocks/table_block.html')), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), ), migrations.AlterField( model_name='improvisationtypepage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), ), ] diff --git a/eureka/main/migrations/0010_auto_20200724_0056.py b/eureka/main/migrations/0010_auto_20200724_0056.py index 98404299..b70bc8fb 100644 --- a/eureka/main/migrations/0010_auto_20200724_0056.py +++ b/eureka/main/migrations/0010_auto_20200724_0056.py @@ -2,8 +2,8 @@ from django.db import migrations import wagtail.contrib.table_block.blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -17,26 +17,26 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='basicpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), ), migrations.AlterField( model_name='eartrainingelementpage', name='body', - field=wagtail.core.fields.StreamField([('topic', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock()), ('musical_elements', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('element_title', wagtail.core.blocks.CharBlock()), ('content', wagtail.core.blocks.StreamBlock([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'li', 'hr', 'link', 'document_link'])), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), + field=wagtail.fields.StreamField([('topic', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('musical_elements', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('element_title', wagtail.blocks.CharBlock()), ('content', wagtail.blocks.StreamBlock([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'li', 'hr', 'link', 'document_link'])), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), ), migrations.AlterField( model_name='eartraininglevelpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), ), migrations.AlterField( model_name='improvisationcombinationpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('table', wagtail.contrib.table_block.blocks.TableBlock(template='main/blocks/table_block.html')), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('table', wagtail.contrib.table_block.blocks.TableBlock(template='main/blocks/table_block.html')), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), ), migrations.AlterField( model_name='improvisationtypepage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), ), ] diff --git a/eureka/main/migrations/0011_auto_20200727_1228.py b/eureka/main/migrations/0011_auto_20200727_1228.py index 091a16eb..836805cf 100644 --- a/eureka/main/migrations/0011_auto_20200727_1228.py +++ b/eureka/main/migrations/0011_auto_20200727_1228.py @@ -1,8 +1,8 @@ # Generated by Django 2.2.14 on 2020-07-27 16:28 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='eartrainingelementpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock()), ('topic', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock()), ('musical_elements', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('element_title', wagtail.core.blocks.CharBlock()), ('content', wagtail.core.blocks.StreamBlock([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'li', 'hr', 'link', 'document_link'])), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock()), ('topic', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('musical_elements', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('element_title', wagtail.blocks.CharBlock()), ('content', wagtail.blocks.StreamBlock([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'li', 'hr', 'link', 'document_link'])), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), ), ] diff --git a/eureka/main/migrations/0012_auto_20200727_1236.py b/eureka/main/migrations/0012_auto_20200727_1236.py index 1a6f701f..c916b0d6 100644 --- a/eureka/main/migrations/0012_auto_20200727_1236.py +++ b/eureka/main/migrations/0012_auto_20200727_1236.py @@ -1,8 +1,8 @@ # Generated by Django 2.2.14 on 2020-07-27 16:36 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='eartrainingelementpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'li', 'hr', 'link', 'document_link'])), ('topic', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock()), ('musical_elements', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('element_title', wagtail.core.blocks.CharBlock()), ('content', wagtail.core.blocks.StreamBlock([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'li', 'hr', 'link', 'document_link'])), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'li', 'hr', 'link', 'document_link'])), ('topic', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('musical_elements', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('element_title', wagtail.blocks.CharBlock()), ('content', wagtail.blocks.StreamBlock([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'li', 'hr', 'link', 'document_link'])), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), ), ] diff --git a/eureka/main/migrations/0013_auto_20200727_1238.py b/eureka/main/migrations/0013_auto_20200727_1238.py index b98f2e3f..d81ec309 100644 --- a/eureka/main/migrations/0013_auto_20200727_1238.py +++ b/eureka/main/migrations/0013_auto_20200727_1238.py @@ -1,8 +1,8 @@ # Generated by Django 2.2.14 on 2020-07-27 16:38 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='eartrainingelementpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'])), ('topic', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock()), ('musical_elements', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('element_title', wagtail.core.blocks.CharBlock()), ('content', wagtail.core.blocks.StreamBlock([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'])), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'])), ('topic', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('musical_elements', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('element_title', wagtail.blocks.CharBlock()), ('content', wagtail.blocks.StreamBlock([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'])), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))]))], icon='cogs'))])))]))]), ), ] diff --git a/eureka/main/migrations/0014_auto_20200728_1326.py b/eureka/main/migrations/0014_auto_20200728_1326.py index 80ba81ff..c1680dcb 100644 --- a/eureka/main/migrations/0014_auto_20200728_1326.py +++ b/eureka/main/migrations/0014_auto_20200728_1326.py @@ -1,8 +1,8 @@ # Generated by Django 2.2.14 on 2020-07-28 17:26 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='eartrainingelementpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'])), ('topic', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=False)), ('musical_elements', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('element_title', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.StreamBlock([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], required=False)), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))], required=False)), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))], required=False))], icon='cogs', required=False))]), required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'])), ('topic', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=False)), ('musical_elements', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('element_title', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.StreamBlock([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], required=False)), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))], required=False)), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))], required=False))], icon='cogs', required=False))]), required=False))]))]), ), ] diff --git a/eureka/main/migrations/0016_auto_20200820_1542.py b/eureka/main/migrations/0016_auto_20200820_1542.py index d1b338f9..6d8658e9 100644 --- a/eureka/main/migrations/0016_auto_20200820_1542.py +++ b/eureka/main/migrations/0016_auto_20200820_1542.py @@ -1,8 +1,8 @@ # Generated by Django 2.2.14 on 2020-08-20 19:42 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='basicpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'hr', 'link', 'document-link', 'image', 'embed'])), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'hr', 'link', 'document-link', 'image', 'embed'])), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), ), ] diff --git a/eureka/main/migrations/0017_auto_20200820_1551.py b/eureka/main/migrations/0017_auto_20200820_1551.py index e6a676f2..0fb0b4e4 100644 --- a/eureka/main/migrations/0017_auto_20200820_1551.py +++ b/eureka/main/migrations/0017_auto_20200820_1551.py @@ -2,8 +2,8 @@ from django.db import migrations import wagtail.contrib.table_block.blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -17,21 +17,21 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='eartrainingelementpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'hr', 'link', 'document_link'])), ('topic', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=False)), ('musical_elements', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('element_title', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.StreamBlock([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], required=False)), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))], required=False)), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))], required=False))], icon='cogs', required=False))]), required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'hr', 'link', 'document_link'])), ('topic', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=False)), ('musical_elements', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('element_title', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.StreamBlock([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], required=False)), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))], required=False)), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))], required=False))], icon='cogs', required=False))]), required=False))]))]), ), migrations.AlterField( model_name='eartraininglevelpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'hr', 'link', 'document-link', 'image', 'embed'])), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'hr', 'link', 'document-link', 'image', 'embed'])), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), ), migrations.AlterField( model_name='improvisationcombinationpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'hr', 'link', 'document-link', 'image', 'embed'])), ('table', wagtail.contrib.table_block.blocks.TableBlock(template='main/blocks/table_block.html')), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'hr', 'link', 'document-link', 'image', 'embed'])), ('table', wagtail.contrib.table_block.blocks.TableBlock(template='main/blocks/table_block.html')), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), ), migrations.AlterField( model_name='improvisationtypepage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'hr', 'link', 'document-link', 'image', 'embed'])), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'hr', 'link', 'document-link', 'image', 'embed'])), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), ), ] diff --git a/eureka/main/migrations/0018_auto_20200831_1243.py b/eureka/main/migrations/0018_auto_20200831_1243.py index 93cda306..27fae90c 100644 --- a/eureka/main/migrations/0018_auto_20200831_1243.py +++ b/eureka/main/migrations/0018_auto_20200831_1243.py @@ -2,8 +2,8 @@ from django.db import migrations import wagtail.contrib.table_block.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='eartrainingelementpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'hr', 'link', 'document_link'])), ('topic', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=False)), ('musical_elements', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('element_title', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.StreamBlock([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], required=False)), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))], required=False)), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))], required=False)), ('table', wagtail.contrib.table_block.blocks.TableBlock(template='main/blocks/table_block.html'))], icon='cogs', required=False))]), required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'hr', 'link', 'document_link'])), ('topic', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=False)), ('musical_elements', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('element_title', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.StreamBlock([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], required=False)), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))], required=False)), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))], required=False)), ('table', wagtail.contrib.table_block.blocks.TableBlock(template='main/blocks/table_block.html'))], icon='cogs', required=False))]), required=False))]))]), ), ] diff --git a/eureka/main/migrations/0019_auto_20200831_1706.py b/eureka/main/migrations/0019_auto_20200831_1706.py index 8b8ffec4..c182bda0 100644 --- a/eureka/main/migrations/0019_auto_20200831_1706.py +++ b/eureka/main/migrations/0019_auto_20200831_1706.py @@ -1,8 +1,8 @@ # Generated by Django 2.2.14 on 2020-08-31 21:06 from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -16,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='basicpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image', 'embed'])), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image', 'embed'])), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))]))]), ), ] diff --git a/eureka/main/migrations/0020_auto_20200923_2335.py b/eureka/main/migrations/0020_auto_20200923_2335.py index 7b4428ed..27da39e7 100644 --- a/eureka/main/migrations/0020_auto_20200923_2335.py +++ b/eureka/main/migrations/0020_auto_20200923_2335.py @@ -2,8 +2,8 @@ from django.db import migrations import wagtail.contrib.table_block.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='eartrainingelementpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'hr', 'link', 'document_link'])), ('accessible_text', wagtail.core.blocks.StructBlock([('visible_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], icon='pilcrow', label='Visible text')), ('screen_reader_text', wagtail.core.blocks.RichTextBlock(features=['ol', 'ul', 'link', 'document_link'], icon='fa-universal-access', label='Screen reader text'))])), ('topic', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=False)), ('musical_elements', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('element_title', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.StreamBlock([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], required=False)), ('accessible_text', wagtail.core.blocks.StructBlock([('visible_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], icon='pilcrow', label='Visible text')), ('screen_reader_text', wagtail.core.blocks.RichTextBlock(features=['ol', 'ul', 'link', 'document_link'], icon='fa-universal-access', label='Screen reader text'))], required=False)), ('sr_only_text', wagtail.core.blocks.TextBlock(icon='fa-universal-access', label='SR text', required=False, template='main/blocks/screen_reader_block.html')), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))], required=False)), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))], required=False)), ('table', wagtail.contrib.table_block.blocks.TableBlock(template='main/blocks/table_block.html'))], icon='cogs', required=False))]), required=False))]))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'hr', 'link', 'document_link'])), ('accessible_text', wagtail.blocks.StructBlock([('visible_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], icon='pilcrow', label='Visible text')), ('screen_reader_text', wagtail.blocks.RichTextBlock(features=['ol', 'ul', 'link', 'document_link'], icon='fa-universal-access', label='Screen reader text'))])), ('topic', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=False)), ('musical_elements', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('element_title', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.StreamBlock([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], required=False)), ('accessible_text', wagtail.blocks.StructBlock([('visible_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], icon='pilcrow', label='Visible text')), ('screen_reader_text', wagtail.blocks.RichTextBlock(features=['ol', 'ul', 'link', 'document_link'], icon='fa-universal-access', label='Screen reader text'))], required=False)), ('sr_only_text', wagtail.blocks.TextBlock(icon='fa-universal-access', label='SR text', required=False, template='main/blocks/screen_reader_block.html')), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))], required=False)), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))], required=False)), ('table', wagtail.contrib.table_block.blocks.TableBlock(template='main/blocks/table_block.html'))], icon='cogs', required=False))]), required=False))]))]), ), ] diff --git a/eureka/main/migrations/0021_auto_20201028_1625.py b/eureka/main/migrations/0021_auto_20201028_1625.py index ac00e3bf..2494ed55 100644 --- a/eureka/main/migrations/0021_auto_20201028_1625.py +++ b/eureka/main/migrations/0021_auto_20201028_1625.py @@ -2,8 +2,8 @@ from django.db import migrations import wagtail.contrib.table_block.blocks -import wagtail.core.blocks -import wagtail.core.fields +import wagtail.blocks +import wagtail.fields import wagtail.images.blocks @@ -17,26 +17,26 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='basicpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image', 'embed'])), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))], required=False))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image', 'embed'])), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))], required=False))]), ), migrations.AlterField( model_name='eartrainingelementpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'hr', 'link', 'document_link'])), ('accessible_text', wagtail.core.blocks.StructBlock([('visible_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], icon='pilcrow', label='Visible text')), ('screen_reader_text', wagtail.core.blocks.RichTextBlock(features=['ol', 'ul', 'link', 'document_link'], icon='fa-universal-access', label='Screen reader text'))])), ('topic', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=False)), ('musical_elements', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('element_title', wagtail.core.blocks.CharBlock(required=False)), ('content', wagtail.core.blocks.StreamBlock([('rich_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], required=False)), ('accessible_text', wagtail.core.blocks.StructBlock([('visible_text', wagtail.core.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], icon='pilcrow', label='Visible text')), ('screen_reader_text', wagtail.core.blocks.RichTextBlock(features=['ol', 'ul', 'link', 'document_link'], icon='fa-universal-access', label='Screen reader text'))], required=False)), ('sr_only_text', wagtail.core.blocks.TextBlock(icon='fa-universal-access', label='SR text', required=False, template='main/blocks/screen_reader_block.html')), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))], required=False)), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))], required=False)), ('table', wagtail.contrib.table_block.blocks.TableBlock(template='main/blocks/table_block.html'))], icon='cogs', required=False))]), required=False))])), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))], required=False))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'hr', 'link', 'document_link'])), ('accessible_text', wagtail.blocks.StructBlock([('visible_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], icon='pilcrow', label='Visible text')), ('screen_reader_text', wagtail.blocks.RichTextBlock(features=['ol', 'ul', 'link', 'document_link'], icon='fa-universal-access', label='Screen reader text'))])), ('topic', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=False)), ('musical_elements', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('element_title', wagtail.blocks.CharBlock(required=False)), ('content', wagtail.blocks.StreamBlock([('rich_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], required=False)), ('accessible_text', wagtail.blocks.StructBlock([('visible_text', wagtail.blocks.RichTextBlock(features=['bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document_link'], icon='pilcrow', label='Visible text')), ('screen_reader_text', wagtail.blocks.RichTextBlock(features=['ol', 'ul', 'link', 'document_link'], icon='fa-universal-access', label='Screen reader text'))], required=False)), ('sr_only_text', wagtail.blocks.TextBlock(icon='fa-universal-access', label='SR text', required=False, template='main/blocks/screen_reader_block.html')), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))], required=False)), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))], required=False)), ('table', wagtail.contrib.table_block.blocks.TableBlock(template='main/blocks/table_block.html'))], icon='cogs', required=False))]), required=False))])), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))], required=False))]), ), migrations.AlterField( model_name='eartraininglevelpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'hr', 'link', 'document-link', 'image', 'embed'])), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))], required=False))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'hr', 'link', 'document-link', 'image', 'embed'])), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))], required=False))]), ), migrations.AlterField( model_name='improvisationcombinationpage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'hr', 'link', 'document-link', 'image', 'embed'])), ('table', wagtail.contrib.table_block.blocks.TableBlock(template='main/blocks/table_block.html')), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))], required=False))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'hr', 'link', 'document-link', 'image', 'embed'])), ('table', wagtail.contrib.table_block.blocks.TableBlock(template='main/blocks/table_block.html')), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))], required=False))]), ), migrations.AlterField( model_name='improvisationtypepage', name='body', - field=wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'hr', 'link', 'document-link', 'image', 'embed'])), ('image', wagtail.core.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.core.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.core.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('description', wagtail.core.blocks.CharBlock(required=False))], required=False))]), + field=wagtail.fields.StreamField([('rich_text', wagtail.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'bold', 'italic', 'ol', 'hr', 'link', 'document-link', 'image', 'embed'])), ('image', wagtail.blocks.StructBlock([('image_file', wagtail.images.blocks.ImageChooserBlock(required=True)), ('title', wagtail.blocks.CharBlock(help_text='Title for the image', required=False)), ('caption', wagtail.blocks.CharBlock(help_text='Caption for the image', required=False))])), ('video', wagtail.blocks.StructBlock([('url', wagtail.blocks.URLBlock()), ('description', wagtail.blocks.CharBlock(required=False))], required=False))]), ), ] diff --git a/eureka/main/models.py b/eureka/main/models.py index d6ec9b2a..4c234ca5 100644 --- a/eureka/main/models.py +++ b/eureka/main/models.py @@ -4,13 +4,13 @@ from eureka.main.blocks import ( EarTrainingElementBlock, ImageBlock, AccessibleTextBlock, VideoEmbedBlock ) -from wagtail.admin.edit_handlers import FieldPanel, PageChooserPanel +from wagtail.admin.panels import FieldPanel, PageChooserPanel from wagtail.contrib.table_block.blocks import TableBlock -from wagtail.core.blocks import ( +from wagtail.blocks import ( RichTextBlock ) -from wagtail.core.fields import StreamField -from wagtail.core.models import Page +from wagtail.fields import StreamField +from wagtail.models import Page from wagtailmenus.models import MenuPageMixin from wagtailmenus.panels import menupage_panel diff --git a/eureka/main/wagtail_hooks.py b/eureka/main/wagtail_hooks.py index 26537754..63ab35f6 100644 --- a/eureka/main/wagtail_hooks.py +++ b/eureka/main/wagtail_hooks.py @@ -1,4 +1,4 @@ -from wagtail.core import hooks +from wagtail import hooks @hooks.register('construct_explorer_page_queryset') diff --git a/eureka/settings_shared.py b/eureka/settings_shared.py index 007e7b7c..905f89c2 100644 --- a/eureka/settings_shared.py +++ b/eureka/settings_shared.py @@ -36,7 +36,7 @@ 'wagtail.images', 'wagtail.search', 'wagtail.admin', - 'wagtail.core', + 'wagtail', 'modelcluster', 'taggit', 'wagtailfontawesome', diff --git a/eureka/urls.py b/eureka/urls.py index 719169cb..ea95a137 100644 --- a/eureka/urls.py +++ b/eureka/urls.py @@ -8,7 +8,7 @@ from eureka.main.views import S3DocumentServe from wagtail.admin import urls as wagtailadmin_urls from wagtail.documents import urls as wagtaildocs_urls -from wagtail.core import urls as wagtail_urls +from wagtail import urls as wagtail_urls site_media_root = os.path.join(os.path.dirname(__file__), "../media") diff --git a/requirements.txt b/requirements.txt index d012a787..fa9f7353 100644 --- a/requirements.txt +++ b/requirements.txt @@ -95,7 +95,7 @@ django-contact-us==1.1.0 entrypoints==0.4 # wagtail requirements -wagtail==4.2.4 +wagtail==5.0.5 openpyxl==3.1.5 # wagtail django-modelcluster>=6.0,<7.0 django-permissionedforms>=0.1,<1.0