From ab0e7422a1a5794c7484f0a5793fb7768ab39688 Mon Sep 17 00:00:00 2001 From: Joseph Lyon Date: Tue, 24 Sep 2019 16:24:12 -0400 Subject: [PATCH 01/36] update gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5981ea26..aecaac7a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ /webpack-stats.json /.vscode/ .DS_Store -/pipeline-env/ \ No newline at end of file +/pipeline-env/ +**/__pycache__/** \ No newline at end of file From 386d0b631902b4bbe00939f2b6f29b7db57b416d Mon Sep 17 00:00:00 2001 From: Joseph Lyon Date: Tue, 24 Sep 2019 17:11:30 -0400 Subject: [PATCH 02/36] add adpage type, adpage column --- core/migrations/0005_adpage.py | 37 +++++ core/models.py | 164 ++++++++++++++++++++- home/migrations/0002_auto_20190924_2108.py | 20 +++ home/models.py | 20 +++ home/templates/home/home_page.html | 23 +++ pipeline/settings/dev.py | 2 +- 6 files changed, 263 insertions(+), 3 deletions(-) create mode 100644 core/migrations/0005_adpage.py create mode 100644 home/migrations/0002_auto_20190924_2108.py diff --git a/core/migrations/0005_adpage.py b/core/migrations/0005_adpage.py new file mode 100644 index 00000000..f8b97be5 --- /dev/null +++ b/core/migrations/0005_adpage.py @@ -0,0 +1,37 @@ +# Generated by Django 2.2.5 on 2019-09-24 21:08 + +from django.db import migrations, models +import django.db.models.deletion +import wagtail.contrib.routable_page.models +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.embeds.blocks +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailcore', '0041_group_collection_permissions_verbose_name_plural'), + ('core', '0004_archivespage_body'), + ] + + operations = [ + migrations.CreateModel( + name='AdPage', + 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')), + ('headline', wagtail.core.fields.RichTextField()), + ('subdeck', wagtail.core.fields.RichTextField(blank=True, null=True)), + ('body', wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('photo', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False)), ('size', wagtail.core.blocks.ChoiceBlock(choices=[('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')], help_text='Width of image in article.'))])), ('photo_gallery', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False))]), icon='image')), ('embed', wagtail.core.blocks.StructBlock([('embed', wagtail.embeds.blocks.EmbedBlock(help_text='URL to the content to embed.'))]))], blank=True)), + ('summary', wagtail.core.fields.RichTextField(blank=True, help_text='Displayed on the home page or other places to provide a taste of what the article is about.', null=True)), + ('featured_caption', wagtail.core.fields.RichTextField(blank=True, null=True)), + ('featured_image', models.ForeignKey(blank=True, help_text='Shown at the top of the article and on the home page.', null=True, on_delete=django.db.models.deletion.PROTECT, to='core.CustomImage')), + ('kicker', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='core.Kicker')), + ], + options={ + 'abstract': False, + }, + bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), + ), + ] diff --git a/core/models.py b/core/models.py index 918b97a1..3c14b030 100644 --- a/core/models.py +++ b/core/models.py @@ -109,7 +109,7 @@ class StaffPage(Page): search_fields = [index.SearchField("first_name"), index.SearchField("last_name")] - parent_page_types = ["StaffIndexPage"] + parent_page_types = ["StaffIndexPage", "ArticlesIndexPage"] subpage_types = [] @property @@ -524,9 +524,169 @@ def get_meta_tags(self): return tags +class AdPage (RoutablePageMixin, Page): + headline = RichTextField(features=["italic"]) + subdeck = RichTextField(features=["italic"], null=True, blank=True) + kicker = models.ForeignKey(Kicker, null=True, blank=True, on_delete=models.PROTECT) + body = StreamField( + [ + ("paragraph", RichTextBlock()), + ("photo", PhotoBlock()), + ("photo_gallery", ListBlock(GalleryPhotoBlock(), icon="image")), + ("embed", EmbeddedMediaBlock()), + ], + blank=True, + ) + summary = RichTextField( + features=["italic"], + null=True, + blank=True, + help_text="Displayed on the home page or other places to provide a taste of what the article is about.", + ) + featured_image = models.ForeignKey( + CustomImage, + null=True, + blank=True, + on_delete=models.PROTECT, + help_text="Shown at the top of the article and on the home page.", + ) + featured_caption = RichTextField(features=["italic"], blank=True, null=True) + + content_panels = [ + MultiFieldPanel( + [FieldPanel("headline", classname="title"), FieldPanel("subdeck")] + ), + + FieldPanel("summary"), + StreamFieldPanel("body"), + ] + + search_fields = Page.search_fields + [ + index.SearchField("headline"), + index.SearchField("subdeck"), + index.SearchField("body"), + index.SearchField("summary"), + index.RelatedFields("kicker", [index.SearchField("title")]), + ] + + subpage_types = [] + + def clean(self): + super().clean() + + soup = BeautifulSoup(self.headline, "html.parser") + self.title = soup.text + + @route(r"^$") + def post_404(self, request): + """Return an HTTP 404 whenever the page is accessed directly. + + This is because it should instead by accessed by its date-based path, + i.e. `///`.""" + raise Http404 + + def set_url_path(self, parent): + """Make sure the page knows its own path. The published date might not be set, + so we have to take that into account and ignore it if so.""" + date = self.get_published_date() or timezone.now() + self.url_path = f"{parent.url_path}{date.year}/{date.month:02d}/{self.slug}/" + return self.url_path + + def serve_preview(self, request, mode_name): + request.is_preview = True + return self.serve(request) + + def get_context(self, request): + context = super().get_context(request) + context["authors"] = self.get_authors() + return context + + def get_authors(self): + return 'ads' + + def get_author_names(self): + return [a.name for a in self.get_authors()] + + def get_published_date(self): + return ( + self.go_live_at + or self.first_published_at + or getattr(self.get_latest_revision(), "created_at", None) + ) + + def get_text_html(self): + """Get the HTML that represents paragraphs within the article as a string.""" + builder = "" + for block in self.body: + if block.block_type == "paragraph": + builder += str(block.value) + return builder + + def get_plain_text(self): + builder = "" + soup = BeautifulSoup(self.get_text_html(), "html.parser") + for para in soup.findAll("p"): + builder += para.text + builder += " " + return builder[:-1] + + + def get_first_chars(self, n=100): + """Convert the body to HTML, extract the text, and then build + a string out of it until we have at least n characters. + If this isn't possible, then return None.""" + + text = self.get_plain_text() + if len(text) < n: + return None + + punctuation = {".", "!"} + for i in range(n, len(text)): + if text[i] in punctuation: + if i + 1 == len(text): + return text + elif text[i + 1] == " ": + return text[: i + 1] + + return None + + def get_meta_tags(self): + tags = {} + tags["og:type"] = "article" + tags["og:title"] = self.title + tags["og:url"] = self.full_url + tags["og:site_name"] = self.get_site().site_name + + # description: either the article's summary or first paragraph + if self.summary is not None: + tags["og:description"] = self.summary + tags["twitter:description"] = self.summary + else: + first_chars = self.get_first_chars() + if first_chars is not None: + tags["og:description"] = first_chars + tags["twitter:description"] = first_chars + + # image + if self.featured_image is not None: + # pylint: disable=E1101 + rendition = self.featured_image.get_rendition("min-1200x1200") + rendition_url = self.get_site().root_url + rendition.url + tags["og:image"] = rendition_url + tags["twitter:image"] = rendition_url + + tags["twitter:site"] = "@rpipoly" + tags["twitter:title"] = self.title + if "twitter:description" in tags and "twitter:image" in tags: + tags["twitter:card"] = "summary_large_image" + else: + tags["twitter:card"] = "summary" + + return tags + class ArticlesIndexPage(RoutablePageMixin, Page): - subpage_types = ["ArticlePage"] + subpage_types = ["ArticlePage", "StaffPage", "AdPage"] @route(r"^(\d{4})\/(\d{2})\/(.*)\/$") def post_by_date(self, request, year, month, slug, *args, **kwargs): diff --git a/home/migrations/0002_auto_20190924_2108.py b/home/migrations/0002_auto_20190924_2108.py new file mode 100644 index 00000000..53665598 --- /dev/null +++ b/home/migrations/0002_auto_20190924_2108.py @@ -0,0 +1,20 @@ +# Generated by Django 2.2.5 on 2019-09-24 21:08 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='homepage', + name='featured_articles', + field=wagtail.core.fields.StreamField([('one_column', wagtail.core.blocks.StructBlock([('column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('one_ad_column', wagtail.core.blocks.StructBlock([('column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.AdPage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('two_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('emphasize_column', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')], help_text='Which article, if either, should appear larger.', required=False))])), ('three_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('middle_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('recent_articles', wagtail.core.blocks.StructBlock([('num_articles', wagtail.core.blocks.IntegerBlock(help_text='Number of recent articles to display.', label='Number of articles'))]))], null=True), + ), + ] diff --git a/home/models.py b/home/models.py index 4a502d7c..6d545a1e 100644 --- a/home/models.py +++ b/home/models.py @@ -17,6 +17,17 @@ class ArticleBlock(blocks.StructBlock): class Meta: template = "home/article_block.html" +class AdBlock(blocks.StructBlock): + article = blocks.PageChooserBlock(target_model="core.AdPage") + headline = blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", required=False + ) + # TODO: add a photo override block + # TODO: add a "hide photo" block + + class Meta: + template = "home/article_block.html" + class OneColumnBlock(blocks.StructBlock): column = ArticleBlock() @@ -24,6 +35,12 @@ class OneColumnBlock(blocks.StructBlock): def article_pks(self): return set(self.column.value.pk) # pylint: disable=E1101 +class OneColumnAdBlock(blocks.StructBlock): + column = AdBlock() + + def article_pks(self): + return set(self.column.value.pk) # pylint: disable=E1101 + class TwoColumnBlock(blocks.StructBlock): left_column = ArticleBlock() @@ -84,6 +101,7 @@ class HomePage(Page): featured_articles = StreamField( [ ("one_column", OneColumnBlock()), + ("one_ad_column", OneColumnAdBlock()), ("two_columns", TwoColumnBlock()), ("three_columns", ThreeColumnBlock()), ("recent_articles", RecentArticlesBlock()), @@ -98,6 +116,8 @@ def article_pks(self): for block in self.featured_articles: # pylint: disable=E1133 if block.block_type == "one_column": pks.add(block.value["column"]["article"].pk) + elif block.block_type == "one_ad_column": + pks.add(block.value["column"]["article"].pk) elif block.block_type == "two_columns": pks.add(block.value["left_column"]["article"].pk) pks.add(block.value["right_column"]["article"].pk) diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index 0fdc27ff..8eca3e04 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -56,6 +56,29 @@

{{ block.value.column.article.specific.summary|richtext }}
+ {% elif block.block_type == "one_ad_column" %} +
+
+ {% if block.value.column.article.specific.kicker %} + THIS IS AN AD + {% endif %} +

+ + {{ block.value.column.article.specific.headline|richtext_unwrapped }} + +

+
{{ block.value.column.article.specific.summary|richtext }}
+
+
+ {% image block.value.column.article.featured_image width-1200 as photo %} + + + +
+
+
{{ block.value.column.article.specific.summary|richtext }}
+
+
{% elif block.block_type == "two_columns" %}
Date: Tue, 24 Sep 2019 18:04:57 -0400 Subject: [PATCH 03/36] add an ad block with target link --- core/models.py | 13 +++++++++++++ home/models.py | 21 ++------------------- home/templates/home/home_page.html | 22 +++++++--------------- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/core/models.py b/core/models.py index 3c14b030..d70e0898 100644 --- a/core/models.py +++ b/core/models.py @@ -313,6 +313,19 @@ class PhotoBlock(StructBlock): class Meta: icon = "image" +class AdBlock(StructBlock): + image = ImageChooserBlock() + caption = RichTextBlock(features=["italic"], required=False) + link = URLBlock(label = "target", required="false") + size = ChoiceBlock( + choices=[("small", "Small"), ("medium", "Medium"), ("large", "Large")], + default="medium", + help_text="Width of image in ad.", + ) + + class Meta: + icon = "image" + class GalleryPhotoBlock(StructBlock): image = ImageChooserBlock() diff --git a/home/models.py b/home/models.py index 6d545a1e..31076534 100644 --- a/home/models.py +++ b/home/models.py @@ -3,7 +3,7 @@ from wagtail.admin.edit_handlers import StreamFieldPanel from wagtail.core import blocks -from core.models import ArticlePage, ArticlesIndexPage +from core.models import ArticlePage, ArticlesIndexPage, AdBlock class ArticleBlock(blocks.StructBlock): @@ -17,18 +17,6 @@ class ArticleBlock(blocks.StructBlock): class Meta: template = "home/article_block.html" -class AdBlock(blocks.StructBlock): - article = blocks.PageChooserBlock(target_model="core.AdPage") - headline = blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", required=False - ) - # TODO: add a photo override block - # TODO: add a "hide photo" block - - class Meta: - template = "home/article_block.html" - - class OneColumnBlock(blocks.StructBlock): column = ArticleBlock() @@ -38,9 +26,6 @@ def article_pks(self): class OneColumnAdBlock(blocks.StructBlock): column = AdBlock() - def article_pks(self): - return set(self.column.value.pk) # pylint: disable=E1101 - class TwoColumnBlock(blocks.StructBlock): left_column = ArticleBlock() @@ -101,7 +86,7 @@ class HomePage(Page): featured_articles = StreamField( [ ("one_column", OneColumnBlock()), - ("one_ad_column", OneColumnAdBlock()), + ("one_ad_column", AdBlock()), ("two_columns", TwoColumnBlock()), ("three_columns", ThreeColumnBlock()), ("recent_articles", RecentArticlesBlock()), @@ -116,8 +101,6 @@ def article_pks(self): for block in self.featured_articles: # pylint: disable=E1133 if block.block_type == "one_column": pks.add(block.value["column"]["article"].pk) - elif block.block_type == "one_ad_column": - pks.add(block.value["column"]["article"].pk) elif block.block_type == "two_columns": pks.add(block.value["left_column"]["article"].pk) pks.add(block.value["right_column"]["article"].pk) diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index 8eca3e04..06ad2110 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -58,22 +58,14 @@

{% elif block.block_type == "one_ad_column" %}
-
- {% if block.value.column.article.specific.kicker %} - THIS IS AN AD - {% endif %} -

- - {{ block.value.column.article.specific.headline|richtext_unwrapped }} +
+ ADVERTISEMENT + {% image block.value.image width-1200 height-400 as photo %} +
+ + -

-
{{ block.value.column.article.specific.summary|richtext }}
-
-
- {% image block.value.column.article.featured_image width-1200 as photo %} - - - +
{{ block.value.column.article.specific.summary|richtext }}
From 37964cf2f60f258ae053fda717a62fdb20ee0395 Mon Sep 17 00:00:00 2001 From: Joseph Lyon Date: Tue, 24 Sep 2019 19:39:05 -0400 Subject: [PATCH 04/36] lint --- core/models.py | 10 +++++----- home/models.py | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/models.py b/core/models.py index d70e0898..694d3f8e 100644 --- a/core/models.py +++ b/core/models.py @@ -313,10 +313,11 @@ class PhotoBlock(StructBlock): class Meta: icon = "image" + class AdBlock(StructBlock): image = ImageChooserBlock() caption = RichTextBlock(features=["italic"], required=False) - link = URLBlock(label = "target", required="false") + link = URLBlock(label="target", required="false") size = ChoiceBlock( choices=[("small", "Small"), ("medium", "Medium"), ("large", "Large")], default="medium", @@ -537,7 +538,8 @@ def get_meta_tags(self): return tags -class AdPage (RoutablePageMixin, Page): + +class AdPage(RoutablePageMixin, Page): headline = RichTextField(features=["italic"]) subdeck = RichTextField(features=["italic"], null=True, blank=True) kicker = models.ForeignKey(Kicker, null=True, blank=True, on_delete=models.PROTECT) @@ -569,7 +571,6 @@ class AdPage (RoutablePageMixin, Page): MultiFieldPanel( [FieldPanel("headline", classname="title"), FieldPanel("subdeck")] ), - FieldPanel("summary"), StreamFieldPanel("body"), ] @@ -615,7 +616,7 @@ def get_context(self, request): return context def get_authors(self): - return 'ads' + return "ads" def get_author_names(self): return [a.name for a in self.get_authors()] @@ -643,7 +644,6 @@ def get_plain_text(self): builder += " " return builder[:-1] - def get_first_chars(self, n=100): """Convert the body to HTML, extract the text, and then build a string out of it until we have at least n characters. diff --git a/home/models.py b/home/models.py index 31076534..38c1008f 100644 --- a/home/models.py +++ b/home/models.py @@ -17,12 +17,14 @@ class ArticleBlock(blocks.StructBlock): class Meta: template = "home/article_block.html" + class OneColumnBlock(blocks.StructBlock): column = ArticleBlock() def article_pks(self): return set(self.column.value.pk) # pylint: disable=E1101 + class OneColumnAdBlock(blocks.StructBlock): column = AdBlock() From 752ec7706fc15afc81032ea376b43b9f74f8eb6c Mon Sep 17 00:00:00 2001 From: Joseph Lyon Date: Tue, 24 Sep 2019 19:42:11 -0400 Subject: [PATCH 05/36] remove unused types and migrations --- core/migrations/0005_adpage.py | 37 ----- core/models.py | 161 +-------------------- home/migrations/0002_auto_20190924_2108.py | 20 --- 3 files changed, 1 insertion(+), 217 deletions(-) delete mode 100644 core/migrations/0005_adpage.py delete mode 100644 home/migrations/0002_auto_20190924_2108.py diff --git a/core/migrations/0005_adpage.py b/core/migrations/0005_adpage.py deleted file mode 100644 index f8b97be5..00000000 --- a/core/migrations/0005_adpage.py +++ /dev/null @@ -1,37 +0,0 @@ -# Generated by Django 2.2.5 on 2019-09-24 21:08 - -from django.db import migrations, models -import django.db.models.deletion -import wagtail.contrib.routable_page.models -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.embeds.blocks -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('wagtailcore', '0041_group_collection_permissions_verbose_name_plural'), - ('core', '0004_archivespage_body'), - ] - - operations = [ - migrations.CreateModel( - name='AdPage', - 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')), - ('headline', wagtail.core.fields.RichTextField()), - ('subdeck', wagtail.core.fields.RichTextField(blank=True, null=True)), - ('body', wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('photo', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False)), ('size', wagtail.core.blocks.ChoiceBlock(choices=[('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')], help_text='Width of image in article.'))])), ('photo_gallery', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False))]), icon='image')), ('embed', wagtail.core.blocks.StructBlock([('embed', wagtail.embeds.blocks.EmbedBlock(help_text='URL to the content to embed.'))]))], blank=True)), - ('summary', wagtail.core.fields.RichTextField(blank=True, help_text='Displayed on the home page or other places to provide a taste of what the article is about.', null=True)), - ('featured_caption', wagtail.core.fields.RichTextField(blank=True, null=True)), - ('featured_image', models.ForeignKey(blank=True, help_text='Shown at the top of the article and on the home page.', null=True, on_delete=django.db.models.deletion.PROTECT, to='core.CustomImage')), - ('kicker', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='core.Kicker')), - ], - options={ - 'abstract': False, - }, - bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), - ), - ] diff --git a/core/models.py b/core/models.py index 694d3f8e..7b182f06 100644 --- a/core/models.py +++ b/core/models.py @@ -539,167 +539,8 @@ def get_meta_tags(self): return tags -class AdPage(RoutablePageMixin, Page): - headline = RichTextField(features=["italic"]) - subdeck = RichTextField(features=["italic"], null=True, blank=True) - kicker = models.ForeignKey(Kicker, null=True, blank=True, on_delete=models.PROTECT) - body = StreamField( - [ - ("paragraph", RichTextBlock()), - ("photo", PhotoBlock()), - ("photo_gallery", ListBlock(GalleryPhotoBlock(), icon="image")), - ("embed", EmbeddedMediaBlock()), - ], - blank=True, - ) - summary = RichTextField( - features=["italic"], - null=True, - blank=True, - help_text="Displayed on the home page or other places to provide a taste of what the article is about.", - ) - featured_image = models.ForeignKey( - CustomImage, - null=True, - blank=True, - on_delete=models.PROTECT, - help_text="Shown at the top of the article and on the home page.", - ) - featured_caption = RichTextField(features=["italic"], blank=True, null=True) - - content_panels = [ - MultiFieldPanel( - [FieldPanel("headline", classname="title"), FieldPanel("subdeck")] - ), - FieldPanel("summary"), - StreamFieldPanel("body"), - ] - - search_fields = Page.search_fields + [ - index.SearchField("headline"), - index.SearchField("subdeck"), - index.SearchField("body"), - index.SearchField("summary"), - index.RelatedFields("kicker", [index.SearchField("title")]), - ] - - subpage_types = [] - - def clean(self): - super().clean() - - soup = BeautifulSoup(self.headline, "html.parser") - self.title = soup.text - - @route(r"^$") - def post_404(self, request): - """Return an HTTP 404 whenever the page is accessed directly. - - This is because it should instead by accessed by its date-based path, - i.e. `///`.""" - raise Http404 - - def set_url_path(self, parent): - """Make sure the page knows its own path. The published date might not be set, - so we have to take that into account and ignore it if so.""" - date = self.get_published_date() or timezone.now() - self.url_path = f"{parent.url_path}{date.year}/{date.month:02d}/{self.slug}/" - return self.url_path - - def serve_preview(self, request, mode_name): - request.is_preview = True - return self.serve(request) - - def get_context(self, request): - context = super().get_context(request) - context["authors"] = self.get_authors() - return context - - def get_authors(self): - return "ads" - - def get_author_names(self): - return [a.name for a in self.get_authors()] - - def get_published_date(self): - return ( - self.go_live_at - or self.first_published_at - or getattr(self.get_latest_revision(), "created_at", None) - ) - - def get_text_html(self): - """Get the HTML that represents paragraphs within the article as a string.""" - builder = "" - for block in self.body: - if block.block_type == "paragraph": - builder += str(block.value) - return builder - - def get_plain_text(self): - builder = "" - soup = BeautifulSoup(self.get_text_html(), "html.parser") - for para in soup.findAll("p"): - builder += para.text - builder += " " - return builder[:-1] - - def get_first_chars(self, n=100): - """Convert the body to HTML, extract the text, and then build - a string out of it until we have at least n characters. - If this isn't possible, then return None.""" - - text = self.get_plain_text() - if len(text) < n: - return None - - punctuation = {".", "!"} - for i in range(n, len(text)): - if text[i] in punctuation: - if i + 1 == len(text): - return text - elif text[i + 1] == " ": - return text[: i + 1] - - return None - - def get_meta_tags(self): - tags = {} - tags["og:type"] = "article" - tags["og:title"] = self.title - tags["og:url"] = self.full_url - tags["og:site_name"] = self.get_site().site_name - - # description: either the article's summary or first paragraph - if self.summary is not None: - tags["og:description"] = self.summary - tags["twitter:description"] = self.summary - else: - first_chars = self.get_first_chars() - if first_chars is not None: - tags["og:description"] = first_chars - tags["twitter:description"] = first_chars - - # image - if self.featured_image is not None: - # pylint: disable=E1101 - rendition = self.featured_image.get_rendition("min-1200x1200") - rendition_url = self.get_site().root_url + rendition.url - tags["og:image"] = rendition_url - tags["twitter:image"] = rendition_url - - tags["twitter:site"] = "@rpipoly" - tags["twitter:title"] = self.title - if "twitter:description" in tags and "twitter:image" in tags: - tags["twitter:card"] = "summary_large_image" - else: - tags["twitter:card"] = "summary" - - return tags - - class ArticlesIndexPage(RoutablePageMixin, Page): - subpage_types = ["ArticlePage", "StaffPage", "AdPage"] + subpage_types = ["ArticlePage", "StaffPage"] @route(r"^(\d{4})\/(\d{2})\/(.*)\/$") def post_by_date(self, request, year, month, slug, *args, **kwargs): diff --git a/home/migrations/0002_auto_20190924_2108.py b/home/migrations/0002_auto_20190924_2108.py deleted file mode 100644 index 53665598..00000000 --- a/home/migrations/0002_auto_20190924_2108.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 2.2.5 on 2019-09-24 21:08 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('home', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='homepage', - name='featured_articles', - field=wagtail.core.fields.StreamField([('one_column', wagtail.core.blocks.StructBlock([('column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('one_ad_column', wagtail.core.blocks.StructBlock([('column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.AdPage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('two_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('emphasize_column', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')], help_text='Which article, if either, should appear larger.', required=False))])), ('three_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('middle_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('recent_articles', wagtail.core.blocks.StructBlock([('num_articles', wagtail.core.blocks.IntegerBlock(help_text='Number of recent articles to display.', label='Number of articles'))]))], null=True), - ), - ] From 523d3ff7f69fcf21086baec3ccb5fe0db1b0b38a Mon Sep 17 00:00:00 2001 From: Joseph Lyon Date: Tue, 24 Sep 2019 19:45:27 -0400 Subject: [PATCH 06/36] migrations --- home/migrations/0002_auto_20190924_2345.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 home/migrations/0002_auto_20190924_2345.py diff --git a/home/migrations/0002_auto_20190924_2345.py b/home/migrations/0002_auto_20190924_2345.py new file mode 100644 index 00000000..c7d26d3e --- /dev/null +++ b/home/migrations/0002_auto_20190924_2345.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.5 on 2019-09-24 23:45 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='homepage', + name='featured_articles', + field=wagtail.core.fields.StreamField([('one_column', wagtail.core.blocks.StructBlock([('column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('one_ad_column', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False)), ('link', wagtail.core.blocks.URLBlock(label='target', required='false')), ('size', wagtail.core.blocks.ChoiceBlock(choices=[('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')], help_text='Width of image in ad.'))])), ('two_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('emphasize_column', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')], help_text='Which article, if either, should appear larger.', required=False))])), ('three_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('middle_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('recent_articles', wagtail.core.blocks.StructBlock([('num_articles', wagtail.core.blocks.IntegerBlock(help_text='Number of recent articles to display.', label='Number of articles'))]))], null=True), + ), + ] From f7c4316415b2e96480f517491096d4a367d4d00d Mon Sep 17 00:00:00 2001 From: Joseph Lyon Date: Tue, 24 Sep 2019 19:45:46 -0400 Subject: [PATCH 07/36] database --- pipeline/settings/dev.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline/settings/dev.py b/pipeline/settings/dev.py index 5ff16658..9b0eac29 100644 --- a/pipeline/settings/dev.py +++ b/pipeline/settings/dev.py @@ -36,7 +36,7 @@ DATABASES = { "default": dj_database_url.config( - default="postgresql://postgres:postgres@127.0.0.1:5432/pq" + default="postgresql://postgres:postgres@127.0.0.1:5432/pipeline" ) } From cbb4a5b5db284b3a11251db62350825a75435d72 Mon Sep 17 00:00:00 2001 From: Joseph Lyon Date: Tue, 24 Sep 2019 19:50:07 -0400 Subject: [PATCH 08/36] lint --- home/migrations/0002_auto_20190924_2345.py | 210 ++++++++++++++++++++- 1 file changed, 203 insertions(+), 7 deletions(-) diff --git a/home/migrations/0002_auto_20190924_2345.py b/home/migrations/0002_auto_20190924_2345.py index c7d26d3e..2f0cc2e3 100644 --- a/home/migrations/0002_auto_20190924_2345.py +++ b/home/migrations/0002_auto_20190924_2345.py @@ -8,14 +8,210 @@ class Migration(migrations.Migration): - dependencies = [ - ('home', '0001_initial'), - ] + dependencies = [("home", "0001_initial")] operations = [ migrations.AlterField( - model_name='homepage', - name='featured_articles', - field=wagtail.core.fields.StreamField([('one_column', wagtail.core.blocks.StructBlock([('column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('one_ad_column', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False)), ('link', wagtail.core.blocks.URLBlock(label='target', required='false')), ('size', wagtail.core.blocks.ChoiceBlock(choices=[('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')], help_text='Width of image in ad.'))])), ('two_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('emphasize_column', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')], help_text='Which article, if either, should appear larger.', required=False))])), ('three_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('middle_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('recent_articles', wagtail.core.blocks.StructBlock([('num_articles', wagtail.core.blocks.IntegerBlock(help_text='Number of recent articles to display.', label='Number of articles'))]))], null=True), - ), + model_name="homepage", + name="featured_articles", + field=wagtail.core.fields.StreamField( + [ + ( + "one_column", + wagtail.core.blocks.StructBlock( + [ + ( + "column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=["core.ArticlePage"] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ) + ] + ), + ), + ( + "one_ad_column", + wagtail.core.blocks.StructBlock( + [ + ("image", wagtail.images.blocks.ImageChooserBlock()), + ( + "caption", + wagtail.core.blocks.RichTextBlock( + features=["italic"], required=False + ), + ), + ( + "link", + wagtail.core.blocks.URLBlock( + label="target", required="false" + ), + ), + ( + "size", + wagtail.core.blocks.ChoiceBlock( + choices=[ + ("small", "Small"), + ("medium", "Medium"), + ("large", "Large"), + ], + help_text="Width of image in ad.", + ), + ), + ] + ), + ), + ( + "two_columns", + wagtail.core.blocks.StructBlock( + [ + ( + "left_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=["core.ArticlePage"] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ( + "right_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=["core.ArticlePage"] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ( + "emphasize_column", + wagtail.core.blocks.ChoiceBlock( + choices=[("left", "Left"), ("right", "Right")], + help_text="Which article, if either, should appear larger.", + required=False, + ), + ), + ] + ), + ), + ( + "three_columns", + wagtail.core.blocks.StructBlock( + [ + ( + "left_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=["core.ArticlePage"] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ( + "middle_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=["core.ArticlePage"] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ( + "right_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=["core.ArticlePage"] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ] + ), + ), + ( + "recent_articles", + wagtail.core.blocks.StructBlock( + [ + ( + "num_articles", + wagtail.core.blocks.IntegerBlock( + help_text="Number of recent articles to display.", + label="Number of articles", + ), + ) + ] + ), + ), + ], + null=True, + ), + ) ] From 2fc68e6eb33a83c1984c5c5cb04699d1c91db674 Mon Sep 17 00:00:00 2001 From: Joseph Lyon Date: Tue, 24 Sep 2019 19:57:52 -0400 Subject: [PATCH 09/36] remove something that shoudlnt be there --- core/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/models.py b/core/models.py index 7b182f06..311af0fd 100644 --- a/core/models.py +++ b/core/models.py @@ -109,7 +109,7 @@ class StaffPage(Page): search_fields = [index.SearchField("first_name"), index.SearchField("last_name")] - parent_page_types = ["StaffIndexPage", "ArticlesIndexPage"] + parent_page_types = ["StaffIndexPage"] subpage_types = [] @property @@ -540,7 +540,7 @@ def get_meta_tags(self): class ArticlesIndexPage(RoutablePageMixin, Page): - subpage_types = ["ArticlePage", "StaffPage"] + subpage_types = ["ArticlePage"] @route(r"^(\d{4})\/(\d{2})\/(.*)\/$") def post_by_date(self, request, year, month, slug, *args, **kwargs): From 15ac843b22c0b80a209844893464abbb795cc131 Mon Sep 17 00:00:00 2001 From: Joseph Lyon Date: Tue, 24 Sep 2019 20:11:59 -0400 Subject: [PATCH 10/36] remove unused fields --- home/templates/home/home_page.html | 3 --- pipeline/settings/dev.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index 06ad2110..28be59c9 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -67,9 +67,6 @@

-
-
{{ block.value.column.article.specific.summary|richtext }}
-
{% elif block.block_type == "two_columns" %}
Date: Tue, 24 Sep 2019 20:14:33 -0400 Subject: [PATCH 11/36] undo --- pipeline/settings/dev.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline/settings/dev.py b/pipeline/settings/dev.py index 5ff16658..9b0eac29 100644 --- a/pipeline/settings/dev.py +++ b/pipeline/settings/dev.py @@ -36,7 +36,7 @@ DATABASES = { "default": dj_database_url.config( - default="postgresql://postgres:postgres@127.0.0.1:5432/pq" + default="postgresql://postgres:postgres@127.0.0.1:5432/pipeline" ) } From 7755c3e9ebbab939f0c7f51aa887f9d33a6bb43e Mon Sep 17 00:00:00 2001 From: Joseph Lyon Date: Tue, 24 Sep 2019 22:35:17 -0400 Subject: [PATCH 12/36] make link not reqd --- core/models.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/core/models.py b/core/models.py index 311af0fd..7899b346 100644 --- a/core/models.py +++ b/core/models.py @@ -316,13 +316,7 @@ class Meta: class AdBlock(StructBlock): image = ImageChooserBlock() - caption = RichTextBlock(features=["italic"], required=False) - link = URLBlock(label="target", required="false") - size = ChoiceBlock( - choices=[("small", "Small"), ("medium", "Medium"), ("large", "Large")], - default="medium", - help_text="Width of image in ad.", - ) + link = URLBlock(label="target", required=False) class Meta: icon = "image" From d3f0884ae62f67de04b7648b6443d6915362d4a6 Mon Sep 17 00:00:00 2001 From: Joseph Lyon Date: Tue, 24 Sep 2019 22:48:47 -0400 Subject: [PATCH 13/36] optional link, add label --- core/models.py | 2 +- home/templates/home/home_page.html | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/models.py b/core/models.py index 7899b346..b57cf966 100644 --- a/core/models.py +++ b/core/models.py @@ -315,7 +315,7 @@ class Meta: class AdBlock(StructBlock): - image = ImageChooserBlock() + image = ImageChooserBlock(help_text="Image should be 22:7") link = URLBlock(label="target", required=False) class Meta: diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index 28be59c9..38f1fd16 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -62,9 +62,13 @@

ADVERTISEMENT {% image block.value.image width-1200 height-400 as photo %}
+ {% if block.value.link != "" %} + {% endif %} + {% if block.value.link != "" %} + {% endif %}

From 7841da39e419303c7c9680c94142cc75a20af29b Mon Sep 17 00:00:00 2001 From: Joseph Lyon Date: Tue, 24 Sep 2019 23:14:46 -0400 Subject: [PATCH 14/36] migrations --- home/migrations/0003_auto_20190925_0314.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 home/migrations/0003_auto_20190925_0314.py diff --git a/home/migrations/0003_auto_20190925_0314.py b/home/migrations/0003_auto_20190925_0314.py new file mode 100644 index 00000000..7655a12e --- /dev/null +++ b/home/migrations/0003_auto_20190925_0314.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.5 on 2019-09-25 03:14 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0002_auto_20190924_2345'), + ] + + operations = [ + migrations.AlterField( + model_name='homepage', + name='featured_articles', + field=wagtail.core.fields.StreamField([('one_column', wagtail.core.blocks.StructBlock([('column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('one_ad_column', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(help_text='Image should be 22:7')), ('link', wagtail.core.blocks.URLBlock(label='target', required=False))])), ('two_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('emphasize_column', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')], help_text='Which article, if either, should appear larger.', required=False))])), ('three_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('middle_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('recent_articles', wagtail.core.blocks.StructBlock([('num_articles', wagtail.core.blocks.IntegerBlock(help_text='Number of recent articles to display.', label='Number of articles'))]))], null=True), + ), + ] From 93e7bbd2d2b7fb32ed734d4880b7a679a7825b22 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Fri, 27 Sep 2019 15:25:53 -0400 Subject: [PATCH 15/36] Started work on a marquee banner. Right now it shows moving text and has basic outline. Needs to be styled better. --- core/models.py | 3 +++ home/models.py | 3 ++- home/templates/home/home_page.html | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/models.py b/core/models.py index b57cf966..8d9b5e0d 100644 --- a/core/models.py +++ b/core/models.py @@ -321,6 +321,9 @@ class AdBlock(StructBlock): class Meta: icon = "image" +class MarqueeBlock(StructBlock): + body=RichTextBlock(required=True) + class GalleryPhotoBlock(StructBlock): image = ImageChooserBlock() diff --git a/home/models.py b/home/models.py index 38c1008f..f01cc2a4 100644 --- a/home/models.py +++ b/home/models.py @@ -3,7 +3,7 @@ from wagtail.admin.edit_handlers import StreamFieldPanel from wagtail.core import blocks -from core.models import ArticlePage, ArticlesIndexPage, AdBlock +from core.models import ArticlePage, ArticlesIndexPage, AdBlock, MarqueeBlock class ArticleBlock(blocks.StructBlock): @@ -92,6 +92,7 @@ class HomePage(Page): ("two_columns", TwoColumnBlock()), ("three_columns", ThreeColumnBlock()), ("recent_articles", RecentArticlesBlock()), + ("marquee_banner", MarqueeBlock()), ], null=True, ) diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index 38f1fd16..2e5c6b69 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -33,7 +33,11 @@
{% for block in page.featured_articles %}
- {% if block.block_type == "one_column" %} + {% if block.block_type == "marquee_banner" %} +
+ {{block.value.body}} +
+ {% elif block.block_type == "one_column" %}
{% if block.value.column.article.specific.kicker %} From 542308e3722d30aee89953b52cf99e98c45813e2 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Fri, 27 Sep 2019 16:50:21 -0400 Subject: [PATCH 16/36] Made the banner text stop on hover to make more readable. Removed border. --- home/templates/home/home_page.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index 2e5c6b69..25857b5b 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -34,8 +34,8 @@ {% for block in page.featured_articles %}
{% if block.block_type == "marquee_banner" %} -
- {{block.value.body}} +
+ {{block.value.body}}
{% elif block.block_type == "one_column" %}
From ea605a52f6e19f5ce36b9e6bbf8604d689da2e19 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Tue, 8 Oct 2019 14:03:28 -0400 Subject: [PATCH 17/36] Finished with rotating marquee. --- core/models.py | 6 ++++++ home/templates/home/home_page.html | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/core/models.py b/core/models.py index 8d9b5e0d..b10a2530 100644 --- a/core/models.py +++ b/core/models.py @@ -323,6 +323,12 @@ class Meta: class MarqueeBlock(StructBlock): body=RichTextBlock(required=True) + banner_type = ChoiceBlock( + choices=[("moves", "Rotating")], # can add stationary later + default="moves", + help_text="Determines whether the marquee banner is stationary or rotating. Only rotating works right now.", + required=True + ) class GalleryPhotoBlock(StructBlock): diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index 25857b5b..a60a8347 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -34,9 +34,13 @@ {% for block in page.featured_articles %}
{% if block.block_type == "marquee_banner" %} -
- {{block.value.body}} -
+ {% if block.value.banner_type == "moves" %} +
+ + {{block.value.body}} + +
+ {% endif %} {% elif block.block_type == "one_column" %}
From 242810340fa7816d8899a83dc1161d6eb919b6b6 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Tue, 8 Oct 2019 14:12:29 -0400 Subject: [PATCH 18/36] Ran black formatting. --- core/models.py | 7 +- home/migrations/0003_auto_20190925_0314.py | 198 ++++++++++++++++++++- 2 files changed, 195 insertions(+), 10 deletions(-) diff --git a/core/models.py b/core/models.py index b10a2530..fac3a332 100644 --- a/core/models.py +++ b/core/models.py @@ -321,13 +321,14 @@ class AdBlock(StructBlock): class Meta: icon = "image" + class MarqueeBlock(StructBlock): - body=RichTextBlock(required=True) + body = RichTextBlock(required=True) banner_type = ChoiceBlock( - choices=[("moves", "Rotating")], # can add stationary later + choices=[("moves", "Rotating")], # can add stationary later default="moves", help_text="Determines whether the marquee banner is stationary or rotating. Only rotating works right now.", - required=True + required=True, ) diff --git a/home/migrations/0003_auto_20190925_0314.py b/home/migrations/0003_auto_20190925_0314.py index 7655a12e..df47ea36 100644 --- a/home/migrations/0003_auto_20190925_0314.py +++ b/home/migrations/0003_auto_20190925_0314.py @@ -8,14 +8,198 @@ class Migration(migrations.Migration): - dependencies = [ - ('home', '0002_auto_20190924_2345'), - ] + dependencies = [("home", "0002_auto_20190924_2345")] operations = [ migrations.AlterField( - model_name='homepage', - name='featured_articles', - field=wagtail.core.fields.StreamField([('one_column', wagtail.core.blocks.StructBlock([('column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('one_ad_column', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(help_text='Image should be 22:7')), ('link', wagtail.core.blocks.URLBlock(label='target', required=False))])), ('two_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('emphasize_column', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')], help_text='Which article, if either, should appear larger.', required=False))])), ('three_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('middle_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('recent_articles', wagtail.core.blocks.StructBlock([('num_articles', wagtail.core.blocks.IntegerBlock(help_text='Number of recent articles to display.', label='Number of articles'))]))], null=True), - ), + model_name="homepage", + name="featured_articles", + field=wagtail.core.fields.StreamField( + [ + ( + "one_column", + wagtail.core.blocks.StructBlock( + [ + ( + "column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=["core.ArticlePage"] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ) + ] + ), + ), + ( + "one_ad_column", + wagtail.core.blocks.StructBlock( + [ + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + help_text="Image should be 22:7" + ), + ), + ( + "link", + wagtail.core.blocks.URLBlock( + label="target", required=False + ), + ), + ] + ), + ), + ( + "two_columns", + wagtail.core.blocks.StructBlock( + [ + ( + "left_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=["core.ArticlePage"] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ( + "right_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=["core.ArticlePage"] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ( + "emphasize_column", + wagtail.core.blocks.ChoiceBlock( + choices=[("left", "Left"), ("right", "Right")], + help_text="Which article, if either, should appear larger.", + required=False, + ), + ), + ] + ), + ), + ( + "three_columns", + wagtail.core.blocks.StructBlock( + [ + ( + "left_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=["core.ArticlePage"] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ( + "middle_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=["core.ArticlePage"] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ( + "right_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=["core.ArticlePage"] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ] + ), + ), + ( + "recent_articles", + wagtail.core.blocks.StructBlock( + [ + ( + "num_articles", + wagtail.core.blocks.IntegerBlock( + help_text="Number of recent articles to display.", + label="Number of articles", + ), + ) + ] + ), + ), + ], + null=True, + ), + ) ] From f834ce80e317fc95fc4eee84709f3e688ade12cd Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Fri, 18 Oct 2019 16:18:50 -0400 Subject: [PATCH 19/36] initial work on union timeline issue/new custom models added --- core/migrations/0001_initial.py | 559 +++-------- .../0001_squashed_0019_auto_20190505_0310.py | 885 ------------------ core/migrations/0002_archivespage.py | 33 - core/migrations/0002_auto_20181225_2045.py | 28 - core/migrations/0003_auto_20181225_2047.py | 21 - core/migrations/0003_auto_20190511_0230.py | 16 - core/migrations/0004_archivespage_body.py | 17 - core/migrations/0004_auto_20181225_2058.py | 13 - core/migrations/0005_auto_20181225_2103.py | 23 - core/migrations/0006_auto_20190426_1633.py | 46 - core/migrations/0007_auto_20190429_1739.py | 55 -- core/migrations/0008_auto_20190429_1807.py | 54 -- core/migrations/0009_auto_20190429_1920.py | 86 -- core/migrations/0010_auto_20190429_2122.py | 24 - core/migrations/0011_delete_photo.py | 10 - core/migrations/0012_auto_20190430_0213.py | 82 -- core/migrations/0013_auto_20190430_0308.py | 82 -- core/migrations/0014_auto_20190430_1628.py | 88 -- core/migrations/0015_auto_20190501_1640.py | 23 - core/migrations/0016_auto_20190501_1716.py | 30 - core/migrations/0017_auto_20190501_1738.py | 23 - core/migrations/0018_auto_20190502_1335.py | 23 - core/migrations/0019_auto_20190505_0310.py | 17 - core/models.py | 25 + core/templates/core/union_timeline.html | 24 + home/migrations/0001_initial.py | 214 +---- home/migrations/0002_auto_20190924_2345.py | 217 ----- home/migrations/0003_auto_20190925_0314.py | 205 ---- lights/migrations/0001_initial.py | 22 +- newsletter/migrations/0001_initial.py | 101 +- package-lock.json | 57 +- 31 files changed, 242 insertions(+), 2861 deletions(-) delete mode 100644 core/migrations/0001_squashed_0019_auto_20190505_0310.py delete mode 100644 core/migrations/0002_archivespage.py delete mode 100644 core/migrations/0002_auto_20181225_2045.py delete mode 100644 core/migrations/0003_auto_20181225_2047.py delete mode 100644 core/migrations/0003_auto_20190511_0230.py delete mode 100644 core/migrations/0004_archivespage_body.py delete mode 100644 core/migrations/0004_auto_20181225_2058.py delete mode 100644 core/migrations/0005_auto_20181225_2103.py delete mode 100644 core/migrations/0006_auto_20190426_1633.py delete mode 100644 core/migrations/0007_auto_20190429_1739.py delete mode 100644 core/migrations/0008_auto_20190429_1807.py delete mode 100644 core/migrations/0009_auto_20190429_1920.py delete mode 100644 core/migrations/0010_auto_20190429_2122.py delete mode 100644 core/migrations/0011_delete_photo.py delete mode 100644 core/migrations/0012_auto_20190430_0213.py delete mode 100644 core/migrations/0013_auto_20190430_0308.py delete mode 100644 core/migrations/0014_auto_20190430_1628.py delete mode 100644 core/migrations/0015_auto_20190501_1640.py delete mode 100644 core/migrations/0016_auto_20190501_1716.py delete mode 100644 core/migrations/0017_auto_20190501_1738.py delete mode 100644 core/migrations/0018_auto_20190502_1335.py delete mode 100644 core/migrations/0019_auto_20190505_0310.py create mode 100644 core/templates/core/union_timeline.html delete mode 100644 home/migrations/0002_auto_20190924_2345.py delete mode 100644 home/migrations/0003_auto_20190925_0314.py diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index 4a434627..b1e67fad 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,17 +1,18 @@ -# Generated by Django 2.1.4 on 2018-12-25 20:16 +# Generated by Django 2.2.1 on 2019-10-15 20:21 from django.conf import settings from django.db import migrations, models import django.db.models.deletion import modelcluster.fields import taggit.managers +import wagtail.contrib.routable_page.models import wagtail.core.blocks import wagtail.core.fields import wagtail.core.models +import wagtail.embeds.blocks import wagtail.images.blocks import wagtail.images.models import wagtail.search.index -import wagtail.snippets.blocks class Migration(migrations.Migration): @@ -19,487 +20,203 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ("taggit", "0002_auto_20150616_2121"), - ("wagtailcore", "0041_group_collection_permissions_verbose_name_plural"), + ('wagtailcore', '0041_group_collection_permissions_verbose_name_plural'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('taggit', '0002_auto_20150616_2121'), ] operations = [ migrations.CreateModel( - name="ArticleAuthor", + name='ArchivesPage', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ) + ('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.RichTextField(blank=True, null=True)), ], + options={ + 'abstract': False, + }, + bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), ), migrations.CreateModel( - name="ArticleAuthorRelationship", + name='ArticlePage', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ) + ('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')), + ('headline', wagtail.core.fields.RichTextField()), + ('subdeck', wagtail.core.fields.RichTextField(blank=True, null=True)), + ('body', wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('photo', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False)), ('size', wagtail.core.blocks.ChoiceBlock(choices=[('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')], help_text='Width of image in article.'))])), ('photo_gallery', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False))]), icon='image')), ('embed', wagtail.core.blocks.StructBlock([('embed', wagtail.embeds.blocks.EmbedBlock(help_text='URL to the content to embed.'))]))], blank=True)), + ('summary', wagtail.core.fields.RichTextField(blank=True, help_text='Displayed on the home page or other places to provide a taste of what the article is about.', null=True)), + ('featured_caption', wagtail.core.fields.RichTextField(blank=True, null=True)), ], + options={ + 'abstract': False, + }, + bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), ), migrations.CreateModel( - name="ArticlePage", + name='ArticlesIndexPage', 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", - ), - ), - ("headline", wagtail.core.fields.RichTextField()), - ("subdeck", wagtail.core.fields.RichTextField(blank=True, null=True)), - ( - "body", - wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ("image", wagtail.images.blocks.ImageChooserBlock()), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.snippets.blocks.SnippetChooserBlock( - "core.Photo" - ) - ), - ), - ] - ), - ), - ( - "summary", - wagtail.core.fields.RichTextField( - blank=True, - help_text="Displayed on the home page or other places to provide a taste of what the article is about.", - null=True, - ), - ), + ('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')), ], - options={"abstract": False}, - bases=("wagtailcore.page",), + options={ + 'abstract': False, + }, + bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), ), migrations.CreateModel( - name="ArticlesIndexPage", + name='Contributor', 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", - ), - ) + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('rich_name', wagtail.core.fields.RichTextField(blank=True, max_length=255, null=True)), ], - options={"abstract": False}, - bases=("wagtailcore.page",), + bases=(wagtail.search.index.Indexed, models.Model), ), migrations.CreateModel( - name="Contributor", + name='CustomImage', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(max_length=255)), - ( - "article_author", - models.OneToOneField( - on_delete=django.db.models.deletion.PROTECT, - to="core.ArticleAuthor", - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=255, verbose_name='title')), + ('file', models.ImageField(height_field='height', upload_to=wagtail.images.models.get_upload_to, verbose_name='file', width_field='width')), + ('width', models.IntegerField(editable=False, verbose_name='width')), + ('height', models.IntegerField(editable=False, verbose_name='height')), + ('created_at', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='created at')), + ('focal_point_x', models.PositiveIntegerField(blank=True, null=True)), + ('focal_point_y', models.PositiveIntegerField(blank=True, null=True)), + ('focal_point_width', models.PositiveIntegerField(blank=True, null=True)), + ('focal_point_height', models.PositiveIntegerField(blank=True, null=True)), + ('file_size', models.PositiveIntegerField(editable=False, null=True)), + ('file_hash', models.CharField(blank=True, editable=False, max_length=40)), + ('collection', models.ForeignKey(default=wagtail.core.models.get_root_collection_id, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.Collection', verbose_name='collection')), + ('photographer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='images', to='core.Contributor')), + ('tags', taggit.managers.TaggableManager(blank=True, help_text=None, through='taggit.TaggedItem', to='taggit.Tag', verbose_name='tags')), + ('uploaded_by_user', models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='uploaded by user')), ], + options={ + 'abstract': False, + }, + bases=(wagtail.search.index.Indexed, models.Model), ), migrations.CreateModel( - name="CustomImage", + name='Kicker', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("title", models.CharField(max_length=255, verbose_name="title")), - ( - "file", - models.ImageField( - height_field="height", - upload_to=wagtail.images.models.get_upload_to, - verbose_name="file", - width_field="width", - ), - ), - ("width", models.IntegerField(editable=False, verbose_name="width")), - ("height", models.IntegerField(editable=False, verbose_name="height")), - ( - "created_at", - models.DateTimeField( - auto_now_add=True, db_index=True, verbose_name="created at" - ), - ), - ("focal_point_x", models.PositiveIntegerField(blank=True, null=True)), - ("focal_point_y", models.PositiveIntegerField(blank=True, null=True)), - ( - "focal_point_width", - models.PositiveIntegerField(blank=True, null=True), - ), - ( - "focal_point_height", - models.PositiveIntegerField(blank=True, null=True), - ), - ("file_size", models.PositiveIntegerField(editable=False, null=True)), - ( - "file_hash", - models.CharField(blank=True, editable=False, max_length=40), - ), - ( - "collection", - models.ForeignKey( - default=wagtail.core.models.get_root_collection_id, - on_delete=django.db.models.deletion.CASCADE, - related_name="+", - to="wagtailcore.Collection", - verbose_name="collection", - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=255)), ], - options={"abstract": False}, - bases=(wagtail.search.index.Indexed, models.Model), ), migrations.CreateModel( - name="CustomRendition", + name='Position', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("filter_spec", models.CharField(db_index=True, max_length=255)), - ( - "file", - models.ImageField( - height_field="height", - upload_to=wagtail.images.models.get_rendition_upload_to, - width_field="width", - ), - ), - ("width", models.IntegerField(editable=False)), - ("height", models.IntegerField(editable=False)), - ( - "focal_point_key", - models.CharField( - blank=True, default="", editable=False, max_length=16 - ), - ), - ( - "image", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="renditions", - to="core.CustomImage", - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=100)), ], ), migrations.CreateModel( - name="Kicker", + name='StaffIndexPage', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("title", models.CharField(max_length=255)), + ('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')), ], + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), ), migrations.CreateModel( - name="MigrationInformation", + name='StaffPage', fields=[ - ("link", models.URLField(db_index=True)), - ( - "guid", - models.CharField(max_length=255, primary_key=True, serialize=False), - ), - ( - "article", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="core.ArticlePage", - ), - ), + ('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')), + ('first_name', models.CharField(max_length=100)), + ('last_name', models.CharField(max_length=100)), + ('biography', wagtail.core.fields.RichTextField(blank=True, null=True)), + ('email_address', models.EmailField(blank=True, max_length=254, null=True)), + ('contributor', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='staff_page', to='core.Contributor')), + ('photo', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='core.CustomImage')), ], + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), ), migrations.CreateModel( - name="Photo", + name='StaticPage', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("caption", wagtail.core.fields.RichTextField(blank=True, null=True)), - ( - "image", - models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.CustomImage", - ), - ), + ('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.RichTextField(blank=True, null=True)), ], + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), ), migrations.CreateModel( - name="Position", + name='UnionTimeline', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("title", models.CharField(max_length=100)), + ('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')), + ('events', wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.RichTextBlock(default='', required=True))]))])), ], + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), ), migrations.CreateModel( - name="StaffIndexPage", + name='Term', 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", - ), - ) + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), + ('date_started', models.DateField(blank=True, null=True)), + ('date_ended', models.DateField(blank=True, null=True)), + ('acting', models.BooleanField(default=False)), + ('de_facto', models.BooleanField(default=False)), + ('person', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.PROTECT, related_name='terms', to='core.StaffPage')), + ('position', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='terms', to='core.Position')), ], - options={"abstract": False}, - bases=("wagtailcore.page",), + options={ + 'ordering': ['sort_order'], + 'abstract': False, + }, ), migrations.CreateModel( - name="StaffPage", + name='MigrationInformation', 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", - ), - ), - ("first_name", models.CharField(max_length=100)), - ("last_name", models.CharField(max_length=100)), - ("biography", wagtail.core.fields.RichTextField(blank=True, null=True)), - ( - "email_address", - models.EmailField(blank=True, max_length=254, null=True), - ), - ( - "article_author", - models.OneToOneField( - on_delete=django.db.models.deletion.PROTECT, - to="core.ArticleAuthor", - ), - ), - ( - "photo", - models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.CustomImage", - ), - ), + ('link', models.URLField(db_index=True)), + ('guid', models.CharField(max_length=255, primary_key=True, serialize=False)), + ('article', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='core.ArticlePage')), ], - options={"abstract": False}, - bases=("wagtailcore.page",), + ), + migrations.AddField( + model_name='articlepage', + name='featured_image', + field=models.ForeignKey(blank=True, help_text='Shown at the top of the article and on the home page.', null=True, on_delete=django.db.models.deletion.PROTECT, to='core.CustomImage'), + ), + migrations.AddField( + model_name='articlepage', + name='kicker', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='core.Kicker'), ), migrations.CreateModel( - name="StaticPage", + name='CustomRendition', 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.RichTextField()), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('filter_spec', models.CharField(db_index=True, max_length=255)), + ('file', models.ImageField(height_field='height', upload_to=wagtail.images.models.get_rendition_upload_to, width_field='width')), + ('width', models.IntegerField(editable=False)), + ('height', models.IntegerField(editable=False)), + ('focal_point_key', models.CharField(blank=True, default='', editable=False, max_length=16)), + ('image', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='renditions', to='core.CustomImage')), ], - options={"abstract": False}, - bases=("wagtailcore.page",), + options={ + 'unique_together': {('image', 'filter_spec', 'focal_point_key')}, + }, ), migrations.CreateModel( - name="Term", + name='ArticleAuthorRelationship', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "sort_order", - models.IntegerField(blank=True, editable=False, null=True), - ), - ("date_started", models.DateField()), - ("date_ended", models.DateField(blank=True, null=True)), - ( - "person", - modelcluster.fields.ParentalKey( - on_delete=django.db.models.deletion.PROTECT, - related_name="terms", - to="core.StaffPage", - ), - ), - ( - "position", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, - related_name="terms", - to="core.Position", - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('article', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='authors', to='core.ArticlePage')), + ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='articles', to='core.Contributor')), ], - options={"ordering": ["sort_order"], "abstract": False}, - ), - migrations.AddField( - model_name="customimage", - name="photographer", - field=models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.CASCADE, - related_name="images", - to="core.StaffPage", - ), - ), - migrations.AddField( - model_name="customimage", - name="tags", - field=taggit.managers.TaggableManager( - blank=True, - help_text=None, - through="taggit.TaggedItem", - to="taggit.Tag", - verbose_name="tags", - ), - ), - migrations.AddField( - model_name="customimage", - name="uploaded_by_user", - field=models.ForeignKey( - blank=True, - editable=False, - null=True, - on_delete=django.db.models.deletion.SET_NULL, - to=settings.AUTH_USER_MODEL, - verbose_name="uploaded by user", - ), - ), - migrations.AddField( - model_name="articlepage", - name="featured_photo", - field=models.ForeignKey( - blank=True, - help_text="Shown at the top of the article and on the home page.", - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.Photo", - ), - ), - migrations.AddField( - model_name="articlepage", - name="kicker", - field=models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.Kicker", - ), - ), - migrations.AddField( - model_name="articleauthorrelationship", - name="article", - field=modelcluster.fields.ParentalKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="authors", - to="core.ArticlePage", - ), - ), - migrations.AddField( - model_name="articleauthorrelationship", - name="author", - field=models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, - related_name="articles", - to="core.ArticleAuthor", - ), - ), - migrations.AlterUniqueTogether( - name="customrendition", - unique_together={("image", "filter_spec", "focal_point_key")}, - ), - migrations.AlterUniqueTogether( - name="articleauthorrelationship", unique_together={("article", "author")} + options={ + 'unique_together': {('article', 'author')}, + }, ), ] diff --git a/core/migrations/0001_squashed_0019_auto_20190505_0310.py b/core/migrations/0001_squashed_0019_auto_20190505_0310.py deleted file mode 100644 index afc2529c..00000000 --- a/core/migrations/0001_squashed_0019_auto_20190505_0310.py +++ /dev/null @@ -1,885 +0,0 @@ -# Generated by Django 2.2.1 on 2019-05-05 16:57 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import modelcluster.fields -import taggit.managers -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.core.models -import wagtail.embeds.blocks -import wagtail.images.blocks -import wagtail.images.models -import wagtail.search.index -import wagtail.snippets.blocks - - -class Migration(migrations.Migration): - - replaces = [ - ("core", "0001_initial"), - ("core", "0002_auto_20181225_2045"), - ("core", "0003_auto_20181225_2047"), - ("core", "0004_auto_20181225_2058"), - ("core", "0005_auto_20181225_2103"), - ("core", "0006_auto_20190426_1633"), - ("core", "0007_auto_20190429_1739"), - ("core", "0008_auto_20190429_1807"), - ("core", "0009_auto_20190429_1920"), - ("core", "0010_auto_20190429_2122"), - ("core", "0011_delete_photo"), - ("core", "0012_auto_20190430_0213"), - ("core", "0013_auto_20190430_0308"), - ("core", "0014_auto_20190430_1628"), - ("core", "0015_auto_20190501_1640"), - ("core", "0016_auto_20190501_1716"), - ("core", "0017_auto_20190501_1738"), - ("core", "0018_auto_20190502_1335"), - ("core", "0019_auto_20190505_0310"), - ] - - initial = True - - dependencies = [ - ("taggit", "0002_auto_20150616_2121"), - ("wagtailcore", "0041_group_collection_permissions_verbose_name_plural"), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name="ArticleAuthor", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(max_length=255, null=True)), - ], - ), - migrations.CreateModel( - name="ArticlePage", - 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", - ), - ), - ("headline", wagtail.core.fields.RichTextField()), - ("subdeck", wagtail.core.fields.RichTextField(blank=True, null=True)), - ( - "body", - wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ("image", wagtail.images.blocks.ImageChooserBlock()), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.snippets.blocks.SnippetChooserBlock( - "core.Photo" - ) - ), - ), - ] - ), - ), - ( - "summary", - wagtail.core.fields.RichTextField( - blank=True, - help_text="Displayed on the home page or other places to provide a taste of what the article is about.", - null=True, - ), - ), - ], - options={"abstract": False}, - bases=("wagtailcore.page",), - ), - migrations.CreateModel( - name="ArticlesIndexPage", - 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", - ), - ) - ], - options={"abstract": False}, - bases=("wagtailcore.page",), - ), - migrations.CreateModel( - name="CustomImage", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("title", models.CharField(max_length=255, verbose_name="title")), - ( - "file", - models.ImageField( - height_field="height", - upload_to=wagtail.images.models.get_upload_to, - verbose_name="file", - width_field="width", - ), - ), - ("width", models.IntegerField(editable=False, verbose_name="width")), - ("height", models.IntegerField(editable=False, verbose_name="height")), - ( - "created_at", - models.DateTimeField( - auto_now_add=True, db_index=True, verbose_name="created at" - ), - ), - ("focal_point_x", models.PositiveIntegerField(blank=True, null=True)), - ("focal_point_y", models.PositiveIntegerField(blank=True, null=True)), - ( - "focal_point_width", - models.PositiveIntegerField(blank=True, null=True), - ), - ( - "focal_point_height", - models.PositiveIntegerField(blank=True, null=True), - ), - ("file_size", models.PositiveIntegerField(editable=False, null=True)), - ( - "file_hash", - models.CharField(blank=True, editable=False, max_length=40), - ), - ( - "collection", - models.ForeignKey( - default=wagtail.core.models.get_root_collection_id, - on_delete=django.db.models.deletion.CASCADE, - related_name="+", - to="wagtailcore.Collection", - verbose_name="collection", - ), - ), - ], - options={"abstract": False}, - bases=(wagtail.search.index.Indexed, models.Model), - ), - migrations.CreateModel( - name="Kicker", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("title", models.CharField(max_length=255)), - ], - ), - migrations.CreateModel( - name="MigrationInformation", - fields=[ - ("link", models.URLField(db_index=True)), - ( - "guid", - models.CharField(max_length=255, primary_key=True, serialize=False), - ), - ( - "article", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="core.ArticlePage", - ), - ), - ], - ), - migrations.CreateModel( - name="Position", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("title", models.CharField(max_length=100)), - ], - ), - migrations.CreateModel( - name="StaffIndexPage", - 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", - ), - ) - ], - options={"abstract": False}, - bases=("wagtailcore.page",), - ), - migrations.CreateModel( - name="StaffPage", - 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", - ), - ), - ("first_name", models.CharField(max_length=100)), - ("last_name", models.CharField(max_length=100)), - ("biography", wagtail.core.fields.RichTextField(blank=True, null=True)), - ( - "email_address", - models.EmailField(blank=True, max_length=254, null=True), - ), - ( - "photo", - models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.CustomImage", - ), - ), - ], - options={"abstract": False}, - bases=("wagtailcore.page",), - ), - migrations.CreateModel( - name="StaticPage", - 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.RichTextField(blank=True, null=True)), - ], - options={"abstract": False}, - bases=("wagtailcore.page",), - ), - migrations.CreateModel( - name="Term", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "sort_order", - models.IntegerField(blank=True, editable=False, null=True), - ), - ("date_started", models.DateField()), - ("date_ended", models.DateField(blank=True, null=True)), - ( - "person", - modelcluster.fields.ParentalKey( - on_delete=django.db.models.deletion.PROTECT, - related_name="terms", - to="core.StaffPage", - ), - ), - ( - "position", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, - related_name="terms", - to="core.Position", - ), - ), - ("acting", models.BooleanField(default=False)), - ("de_facto", models.BooleanField(default=False)), - ], - options={"ordering": ["sort_order"], "abstract": False}, - ), - migrations.AddField( - model_name="customimage", - name="photographer", - field=models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.CASCADE, - related_name="images", - to="core.StaffPage", - ), - ), - migrations.AddField( - model_name="customimage", - name="tags", - field=taggit.managers.TaggableManager( - blank=True, - help_text=None, - through="taggit.TaggedItem", - to="taggit.Tag", - verbose_name="tags", - ), - ), - migrations.AddField( - model_name="customimage", - name="uploaded_by_user", - field=models.ForeignKey( - blank=True, - editable=False, - null=True, - on_delete=django.db.models.deletion.SET_NULL, - to=settings.AUTH_USER_MODEL, - verbose_name="uploaded by user", - ), - ), - migrations.AddField( - model_name="articlepage", - name="kicker", - field=models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.Kicker", - ), - ), - migrations.CreateModel( - name="CustomRendition", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("filter_spec", models.CharField(db_index=True, max_length=255)), - ( - "file", - models.ImageField( - height_field="height", - upload_to=wagtail.images.models.get_rendition_upload_to, - width_field="width", - ), - ), - ("width", models.IntegerField(editable=False)), - ("height", models.IntegerField(editable=False)), - ( - "focal_point_key", - models.CharField( - blank=True, default="", editable=False, max_length=16 - ), - ), - ( - "image", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="renditions", - to="core.CustomImage", - ), - ), - ], - options={"unique_together": {("image", "filter_spec", "focal_point_key")}}, - ), - migrations.CreateModel( - name="ArticleAuthorRelationship", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "article", - modelcluster.fields.ParentalKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="authors", - to="core.ArticlePage", - ), - ), - ( - "author", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, - related_name="articles", - to="core.ArticleAuthor", - ), - ), - ], - options={"unique_together": {("article", "author")}}, - ), - migrations.AddField( - model_name="articleauthor", - name="staff_page", - field=models.OneToOneField( - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.StaffPage", - ), - ), - migrations.RenameModel(old_name="ArticleAuthor", new_name="Contributor"), - migrations.AlterField( - model_name="customimage", - name="photographer", - field=models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.CASCADE, - related_name="images", - to="core.Contributor", - ), - ), - migrations.AlterField( - model_name="articlepage", - name="body", - field=wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ("image", wagtail.images.blocks.ImageChooserBlock()), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.snippets.blocks.SnippetChooserBlock("core.Photo"), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ] - ), - ), - migrations.AlterField( - model_name="articlepage", - name="body", - field=wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ( - "photo", - wagtail.core.blocks.StructBlock( - [ - ("image", wagtail.images.blocks.ImageChooserBlock()), - ("caption", wagtail.core.blocks.RichTextBlock()), - ], - icon="image", - ), - ), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.snippets.blocks.SnippetChooserBlock("core.Photo"), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ] - ), - ), - migrations.AlterField( - model_name="articlepage", - name="body", - field=wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ( - "photo", - wagtail.core.blocks.StructBlock( - [ - ("image", wagtail.images.blocks.ImageChooserBlock()), - ("caption", wagtail.core.blocks.RichTextBlock()), - ] - ), - ), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.snippets.blocks.SnippetChooserBlock("core.Photo"), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ] - ), - ), - migrations.AddField( - model_name="articlepage", - name="featured_caption", - field=wagtail.core.fields.RichTextField(blank=True, null=True), - ), - migrations.AlterField( - model_name="articlepage", - name="body", - field=wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ( - "photo", - wagtail.core.blocks.StructBlock( - [ - ("image", wagtail.images.blocks.ImageChooserBlock()), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["bold", "italic"], required=False - ), - ), - ( - "size", - wagtail.core.blocks.ChoiceBlock( - choices=[ - ("small", "Small"), - ("medium", "Medium"), - ("large", "Large"), - ], - help_text="Width of image in article.", - ), - ), - ] - ), - ), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.snippets.blocks.SnippetChooserBlock("core.Photo"), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ] - ), - ), - migrations.AddField( - model_name="articlepage", - name="featured_image", - field=models.ForeignKey( - blank=True, - help_text="Shown at the top of the article and on the home page.", - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.CustomImage", - ), - ), - migrations.AlterField( - model_name="articlepage", - name="body", - field=wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ( - "photo", - wagtail.core.blocks.StructBlock( - [ - ("image", wagtail.images.blocks.ImageChooserBlock()), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["bold", "italic"], required=False - ), - ), - ( - "size", - wagtail.core.blocks.ChoiceBlock( - choices=[ - ("small", "Small"), - ("medium", "Medium"), - ("large", "Large"), - ], - help_text="Width of image in article.", - ), - ), - ] - ), - ), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.core.blocks.StructBlock( - [ - ( - "image", - wagtail.images.blocks.ImageChooserBlock(), - ), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["bold", "italic"], required=False - ), - ), - ] - ), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ] - ), - ), - migrations.AlterField( - model_name="articlepage", - name="body", - field=wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ( - "photo", - wagtail.core.blocks.StructBlock( - [ - ("image", wagtail.images.blocks.ImageChooserBlock()), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["italic"], required=False - ), - ), - ( - "size", - wagtail.core.blocks.ChoiceBlock( - choices=[ - ("small", "Small"), - ("medium", "Medium"), - ("large", "Large"), - ], - help_text="Width of image in article.", - ), - ), - ] - ), - ), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.core.blocks.StructBlock( - [ - ( - "image", - wagtail.images.blocks.ImageChooserBlock(), - ), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["italic"], required=False - ), - ), - ] - ), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ] - ), - ), - migrations.AlterField( - model_name="articlepage", - name="body", - field=wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ( - "photo", - wagtail.core.blocks.StructBlock( - [ - ("image", wagtail.images.blocks.ImageChooserBlock()), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["italic"], required=False - ), - ), - ( - "size", - wagtail.core.blocks.ChoiceBlock( - choices=[ - ("small", "Small"), - ("medium", "Medium"), - ("large", "Large"), - ], - help_text="Width of image in article.", - ), - ), - ] - ), - ), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.core.blocks.StructBlock( - [ - ( - "image", - wagtail.images.blocks.ImageChooserBlock(), - ), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["italic"], required=False - ), - ), - ] - ), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ], - blank=True, - ), - ), - migrations.AlterField( - model_name="contributor", - name="name", - field=models.CharField(default="", max_length=255), - preserve_default=False, - ), - migrations.AddField( - model_name="contributor", - name="rich_name", - field=wagtail.core.fields.RichTextField( - blank=True, max_length=255, null=True - ), - ), - migrations.RemoveField(model_name="contributor", name="staff_page"), - migrations.AddField( - model_name="staffpage", - name="contributor", - field=models.OneToOneField( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - related_name="staff_page", - to="core.Contributor", - ), - ), - ] diff --git a/core/migrations/0002_archivespage.py b/core/migrations/0002_archivespage.py deleted file mode 100644 index f99f49f5..00000000 --- a/core/migrations/0002_archivespage.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 2.2.1 on 2019-05-09 16:57 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ("wagtailcore", "0041_group_collection_permissions_verbose_name_plural"), - ("core", "0001_squashed_0019_auto_20190505_0310"), - ] - - operations = [ - migrations.CreateModel( - name="ArchivesPage", - 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", - ), - ) - ], - options={"abstract": False}, - bases=("wagtailcore.page",), - ) - ] diff --git a/core/migrations/0002_auto_20181225_2045.py b/core/migrations/0002_auto_20181225_2045.py deleted file mode 100644 index 4f74fd6e..00000000 --- a/core/migrations/0002_auto_20181225_2045.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.1.4 on 2018-12-25 20:45 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [("core", "0001_initial")] - - operations = [ - migrations.RemoveField(model_name="contributor", name="article_author"), - migrations.AddField( - model_name="articleauthor", - name="name", - field=models.CharField(max_length=255, null=True), - ), - migrations.AddField( - model_name="articleauthor", - name="staff_page", - field=models.ForeignKey( - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.StaffPage", - ), - ), - migrations.DeleteModel(name="Contributor"), - ] diff --git a/core/migrations/0003_auto_20181225_2047.py b/core/migrations/0003_auto_20181225_2047.py deleted file mode 100644 index e7483adb..00000000 --- a/core/migrations/0003_auto_20181225_2047.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.1.4 on 2018-12-25 20:47 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [("core", "0002_auto_20181225_2045")] - - operations = [ - migrations.AlterField( - model_name="articleauthor", - name="staff_page", - field=models.OneToOneField( - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.StaffPage", - ), - ) - ] diff --git a/core/migrations/0003_auto_20190511_0230.py b/core/migrations/0003_auto_20190511_0230.py deleted file mode 100644 index 576bfc74..00000000 --- a/core/migrations/0003_auto_20190511_0230.py +++ /dev/null @@ -1,16 +0,0 @@ -# Generated by Django 2.2.1 on 2019-05-11 02:30 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [("core", "0002_archivespage")] - - operations = [ - migrations.AlterField( - model_name="term", - name="date_started", - field=models.DateField(blank=True, null=True), - ) - ] diff --git a/core/migrations/0004_archivespage_body.py b/core/migrations/0004_archivespage_body.py deleted file mode 100644 index 420de648..00000000 --- a/core/migrations/0004_archivespage_body.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.1 on 2019-05-11 15:30 - -from django.db import migrations -import wagtail.core.fields - - -class Migration(migrations.Migration): - - dependencies = [("core", "0003_auto_20190511_0230")] - - operations = [ - migrations.AddField( - model_name="archivespage", - name="body", - field=wagtail.core.fields.RichTextField(blank=True, null=True), - ) - ] diff --git a/core/migrations/0004_auto_20181225_2058.py b/core/migrations/0004_auto_20181225_2058.py deleted file mode 100644 index 61c03cad..00000000 --- a/core/migrations/0004_auto_20181225_2058.py +++ /dev/null @@ -1,13 +0,0 @@ -# Generated by Django 2.1.4 on 2018-12-25 20:58 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [("core", "0003_auto_20181225_2047")] - - operations = [ - migrations.RenameModel(old_name="ArticleAuthor", new_name="Contributor"), - migrations.RemoveField(model_name="staffpage", name="article_author"), - ] diff --git a/core/migrations/0005_auto_20181225_2103.py b/core/migrations/0005_auto_20181225_2103.py deleted file mode 100644 index 3e41e707..00000000 --- a/core/migrations/0005_auto_20181225_2103.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.4 on 2018-12-25 21:03 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [("core", "0004_auto_20181225_2058")] - - operations = [ - migrations.AlterField( - model_name="customimage", - name="photographer", - field=models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.CASCADE, - related_name="images", - to="core.Contributor", - ), - ) - ] diff --git a/core/migrations/0006_auto_20190426_1633.py b/core/migrations/0006_auto_20190426_1633.py deleted file mode 100644 index 512c21c1..00000000 --- a/core/migrations/0006_auto_20190426_1633.py +++ /dev/null @@ -1,46 +0,0 @@ -# Generated by Django 2.1.8 on 2019-04-26 16:33 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.embeds.blocks -import wagtail.images.blocks -import wagtail.snippets.blocks - - -class Migration(migrations.Migration): - - dependencies = [("core", "0005_auto_20181225_2103")] - - operations = [ - migrations.AlterField( - model_name="articlepage", - name="body", - field=wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ("image", wagtail.images.blocks.ImageChooserBlock()), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.snippets.blocks.SnippetChooserBlock("core.Photo"), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ] - ), - ) - ] diff --git a/core/migrations/0007_auto_20190429_1739.py b/core/migrations/0007_auto_20190429_1739.py deleted file mode 100644 index 73b15704..00000000 --- a/core/migrations/0007_auto_20190429_1739.py +++ /dev/null @@ -1,55 +0,0 @@ -# Generated by Django 2.2 on 2019-04-29 17:39 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.embeds.blocks -import wagtail.images.blocks -import wagtail.snippets.blocks - - -class Migration(migrations.Migration): - - dependencies = [("core", "0006_auto_20190426_1633")] - - operations = [ - migrations.AlterField( - model_name="articlepage", - name="body", - field=wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ( - "photo", - wagtail.core.blocks.StructBlock( - [ - ("image", wagtail.images.blocks.ImageChooserBlock()), - ("caption", wagtail.core.blocks.RichTextBlock()), - ], - icon="image", - ), - ), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.snippets.blocks.SnippetChooserBlock("core.Photo"), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ] - ), - ) - ] diff --git a/core/migrations/0008_auto_20190429_1807.py b/core/migrations/0008_auto_20190429_1807.py deleted file mode 100644 index 2214bdda..00000000 --- a/core/migrations/0008_auto_20190429_1807.py +++ /dev/null @@ -1,54 +0,0 @@ -# Generated by Django 2.2 on 2019-04-29 18:07 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.embeds.blocks -import wagtail.images.blocks -import wagtail.snippets.blocks - - -class Migration(migrations.Migration): - - dependencies = [("core", "0007_auto_20190429_1739")] - - operations = [ - migrations.AlterField( - model_name="articlepage", - name="body", - field=wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ( - "photo", - wagtail.core.blocks.StructBlock( - [ - ("image", wagtail.images.blocks.ImageChooserBlock()), - ("caption", wagtail.core.blocks.RichTextBlock()), - ] - ), - ), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.snippets.blocks.SnippetChooserBlock("core.Photo"), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ] - ), - ) - ] diff --git a/core/migrations/0009_auto_20190429_1920.py b/core/migrations/0009_auto_20190429_1920.py deleted file mode 100644 index f3ace972..00000000 --- a/core/migrations/0009_auto_20190429_1920.py +++ /dev/null @@ -1,86 +0,0 @@ -# Generated by Django 2.2 on 2019-04-29 19:20 - -from django.db import migrations, models -import django.db.models.deletion -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.embeds.blocks -import wagtail.images.blocks -import wagtail.snippets.blocks - - -class Migration(migrations.Migration): - - dependencies = [("core", "0008_auto_20190429_1807")] - - operations = [ - migrations.AddField( - model_name="articlepage", - name="featured_caption", - field=wagtail.core.fields.RichTextField(blank=True, null=True), - ), - migrations.AddField( - model_name="articlepage", - name="featured_image", - field=models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.CustomImage", - ), - ), - migrations.AlterField( - model_name="articlepage", - name="body", - field=wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ( - "photo", - wagtail.core.blocks.StructBlock( - [ - ("image", wagtail.images.blocks.ImageChooserBlock()), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["bold", "italic"], required=False - ), - ), - ( - "size", - wagtail.core.blocks.ChoiceBlock( - choices=[ - ("small", "Small"), - ("medium", "Medium"), - ("large", "Large"), - ], - help_text="Width of image in article.", - ), - ), - ] - ), - ), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.snippets.blocks.SnippetChooserBlock("core.Photo"), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ] - ), - ), - ] diff --git a/core/migrations/0010_auto_20190429_2122.py b/core/migrations/0010_auto_20190429_2122.py deleted file mode 100644 index d3449cd8..00000000 --- a/core/migrations/0010_auto_20190429_2122.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2 on 2019-04-29 21:22 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [("core", "0009_auto_20190429_1920")] - - operations = [ - migrations.RemoveField(model_name="articlepage", name="featured_photo"), - migrations.AlterField( - model_name="articlepage", - name="featured_image", - field=models.ForeignKey( - blank=True, - help_text="Shown at the top of the article and on the home page.", - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.CustomImage", - ), - ), - ] diff --git a/core/migrations/0011_delete_photo.py b/core/migrations/0011_delete_photo.py deleted file mode 100644 index ea8e75b2..00000000 --- a/core/migrations/0011_delete_photo.py +++ /dev/null @@ -1,10 +0,0 @@ -# Generated by Django 2.2 on 2019-04-29 22:51 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [("core", "0010_auto_20190429_2122")] - - operations = [migrations.DeleteModel(name="Photo")] diff --git a/core/migrations/0012_auto_20190430_0213.py b/core/migrations/0012_auto_20190430_0213.py deleted file mode 100644 index 36c28b69..00000000 --- a/core/migrations/0012_auto_20190430_0213.py +++ /dev/null @@ -1,82 +0,0 @@ -# Generated by Django 2.2 on 2019-04-30 02:13 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.embeds.blocks -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [("core", "0011_delete_photo")] - - operations = [ - migrations.AlterField( - model_name="articlepage", - name="body", - field=wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ( - "photo", - wagtail.core.blocks.StructBlock( - [ - ("image", wagtail.images.blocks.ImageChooserBlock()), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["bold", "italic"], required=False - ), - ), - ( - "size", - wagtail.core.blocks.ChoiceBlock( - choices=[ - ("small", "Small"), - ("medium", "Medium"), - ("large", "Large"), - ], - help_text="Width of image in article.", - ), - ), - ] - ), - ), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.core.blocks.StructBlock( - [ - ( - "image", - wagtail.images.blocks.ImageChooserBlock(), - ), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["bold", "italic"], required=False - ), - ), - ] - ), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ] - ), - ) - ] diff --git a/core/migrations/0013_auto_20190430_0308.py b/core/migrations/0013_auto_20190430_0308.py deleted file mode 100644 index dd2128b7..00000000 --- a/core/migrations/0013_auto_20190430_0308.py +++ /dev/null @@ -1,82 +0,0 @@ -# Generated by Django 2.2 on 2019-04-30 03:08 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.embeds.blocks -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [("core", "0012_auto_20190430_0213")] - - operations = [ - migrations.AlterField( - model_name="articlepage", - name="body", - field=wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ( - "photo", - wagtail.core.blocks.StructBlock( - [ - ("image", wagtail.images.blocks.ImageChooserBlock()), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["italic"], required=False - ), - ), - ( - "size", - wagtail.core.blocks.ChoiceBlock( - choices=[ - ("small", "Small"), - ("medium", "Medium"), - ("large", "Large"), - ], - help_text="Width of image in article.", - ), - ), - ] - ), - ), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.core.blocks.StructBlock( - [ - ( - "image", - wagtail.images.blocks.ImageChooserBlock(), - ), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["italic"], required=False - ), - ), - ] - ), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ] - ), - ) - ] diff --git a/core/migrations/0014_auto_20190430_1628.py b/core/migrations/0014_auto_20190430_1628.py deleted file mode 100644 index 1a38c6a5..00000000 --- a/core/migrations/0014_auto_20190430_1628.py +++ /dev/null @@ -1,88 +0,0 @@ -# Generated by Django 2.2 on 2019-04-30 16:28 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.embeds.blocks -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [("core", "0013_auto_20190430_0308")] - - operations = [ - migrations.AlterField( - model_name="articlepage", - name="body", - field=wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ( - "photo", - wagtail.core.blocks.StructBlock( - [ - ("image", wagtail.images.blocks.ImageChooserBlock()), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["italic"], required=False - ), - ), - ( - "size", - wagtail.core.blocks.ChoiceBlock( - choices=[ - ("small", "Small"), - ("medium", "Medium"), - ("large", "Large"), - ], - help_text="Width of image in article.", - ), - ), - ] - ), - ), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.core.blocks.StructBlock( - [ - ( - "image", - wagtail.images.blocks.ImageChooserBlock(), - ), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["italic"], required=False - ), - ), - ] - ), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ], - blank=True, - ), - ), - migrations.AlterField( - model_name="staticpage", - name="body", - field=wagtail.core.fields.RichTextField(blank=True, null=True), - ), - ] diff --git a/core/migrations/0015_auto_20190501_1640.py b/core/migrations/0015_auto_20190501_1640.py deleted file mode 100644 index be98f8e0..00000000 --- a/core/migrations/0015_auto_20190501_1640.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2 on 2019-05-01 16:40 - -from django.db import migrations, models -import wagtail.core.fields - - -class Migration(migrations.Migration): - - dependencies = [("core", "0014_auto_20190430_1628")] - - operations = [ - migrations.AddField( - model_name="contributor", - name="rich_name", - field=wagtail.core.fields.RichTextField(max_length=255, null=True), - ), - migrations.AlterField( - model_name="contributor", - name="name", - field=models.CharField(default="", max_length=255), - preserve_default=False, - ), - ] diff --git a/core/migrations/0016_auto_20190501_1716.py b/core/migrations/0016_auto_20190501_1716.py deleted file mode 100644 index 2bc0bf76..00000000 --- a/core/migrations/0016_auto_20190501_1716.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 2.2 on 2019-05-01 17:16 - -from django.db import migrations, models -import django.db.models.deletion -import wagtail.core.fields - - -class Migration(migrations.Migration): - - dependencies = [("core", "0015_auto_20190501_1640")] - - operations = [ - migrations.AlterField( - model_name="contributor", - name="rich_name", - field=wagtail.core.fields.RichTextField( - blank=True, max_length=255, null=True - ), - ), - migrations.AlterField( - model_name="contributor", - name="staff_page", - field=models.OneToOneField( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.StaffPage", - ), - ), - ] diff --git a/core/migrations/0017_auto_20190501_1738.py b/core/migrations/0017_auto_20190501_1738.py deleted file mode 100644 index fc6ac2f1..00000000 --- a/core/migrations/0017_auto_20190501_1738.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2 on 2019-05-01 17:38 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [("core", "0016_auto_20190501_1716")] - - operations = [ - migrations.RemoveField(model_name="contributor", name="staff_page"), - migrations.AddField( - model_name="staffpage", - name="contributor", - field=models.OneToOneField( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.Contributor", - ), - ), - ] diff --git a/core/migrations/0018_auto_20190502_1335.py b/core/migrations/0018_auto_20190502_1335.py deleted file mode 100644 index 052ebc31..00000000 --- a/core/migrations/0018_auto_20190502_1335.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2 on 2019-05-02 13:35 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [("core", "0017_auto_20190501_1738")] - - operations = [ - migrations.AlterField( - model_name="staffpage", - name="contributor", - field=models.OneToOneField( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - related_name="staff_page", - to="core.Contributor", - ), - ) - ] diff --git a/core/migrations/0019_auto_20190505_0310.py b/core/migrations/0019_auto_20190505_0310.py deleted file mode 100644 index 1f749805..00000000 --- a/core/migrations/0019_auto_20190505_0310.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2 on 2019-05-05 03:10 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [("core", "0018_auto_20190502_1335")] - - operations = [ - migrations.AddField( - model_name="term", name="acting", field=models.BooleanField(default=False) - ), - migrations.AddField( - model_name="term", name="de_facto", field=models.BooleanField(default=False) - ), - ] diff --git a/core/models.py b/core/models.py index fac3a332..2ef479dc 100644 --- a/core/models.py +++ b/core/models.py @@ -23,6 +23,7 @@ URLBlock, StructValue, ChoiceBlock, + IntegerBlock, ) from wagtail.core.fields import RichTextField, StreamField from wagtail.core.models import Page, Orderable @@ -336,6 +337,30 @@ class GalleryPhotoBlock(StructBlock): image = ImageChooserBlock() caption = RichTextBlock(features=["italic"], required=False) +class UnionEvent(StructBlock): + title=RichTextBlock(required=True, default="") + body=RichTextBlock(required=True, default="") + date_month=IntegerBlock(required=True) + date_day=IntegerBlock(required=True) + date_year=IntegerBlock(required=True) + + def get_date(self): + return datetime.datetime(self["date_year"], self["date_month"], self["date_day"]) + #date=models.DateField("Date of the Event", default="") + + def get_title(): + return title + + def get_body(): + return body + +class UnionTimeline(Page): + events=StreamField( + [("event", UnionEvent())] + ) + + content_panels = Page.content_panels + [StreamFieldPanel("events")] + class ArticlePage(RoutablePageMixin, Page): headline = RichTextField(features=["italic"]) diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html new file mode 100644 index 00000000..f5960086 --- /dev/null +++ b/core/templates/core/union_timeline.html @@ -0,0 +1,24 @@ +{% extends "base.html" %} + +{% load wagtailcore_tags wagtailimages_tags %} + +{% block body_class %}template-staffindexpage{% endblock %} + +{% block content %} +
+

Union Events Timeline

+
+ {% for block in page.events %} +
+ {{block.value.title}} +
+
+ "this is the date: "{{block.get_date}} +
+
+ {{block.value.body}} +
+ {% endfor %} +
+
+{% endblock %} diff --git a/home/migrations/0001_initial.py b/home/migrations/0001_initial.py index 8927d232..bbc970aa 100644 --- a/home/migrations/0001_initial.py +++ b/home/migrations/0001_initial.py @@ -1,9 +1,10 @@ -# Generated by Django 2.1.4 on 2018-12-25 20:16 +# Generated by Django 2.2.1 on 2019-10-15 20:21 from django.db import migrations, models import django.db.models.deletion import wagtail.core.blocks import wagtail.core.fields +import wagtail.images.blocks class Migration(migrations.Migration): @@ -11,212 +12,19 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ("wagtailcore", "0041_group_collection_permissions_verbose_name_plural") + ('wagtailcore', '0041_group_collection_permissions_verbose_name_plural'), ] operations = [ migrations.CreateModel( - name="HomePage", + 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", - ), - ), - ( - "featured_articles", - wagtail.core.fields.StreamField( - [ - ( - "one_column", - wagtail.core.blocks.StructBlock( - [ - ( - "column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - target_model=[ - "core.ArticlePage" - ] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ) - ] - ), - ), - ( - "two_columns", - wagtail.core.blocks.StructBlock( - [ - ( - "left_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - target_model=[ - "core.ArticlePage" - ] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "right_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - target_model=[ - "core.ArticlePage" - ] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "emphasize_column", - wagtail.core.blocks.ChoiceBlock( - choices=[ - ("left", "Left"), - ("right", "Right"), - ], - help_text="Which article, if either, should appear larger.", - required=False, - ), - ), - ] - ), - ), - ( - "three_columns", - wagtail.core.blocks.StructBlock( - [ - ( - "left_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - target_model=[ - "core.ArticlePage" - ] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "middle_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - target_model=[ - "core.ArticlePage" - ] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "right_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - target_model=[ - "core.ArticlePage" - ] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ] - ), - ), - ( - "recent_articles", - wagtail.core.blocks.StructBlock( - [ - ( - "num_articles", - wagtail.core.blocks.IntegerBlock( - help_text="Number of recent articles to display.", - label="Number of articles", - ), - ) - ] - ), - ), - ], - null=True, - ), - ), + ('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')), + ('featured_articles', wagtail.core.fields.StreamField([('one_column', wagtail.core.blocks.StructBlock([('column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('one_ad_column', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(help_text='Image should be 22:7')), ('link', wagtail.core.blocks.URLBlock(label='target', required=False))])), ('two_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('emphasize_column', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')], help_text='Which article, if either, should appear larger.', required=False))])), ('three_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('middle_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('recent_articles', wagtail.core.blocks.StructBlock([('num_articles', wagtail.core.blocks.IntegerBlock(help_text='Number of recent articles to display.', label='Number of articles'))])), ('marquee_banner', wagtail.core.blocks.StructBlock([('body', wagtail.core.blocks.RichTextBlock(required=True)), ('banner_type', wagtail.core.blocks.ChoiceBlock(choices=[('moves', 'Rotating')], help_text='Determines whether the marquee banner is stationary or rotating. Only rotating works right now.'))]))], null=True)), ], - options={"abstract": False}, - bases=("wagtailcore.page",), - ) + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), + ), ] diff --git a/home/migrations/0002_auto_20190924_2345.py b/home/migrations/0002_auto_20190924_2345.py deleted file mode 100644 index 2f0cc2e3..00000000 --- a/home/migrations/0002_auto_20190924_2345.py +++ /dev/null @@ -1,217 +0,0 @@ -# Generated by Django 2.2.5 on 2019-09-24 23:45 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [("home", "0001_initial")] - - operations = [ - migrations.AlterField( - model_name="homepage", - name="featured_articles", - field=wagtail.core.fields.StreamField( - [ - ( - "one_column", - wagtail.core.blocks.StructBlock( - [ - ( - "column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ) - ] - ), - ), - ( - "one_ad_column", - wagtail.core.blocks.StructBlock( - [ - ("image", wagtail.images.blocks.ImageChooserBlock()), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["italic"], required=False - ), - ), - ( - "link", - wagtail.core.blocks.URLBlock( - label="target", required="false" - ), - ), - ( - "size", - wagtail.core.blocks.ChoiceBlock( - choices=[ - ("small", "Small"), - ("medium", "Medium"), - ("large", "Large"), - ], - help_text="Width of image in ad.", - ), - ), - ] - ), - ), - ( - "two_columns", - wagtail.core.blocks.StructBlock( - [ - ( - "left_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "right_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "emphasize_column", - wagtail.core.blocks.ChoiceBlock( - choices=[("left", "Left"), ("right", "Right")], - help_text="Which article, if either, should appear larger.", - required=False, - ), - ), - ] - ), - ), - ( - "three_columns", - wagtail.core.blocks.StructBlock( - [ - ( - "left_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "middle_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "right_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ] - ), - ), - ( - "recent_articles", - wagtail.core.blocks.StructBlock( - [ - ( - "num_articles", - wagtail.core.blocks.IntegerBlock( - help_text="Number of recent articles to display.", - label="Number of articles", - ), - ) - ] - ), - ), - ], - null=True, - ), - ) - ] diff --git a/home/migrations/0003_auto_20190925_0314.py b/home/migrations/0003_auto_20190925_0314.py deleted file mode 100644 index df47ea36..00000000 --- a/home/migrations/0003_auto_20190925_0314.py +++ /dev/null @@ -1,205 +0,0 @@ -# Generated by Django 2.2.5 on 2019-09-25 03:14 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [("home", "0002_auto_20190924_2345")] - - operations = [ - migrations.AlterField( - model_name="homepage", - name="featured_articles", - field=wagtail.core.fields.StreamField( - [ - ( - "one_column", - wagtail.core.blocks.StructBlock( - [ - ( - "column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ) - ] - ), - ), - ( - "one_ad_column", - wagtail.core.blocks.StructBlock( - [ - ( - "image", - wagtail.images.blocks.ImageChooserBlock( - help_text="Image should be 22:7" - ), - ), - ( - "link", - wagtail.core.blocks.URLBlock( - label="target", required=False - ), - ), - ] - ), - ), - ( - "two_columns", - wagtail.core.blocks.StructBlock( - [ - ( - "left_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "right_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "emphasize_column", - wagtail.core.blocks.ChoiceBlock( - choices=[("left", "Left"), ("right", "Right")], - help_text="Which article, if either, should appear larger.", - required=False, - ), - ), - ] - ), - ), - ( - "three_columns", - wagtail.core.blocks.StructBlock( - [ - ( - "left_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "middle_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "right_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ] - ), - ), - ( - "recent_articles", - wagtail.core.blocks.StructBlock( - [ - ( - "num_articles", - wagtail.core.blocks.IntegerBlock( - help_text="Number of recent articles to display.", - label="Number of articles", - ), - ) - ] - ), - ), - ], - null=True, - ), - ) - ] diff --git a/lights/migrations/0001_initial.py b/lights/migrations/0001_initial.py index fb0a3003..bacc0092 100644 --- a/lights/migrations/0001_initial.py +++ b/lights/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.4 on 2018-12-25 20:16 +# Generated by Django 2.2.1 on 2019-10-15 20:21 from django.db import migrations, models @@ -7,21 +7,17 @@ class Migration(migrations.Migration): initial = True - dependencies = [] + dependencies = [ + ] operations = [ migrations.CreateModel( - name="Color", + name='Color', fields=[ - ("R", models.IntegerField(default=255)), - ("G", models.IntegerField(default=0)), - ("B", models.IntegerField(default=0)), - ( - "id", - models.IntegerField( - default=0, editable=False, primary_key=True, serialize=False - ), - ), + ('R', models.IntegerField(default=255)), + ('G', models.IntegerField(default=0)), + ('B', models.IntegerField(default=0)), + ('id', models.IntegerField(default=0, editable=False, primary_key=True, serialize=False)), ], - ) + ), ] diff --git a/newsletter/migrations/0001_initial.py b/newsletter/migrations/0001_initial.py index beca2853..e0ee068c 100644 --- a/newsletter/migrations/0001_initial.py +++ b/newsletter/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.4 on 2018-12-25 20:16 +# Generated by Django 2.2.1 on 2019-10-15 20:21 from django.db import migrations, models import django.db.models.deletion @@ -11,103 +11,34 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ("wagtailcore", "0041_group_collection_permissions_verbose_name_plural") + ('wagtailcore', '0041_group_collection_permissions_verbose_name_plural'), ] operations = [ migrations.CreateModel( - name="Newsletter", + name='Newsletter', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("subject", models.CharField(max_length=255)), - ( - "body", - wagtail.core.fields.StreamField( - [ - ( - "article", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - target_model=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ( - "summary", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's summary.", - required=False, - ), - ), - ] - ), - ), - ("text", wagtail.core.blocks.RichTextBlock()), - ] - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('subject', models.CharField(max_length=255)), + ('body', wagtail.core.fields.StreamField([('article', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False)), ('summary', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's summary.", required=False))])), ('text', wagtail.core.blocks.RichTextBlock())])), ], ), migrations.CreateModel( - name="NewsletterSettings", + name='Subscription', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "subscriptions_token", - models.CharField( - help_text="The token required to access the subscription list", - max_length=255, - ), - ), - ( - "site", - models.OneToOneField( - editable=False, - on_delete=django.db.models.deletion.CASCADE, - to="wagtailcore.Site", - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('email', models.EmailField(max_length=254, unique=True)), ], - options={"verbose_name": "newsletter settings"}, ), migrations.CreateModel( - name="Subscription", + name='NewsletterSettings', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("email", models.EmailField(max_length=254, unique=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('subscriptions_token', models.CharField(help_text='The token required to access the subscription list', max_length=255)), + ('site', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.Site')), ], + options={ + 'verbose_name': 'newsletter settings', + }, ), ] diff --git a/package-lock.json b/package-lock.json index 3ba945df..94c17af2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" } } @@ -1717,7 +1717,7 @@ }, "camelcase-keys": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "requires": { "camelcase": "^2.0.0", @@ -3205,8 +3205,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -3224,13 +3223,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3243,18 +3240,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -3357,8 +3351,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -3368,7 +3361,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3381,20 +3373,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.3.5", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -3411,7 +3400,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -3484,8 +3472,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -3495,7 +3482,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -3571,8 +3557,7 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -3602,7 +3587,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3620,7 +3604,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3659,13 +3642,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.3", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -4448,7 +4429,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "requires": { "graceful-fs": "^4.1.2", @@ -4468,7 +4449,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" } } @@ -4653,7 +4634,7 @@ }, "meow": { "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "requires": { "camelcase-keys": "^2.0.0", @@ -4670,7 +4651,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" } } @@ -5340,7 +5321,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" } } @@ -8618,7 +8599,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { "ansi-regex": "^2.0.0" From 1f1fb987bf247ce800efe352ea97be0cbc60f052 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Fri, 25 Oct 2019 14:07:45 -0400 Subject: [PATCH 20/36] Data for timeline is inputted and saved correctly --- core/models.py | 17 ++++------------- core/templates/core/union_timeline.html | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/core/models.py b/core/models.py index 2ef479dc..27057572 100644 --- a/core/models.py +++ b/core/models.py @@ -339,20 +339,11 @@ class GalleryPhotoBlock(StructBlock): class UnionEvent(StructBlock): title=RichTextBlock(required=True, default="") + date=RichTextBlock(required=True, default="") body=RichTextBlock(required=True, default="") - date_month=IntegerBlock(required=True) - date_day=IntegerBlock(required=True) - date_year=IntegerBlock(required=True) - - def get_date(self): - return datetime.datetime(self["date_year"], self["date_month"], self["date_day"]) - #date=models.DateField("Date of the Event", default="") - - def get_title(): - return title - - def get_body(): - return body + #date_month=IntegerBlock(required=True) + #date_day=IntegerBlock(required=True) + #date_year=IntegerBlock(required=True) class UnionTimeline(Page): events=StreamField( diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html index f5960086..edba4cc7 100644 --- a/core/templates/core/union_timeline.html +++ b/core/templates/core/union_timeline.html @@ -13,7 +13,7 @@

Union Events Timeline

{{block.value.title}}
- "this is the date: "{{block.get_date}} + {{block.value.date}}
{{block.value.body}} From d9b7ed91515e8b8541ada6ab87a77b6c5d144990 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Mon, 28 Oct 2019 21:56:35 -0400 Subject: [PATCH 21/36] Added a small photo to each event. --- core/migrations/0002_auto_20191025_2013.py | 20 +++++ core/migrations/0003_auto_20191025_2019.py | 21 ++++++ core/migrations/0004_auto_20191025_2036.py | 21 ++++++ core/models.py | 4 +- core/templates/core/union_timeline.html | 88 +++++++++++++++++++--- 5 files changed, 140 insertions(+), 14 deletions(-) create mode 100644 core/migrations/0002_auto_20191025_2013.py create mode 100644 core/migrations/0003_auto_20191025_2019.py create mode 100644 core/migrations/0004_auto_20191025_2036.py diff --git a/core/migrations/0002_auto_20191025_2013.py b/core/migrations/0002_auto_20191025_2013.py new file mode 100644 index 00000000..9f235fb1 --- /dev/null +++ b/core/migrations/0002_auto_20191025_2013.py @@ -0,0 +1,20 @@ +# Generated by Django 2.2.1 on 2019-10-25 20:13 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='uniontimeline', + name='events', + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.RichTextBlock(default='', required=True))]))]), + ), + ] diff --git a/core/migrations/0003_auto_20191025_2019.py b/core/migrations/0003_auto_20191025_2019.py new file mode 100644 index 00000000..795448f9 --- /dev/null +++ b/core/migrations/0003_auto_20191025_2019.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.1 on 2019-10-25 20:19 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0002_auto_20191025_2013'), + ] + + operations = [ + migrations.AlterField( + model_name='uniontimeline', + name='events', + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('featured_image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False)), ('size', wagtail.core.blocks.ChoiceBlock(choices=[('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')], help_text='Width of image in article.'))]))]))]), + ), + ] diff --git a/core/migrations/0004_auto_20191025_2036.py b/core/migrations/0004_auto_20191025_2036.py new file mode 100644 index 00000000..f8ff9e1a --- /dev/null +++ b/core/migrations/0004_auto_20191025_2036.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.1 on 2019-10-25 20:36 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0003_auto_20191025_2019'), + ] + + operations = [ + migrations.AlterField( + model_name='uniontimeline', + name='events', + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), + ), + ] diff --git a/core/models.py b/core/models.py index 27057572..f24c8ea5 100644 --- a/core/models.py +++ b/core/models.py @@ -341,9 +341,7 @@ class UnionEvent(StructBlock): title=RichTextBlock(required=True, default="") date=RichTextBlock(required=True, default="") body=RichTextBlock(required=True, default="") - #date_month=IntegerBlock(required=True) - #date_day=IntegerBlock(required=True) - #date_year=IntegerBlock(required=True) + featured_image = ImageChooserBlock(required=False) class UnionTimeline(Page): events=StreamField( diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html index edba4cc7..7b51d364 100644 --- a/core/templates/core/union_timeline.html +++ b/core/templates/core/union_timeline.html @@ -5,20 +5,86 @@ {% block body_class %}template-staffindexpage{% endblock %} {% block content %} -
-

Union Events Timeline

-
+ + +
+
+
+

Union Events Timeline

+
    {% for block in page.events %} -
    - {{block.value.title}} -
    -
    - {{block.value.date}} -
    -
    - {{block.value.body}} +
  • +
    +
    +
    + {{ block.value.title }} +
    +
    + {{ block.value.date }} +
    +
    +
    +

    {{ block.value.body }}

    +
    +
    + {% if block.value.featured_image %} +
    + {% image block.value.featured_image width-200 as photo %} +
    + +
    +
    + {% endif %} +
    +
    +
    • {% endfor %} +
+
{% endblock %} From 48485dfa4a1058e5b26575409589a9c34b19ac63 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Tue, 29 Oct 2019 11:41:40 -0400 Subject: [PATCH 22/36] Trying to format photos to expand when clicked on --- core/templates/core/union_timeline.html | 31 ++++++++++++++++++++----- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html index 7b51d364..06f4ca29 100644 --- a/core/templates/core/union_timeline.html +++ b/core/templates/core/union_timeline.html @@ -48,6 +48,11 @@ z-index: 400; } +.imageContainer > img:hover { + width: 500px; + height: 200px; +} +
@@ -59,10 +64,10 @@

Union Events Timeline

  • -
    +
    {{ block.value.title }}
    -
    +
    {{ block.value.date }}
    @@ -72,12 +77,26 @@

    Union Events Timeline

    {% if block.value.featured_image %} -
    - {% image block.value.featured_image width-200 as photo %} -
    - + +
    +
    +
    +
    + +
    +

    + +

    +
    +
    + {% image block.value.featured_image width-200 as photo %} + {% image block.value.featured_image max-2000x1500 as large_photo %} + + +
    + {% endif %}
    From cd60beb5e35a31c1406f99a6cfb874c71c861d02 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Thu, 31 Oct 2019 18:51:47 -0400 Subject: [PATCH 23/36] Trying to make the photo expandable. --- core/templates/core/union_timeline.html | 40 +++++++++---------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html index 06f4ca29..07991f20 100644 --- a/core/templates/core/union_timeline.html +++ b/core/templates/core/union_timeline.html @@ -48,9 +48,14 @@ z-index: 400; } -.imageContainer > img:hover { - width: 500px; - height: 200px; +.thumbnail:hover { + position:relative; + top:-300px; + left:-600px; + width:1000px; + height:auto; + display:block; + z-index:999; } @@ -64,37 +69,20 @@

    Union Events Timeline

  • -
    - {{ block.value.title }} -
    -
    - {{ block.value.date }} +
    + {{ block.value.date }}

    {{ block.value.body }}

    -
    +
    {% if block.value.featured_image %} - -
    -
    -
    -
    - -
    -

    - -

    -
    -
    - {% image block.value.featured_image width-200 as photo %} - {% image block.value.featured_image max-2000x1500 as large_photo %} - - - + {% image block.value.featured_image width-300 as photo %} + +
    {% endif %} From ce7f46a398bf869870b46ca3edfcc430c81ffa82 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Tue, 5 Nov 2019 21:07:02 -0500 Subject: [PATCH 24/36] Trying to make photos expandable --- core/templates/core/union_timeline.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html index 07991f20..228b1a55 100644 --- a/core/templates/core/union_timeline.html +++ b/core/templates/core/union_timeline.html @@ -50,9 +50,9 @@ .thumbnail:hover { position:relative; - top:-300px; - left:-600px; - width:1000px; + top: 25%; + left: 0%; + width:500px; height:auto; display:block; z-index:999; @@ -80,7 +80,8 @@

    Union Events Timeline

    {% if block.value.featured_image %}
    - {% image block.value.featured_image width-300 as photo %} + {% image block.value.featured_image width-400 as photo %} + {% image block.value.featured_image width-500 as big_photo %}
    From a25ac02e9254ffb0f1a20e86c3d9e1419704f703 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Tue, 12 Nov 2019 22:11:34 -0500 Subject: [PATCH 25/36] Trying to add custom styling to text toolbar. --- core/templates/core/union_timeline.html | 22 +++++++++++++--- core/wagtail_hooks.py | 34 +++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 core/wagtail_hooks.py diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html index 228b1a55..4bfe29af 100644 --- a/core/templates/core/union_timeline.html +++ b/core/templates/core/union_timeline.html @@ -2,7 +2,7 @@ {% load wagtailcore_tags wagtailimages_tags %} -{% block body_class %}template-staffindexpage{% endblock %} +{% block body_class %}template-uniontimeline{% endblock %} {% block content %}
    -
    +
    +
    + Definitions +
    +
    +

    Union Events Timeline

      {% for block in page.events %} diff --git a/core/wagtail_hooks.py b/core/wagtail_hooks.py new file mode 100644 index 00000000..a9ed746b --- /dev/null +++ b/core/wagtail_hooks.py @@ -0,0 +1,34 @@ + +from wagtail.core import hooks + +# 1. Use the register_rich_text_features hook. +@hooks.register('register_rich_text_features') +def register_tooltip_feature(features): + feature_name = 'tooltip' + type_ = 'TOOLTIP' + tag = 'tl' + + # 2. Configure how Draftail handles the feature in its toolbar. + control = { + 'type': type_, + 'label': 'TL', + 'description': 'Tooltip', + } + + # 3. Call register_editor_plugin to register the configuration for Draftail. + features.register_editor_plugin( + 'draftail', feature_name, draftail_features.InlineStyleFeature(control) + ) + + # 4.configure the content transform from the DB to the editor and back. + db_conversion = { + 'from_database_format': {tag: InlineStyleElementHandler(type_)}, + 'to_database_format': {'style_map': {type_: tag}}, + } + + # 5. Call register_converter_rule to register the content transformation conversion. + features.register_converter_rule('contentstate', feature_name, db_conversion) + + # 6. (optional) Add the feature to the default features list to make it available + # on rich text fields that do not specify an explicit 'features' list + features.default_features.append('strikethrough') \ No newline at end of file From f0a256171bb9cbf559ac41c9e315ee3a10363d35 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Tue, 10 Dec 2019 20:02:50 -0500 Subject: [PATCH 26/36] not done, will continue work during break --- core/templates/core/union_timeline.html | 52 +++++++++++-------------- core/wagtail_hooks.py | 24 +++++++++--- 2 files changed, 41 insertions(+), 35 deletions(-) diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html index 4bfe29af..b4b2929e 100644 --- a/core/templates/core/union_timeline.html +++ b/core/templates/core/union_timeline.html @@ -6,11 +6,11 @@ {% block content %} +
      -
      -
      - Definitions -
      -

      Union Events Timeline

        @@ -93,7 +80,7 @@

        Union Events Timeline

        {{ block.value.body }}

        -
        +
        {% if block.value.featured_image %}
        {% image block.value.featured_image width-400 as photo %} @@ -104,10 +91,15 @@

        Union Events Timeline

        {% endif %}
        +
        {% endfor %}
      +
      +

      Tooltip Example

      +

      Executive Board

       +
      diff --git a/core/wagtail_hooks.py b/core/wagtail_hooks.py index a9ed746b..fccc1979 100644 --- a/core/wagtail_hooks.py +++ b/core/wagtail_hooks.py @@ -1,18 +1,25 @@ - from wagtail.core import hooks +import wagtail.admin.rich_text.editors.draftail.features as draftail_features +from wagtail.admin.rich_text.converters.html_to_contentstate import ( + InlineStyleElementHandler +) -# 1. Use the register_rich_text_features hook. @hooks.register('register_rich_text_features') def register_tooltip_feature(features): feature_name = 'tooltip' type_ = 'TOOLTIP' - tag = 'tl' + tag = 'div' # 2. Configure how Draftail handles the feature in its toolbar. control = { 'type': type_, 'label': 'TL', 'description': 'Tooltip', + 'style': { + 'data-toggle':'tooltip', + 'data-placement': 'top', + 'title': "Some words" + }, } # 3. Call register_editor_plugin to register the configuration for Draftail. @@ -23,7 +30,14 @@ def register_tooltip_feature(features): # 4.configure the content transform from the DB to the editor and back. db_conversion = { 'from_database_format': {tag: InlineStyleElementHandler(type_)}, - 'to_database_format': {'style_map': {type_: tag}}, + 'to_database_format': {'style_map': { + type_: { + 'element': tag, + 'props': { + #brokennnn + } + } + }}, } # 5. Call register_converter_rule to register the content transformation conversion. @@ -31,4 +45,4 @@ def register_tooltip_feature(features): # 6. (optional) Add the feature to the default features list to make it available # on rich text fields that do not specify an explicit 'features' list - features.default_features.append('strikethrough') \ No newline at end of file + features.default_features.append(feature_name) \ No newline at end of file From ae179a28ea3370ffcd02c332b27c2d123210683a Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Tue, 25 Feb 2020 13:32:22 -0500 Subject: [PATCH 27/36] Not using bootstrap tooltip anymore. Using custom CSS tooltip. --- core/migrations/0005_auto_20200209_2009.py | 21 ++++++++++ core/migrations/0006_auto_20200209_2024.py | 21 ++++++++++ core/migrations/0007_auto_20200209_2039.py | 21 ++++++++++ core/migrations/0008_auto_20200209_2106.py | 21 ++++++++++ core/migrations/0009_auto_20200220_2239.py | 21 ++++++++++ core/migrations/0010_auto_20200220_2241.py | 21 ++++++++++ core/migrations/0011_auto_20200220_2245.py | 21 ++++++++++ core/migrations/0012_auto_20200220_2250.py | 21 ++++++++++ core/migrations/0013_auto_20200225_1819.py | 21 ++++++++++ core/migrations/0014_auto_20200225_1821.py | 21 ++++++++++ core/migrations/0015_auto_20200225_1830.py | 21 ++++++++++ core/models.py | 20 ++++++++- core/templates/core/union_timeline.html | 47 +++++++++++++++++----- 13 files changed, 286 insertions(+), 12 deletions(-) create mode 100644 core/migrations/0005_auto_20200209_2009.py create mode 100644 core/migrations/0006_auto_20200209_2024.py create mode 100644 core/migrations/0007_auto_20200209_2039.py create mode 100644 core/migrations/0008_auto_20200209_2106.py create mode 100644 core/migrations/0009_auto_20200220_2239.py create mode 100644 core/migrations/0010_auto_20200220_2241.py create mode 100644 core/migrations/0011_auto_20200220_2245.py create mode 100644 core/migrations/0012_auto_20200220_2250.py create mode 100644 core/migrations/0013_auto_20200225_1819.py create mode 100644 core/migrations/0014_auto_20200225_1821.py create mode 100644 core/migrations/0015_auto_20200225_1830.py diff --git a/core/migrations/0005_auto_20200209_2009.py b/core/migrations/0005_auto_20200209_2009.py new file mode 100644 index 00000000..cd23ceb6 --- /dev/null +++ b/core/migrations/0005_auto_20200209_2009.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.1 on 2020-02-09 20:09 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0004_auto_20191025_2036'), + ] + + operations = [ + migrations.AlterField( + model_name='uniontimeline', + name='events', + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), + ), + ] diff --git a/core/migrations/0006_auto_20200209_2024.py b/core/migrations/0006_auto_20200209_2024.py new file mode 100644 index 00000000..d3726dd7 --- /dev/null +++ b/core/migrations/0006_auto_20200209_2024.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.1 on 2020-02-09 20:24 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0005_auto_20200209_2009'), + ] + + operations = [ + migrations.AlterField( + model_name='uniontimeline', + name='events', + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.StreamBlock([('paragraph', wagtail.core.blocks.RichTextBlock()), ('tooltip', wagtail.core.blocks.RichTextBlock())], blank=True)), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), + ), + ] diff --git a/core/migrations/0007_auto_20200209_2039.py b/core/migrations/0007_auto_20200209_2039.py new file mode 100644 index 00000000..0d9b4a4c --- /dev/null +++ b/core/migrations/0007_auto_20200209_2039.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.1 on 2020-02-09 20:39 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0006_auto_20200209_2024'), + ] + + operations = [ + migrations.AlterField( + model_name='uniontimeline', + name='events', + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StreamBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), + ), + ] diff --git a/core/migrations/0008_auto_20200209_2106.py b/core/migrations/0008_auto_20200209_2106.py new file mode 100644 index 00000000..46c42bc4 --- /dev/null +++ b/core/migrations/0008_auto_20200209_2106.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.1 on 2020-02-09 21:06 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0007_auto_20200209_2039'), + ] + + operations = [ + migrations.AlterField( + model_name='uniontimeline', + name='events', + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('paragraph', wagtail.core.blocks.RichTextBlock()), ('tooltip', wagtail.core.blocks.RichTextBlock())]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), + ), + ] diff --git a/core/migrations/0009_auto_20200220_2239.py b/core/migrations/0009_auto_20200220_2239.py new file mode 100644 index 00000000..1d07c16d --- /dev/null +++ b/core/migrations/0009_auto_20200220_2239.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.1 on 2020-02-20 22:39 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0008_auto_20200209_2106'), + ] + + operations = [ + migrations.AlterField( + model_name='uniontimeline', + name='events', + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('paragraph_before', wagtail.core.blocks.RichTextBlock()), ('tooltip', wagtail.core.blocks.StructBlock([('word', wagtail.core.blocks.RichTextBlock()), ('definition', wagtail.core.blocks.RichTextBlock())]))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), + ), + ] diff --git a/core/migrations/0010_auto_20200220_2241.py b/core/migrations/0010_auto_20200220_2241.py new file mode 100644 index 00000000..900a08a6 --- /dev/null +++ b/core/migrations/0010_auto_20200220_2241.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.1 on 2020-02-20 22:41 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0009_auto_20200220_2239'), + ] + + operations = [ + migrations.AlterField( + model_name='uniontimeline', + name='events', + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StreamBlock([('paragraph_before', wagtail.core.blocks.RichTextBlock()), ('tooltip', wagtail.core.blocks.StructBlock([('word', wagtail.core.blocks.RichTextBlock()), ('definition', wagtail.core.blocks.RichTextBlock())]))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), + ), + ] diff --git a/core/migrations/0011_auto_20200220_2245.py b/core/migrations/0011_auto_20200220_2245.py new file mode 100644 index 00000000..afe685c1 --- /dev/null +++ b/core/migrations/0011_auto_20200220_2245.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.1 on 2020-02-20 22:45 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0010_auto_20200220_2241'), + ] + + operations = [ + migrations.AlterField( + model_name='uniontimeline', + name='events', + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StreamBlock([('paragraph_before', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('tooltip', wagtail.core.blocks.StructBlock([('word', wagtail.core.blocks.RichTextBlock()), ('definition', wagtail.core.blocks.RichTextBlock())]))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), + ), + ] diff --git a/core/migrations/0012_auto_20200220_2250.py b/core/migrations/0012_auto_20200220_2250.py new file mode 100644 index 00000000..c4637115 --- /dev/null +++ b/core/migrations/0012_auto_20200220_2250.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.1 on 2020-02-20 22:50 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0011_auto_20200220_2245'), + ] + + operations = [ + migrations.AlterField( + model_name='uniontimeline', + name='events', + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.StreamBlock([('tooltip', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('paragraph', wagtail.core.blocks.RichTextBlock()), ('definition', wagtail.core.blocks.RichTextBlock(required=False))])))])), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), + ), + ] diff --git a/core/migrations/0013_auto_20200225_1819.py b/core/migrations/0013_auto_20200225_1819.py new file mode 100644 index 00000000..48ca61f5 --- /dev/null +++ b/core/migrations/0013_auto_20200225_1819.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.1 on 2020-02-25 18:19 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0012_auto_20200220_2250'), + ] + + operations = [ + migrations.AlterField( + model_name='uniontimeline', + name='events', + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('paragraph', wagtail.core.blocks.RichTextBlock()), ('tooltip', wagtail.core.blocks.StructBlock([('phrase', wagtail.core.blocks.RichTextBlock()), ('definition', wagtail.core.blocks.RichTextBlock(required=False))]))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), + ), + ] diff --git a/core/migrations/0014_auto_20200225_1821.py b/core/migrations/0014_auto_20200225_1821.py new file mode 100644 index 00000000..c2431ae5 --- /dev/null +++ b/core/migrations/0014_auto_20200225_1821.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.1 on 2020-02-25 18:21 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0013_auto_20200225_1819'), + ] + + operations = [ + migrations.AlterField( + model_name='uniontimeline', + name='events', + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('paragraph', wagtail.core.blocks.RichTextBlock()), ('definition', wagtail.core.blocks.RichTextBlock(required=False))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), + ), + ] diff --git a/core/migrations/0015_auto_20200225_1830.py b/core/migrations/0015_auto_20200225_1830.py new file mode 100644 index 00000000..d7e529e6 --- /dev/null +++ b/core/migrations/0015_auto_20200225_1830.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.1 on 2020-02-25 18:30 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0014_auto_20200225_1821'), + ] + + operations = [ + migrations.AlterField( + model_name='uniontimeline', + name='events', + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('phrase', wagtail.core.blocks.RichTextBlock()), ('definition', wagtail.core.blocks.RichTextBlock(required=False))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), + ), + ] diff --git a/core/models.py b/core/models.py index f24c8ea5..6d08ba9c 100644 --- a/core/models.py +++ b/core/models.py @@ -24,6 +24,7 @@ StructValue, ChoiceBlock, IntegerBlock, + StreamBlock ) from wagtail.core.fields import RichTextField, StreamField from wagtail.core.models import Page, Orderable @@ -336,13 +337,28 @@ class MarqueeBlock(StructBlock): class GalleryPhotoBlock(StructBlock): image = ImageChooserBlock() caption = RichTextBlock(features=["italic"], required=False) - + class UnionEvent(StructBlock): title=RichTextBlock(required=True, default="") date=RichTextBlock(required=True, default="") - body=RichTextBlock(required=True, default="") + body=ListBlock(StructBlock([ + ("phrase", RichTextBlock()), + ("definition", RichTextBlock(required=False)), + ])) featured_image = ImageChooserBlock(required=False) +'''class UnionEvent(StructBlock): + title=RichTextBlock(required=True, default="") + date=RichTextBlock(required=True, default="") + body=ListBlock(StructBlock([ + ("paragraph", RichTextBlock()), + ("tooltip", StructBlock([ + ("phrase", RichTextBlock()), + ("definition", RichTextBlock(required=False)), + ])), + ])) + featured_image = ImageChooserBlock(required=False)''' + class UnionTimeline(Page): events=StreamField( [("event", UnionEvent())] diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html index b4b2929e..13d6e9b8 100644 --- a/core/templates/core/union_timeline.html +++ b/core/templates/core/union_timeline.html @@ -55,13 +55,33 @@ display:block; z-index:999; } + .tooltip { + position: relative; + display: inline-block; + border-bottom: 1px dotted black; + } + .tooltip .tooltiptext { + visibility: hidden; + width: 300px; + background-color: black; + color: #fff; + text-align: center; + border-radius: 6px; + padding: 5px 0; + + /* Position the tooltip */ + position: absolute; + z-index: 1; + bottom: 100%; + left: 50%; + margin-left: -60px; + } + + .tooltip:hover .tooltiptext { + visibility: visible; + } -
      @@ -78,7 +98,17 @@

      Union Events Timeline

      -

      {{ block.value.body }}

      + {% if block.value.body %} + {% for item in block.value.body %} + {% if item.definition %} +
      {{item.phrase}} + {{item.definition}} +
      + {% else %} + {{item.phrase}} + {% endif %} + {% endfor %} + {% endif %}
      {% if block.value.featured_image %} @@ -96,11 +126,8 @@

      Union Events Timeline

      {% endfor %}
    -
    -

    Tooltip Example

    -

    Executive Board

     -
    {% endblock %} + From 80852b2eaec60337580c2e1b37cda9df87891c71 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Fri, 28 Feb 2020 11:43:05 -0500 Subject: [PATCH 28/36] Have extra p tags, but almost close to having definitions for timeline. --- core/models.py | 41 ++++++++++++++++- core/templates/core/union_timeline.html | 58 +++++++++++++------------ core/wagtail_hooks.py | 48 -------------------- 3 files changed, 69 insertions(+), 78 deletions(-) delete mode 100644 core/wagtail_hooks.py diff --git a/core/models.py b/core/models.py index 6d08ba9c..aa848574 100644 --- a/core/models.py +++ b/core/models.py @@ -24,7 +24,8 @@ StructValue, ChoiceBlock, IntegerBlock, - StreamBlock + StreamBlock, + TextBlock ) from wagtail.core.fields import RichTextField, StreamField from wagtail.core.models import Page, Orderable @@ -338,15 +339,34 @@ class GalleryPhotoBlock(StructBlock): image = ImageChooserBlock() caption = RichTextBlock(features=["italic"], required=False) +class EventPhrase(RichTextBlock): + phrase=RichTextBlock() + class UnionEvent(StructBlock): title=RichTextBlock(required=True, default="") date=RichTextBlock(required=True, default="") body=ListBlock(StructBlock([ - ("phrase", RichTextBlock()), + ("phrase", TextBlock()), ("definition", RichTextBlock(required=False)), ])) featured_image = ImageChooserBlock(required=False) + def get_text_html(self): + """Get the HTML that represents paragraphs within the article as a string.""" + builder = "" + for block in event.body: + builder += str(block.value.phrase) + return builder + + def get_plain_text(self): + builder = "" + soup = BeautifulSoup(self.get_text_html(), "html.parser") + for para in soup.findAll("p"): + builder += para.text + builder += " " + return builder[:-1] + + '''class UnionEvent(StructBlock): title=RichTextBlock(required=True, default="") date=RichTextBlock(required=True, default="") @@ -365,6 +385,23 @@ class UnionTimeline(Page): ) content_panels = Page.content_panels + [StreamFieldPanel("events")] + + '''def get_text_html(self, current_block): + """Get the HTML that represents paragraphs within the article as a string.""" + builder = "" + for event in self.events: + for block in event.body: + if (block.value.phrase==current_block.value.phrase): + builder += str(block.value.phrase) + return builder + + def get_plain_text(self, current_block): + builder = "" + soup = BeautifulSoup(self.get_text_html(current_block), "html.parser") + for para in soup.findAll("p"): + builder += para.text + builder += " " + return builder[:-1]''' class ArticlePage(RoutablePageMixin, Page): diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html index 13d6e9b8..bdbd61e4 100644 --- a/core/templates/core/union_timeline.html +++ b/core/templates/core/union_timeline.html @@ -56,31 +56,31 @@ z-index:999; } .tooltip { - position: relative; - display: inline-block; - border-bottom: 1px dotted black; - } + position: relative; + display: inline-block; + border-bottom: 1px dotted black; +} - .tooltip .tooltiptext { - visibility: hidden; - width: 300px; - background-color: black; - color: #fff; - text-align: center; - border-radius: 6px; - padding: 5px 0; +.tooltip .tooltiptext { + visibility: hidden; + width: 300px; + background-color: black; + color: #fff; + text-align: center; + border-radius: 6px; + padding: 5px 0; - /* Position the tooltip */ - position: absolute; - z-index: 1; - bottom: 100%; - left: 50%; - margin-left: -60px; - } + /* Position the tooltip */ + position: absolute; + z-index: 1; + bottom: 100%; + left: 50%; + margin-left: -60px; +} - .tooltip:hover .tooltiptext { - visibility: visible; - } +.tooltip:hover .tooltiptext { + visibility: visible; +}
    @@ -99,13 +99,15 @@

    Union Events Timeline

    {% if block.value.body %} - {% for item in block.value.body %} - {% if item.definition %} -
    {{item.phrase}} - {{item.definition}} -
    + {% for event_body_block in block.value.body %} + {% if event_body_block.definition %} + {{event_body_block.phrase}} + {{event_body_block.definition}} + {% else %} - {{item.phrase}} + + {{event_body_block.phrase}} + {% endif %} {% endfor %} {% endif %} diff --git a/core/wagtail_hooks.py b/core/wagtail_hooks.py deleted file mode 100644 index fccc1979..00000000 --- a/core/wagtail_hooks.py +++ /dev/null @@ -1,48 +0,0 @@ -from wagtail.core import hooks -import wagtail.admin.rich_text.editors.draftail.features as draftail_features -from wagtail.admin.rich_text.converters.html_to_contentstate import ( - InlineStyleElementHandler -) - -@hooks.register('register_rich_text_features') -def register_tooltip_feature(features): - feature_name = 'tooltip' - type_ = 'TOOLTIP' - tag = 'div' - - # 2. Configure how Draftail handles the feature in its toolbar. - control = { - 'type': type_, - 'label': 'TL', - 'description': 'Tooltip', - 'style': { - 'data-toggle':'tooltip', - 'data-placement': 'top', - 'title': "Some words" - }, - } - - # 3. Call register_editor_plugin to register the configuration for Draftail. - features.register_editor_plugin( - 'draftail', feature_name, draftail_features.InlineStyleFeature(control) - ) - - # 4.configure the content transform from the DB to the editor and back. - db_conversion = { - 'from_database_format': {tag: InlineStyleElementHandler(type_)}, - 'to_database_format': {'style_map': { - type_: { - 'element': tag, - 'props': { - #brokennnn - } - } - }}, - } - - # 5. Call register_converter_rule to register the content transformation conversion. - features.register_converter_rule('contentstate', feature_name, db_conversion) - - # 6. (optional) Add the feature to the default features list to make it available - # on rich text fields that do not specify an explicit 'features' list - features.default_features.append(feature_name) \ No newline at end of file From f4b97e763ce1a3e78e6a4ebd44612503eb1ec443 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Fri, 28 Feb 2020 16:54:22 -0500 Subject: [PATCH 29/36] Fixed migrations and CSS styling. --- core/migrations/0001_initial.py | 105 ++++++++- ...025_2013.py => 0002_auto_20200228_2120.py} | 5 +- core/migrations/0003_auto_20191025_2019.py | 21 -- ...225_1830.py => 0003_auto_20200228_2122.py} | 6 +- core/migrations/0004_auto_20191025_2036.py | 21 -- ...209_2024.py => 0004_auto_20200228_2153.py} | 6 +- core/migrations/0005_auto_20200209_2009.py | 21 -- core/migrations/0005_electionindexpage.py | 33 --- core/migrations/0006_candidate.py | 43 ---- core/migrations/0007_auto_20200131_0036.py | 52 ---- core/migrations/0007_auto_20200209_2039.py | 21 -- core/migrations/0008_auto_20200131_0038.py | 24 -- core/migrations/0008_auto_20200209_2106.py | 21 -- core/migrations/0009_auto_20200131_0045.py | 24 -- core/migrations/0009_auto_20200220_2239.py | 21 -- core/migrations/0010_auto_20200131_0051.py | 58 ----- core/migrations/0010_auto_20200220_2241.py | 21 -- core/migrations/0011_auto_20200131_0053.py | 19 -- core/migrations/0011_auto_20200220_2245.py | 21 -- core/migrations/0012_auto_20200131_0237.py | 51 ---- core/migrations/0012_auto_20200220_2250.py | 21 -- core/migrations/0013_auto_20200225_1819.py | 21 -- ...013_electionindexpage_featured_articles.py | 76 ------ core/migrations/0014_auto_20200131_0252.py | 25 -- core/migrations/0014_auto_20200225_1821.py | 21 -- .../0015_candidatepage_officesorderable.py | 78 ------ core/migrations/0016_auto_20200131_0323.py | 22 -- .../0017_candidatepage_nominations.py | 17 -- .../0018_remove_candidatepage_offices.py | 10 - core/migrations/0019_auto_20200131_2107.py | 22 -- core/migrations/0020_auto_20200131_2115.py | 53 ----- .../0021_officesorderable_electionpage.py | 24 -- core/migrations/0022_auto_20200131_2247.py | 70 ------ core/migrations/0023_auto_20200201_2030.py | 26 -- .../0024_remove_candidatepage_nominations.py | 12 - .../0025_electionindexpage_panels.py | 42 ---- core/migrations/0026_auto_20200202_0329.py | 44 ---- core/migrations/0027_auto_20200202_1822.py | 17 -- core/migrations/0028_auto_20200202_1832.py | 13 - .../0029_remove_candidatepage_name.py | 10 - .../0030_candidatepage_related_articles.py | 23 -- core/migrations/0031_auto_20200215_1843.py | 41 ---- core/migrations/0032_auto_20200215_1845.py | 50 ---- core/migrations/0033_office_description.py | 17 -- .../0034_remove_office_election_in.py | 10 - core/migrations/0035_auto_20200215_2037.py | 23 -- core/migrations/0036_auto_20200215_2042.py | 14 -- core/models.py | 5 +- core/templates/core/union_timeline.html | 8 +- home/migrations/0001_initial.py | 2 +- home/migrations/0002_auto_20190924_2345.py | 217 ----------------- home/migrations/0003_auto_20190925_0314.py | 205 ---------------- home/migrations/0004_auto_20191106_0215.py | 223 ------------------ 53 files changed, 118 insertions(+), 1938 deletions(-) rename core/migrations/{0002_auto_20191025_2013.py => 0002_auto_20200228_2120.py} (66%) delete mode 100644 core/migrations/0003_auto_20191025_2019.py rename core/migrations/{0015_auto_20200225_1830.py => 0003_auto_20200228_2122.py} (69%) delete mode 100644 core/migrations/0004_auto_20191025_2036.py rename core/migrations/{0006_auto_20200209_2024.py => 0004_auto_20200228_2153.py} (62%) delete mode 100644 core/migrations/0005_auto_20200209_2009.py delete mode 100644 core/migrations/0005_electionindexpage.py delete mode 100644 core/migrations/0006_candidate.py delete mode 100644 core/migrations/0007_auto_20200131_0036.py delete mode 100644 core/migrations/0007_auto_20200209_2039.py delete mode 100644 core/migrations/0008_auto_20200131_0038.py delete mode 100644 core/migrations/0008_auto_20200209_2106.py delete mode 100644 core/migrations/0009_auto_20200131_0045.py delete mode 100644 core/migrations/0009_auto_20200220_2239.py delete mode 100644 core/migrations/0010_auto_20200131_0051.py delete mode 100644 core/migrations/0010_auto_20200220_2241.py delete mode 100644 core/migrations/0011_auto_20200131_0053.py delete mode 100644 core/migrations/0011_auto_20200220_2245.py delete mode 100644 core/migrations/0012_auto_20200131_0237.py delete mode 100644 core/migrations/0012_auto_20200220_2250.py delete mode 100644 core/migrations/0013_auto_20200225_1819.py delete mode 100644 core/migrations/0013_electionindexpage_featured_articles.py delete mode 100644 core/migrations/0014_auto_20200131_0252.py delete mode 100644 core/migrations/0014_auto_20200225_1821.py delete mode 100644 core/migrations/0015_candidatepage_officesorderable.py delete mode 100644 core/migrations/0016_auto_20200131_0323.py delete mode 100644 core/migrations/0017_candidatepage_nominations.py delete mode 100644 core/migrations/0018_remove_candidatepage_offices.py delete mode 100644 core/migrations/0019_auto_20200131_2107.py delete mode 100644 core/migrations/0020_auto_20200131_2115.py delete mode 100644 core/migrations/0021_officesorderable_electionpage.py delete mode 100644 core/migrations/0022_auto_20200131_2247.py delete mode 100644 core/migrations/0023_auto_20200201_2030.py delete mode 100644 core/migrations/0024_remove_candidatepage_nominations.py delete mode 100644 core/migrations/0025_electionindexpage_panels.py delete mode 100644 core/migrations/0026_auto_20200202_0329.py delete mode 100644 core/migrations/0027_auto_20200202_1822.py delete mode 100644 core/migrations/0028_auto_20200202_1832.py delete mode 100644 core/migrations/0029_remove_candidatepage_name.py delete mode 100644 core/migrations/0030_candidatepage_related_articles.py delete mode 100644 core/migrations/0031_auto_20200215_1843.py delete mode 100644 core/migrations/0032_auto_20200215_1845.py delete mode 100644 core/migrations/0033_office_description.py delete mode 100644 core/migrations/0034_remove_office_election_in.py delete mode 100644 core/migrations/0035_auto_20200215_2037.py delete mode 100644 core/migrations/0036_auto_20200215_2042.py delete mode 100644 home/migrations/0002_auto_20190924_2345.py delete mode 100644 home/migrations/0003_auto_20190925_0314.py delete mode 100644 home/migrations/0004_auto_20191106_0215.py diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index b1e67fad..8d7532dd 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,5 +1,6 @@ -# Generated by Django 2.2.1 on 2019-10-15 20:21 +# Generated by Django 2.2.1 on 2020-02-28 21:14 +import core.models from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -13,6 +14,7 @@ import wagtail.images.blocks import wagtail.images.models import wagtail.search.index +import wagtail.snippets.blocks class Migration(migrations.Migration): @@ -62,6 +64,19 @@ class Migration(migrations.Migration): }, bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), ), + migrations.CreateModel( + name='CandidatePage', + 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')), + ('rcs_id', models.CharField(max_length=255)), + ('election_site_id', models.IntegerField()), + ('bio', wagtail.core.fields.RichTextField(blank=True, max_length=3000, null=True)), + ], + options={ + 'abstract': False, + }, + bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), + ), migrations.CreateModel( name='Contributor', fields=[ @@ -96,6 +111,28 @@ class Migration(migrations.Migration): }, bases=(wagtail.search.index.Indexed, models.Model), ), + migrations.CreateModel( + name='Election', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('election_site_id', models.IntegerField(default=-1)), + ], + bases=(wagtail.search.index.Indexed, models.Model), + ), + migrations.CreateModel( + name='ElectionIndexPage', + 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')), + ('electionName', models.CharField(max_length=255)), + ('electionID', models.IntegerField()), + ('panels', wagtail.core.fields.StreamField([('three_cards', wagtail.core.blocks.StructBlock([('cards', wagtail.core.blocks.StructBlock([('office', wagtail.snippets.blocks.SnippetChooserBlock(core.models.Office))]))]))], null=True)), + ], + options={ + 'abstract': False, + }, + bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), + ), migrations.CreateModel( name='Kicker', fields=[ @@ -103,6 +140,16 @@ class Migration(migrations.Migration): ('title', models.CharField(max_length=255)), ], ), + migrations.CreateModel( + name='Office', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('elections_site_id', models.IntegerField()), + ('election_in', models.IntegerField()), + ], + bases=(wagtail.search.index.Indexed, models.Model), + ), migrations.CreateModel( name='Position', fields=[ @@ -151,7 +198,7 @@ class Migration(migrations.Migration): name='UnionTimeline', 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')), - ('events', wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.RichTextBlock(default='', required=True))]))])), + ('events', wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('phrase', wagtail.core.blocks.TextBlock()), ('definition', wagtail.core.blocks.RichTextBlock(required=False))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))])), ], options={ 'abstract': False, @@ -175,6 +222,42 @@ class Migration(migrations.Migration): 'abstract': False, }, ), + migrations.CreateModel( + name='OfficesOrderable', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), + ('office', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Office')), + ], + options={ + 'ordering': ['sort_order'], + 'abstract': False, + }, + ), + migrations.CreateModel( + name='NomCountOrderable', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), + ('count', models.IntegerField(default=0)), + ('required', models.IntegerField(default=100)), + ('office', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='core.Office')), + ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='nom_counts', to='core.CandidatePage')), + ], + options={ + 'ordering': ['sort_order'], + 'abstract': False, + }, + ), + migrations.CreateModel( + name='NomCount', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('count', models.IntegerField(default=0)), + ('office', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='core.Office')), + ], + bases=(wagtail.search.index.Indexed, models.Model), + ), migrations.CreateModel( name='MigrationInformation', fields=[ @@ -183,6 +266,24 @@ class Migration(migrations.Migration): ('article', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='core.ArticlePage')), ], ), + migrations.CreateModel( + name='CandidateRelatedArticles', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), + ('article', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='core.ArticlePage')), + ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='related_articles', to='core.CandidatePage')), + ], + options={ + 'ordering': ['sort_order'], + 'abstract': False, + }, + ), + migrations.AddField( + model_name='candidatepage', + name='image', + field=models.ForeignKey(blank=True, help_text='Candidate image', null=True, on_delete=django.db.models.deletion.PROTECT, to='core.CustomImage'), + ), migrations.AddField( model_name='articlepage', name='featured_image', diff --git a/core/migrations/0002_auto_20191025_2013.py b/core/migrations/0002_auto_20200228_2120.py similarity index 66% rename from core/migrations/0002_auto_20191025_2013.py rename to core/migrations/0002_auto_20200228_2120.py index 9f235fb1..3d22d7a7 100644 --- a/core/migrations/0002_auto_20191025_2013.py +++ b/core/migrations/0002_auto_20200228_2120.py @@ -1,8 +1,9 @@ -# Generated by Django 2.2.1 on 2019-10-25 20:13 +# Generated by Django 2.2.1 on 2020-02-28 21:20 from django.db import migrations import wagtail.core.blocks import wagtail.core.fields +import wagtail.images.blocks class Migration(migrations.Migration): @@ -15,6 +16,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='uniontimeline', name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.RichTextBlock(default='', required=True))]))]), + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.StructBlock([('phrase', wagtail.core.blocks.TextBlock()), ('definition', wagtail.core.blocks.RichTextBlock(required=False))])), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), ), ] diff --git a/core/migrations/0003_auto_20191025_2019.py b/core/migrations/0003_auto_20191025_2019.py deleted file mode 100644 index 795448f9..00000000 --- a/core/migrations/0003_auto_20191025_2019.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.1 on 2019-10-25 20:19 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0002_auto_20191025_2013'), - ] - - operations = [ - migrations.AlterField( - model_name='uniontimeline', - name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('featured_image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False)), ('size', wagtail.core.blocks.ChoiceBlock(choices=[('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')], help_text='Width of image in article.'))]))]))]), - ), - ] diff --git a/core/migrations/0015_auto_20200225_1830.py b/core/migrations/0003_auto_20200228_2122.py similarity index 69% rename from core/migrations/0015_auto_20200225_1830.py rename to core/migrations/0003_auto_20200228_2122.py index d7e529e6..178151c3 100644 --- a/core/migrations/0015_auto_20200225_1830.py +++ b/core/migrations/0003_auto_20200228_2122.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.1 on 2020-02-25 18:30 +# Generated by Django 2.2.1 on 2020-02-28 21:22 from django.db import migrations import wagtail.core.blocks @@ -9,13 +9,13 @@ class Migration(migrations.Migration): dependencies = [ - ('core', '0014_auto_20200225_1821'), + ('core', '0002_auto_20200228_2120'), ] operations = [ migrations.AlterField( model_name='uniontimeline', name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('phrase', wagtail.core.blocks.RichTextBlock()), ('definition', wagtail.core.blocks.RichTextBlock(required=False))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('phrase', wagtail.core.blocks.TextBlock()), ('definition', wagtail.core.blocks.RichTextBlock(required=False))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), ), ] diff --git a/core/migrations/0004_auto_20191025_2036.py b/core/migrations/0004_auto_20191025_2036.py deleted file mode 100644 index f8ff9e1a..00000000 --- a/core/migrations/0004_auto_20191025_2036.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.1 on 2019-10-25 20:36 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0003_auto_20191025_2019'), - ] - - operations = [ - migrations.AlterField( - model_name='uniontimeline', - name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), - ), - ] diff --git a/core/migrations/0006_auto_20200209_2024.py b/core/migrations/0004_auto_20200228_2153.py similarity index 62% rename from core/migrations/0006_auto_20200209_2024.py rename to core/migrations/0004_auto_20200228_2153.py index d3726dd7..ae7bc03c 100644 --- a/core/migrations/0006_auto_20200209_2024.py +++ b/core/migrations/0004_auto_20200228_2153.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.1 on 2020-02-09 20:24 +# Generated by Django 2.2.1 on 2020-02-28 21:53 from django.db import migrations import wagtail.core.blocks @@ -9,13 +9,13 @@ class Migration(migrations.Migration): dependencies = [ - ('core', '0005_auto_20200209_2009'), + ('core', '0003_auto_20200228_2122'), ] operations = [ migrations.AlterField( model_name='uniontimeline', name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.StreamBlock([('paragraph', wagtail.core.blocks.RichTextBlock()), ('tooltip', wagtail.core.blocks.RichTextBlock())], blank=True)), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), + field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('phrase', wagtail.core.blocks.TextBlock()), ('definition', wagtail.core.blocks.TextBlock(required=False))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), ), ] diff --git a/core/migrations/0005_auto_20200209_2009.py b/core/migrations/0005_auto_20200209_2009.py deleted file mode 100644 index cd23ceb6..00000000 --- a/core/migrations/0005_auto_20200209_2009.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.1 on 2020-02-09 20:09 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0004_auto_20191025_2036'), - ] - - operations = [ - migrations.AlterField( - model_name='uniontimeline', - name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), - ), - ] diff --git a/core/migrations/0005_electionindexpage.py b/core/migrations/0005_electionindexpage.py deleted file mode 100644 index 7f001dd8..00000000 --- a/core/migrations/0005_electionindexpage.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-30 23:52 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ("wagtailcore", "0041_group_collection_permissions_verbose_name_plural"), - ("core", "0004_archivespage_body"), - ] - - operations = [ - migrations.CreateModel( - name="ElectionIndexPage", - 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", - ), - ) - ], - options={"abstract": False}, - bases=("wagtailcore.page",), - ) - ] diff --git a/core/migrations/0006_candidate.py b/core/migrations/0006_candidate.py deleted file mode 100644 index c73c2530..00000000 --- a/core/migrations/0006_candidate.py +++ /dev/null @@ -1,43 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 00:18 - -from django.db import migrations, models -import wagtail.core.fields -import wagtail.search.index - - -class Migration(migrations.Migration): - - dependencies = [("core", "0005_electionindexpage")] - - operations = [ - migrations.CreateModel( - name="Candidate", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(max_length=255)), - ("rcs_id", models.CharField(max_length=255)), - ( - "rich_name", - wagtail.core.fields.RichTextField( - blank=True, max_length=255, null=True - ), - ), - ("nominations", models.IntegerField()), - ( - "bio", - wagtail.core.fields.RichTextField( - blank=True, max_length=3000, null=True - ), - ), - ], - bases=(wagtail.search.index.Indexed, models.Model), - ) - ] diff --git a/core/migrations/0007_auto_20200131_0036.py b/core/migrations/0007_auto_20200131_0036.py deleted file mode 100644 index dc5c2ad8..00000000 --- a/core/migrations/0007_auto_20200131_0036.py +++ /dev/null @@ -1,52 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 00:36 - -from django.db import migrations, models -import django.db.models.deletion -import wagtail.search.index - - -class Migration(migrations.Migration): - - dependencies = [("core", "0006_candidate")] - - operations = [ - migrations.CreateModel( - name="Office", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(max_length=255)), - ("req_nominations", models.IntegerField()), - ], - bases=(wagtail.search.index.Indexed, models.Model), - ), - migrations.AddField( - model_name="candidate", - name="position", - field=models.CharField(default="", max_length=255), - preserve_default=False, - ), - migrations.AddField( - model_name="candidate", - name="reqd_nominations", - field=models.IntegerField(default=0), - preserve_default=False, - ), - migrations.AddField( - model_name="candidate", - name="contributor", - field=models.OneToOneField( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.Office", - ), - ), - ] diff --git a/core/migrations/0007_auto_20200209_2039.py b/core/migrations/0007_auto_20200209_2039.py deleted file mode 100644 index 0d9b4a4c..00000000 --- a/core/migrations/0007_auto_20200209_2039.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.1 on 2020-02-09 20:39 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0006_auto_20200209_2024'), - ] - - operations = [ - migrations.AlterField( - model_name='uniontimeline', - name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StreamBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), - ), - ] diff --git a/core/migrations/0008_auto_20200131_0038.py b/core/migrations/0008_auto_20200131_0038.py deleted file mode 100644 index edf49f7b..00000000 --- a/core/migrations/0008_auto_20200131_0038.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 00:38 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [("core", "0007_auto_20200131_0036")] - - operations = [ - migrations.RemoveField(model_name="candidate", name="contributor"), - migrations.AlterField( - model_name="candidate", - name="position", - field=models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - related_name="office", - to="core.Office", - ), - ), - ] diff --git a/core/migrations/0008_auto_20200209_2106.py b/core/migrations/0008_auto_20200209_2106.py deleted file mode 100644 index 46c42bc4..00000000 --- a/core/migrations/0008_auto_20200209_2106.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.1 on 2020-02-09 21:06 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0007_auto_20200209_2039'), - ] - - operations = [ - migrations.AlterField( - model_name='uniontimeline', - name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('paragraph', wagtail.core.blocks.RichTextBlock()), ('tooltip', wagtail.core.blocks.RichTextBlock())]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), - ), - ] diff --git a/core/migrations/0009_auto_20200131_0045.py b/core/migrations/0009_auto_20200131_0045.py deleted file mode 100644 index d02b289d..00000000 --- a/core/migrations/0009_auto_20200131_0045.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 00:45 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [("core", "0008_auto_20200131_0038")] - - operations = [ - migrations.AlterField( - model_name="candidate", - name="position", - field=models.ForeignKey( - blank=True, - default="", - on_delete=django.db.models.deletion.PROTECT, - related_name="office", - to="core.Office", - ), - preserve_default=False, - ) - ] diff --git a/core/migrations/0009_auto_20200220_2239.py b/core/migrations/0009_auto_20200220_2239.py deleted file mode 100644 index 1d07c16d..00000000 --- a/core/migrations/0009_auto_20200220_2239.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.1 on 2020-02-20 22:39 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0008_auto_20200209_2106'), - ] - - operations = [ - migrations.AlterField( - model_name='uniontimeline', - name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('paragraph_before', wagtail.core.blocks.RichTextBlock()), ('tooltip', wagtail.core.blocks.StructBlock([('word', wagtail.core.blocks.RichTextBlock()), ('definition', wagtail.core.blocks.RichTextBlock())]))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), - ), - ] diff --git a/core/migrations/0010_auto_20200131_0051.py b/core/migrations/0010_auto_20200131_0051.py deleted file mode 100644 index d214d1ad..00000000 --- a/core/migrations/0010_auto_20200131_0051.py +++ /dev/null @@ -1,58 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 00:51 - -from django.db import migrations, models -import django.db.models.deletion -import wagtail.search.index - - -class Migration(migrations.Migration): - - dependencies = [("core", "0009_auto_20200131_0045")] - - operations = [ - migrations.RemoveField(model_name="candidate", name="nominations"), - migrations.RemoveField(model_name="candidate", name="reqd_nominations"), - migrations.AlterField( - model_name="candidate", - name="position", - field=models.CharField(max_length=255), - ), - migrations.CreateModel( - name="RunningFor", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("nominations", models.IntegerField()), - ("reqd_nominations", models.IntegerField()), - ( - "office", - models.ForeignKey( - blank=True, - on_delete=django.db.models.deletion.PROTECT, - related_name="offices", - to="core.Office", - ), - ), - ], - bases=(wagtail.search.index.Indexed, models.Model), - ), - migrations.AddField( - model_name="candidate", - name="runningFor", - field=models.ForeignKey( - blank=True, - default="", - on_delete=django.db.models.deletion.PROTECT, - related_name="offices", - to="core.RunningFor", - ), - preserve_default=False, - ), - ] diff --git a/core/migrations/0010_auto_20200220_2241.py b/core/migrations/0010_auto_20200220_2241.py deleted file mode 100644 index 900a08a6..00000000 --- a/core/migrations/0010_auto_20200220_2241.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.1 on 2020-02-20 22:41 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0009_auto_20200220_2239'), - ] - - operations = [ - migrations.AlterField( - model_name='uniontimeline', - name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StreamBlock([('paragraph_before', wagtail.core.blocks.RichTextBlock()), ('tooltip', wagtail.core.blocks.StructBlock([('word', wagtail.core.blocks.RichTextBlock()), ('definition', wagtail.core.blocks.RichTextBlock())]))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), - ), - ] diff --git a/core/migrations/0011_auto_20200131_0053.py b/core/migrations/0011_auto_20200131_0053.py deleted file mode 100644 index e801ee55..00000000 --- a/core/migrations/0011_auto_20200131_0053.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 00:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [("core", "0010_auto_20200131_0051")] - - operations = [ - migrations.RemoveField(model_name="candidate", name="runningFor"), - migrations.AddField( - model_name="office", - name="elections_site_id", - field=models.IntegerField(default=10), - preserve_default=False, - ), - migrations.DeleteModel(name="RunningFor"), - ] diff --git a/core/migrations/0011_auto_20200220_2245.py b/core/migrations/0011_auto_20200220_2245.py deleted file mode 100644 index afe685c1..00000000 --- a/core/migrations/0011_auto_20200220_2245.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.1 on 2020-02-20 22:45 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0010_auto_20200220_2241'), - ] - - operations = [ - migrations.AlterField( - model_name='uniontimeline', - name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StreamBlock([('paragraph_before', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('tooltip', wagtail.core.blocks.StructBlock([('word', wagtail.core.blocks.RichTextBlock()), ('definition', wagtail.core.blocks.RichTextBlock())]))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), - ), - ] diff --git a/core/migrations/0012_auto_20200131_0237.py b/core/migrations/0012_auto_20200131_0237.py deleted file mode 100644 index 197c6a80..00000000 --- a/core/migrations/0012_auto_20200131_0237.py +++ /dev/null @@ -1,51 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 02:37 - -from django.db import migrations, models -import django.db.models.deletion -import wagtail.search.index - - -class Migration(migrations.Migration): - - dependencies = [("core", "0011_auto_20200131_0053")] - - operations = [ - migrations.CreateModel( - name="Election", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(max_length=255)), - ("election_site_id", models.IntegerField(default=-1)), - ], - bases=(wagtail.search.index.Indexed, models.Model), - ), - migrations.RemoveField(model_name="candidate", name="position"), - migrations.AddField( - model_name="candidate", - name="election_in", - field=models.ForeignKey( - default="", - on_delete=django.db.models.deletion.PROTECT, - to="core.Election", - ), - preserve_default=False, - ), - migrations.AddField( - model_name="office", - name="election_in", - field=models.ForeignKey( - default="", - on_delete=django.db.models.deletion.PROTECT, - to="core.Election", - ), - preserve_default=False, - ), - ] diff --git a/core/migrations/0012_auto_20200220_2250.py b/core/migrations/0012_auto_20200220_2250.py deleted file mode 100644 index c4637115..00000000 --- a/core/migrations/0012_auto_20200220_2250.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.1 on 2020-02-20 22:50 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0011_auto_20200220_2245'), - ] - - operations = [ - migrations.AlterField( - model_name='uniontimeline', - name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.StreamBlock([('tooltip', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('paragraph', wagtail.core.blocks.RichTextBlock()), ('definition', wagtail.core.blocks.RichTextBlock(required=False))])))])), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), - ), - ] diff --git a/core/migrations/0013_auto_20200225_1819.py b/core/migrations/0013_auto_20200225_1819.py deleted file mode 100644 index 48ca61f5..00000000 --- a/core/migrations/0013_auto_20200225_1819.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.1 on 2020-02-25 18:19 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0012_auto_20200220_2250'), - ] - - operations = [ - migrations.AlterField( - model_name='uniontimeline', - name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('paragraph', wagtail.core.blocks.RichTextBlock()), ('tooltip', wagtail.core.blocks.StructBlock([('phrase', wagtail.core.blocks.RichTextBlock()), ('definition', wagtail.core.blocks.RichTextBlock(required=False))]))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), - ), - ] diff --git a/core/migrations/0013_electionindexpage_featured_articles.py b/core/migrations/0013_electionindexpage_featured_articles.py deleted file mode 100644 index 49bdad7e..00000000 --- a/core/migrations/0013_electionindexpage_featured_articles.py +++ /dev/null @@ -1,76 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 02:49 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields - - -class Migration(migrations.Migration): - - dependencies = [("core", "0012_auto_20200131_0237")] - - operations = [ - migrations.AddField( - model_name="electionindexpage", - name="featured_articles", - field=wagtail.core.fields.StreamField( - [ - ( - "one_column_candidate", - wagtail.core.blocks.StructBlock( - [ - ( - "column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ) - ] - ), - ), - ( - "one_column_article", - wagtail.core.blocks.StructBlock( - [ - ( - "column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ) - ] - ), - ), - ], - null=True, - ), - ) - ] diff --git a/core/migrations/0014_auto_20200131_0252.py b/core/migrations/0014_auto_20200131_0252.py deleted file mode 100644 index d3ad8688..00000000 --- a/core/migrations/0014_auto_20200131_0252.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 02:52 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [("core", "0013_electionindexpage_featured_articles")] - - operations = [ - migrations.RemoveField( - model_name="electionindexpage", name="featured_articles" - ), - migrations.AddField( - model_name="electionindexpage", - name="electionID", - field=models.ForeignKey( - default=1, - on_delete=django.db.models.deletion.PROTECT, - to="core.Election", - ), - preserve_default=False, - ), - ] diff --git a/core/migrations/0014_auto_20200225_1821.py b/core/migrations/0014_auto_20200225_1821.py deleted file mode 100644 index c2431ae5..00000000 --- a/core/migrations/0014_auto_20200225_1821.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.1 on 2020-02-25 18:21 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0013_auto_20200225_1819'), - ] - - operations = [ - migrations.AlterField( - model_name='uniontimeline', - name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('paragraph', wagtail.core.blocks.RichTextBlock()), ('definition', wagtail.core.blocks.RichTextBlock(required=False))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), - ), - ] diff --git a/core/migrations/0015_candidatepage_officesorderable.py b/core/migrations/0015_candidatepage_officesorderable.py deleted file mode 100644 index 4f4a2f18..00000000 --- a/core/migrations/0015_candidatepage_officesorderable.py +++ /dev/null @@ -1,78 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 03:19 - -from django.db import migrations, models -import django.db.models.deletion -import modelcluster.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ("wagtailcore", "0041_group_collection_permissions_verbose_name_plural"), - ("core", "0014_auto_20200131_0252"), - ] - - operations = [ - migrations.CreateModel( - name="CandidatePage", - 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", - ), - ), - ( - "candidate", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, to="core.Candidate" - ), - ), - ( - "offices", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, to="core.Office" - ), - ), - ], - options={"abstract": False}, - bases=("wagtailcore.page",), - ), - migrations.CreateModel( - name="OfficesOrderable", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "sort_order", - models.IntegerField(blank=True, editable=False, null=True), - ), - ( - "office", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to="core.Office" - ), - ), - ( - "page", - modelcluster.fields.ParentalKey( - on_delete=django.db.models.deletion.CASCADE, - to="core.CandidatePage", - ), - ), - ], - options={"ordering": ["sort_order"], "abstract": False}, - ), - ] diff --git a/core/migrations/0016_auto_20200131_0323.py b/core/migrations/0016_auto_20200131_0323.py deleted file mode 100644 index e023e795..00000000 --- a/core/migrations/0016_auto_20200131_0323.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 03:23 - -from django.db import migrations -import django.db.models.deletion -import modelcluster.fields - - -class Migration(migrations.Migration): - - dependencies = [("core", "0015_candidatepage_officesorderable")] - - operations = [ - migrations.AlterField( - model_name="officesorderable", - name="page", - field=modelcluster.fields.ParentalKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="offices_in", - to="core.CandidatePage", - ), - ) - ] diff --git a/core/migrations/0017_candidatepage_nominations.py b/core/migrations/0017_candidatepage_nominations.py deleted file mode 100644 index dbd6fd74..00000000 --- a/core/migrations/0017_candidatepage_nominations.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 03:26 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [("core", "0016_auto_20200131_0323")] - - operations = [ - migrations.AddField( - model_name="candidatepage", - name="nominations", - field=models.IntegerField(default=5), - preserve_default=False, - ) - ] diff --git a/core/migrations/0018_remove_candidatepage_offices.py b/core/migrations/0018_remove_candidatepage_offices.py deleted file mode 100644 index 399cecaf..00000000 --- a/core/migrations/0018_remove_candidatepage_offices.py +++ /dev/null @@ -1,10 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 03:28 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [("core", "0017_candidatepage_nominations")] - - operations = [migrations.RemoveField(model_name="candidatepage", name="offices")] diff --git a/core/migrations/0019_auto_20200131_2107.py b/core/migrations/0019_auto_20200131_2107.py deleted file mode 100644 index 71ad3318..00000000 --- a/core/migrations/0019_auto_20200131_2107.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 21:07 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [("core", "0018_remove_candidatepage_offices")] - - operations = [ - migrations.AddField( - model_name="electionindexpage", - name="electionName", - field=models.CharField(default="test", max_length=255), - preserve_default=False, - ), - migrations.AlterField( - model_name="electionindexpage", - name="electionID", - field=models.IntegerField(), - ), - ] diff --git a/core/migrations/0020_auto_20200131_2115.py b/core/migrations/0020_auto_20200131_2115.py deleted file mode 100644 index b61eadc2..00000000 --- a/core/migrations/0020_auto_20200131_2115.py +++ /dev/null @@ -1,53 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 21:15 - -from django.db import migrations, models -import django.db.models.deletion -import wagtail.core.fields - - -class Migration(migrations.Migration): - - dependencies = [("core", "0019_auto_20200131_2107")] - - operations = [ - migrations.RemoveField(model_name="candidate", name="bio"), - migrations.RemoveField(model_name="candidate", name="name"), - migrations.RemoveField(model_name="candidate", name="rcs_id"), - migrations.RemoveField(model_name="candidatepage", name="candidate"), - migrations.AddField( - model_name="candidatepage", - name="bio", - field=wagtail.core.fields.RichTextField( - blank=True, max_length=3000, null=True - ), - ), - migrations.AddField( - model_name="candidatepage", - name="election_site_id", - field=models.IntegerField(default=1), - preserve_default=False, - ), - migrations.AddField( - model_name="candidatepage", - name="image", - field=models.ForeignKey( - blank=True, - help_text="Candidate image", - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.CustomImage", - ), - ), - migrations.AddField( - model_name="candidatepage", - name="name", - field=models.CharField(default="Joey", max_length=255), - preserve_default=False, - ), - migrations.AddField( - model_name="candidatepage", - name="rcs_id", - field=models.CharField(default="lyonj4", max_length=255), - preserve_default=False, - ), - ] diff --git a/core/migrations/0021_officesorderable_electionpage.py b/core/migrations/0021_officesorderable_electionpage.py deleted file mode 100644 index a01ed645..00000000 --- a/core/migrations/0021_officesorderable_electionpage.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 21:46 - -from django.db import migrations -import django.db.models.deletion -import modelcluster.fields - - -class Migration(migrations.Migration): - - dependencies = [("core", "0020_auto_20200131_2115")] - - operations = [ - migrations.AddField( - model_name="officesorderable", - name="electionPage", - field=modelcluster.fields.ParentalKey( - default=546, - on_delete=django.db.models.deletion.CASCADE, - related_name="election_offices", - to="core.ElectionIndexPage", - ), - preserve_default=False, - ) - ] diff --git a/core/migrations/0022_auto_20200131_2247.py b/core/migrations/0022_auto_20200131_2247.py deleted file mode 100644 index 31b24274..00000000 --- a/core/migrations/0022_auto_20200131_2247.py +++ /dev/null @@ -1,70 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-31 22:47 - -from django.db import migrations, models -import django.db.models.deletion -import modelcluster.fields -import wagtail.search.index - - -class Migration(migrations.Migration): - - dependencies = [("core", "0021_officesorderable_electionpage")] - - operations = [ - migrations.CreateModel( - name="NomCount", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("count", models.IntegerField(default=0)), - ( - "office", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, to="core.Office" - ), - ), - ], - bases=(wagtail.search.index.Indexed, models.Model), - ), - migrations.RemoveField(model_name="officesorderable", name="page"), - migrations.CreateModel( - name="NomCountOrderable", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "sort_order", - models.IntegerField(blank=True, editable=False, null=True), - ), - ( - "NomCount", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to="core.NomCount" - ), - ), - ( - "page", - modelcluster.fields.ParentalKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="nom_counts", - to="core.CandidatePage", - ), - ), - ], - options={"ordering": ["sort_order"], "abstract": False}, - ), - ] diff --git a/core/migrations/0023_auto_20200201_2030.py b/core/migrations/0023_auto_20200201_2030.py deleted file mode 100644 index 036e7a08..00000000 --- a/core/migrations/0023_auto_20200201_2030.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-01 20:30 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [("core", "0022_auto_20200131_2247")] - - operations = [ - migrations.RemoveField(model_name="nomcountorderable", name="NomCount"), - migrations.AddField( - model_name="nomcountorderable", - name="count", - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name="nomcountorderable", - name="office", - field=models.ForeignKey( - default=3, on_delete=django.db.models.deletion.PROTECT, to="core.Office" - ), - preserve_default=False, - ), - ] diff --git a/core/migrations/0024_remove_candidatepage_nominations.py b/core/migrations/0024_remove_candidatepage_nominations.py deleted file mode 100644 index 3ab8d0c4..00000000 --- a/core/migrations/0024_remove_candidatepage_nominations.py +++ /dev/null @@ -1,12 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-01 20:45 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [("core", "0023_auto_20200201_2030")] - - operations = [ - migrations.RemoveField(model_name="candidatepage", name="nominations") - ] diff --git a/core/migrations/0025_electionindexpage_panels.py b/core/migrations/0025_electionindexpage_panels.py deleted file mode 100644 index e6d12528..00000000 --- a/core/migrations/0025_electionindexpage_panels.py +++ /dev/null @@ -1,42 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-02 03:17 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields - - -class Migration(migrations.Migration): - - dependencies = [("core", "0024_remove_candidatepage_nominations")] - - operations = [ - migrations.AddField( - model_name="electionindexpage", - name="panels", - field=wagtail.core.fields.StreamField( - [ - ( - "three_cards", - wagtail.core.blocks.StructBlock( - [ - ( - "cards", - wagtail.core.blocks.StructBlock( - [ - ( - "candidate", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.Office"] - ), - ) - ] - ), - ) - ] - ), - ) - ], - null=True, - ), - ) - ] diff --git a/core/migrations/0026_auto_20200202_0329.py b/core/migrations/0026_auto_20200202_0329.py deleted file mode 100644 index 82df96ff..00000000 --- a/core/migrations/0026_auto_20200202_0329.py +++ /dev/null @@ -1,44 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-02 03:29 - -import core.models -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.snippets.blocks - - -class Migration(migrations.Migration): - - dependencies = [("core", "0025_electionindexpage_panels")] - - operations = [ - migrations.AlterField( - model_name="electionindexpage", - name="panels", - field=wagtail.core.fields.StreamField( - [ - ( - "three_cards", - wagtail.core.blocks.StructBlock( - [ - ( - "cards", - wagtail.core.blocks.StructBlock( - [ - ( - "office", - wagtail.snippets.blocks.SnippetChooserBlock( - core.models.Office - ), - ) - ] - ), - ) - ] - ), - ) - ], - null=True, - ), - ) - ] diff --git a/core/migrations/0027_auto_20200202_1822.py b/core/migrations/0027_auto_20200202_1822.py deleted file mode 100644 index 8553bbbe..00000000 --- a/core/migrations/0027_auto_20200202_1822.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-02 18:22 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [("core", "0026_auto_20200202_0329")] - - operations = [ - migrations.AddField( - model_name="nomcountorderable", - name="required", - field=models.IntegerField(default=100), - ), - migrations.DeleteModel(name="Candidate"), - ] diff --git a/core/migrations/0028_auto_20200202_1832.py b/core/migrations/0028_auto_20200202_1832.py deleted file mode 100644 index 5a3c03f6..00000000 --- a/core/migrations/0028_auto_20200202_1832.py +++ /dev/null @@ -1,13 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-02 18:32 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [("core", "0027_auto_20200202_1822")] - - operations = [ - migrations.RemoveField(model_name="office", name="req_nominations"), - migrations.RemoveField(model_name="officesorderable", name="electionPage"), - ] diff --git a/core/migrations/0029_remove_candidatepage_name.py b/core/migrations/0029_remove_candidatepage_name.py deleted file mode 100644 index 3d41c59c..00000000 --- a/core/migrations/0029_remove_candidatepage_name.py +++ /dev/null @@ -1,10 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-15 18:05 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [("core", "0028_auto_20200202_1832")] - - operations = [migrations.RemoveField(model_name="candidatepage", name="name")] diff --git a/core/migrations/0030_candidatepage_related_articles.py b/core/migrations/0030_candidatepage_related_articles.py deleted file mode 100644 index 30dad96f..00000000 --- a/core/migrations/0030_candidatepage_related_articles.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-15 18:37 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [("core", "0029_remove_candidatepage_name")] - - operations = [ - migrations.AddField( - model_name="candidatepage", - name="related_articles", - field=models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - related_name="+", - to="core.ArticlePage", - ), - ) - ] diff --git a/core/migrations/0031_auto_20200215_1843.py b/core/migrations/0031_auto_20200215_1843.py deleted file mode 100644 index 463a3415..00000000 --- a/core/migrations/0031_auto_20200215_1843.py +++ /dev/null @@ -1,41 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-15 18:43 - -from django.db import migrations, models -import django.db.models.deletion -import modelcluster.fields - - -class Migration(migrations.Migration): - - dependencies = [("core", "0030_candidatepage_related_articles")] - - operations = [ - migrations.RemoveField(model_name="candidatepage", name="related_articles"), - migrations.CreateModel( - name="CandidateRelatedAuthors", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "sort_order", - models.IntegerField(blank=True, editable=False, null=True), - ), - ( - "page", - modelcluster.fields.ParentalKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="related_articles", - to="core.ArticlePage", - ), - ), - ], - options={"ordering": ["sort_order"], "abstract": False}, - ), - ] diff --git a/core/migrations/0032_auto_20200215_1845.py b/core/migrations/0032_auto_20200215_1845.py deleted file mode 100644 index 6b032287..00000000 --- a/core/migrations/0032_auto_20200215_1845.py +++ /dev/null @@ -1,50 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-15 18:45 - -from django.db import migrations, models -import django.db.models.deletion -import modelcluster.fields - - -class Migration(migrations.Migration): - - dependencies = [("core", "0031_auto_20200215_1843")] - - operations = [ - migrations.CreateModel( - name="CandidateRelatedArticles", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "sort_order", - models.IntegerField(blank=True, editable=False, null=True), - ), - ( - "article", - models.ForeignKey( - blank=True, - on_delete=django.db.models.deletion.PROTECT, - related_name="+", - to="core.ArticlePage", - ), - ), - ( - "page", - modelcluster.fields.ParentalKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="related_articles", - to="core.CandidatePage", - ), - ), - ], - options={"ordering": ["sort_order"], "abstract": False}, - ), - migrations.DeleteModel(name="CandidateRelatedAuthors"), - ] diff --git a/core/migrations/0033_office_description.py b/core/migrations/0033_office_description.py deleted file mode 100644 index 0c2d0bd1..00000000 --- a/core/migrations/0033_office_description.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-15 20:29 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [("core", "0032_auto_20200215_1845")] - - operations = [ - migrations.AddField( - model_name="office", - name="description", - field=models.CharField(default="", max_length=255), - preserve_default=False, - ) - ] diff --git a/core/migrations/0034_remove_office_election_in.py b/core/migrations/0034_remove_office_election_in.py deleted file mode 100644 index 14b5dee5..00000000 --- a/core/migrations/0034_remove_office_election_in.py +++ /dev/null @@ -1,10 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-15 20:30 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [("core", "0033_office_description")] - - operations = [migrations.RemoveField(model_name="office", name="election_in")] diff --git a/core/migrations/0035_auto_20200215_2037.py b/core/migrations/0035_auto_20200215_2037.py deleted file mode 100644 index fb47e019..00000000 --- a/core/migrations/0035_auto_20200215_2037.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-15 20:37 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [("core", "0034_remove_office_election_in")] - - operations = [ - migrations.RemoveField(model_name="office", name="description"), - migrations.AddField( - model_name="office", - name="election_in", - field=models.ForeignKey( - default=1, - on_delete=django.db.models.deletion.PROTECT, - to="core.Election", - ), - preserve_default=False, - ), - ] diff --git a/core/migrations/0036_auto_20200215_2042.py b/core/migrations/0036_auto_20200215_2042.py deleted file mode 100644 index 4770d16f..00000000 --- a/core/migrations/0036_auto_20200215_2042.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-15 20:42 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [("core", "0035_auto_20200215_2037")] - - operations = [ - migrations.AlterField( - model_name="office", name="election_in", field=models.IntegerField() - ) - ] diff --git a/core/models.py b/core/models.py index 6b763788..577ee821 100644 --- a/core/models.py +++ b/core/models.py @@ -372,16 +372,13 @@ class MarqueeBlock(StructBlock): class GalleryPhotoBlock(StructBlock): image = ImageChooserBlock() caption = RichTextBlock(features=["italic"], required=False) - -class EventPhrase(RichTextBlock): - phrase=RichTextBlock() class UnionEvent(StructBlock): title=RichTextBlock(required=True, default="") date=RichTextBlock(required=True, default="") body=ListBlock(StructBlock([ ("phrase", TextBlock()), - ("definition", RichTextBlock(required=False)), + ("definition", TextBlock(required=False)), ])) featured_image = ImageChooserBlock(required=False) diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html index bdbd61e4..c0fc2f9a 100644 --- a/core/templates/core/union_timeline.html +++ b/core/templates/core/union_timeline.html @@ -57,18 +57,18 @@ } .tooltip { position: relative; - display: inline-block; + display: inline; border-bottom: 1px dotted black; } .tooltip .tooltiptext { visibility: hidden; - width: 300px; + width: 500px; background-color: black; color: #fff; - text-align: center; + text-align: justify; border-radius: 6px; - padding: 5px 0; + padding: 15px; /* Position the tooltip */ position: absolute; diff --git a/home/migrations/0001_initial.py b/home/migrations/0001_initial.py index bbc970aa..8b818141 100644 --- a/home/migrations/0001_initial.py +++ b/home/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.1 on 2019-10-15 20:21 +# Generated by Django 2.2.1 on 2020-02-28 21:14 from django.db import migrations, models import django.db.models.deletion diff --git a/home/migrations/0002_auto_20190924_2345.py b/home/migrations/0002_auto_20190924_2345.py deleted file mode 100644 index 2f0cc2e3..00000000 --- a/home/migrations/0002_auto_20190924_2345.py +++ /dev/null @@ -1,217 +0,0 @@ -# Generated by Django 2.2.5 on 2019-09-24 23:45 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [("home", "0001_initial")] - - operations = [ - migrations.AlterField( - model_name="homepage", - name="featured_articles", - field=wagtail.core.fields.StreamField( - [ - ( - "one_column", - wagtail.core.blocks.StructBlock( - [ - ( - "column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ) - ] - ), - ), - ( - "one_ad_column", - wagtail.core.blocks.StructBlock( - [ - ("image", wagtail.images.blocks.ImageChooserBlock()), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["italic"], required=False - ), - ), - ( - "link", - wagtail.core.blocks.URLBlock( - label="target", required="false" - ), - ), - ( - "size", - wagtail.core.blocks.ChoiceBlock( - choices=[ - ("small", "Small"), - ("medium", "Medium"), - ("large", "Large"), - ], - help_text="Width of image in ad.", - ), - ), - ] - ), - ), - ( - "two_columns", - wagtail.core.blocks.StructBlock( - [ - ( - "left_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "right_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "emphasize_column", - wagtail.core.blocks.ChoiceBlock( - choices=[("left", "Left"), ("right", "Right")], - help_text="Which article, if either, should appear larger.", - required=False, - ), - ), - ] - ), - ), - ( - "three_columns", - wagtail.core.blocks.StructBlock( - [ - ( - "left_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "middle_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "right_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ] - ), - ), - ( - "recent_articles", - wagtail.core.blocks.StructBlock( - [ - ( - "num_articles", - wagtail.core.blocks.IntegerBlock( - help_text="Number of recent articles to display.", - label="Number of articles", - ), - ) - ] - ), - ), - ], - null=True, - ), - ) - ] diff --git a/home/migrations/0003_auto_20190925_0314.py b/home/migrations/0003_auto_20190925_0314.py deleted file mode 100644 index df47ea36..00000000 --- a/home/migrations/0003_auto_20190925_0314.py +++ /dev/null @@ -1,205 +0,0 @@ -# Generated by Django 2.2.5 on 2019-09-25 03:14 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [("home", "0002_auto_20190924_2345")] - - operations = [ - migrations.AlterField( - model_name="homepage", - name="featured_articles", - field=wagtail.core.fields.StreamField( - [ - ( - "one_column", - wagtail.core.blocks.StructBlock( - [ - ( - "column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ) - ] - ), - ), - ( - "one_ad_column", - wagtail.core.blocks.StructBlock( - [ - ( - "image", - wagtail.images.blocks.ImageChooserBlock( - help_text="Image should be 22:7" - ), - ), - ( - "link", - wagtail.core.blocks.URLBlock( - label="target", required=False - ), - ), - ] - ), - ), - ( - "two_columns", - wagtail.core.blocks.StructBlock( - [ - ( - "left_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "right_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "emphasize_column", - wagtail.core.blocks.ChoiceBlock( - choices=[("left", "Left"), ("right", "Right")], - help_text="Which article, if either, should appear larger.", - required=False, - ), - ), - ] - ), - ), - ( - "three_columns", - wagtail.core.blocks.StructBlock( - [ - ( - "left_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "middle_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "right_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ] - ), - ), - ( - "recent_articles", - wagtail.core.blocks.StructBlock( - [ - ( - "num_articles", - wagtail.core.blocks.IntegerBlock( - help_text="Number of recent articles to display.", - label="Number of articles", - ), - ) - ] - ), - ), - ], - null=True, - ), - ) - ] diff --git a/home/migrations/0004_auto_20191106_0215.py b/home/migrations/0004_auto_20191106_0215.py deleted file mode 100644 index 77662b24..00000000 --- a/home/migrations/0004_auto_20191106_0215.py +++ /dev/null @@ -1,223 +0,0 @@ -# Generated by Django 2.2.1 on 2019-11-06 02:15 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [("home", "0003_auto_20190925_0314")] - - operations = [ - migrations.AlterField( - model_name="homepage", - name="featured_articles", - field=wagtail.core.fields.StreamField( - [ - ( - "one_column", - wagtail.core.blocks.StructBlock( - [ - ( - "column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ) - ] - ), - ), - ( - "one_ad_column", - wagtail.core.blocks.StructBlock( - [ - ( - "image", - wagtail.images.blocks.ImageChooserBlock( - help_text="Image should be 22:7" - ), - ), - ( - "link", - wagtail.core.blocks.URLBlock( - label="target", required=False - ), - ), - ] - ), - ), - ( - "two_columns", - wagtail.core.blocks.StructBlock( - [ - ( - "left_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "right_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "emphasize_column", - wagtail.core.blocks.ChoiceBlock( - choices=[("left", "Left"), ("right", "Right")], - help_text="Which article, if either, should appear larger.", - required=False, - ), - ), - ] - ), - ), - ( - "three_columns", - wagtail.core.blocks.StructBlock( - [ - ( - "left_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "middle_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "right_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ] - ), - ), - ( - "recent_articles", - wagtail.core.blocks.StructBlock( - [ - ( - "num_articles", - wagtail.core.blocks.IntegerBlock( - help_text="Number of recent articles to display.", - label="Number of articles", - ), - ) - ] - ), - ), - ( - "marquee_banner", - wagtail.core.blocks.StructBlock( - [ - ( - "body", - wagtail.core.blocks.RichTextBlock(required=True), - ), - ( - "banner_type", - wagtail.core.blocks.ChoiceBlock( - choices=[("moves", "Rotating")], - help_text="Determines whether the marquee banner is stationary or rotating. Only rotating works right now.", - ), - ), - ] - ), - ), - ], - null=True, - ), - ) - ] From 2fe0f4b6a50a373a8ea819b646c86d57836e5538 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Tue, 3 Mar 2020 16:25:16 -0500 Subject: [PATCH 30/36] Added more text to check. Need to have better css styling. --- core/templates/core/union_timeline.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html index c0fc2f9a..714ae2eb 100644 --- a/core/templates/core/union_timeline.html +++ b/core/templates/core/union_timeline.html @@ -21,7 +21,7 @@ z-index: 400; } ul.timeline > li { - margin: 20px 0; + margin: 20px; padding-left: 20px; } ul.timeline > li:before { @@ -74,7 +74,7 @@ position: absolute; z-index: 1; bottom: 100%; - left: 50%; + left: 0%; margin-left: -60px; } From fd3fd9da9a3a0893afe3d60a23780036fe781466 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Tue, 7 Apr 2020 21:34:12 -0400 Subject: [PATCH 31/36] Added authors to timeline page. --- .../0005_uniontimelineauthorrelationship.py | 26 +++++++++ core/models.py | 58 +++++++++---------- core/templates/core/union_timeline.html | 10 ++++ 3 files changed, 64 insertions(+), 30 deletions(-) create mode 100644 core/migrations/0005_uniontimelineauthorrelationship.py diff --git a/core/migrations/0005_uniontimelineauthorrelationship.py b/core/migrations/0005_uniontimelineauthorrelationship.py new file mode 100644 index 00000000..4d72e6d4 --- /dev/null +++ b/core/migrations/0005_uniontimelineauthorrelationship.py @@ -0,0 +1,26 @@ +# Generated by Django 2.2.1 on 2020-04-08 01:10 + +from django.db import migrations, models +import django.db.models.deletion +import modelcluster.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0004_auto_20200228_2153'), + ] + + operations = [ + migrations.CreateModel( + name='UnionTimelineAuthorRelationship', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='timeline', to='core.Contributor')), + ('timeline', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='authors', to='core.UnionTimeline')), + ], + options={ + 'unique_together': {('timeline', 'author')}, + }, + ), + ] diff --git a/core/models.py b/core/models.py index 577ee821..e39368eb 100644 --- a/core/models.py +++ b/core/models.py @@ -396,45 +396,32 @@ def get_plain_text(self): builder += para.text builder += " " return builder[:-1] - - -'''class UnionEvent(StructBlock): - title=RichTextBlock(required=True, default="") - date=RichTextBlock(required=True, default="") - body=ListBlock(StructBlock([ - ("paragraph", RichTextBlock()), - ("tooltip", StructBlock([ - ("phrase", RichTextBlock()), - ("definition", RichTextBlock(required=False)), - ])), - ])) - featured_image = ImageChooserBlock(required=False)''' class UnionTimeline(Page): events=StreamField( [("event", UnionEvent())] ) - content_panels = Page.content_panels + [StreamFieldPanel("events")] + content_panels = [InlinePanel( + "authors", + panels=[ + AutocompletePanel("author", target_model="core.Contributor") + ], + label="Author", + ), + StreamFieldPanel("events")] - '''def get_text_html(self, current_block): - """Get the HTML that represents paragraphs within the article as a string.""" - builder = "" - for event in self.events: - for block in event.body: - if (block.value.phrase==current_block.value.phrase): - builder += str(block.value.phrase) - return builder + def get_context(self, request): + context = super().get_context(request) + context["authors"] = self.get_authors() + return context - def get_plain_text(self, current_block): - builder = "" - soup = BeautifulSoup(self.get_text_html(current_block), "html.parser") - for para in soup.findAll("p"): - builder += para.text - builder += " " - return builder[:-1]''' - + def get_authors(self): + return [r.author for r in self.authors.select_related("author")] + def get_author_names(self): + return [a.name for a in self.get_authors()] + class ArticlePage(RoutablePageMixin, Page): headline = RichTextField(features=["italic"]) subdeck = RichTextField(features=["italic"], null=True, blank=True) @@ -691,6 +678,17 @@ class ArticleAuthorRelationship(models.Model): class Meta: unique_together = [("article", "author")] +class UnionTimelineAuthorRelationship(models.Model): + timeline = ParentalKey(UnionTimeline, related_name="authors", on_delete=models.CASCADE) + author = models.ForeignKey( + Contributor, related_name="timeline", on_delete=models.PROTECT + ) + + panels = [SnippetChooserPanel("author")] + + class Meta: + unique_together = [("timeline", "author")] + class ArchivesPage(RoutablePageMixin, Page): body = RichTextField(blank=True, null=True) diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html index 714ae2eb..51b64f35 100644 --- a/core/templates/core/union_timeline.html +++ b/core/templates/core/union_timeline.html @@ -87,6 +87,16 @@

    Union Events Timeline

    + + By {% for author in authors %} + {% if forloop.last and authors|length > 1 %} and {% endif %} + {% if author.staff_page %} + {{ author.staff_page.name }}{% if not forloop.last and authors|length > 2 %}, {% endif %} + {% else %} + {% firstof author.rich_name author.name %}{% if not forloop.last and authors|length > 2 %}, {% endif %} + {% endif %} + {% endfor %} +
      {% for block in page.events %}
    • From 51596d420a43495e7abcd6115f702c5f990920f7 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Tue, 7 Apr 2020 21:51:09 -0400 Subject: [PATCH 32/36] Fixing photo size. --- core/templates/core/union_timeline.html | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html index 51b64f35..542d5fed 100644 --- a/core/templates/core/union_timeline.html +++ b/core/templates/core/union_timeline.html @@ -124,13 +124,8 @@

      Union Events Timeline

    {% if block.value.featured_image %} -
    - {% image block.value.featured_image width-400 as photo %} - {% image block.value.featured_image width-500 as big_photo %} - - -
    - + {% image block.value.featured_image width-400 as photo %} + {% endif %}
    From c21504eb2aa8a6a4db6ead875635712f81a8b6e3 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Tue, 7 Apr 2020 22:18:41 -0400 Subject: [PATCH 33/36] Fixed author if statement. --- core/templates/core/union_timeline.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/templates/core/union_timeline.html b/core/templates/core/union_timeline.html index 542d5fed..c6072e35 100644 --- a/core/templates/core/union_timeline.html +++ b/core/templates/core/union_timeline.html @@ -88,6 +88,7 @@

    Union Events Timeline

    + {% if authors %} By {% for author in authors %} {% if forloop.last and authors|length > 1 %} and {% endif %} {% if author.staff_page %} @@ -96,6 +97,7 @@

    Union Events Timeline

    {% firstof author.rich_name author.name %}{% if not forloop.last and authors|length > 2 %}, {% endif %} {% endif %} {% endfor %} + {% endif %}
      {% for block in page.events %} From b3a69ad241cf94144a8d3afdafbb9865edb32f31 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Tue, 7 Apr 2020 22:33:13 -0400 Subject: [PATCH 34/36] Fixed black formatting. --- core/migrations/0001_initial.py | 922 ++++++++++++++---- core/migrations/0002_auto_20200228_2120.py | 54 +- core/migrations/0003_auto_20200228_2122.py | 59 +- core/migrations/0004_auto_20200228_2153.py | 59 +- .../0005_uniontimelineauthorrelationship.py | 40 +- core/models.py | 45 +- home/migrations/0001_initial.py | 250 ++++- lights/migrations/0001_initial.py | 20 +- newsletter/migrations/0001_initial.py | 99 +- 9 files changed, 1273 insertions(+), 275 deletions(-) diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index 8d7532dd..e25444ef 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -22,302 +22,842 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('wagtailcore', '0041_group_collection_permissions_verbose_name_plural'), + ("wagtailcore", "0041_group_collection_permissions_verbose_name_plural"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('taggit', '0002_auto_20150616_2121'), + ("taggit", "0002_auto_20150616_2121"), ] operations = [ migrations.CreateModel( - name='ArchivesPage', + name="ArchivesPage", 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.RichTextField(blank=True, null=True)), + ( + "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.RichTextField(blank=True, null=True)), ], - options={ - 'abstract': False, - }, - bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), + options={"abstract": False}, + bases=( + wagtail.contrib.routable_page.models.RoutablePageMixin, + "wagtailcore.page", + ), ), migrations.CreateModel( - name='ArticlePage', + name="ArticlePage", 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')), - ('headline', wagtail.core.fields.RichTextField()), - ('subdeck', wagtail.core.fields.RichTextField(blank=True, null=True)), - ('body', wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('photo', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False)), ('size', wagtail.core.blocks.ChoiceBlock(choices=[('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')], help_text='Width of image in article.'))])), ('photo_gallery', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False))]), icon='image')), ('embed', wagtail.core.blocks.StructBlock([('embed', wagtail.embeds.blocks.EmbedBlock(help_text='URL to the content to embed.'))]))], blank=True)), - ('summary', wagtail.core.fields.RichTextField(blank=True, help_text='Displayed on the home page or other places to provide a taste of what the article is about.', null=True)), - ('featured_caption', wagtail.core.fields.RichTextField(blank=True, null=True)), + ( + "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", + ), + ), + ("headline", wagtail.core.fields.RichTextField()), + ("subdeck", wagtail.core.fields.RichTextField(blank=True, null=True)), + ( + "body", + wagtail.core.fields.StreamField( + [ + ("paragraph", wagtail.core.blocks.RichTextBlock()), + ( + "photo", + wagtail.core.blocks.StructBlock( + [ + ( + "image", + wagtail.images.blocks.ImageChooserBlock(), + ), + ( + "caption", + wagtail.core.blocks.RichTextBlock( + features=["italic"], required=False + ), + ), + ( + "size", + wagtail.core.blocks.ChoiceBlock( + choices=[ + ("small", "Small"), + ("medium", "Medium"), + ("large", "Large"), + ], + help_text="Width of image in article.", + ), + ), + ] + ), + ), + ( + "photo_gallery", + wagtail.core.blocks.ListBlock( + wagtail.core.blocks.StructBlock( + [ + ( + "image", + wagtail.images.blocks.ImageChooserBlock(), + ), + ( + "caption", + wagtail.core.blocks.RichTextBlock( + features=["italic"], required=False + ), + ), + ] + ), + icon="image", + ), + ), + ( + "embed", + wagtail.core.blocks.StructBlock( + [ + ( + "embed", + wagtail.embeds.blocks.EmbedBlock( + help_text="URL to the content to embed." + ), + ) + ] + ), + ), + ], + blank=True, + ), + ), + ( + "summary", + wagtail.core.fields.RichTextField( + blank=True, + help_text="Displayed on the home page or other places to provide a taste of what the article is about.", + null=True, + ), + ), + ( + "featured_caption", + wagtail.core.fields.RichTextField(blank=True, null=True), + ), ], - options={ - 'abstract': False, - }, - bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), + options={"abstract": False}, + bases=( + wagtail.contrib.routable_page.models.RoutablePageMixin, + "wagtailcore.page", + ), ), migrations.CreateModel( - name='ArticlesIndexPage', + name="ArticlesIndexPage", 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')), + ( + "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", + ), + ) ], - options={ - 'abstract': False, - }, - bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), + options={"abstract": False}, + bases=( + wagtail.contrib.routable_page.models.RoutablePageMixin, + "wagtailcore.page", + ), ), migrations.CreateModel( - name='CandidatePage', + name="CandidatePage", 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')), - ('rcs_id', models.CharField(max_length=255)), - ('election_site_id', models.IntegerField()), - ('bio', wagtail.core.fields.RichTextField(blank=True, max_length=3000, null=True)), + ( + "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", + ), + ), + ("rcs_id", models.CharField(max_length=255)), + ("election_site_id", models.IntegerField()), + ( + "bio", + wagtail.core.fields.RichTextField( + blank=True, max_length=3000, null=True + ), + ), ], - options={ - 'abstract': False, - }, - bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), + options={"abstract": False}, + bases=( + wagtail.contrib.routable_page.models.RoutablePageMixin, + "wagtailcore.page", + ), ), migrations.CreateModel( - name='Contributor', + name="Contributor", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255)), - ('rich_name', wagtail.core.fields.RichTextField(blank=True, max_length=255, null=True)), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.CharField(max_length=255)), + ( + "rich_name", + wagtail.core.fields.RichTextField( + blank=True, max_length=255, null=True + ), + ), ], bases=(wagtail.search.index.Indexed, models.Model), ), migrations.CreateModel( - name='CustomImage', + name="CustomImage", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=255, verbose_name='title')), - ('file', models.ImageField(height_field='height', upload_to=wagtail.images.models.get_upload_to, verbose_name='file', width_field='width')), - ('width', models.IntegerField(editable=False, verbose_name='width')), - ('height', models.IntegerField(editable=False, verbose_name='height')), - ('created_at', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='created at')), - ('focal_point_x', models.PositiveIntegerField(blank=True, null=True)), - ('focal_point_y', models.PositiveIntegerField(blank=True, null=True)), - ('focal_point_width', models.PositiveIntegerField(blank=True, null=True)), - ('focal_point_height', models.PositiveIntegerField(blank=True, null=True)), - ('file_size', models.PositiveIntegerField(editable=False, null=True)), - ('file_hash', models.CharField(blank=True, editable=False, max_length=40)), - ('collection', models.ForeignKey(default=wagtail.core.models.get_root_collection_id, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.Collection', verbose_name='collection')), - ('photographer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='images', to='core.Contributor')), - ('tags', taggit.managers.TaggableManager(blank=True, help_text=None, through='taggit.TaggedItem', to='taggit.Tag', verbose_name='tags')), - ('uploaded_by_user', models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='uploaded by user')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("title", models.CharField(max_length=255, verbose_name="title")), + ( + "file", + models.ImageField( + height_field="height", + upload_to=wagtail.images.models.get_upload_to, + verbose_name="file", + width_field="width", + ), + ), + ("width", models.IntegerField(editable=False, verbose_name="width")), + ("height", models.IntegerField(editable=False, verbose_name="height")), + ( + "created_at", + models.DateTimeField( + auto_now_add=True, db_index=True, verbose_name="created at" + ), + ), + ("focal_point_x", models.PositiveIntegerField(blank=True, null=True)), + ("focal_point_y", models.PositiveIntegerField(blank=True, null=True)), + ( + "focal_point_width", + models.PositiveIntegerField(blank=True, null=True), + ), + ( + "focal_point_height", + models.PositiveIntegerField(blank=True, null=True), + ), + ("file_size", models.PositiveIntegerField(editable=False, null=True)), + ( + "file_hash", + models.CharField(blank=True, editable=False, max_length=40), + ), + ( + "collection", + models.ForeignKey( + default=wagtail.core.models.get_root_collection_id, + on_delete=django.db.models.deletion.CASCADE, + related_name="+", + to="wagtailcore.Collection", + verbose_name="collection", + ), + ), + ( + "photographer", + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="images", + to="core.Contributor", + ), + ), + ( + "tags", + taggit.managers.TaggableManager( + blank=True, + help_text=None, + through="taggit.TaggedItem", + to="taggit.Tag", + verbose_name="tags", + ), + ), + ( + "uploaded_by_user", + models.ForeignKey( + blank=True, + editable=False, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + to=settings.AUTH_USER_MODEL, + verbose_name="uploaded by user", + ), + ), ], - options={ - 'abstract': False, - }, + options={"abstract": False}, bases=(wagtail.search.index.Indexed, models.Model), ), migrations.CreateModel( - name='Election', + name="Election", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255)), - ('election_site_id', models.IntegerField(default=-1)), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.CharField(max_length=255)), + ("election_site_id", models.IntegerField(default=-1)), ], bases=(wagtail.search.index.Indexed, models.Model), ), migrations.CreateModel( - name='ElectionIndexPage', + name="ElectionIndexPage", 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')), - ('electionName', models.CharField(max_length=255)), - ('electionID', models.IntegerField()), - ('panels', wagtail.core.fields.StreamField([('three_cards', wagtail.core.blocks.StructBlock([('cards', wagtail.core.blocks.StructBlock([('office', wagtail.snippets.blocks.SnippetChooserBlock(core.models.Office))]))]))], null=True)), + ( + "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", + ), + ), + ("electionName", models.CharField(max_length=255)), + ("electionID", models.IntegerField()), + ( + "panels", + wagtail.core.fields.StreamField( + [ + ( + "three_cards", + wagtail.core.blocks.StructBlock( + [ + ( + "cards", + wagtail.core.blocks.StructBlock( + [ + ( + "office", + wagtail.snippets.blocks.SnippetChooserBlock( + core.models.Office + ), + ) + ] + ), + ) + ] + ), + ) + ], + null=True, + ), + ), ], - options={ - 'abstract': False, - }, - bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), + options={"abstract": False}, + bases=( + wagtail.contrib.routable_page.models.RoutablePageMixin, + "wagtailcore.page", + ), ), migrations.CreateModel( - name='Kicker', + name="Kicker", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=255)), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("title", models.CharField(max_length=255)), ], ), migrations.CreateModel( - name='Office', + name="Office", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255)), - ('elections_site_id', models.IntegerField()), - ('election_in', models.IntegerField()), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.CharField(max_length=255)), + ("elections_site_id", models.IntegerField()), + ("election_in", models.IntegerField()), ], bases=(wagtail.search.index.Indexed, models.Model), ), migrations.CreateModel( - name='Position', + name="Position", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=100)), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("title", models.CharField(max_length=100)), ], ), migrations.CreateModel( - name='StaffIndexPage', + name="StaffIndexPage", 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')), + ( + "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", + ), + ) ], - options={ - 'abstract': False, - }, - bases=('wagtailcore.page',), + options={"abstract": False}, + bases=("wagtailcore.page",), ), migrations.CreateModel( - name='StaffPage', + name="StaffPage", 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')), - ('first_name', models.CharField(max_length=100)), - ('last_name', models.CharField(max_length=100)), - ('biography', wagtail.core.fields.RichTextField(blank=True, null=True)), - ('email_address', models.EmailField(blank=True, max_length=254, null=True)), - ('contributor', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='staff_page', to='core.Contributor')), - ('photo', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='core.CustomImage')), + ( + "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", + ), + ), + ("first_name", models.CharField(max_length=100)), + ("last_name", models.CharField(max_length=100)), + ("biography", wagtail.core.fields.RichTextField(blank=True, null=True)), + ( + "email_address", + models.EmailField(blank=True, max_length=254, null=True), + ), + ( + "contributor", + models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name="staff_page", + to="core.Contributor", + ), + ), + ( + "photo", + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + to="core.CustomImage", + ), + ), ], - options={ - 'abstract': False, - }, - bases=('wagtailcore.page',), + options={"abstract": False}, + bases=("wagtailcore.page",), ), migrations.CreateModel( - name='StaticPage', + name="StaticPage", 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.RichTextField(blank=True, null=True)), + ( + "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.RichTextField(blank=True, null=True)), ], - options={ - 'abstract': False, - }, - bases=('wagtailcore.page',), + options={"abstract": False}, + bases=("wagtailcore.page",), ), migrations.CreateModel( - name='UnionTimeline', + name="UnionTimeline", 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')), - ('events', wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('phrase', wagtail.core.blocks.TextBlock()), ('definition', wagtail.core.blocks.RichTextBlock(required=False))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))])), + ( + "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", + ), + ), + ( + "events", + wagtail.core.fields.StreamField( + [ + ( + "event", + wagtail.core.blocks.StructBlock( + [ + ( + "title", + wagtail.core.blocks.RichTextBlock( + default="", required=True + ), + ), + ( + "date", + wagtail.core.blocks.RichTextBlock( + default="", required=True + ), + ), + ( + "body", + wagtail.core.blocks.ListBlock( + wagtail.core.blocks.StructBlock( + [ + ( + "phrase", + wagtail.core.blocks.TextBlock(), + ), + ( + "definition", + wagtail.core.blocks.RichTextBlock( + required=False + ), + ), + ] + ) + ), + ), + ( + "featured_image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ] + ), + ) + ] + ), + ), ], - options={ - 'abstract': False, - }, - bases=('wagtailcore.page',), + options={"abstract": False}, + bases=("wagtailcore.page",), ), migrations.CreateModel( - name='Term', + name="Term", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), - ('date_started', models.DateField(blank=True, null=True)), - ('date_ended', models.DateField(blank=True, null=True)), - ('acting', models.BooleanField(default=False)), - ('de_facto', models.BooleanField(default=False)), - ('person', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.PROTECT, related_name='terms', to='core.StaffPage')), - ('position', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='terms', to='core.Position')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "sort_order", + models.IntegerField(blank=True, editable=False, null=True), + ), + ("date_started", models.DateField(blank=True, null=True)), + ("date_ended", models.DateField(blank=True, null=True)), + ("acting", models.BooleanField(default=False)), + ("de_facto", models.BooleanField(default=False)), + ( + "person", + modelcluster.fields.ParentalKey( + on_delete=django.db.models.deletion.PROTECT, + related_name="terms", + to="core.StaffPage", + ), + ), + ( + "position", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + related_name="terms", + to="core.Position", + ), + ), ], - options={ - 'ordering': ['sort_order'], - 'abstract': False, - }, + options={"ordering": ["sort_order"], "abstract": False}, ), migrations.CreateModel( - name='OfficesOrderable', + name="OfficesOrderable", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), - ('office', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Office')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "sort_order", + models.IntegerField(blank=True, editable=False, null=True), + ), + ( + "office", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="core.Office" + ), + ), ], - options={ - 'ordering': ['sort_order'], - 'abstract': False, - }, + options={"ordering": ["sort_order"], "abstract": False}, ), migrations.CreateModel( - name='NomCountOrderable', + name="NomCountOrderable", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), - ('count', models.IntegerField(default=0)), - ('required', models.IntegerField(default=100)), - ('office', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='core.Office')), - ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='nom_counts', to='core.CandidatePage')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "sort_order", + models.IntegerField(blank=True, editable=False, null=True), + ), + ("count", models.IntegerField(default=0)), + ("required", models.IntegerField(default=100)), + ( + "office", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, to="core.Office" + ), + ), + ( + "page", + modelcluster.fields.ParentalKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="nom_counts", + to="core.CandidatePage", + ), + ), ], - options={ - 'ordering': ['sort_order'], - 'abstract': False, - }, + options={"ordering": ["sort_order"], "abstract": False}, ), migrations.CreateModel( - name='NomCount', + name="NomCount", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('count', models.IntegerField(default=0)), - ('office', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='core.Office')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("count", models.IntegerField(default=0)), + ( + "office", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, to="core.Office" + ), + ), ], bases=(wagtail.search.index.Indexed, models.Model), ), migrations.CreateModel( - name='MigrationInformation', + name="MigrationInformation", fields=[ - ('link', models.URLField(db_index=True)), - ('guid', models.CharField(max_length=255, primary_key=True, serialize=False)), - ('article', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='core.ArticlePage')), + ("link", models.URLField(db_index=True)), + ( + "guid", + models.CharField(max_length=255, primary_key=True, serialize=False), + ), + ( + "article", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + to="core.ArticlePage", + ), + ), ], ), migrations.CreateModel( - name='CandidateRelatedArticles', + name="CandidateRelatedArticles", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), - ('article', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='core.ArticlePage')), - ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='related_articles', to='core.CandidatePage')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "sort_order", + models.IntegerField(blank=True, editable=False, null=True), + ), + ( + "article", + models.ForeignKey( + blank=True, + on_delete=django.db.models.deletion.PROTECT, + related_name="+", + to="core.ArticlePage", + ), + ), + ( + "page", + modelcluster.fields.ParentalKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="related_articles", + to="core.CandidatePage", + ), + ), ], - options={ - 'ordering': ['sort_order'], - 'abstract': False, - }, + options={"ordering": ["sort_order"], "abstract": False}, ), migrations.AddField( - model_name='candidatepage', - name='image', - field=models.ForeignKey(blank=True, help_text='Candidate image', null=True, on_delete=django.db.models.deletion.PROTECT, to='core.CustomImage'), + model_name="candidatepage", + name="image", + field=models.ForeignKey( + blank=True, + help_text="Candidate image", + null=True, + on_delete=django.db.models.deletion.PROTECT, + to="core.CustomImage", + ), ), migrations.AddField( - model_name='articlepage', - name='featured_image', - field=models.ForeignKey(blank=True, help_text='Shown at the top of the article and on the home page.', null=True, on_delete=django.db.models.deletion.PROTECT, to='core.CustomImage'), + model_name="articlepage", + name="featured_image", + field=models.ForeignKey( + blank=True, + help_text="Shown at the top of the article and on the home page.", + null=True, + on_delete=django.db.models.deletion.PROTECT, + to="core.CustomImage", + ), ), migrations.AddField( - model_name='articlepage', - name='kicker', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='core.Kicker'), + model_name="articlepage", + name="kicker", + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + to="core.Kicker", + ), ), migrations.CreateModel( - name='CustomRendition', + name="CustomRendition", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('filter_spec', models.CharField(db_index=True, max_length=255)), - ('file', models.ImageField(height_field='height', upload_to=wagtail.images.models.get_rendition_upload_to, width_field='width')), - ('width', models.IntegerField(editable=False)), - ('height', models.IntegerField(editable=False)), - ('focal_point_key', models.CharField(blank=True, default='', editable=False, max_length=16)), - ('image', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='renditions', to='core.CustomImage')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("filter_spec", models.CharField(db_index=True, max_length=255)), + ( + "file", + models.ImageField( + height_field="height", + upload_to=wagtail.images.models.get_rendition_upload_to, + width_field="width", + ), + ), + ("width", models.IntegerField(editable=False)), + ("height", models.IntegerField(editable=False)), + ( + "focal_point_key", + models.CharField( + blank=True, default="", editable=False, max_length=16 + ), + ), + ( + "image", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="renditions", + to="core.CustomImage", + ), + ), ], - options={ - 'unique_together': {('image', 'filter_spec', 'focal_point_key')}, - }, + options={"unique_together": {("image", "filter_spec", "focal_point_key")}}, ), migrations.CreateModel( - name='ArticleAuthorRelationship', + name="ArticleAuthorRelationship", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('article', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='authors', to='core.ArticlePage')), - ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='articles', to='core.Contributor')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "article", + modelcluster.fields.ParentalKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="authors", + to="core.ArticlePage", + ), + ), + ( + "author", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + related_name="articles", + to="core.Contributor", + ), + ), ], - options={ - 'unique_together': {('article', 'author')}, - }, + options={"unique_together": {("article", "author")}}, ), ] diff --git a/core/migrations/0002_auto_20200228_2120.py b/core/migrations/0002_auto_20200228_2120.py index 3d22d7a7..405dba70 100644 --- a/core/migrations/0002_auto_20200228_2120.py +++ b/core/migrations/0002_auto_20200228_2120.py @@ -8,14 +8,54 @@ class Migration(migrations.Migration): - dependencies = [ - ('core', '0001_initial'), - ] + dependencies = [("core", "0001_initial")] operations = [ migrations.AlterField( - model_name='uniontimeline', - name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.StructBlock([('phrase', wagtail.core.blocks.TextBlock()), ('definition', wagtail.core.blocks.RichTextBlock(required=False))])), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), - ), + model_name="uniontimeline", + name="events", + field=wagtail.core.fields.StreamField( + [ + ( + "event", + wagtail.core.blocks.StructBlock( + [ + ( + "title", + wagtail.core.blocks.RichTextBlock( + default="", required=True + ), + ), + ( + "date", + wagtail.core.blocks.RichTextBlock( + default="", required=True + ), + ), + ( + "body", + wagtail.core.blocks.StructBlock( + [ + ("phrase", wagtail.core.blocks.TextBlock()), + ( + "definition", + wagtail.core.blocks.RichTextBlock( + required=False + ), + ), + ] + ), + ), + ( + "featured_image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ] + ), + ) + ] + ), + ) ] diff --git a/core/migrations/0003_auto_20200228_2122.py b/core/migrations/0003_auto_20200228_2122.py index 178151c3..709d71a7 100644 --- a/core/migrations/0003_auto_20200228_2122.py +++ b/core/migrations/0003_auto_20200228_2122.py @@ -8,14 +8,59 @@ class Migration(migrations.Migration): - dependencies = [ - ('core', '0002_auto_20200228_2120'), - ] + dependencies = [("core", "0002_auto_20200228_2120")] operations = [ migrations.AlterField( - model_name='uniontimeline', - name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('phrase', wagtail.core.blocks.TextBlock()), ('definition', wagtail.core.blocks.RichTextBlock(required=False))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), - ), + model_name="uniontimeline", + name="events", + field=wagtail.core.fields.StreamField( + [ + ( + "event", + wagtail.core.blocks.StructBlock( + [ + ( + "title", + wagtail.core.blocks.RichTextBlock( + default="", required=True + ), + ), + ( + "date", + wagtail.core.blocks.RichTextBlock( + default="", required=True + ), + ), + ( + "body", + wagtail.core.blocks.ListBlock( + wagtail.core.blocks.StructBlock( + [ + ( + "phrase", + wagtail.core.blocks.TextBlock(), + ), + ( + "definition", + wagtail.core.blocks.RichTextBlock( + required=False + ), + ), + ] + ) + ), + ), + ( + "featured_image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ] + ), + ) + ] + ), + ) ] diff --git a/core/migrations/0004_auto_20200228_2153.py b/core/migrations/0004_auto_20200228_2153.py index ae7bc03c..2c843975 100644 --- a/core/migrations/0004_auto_20200228_2153.py +++ b/core/migrations/0004_auto_20200228_2153.py @@ -8,14 +8,59 @@ class Migration(migrations.Migration): - dependencies = [ - ('core', '0003_auto_20200228_2122'), - ] + dependencies = [("core", "0003_auto_20200228_2122")] operations = [ migrations.AlterField( - model_name='uniontimeline', - name='events', - field=wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('phrase', wagtail.core.blocks.TextBlock()), ('definition', wagtail.core.blocks.TextBlock(required=False))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))]), - ), + model_name="uniontimeline", + name="events", + field=wagtail.core.fields.StreamField( + [ + ( + "event", + wagtail.core.blocks.StructBlock( + [ + ( + "title", + wagtail.core.blocks.RichTextBlock( + default="", required=True + ), + ), + ( + "date", + wagtail.core.blocks.RichTextBlock( + default="", required=True + ), + ), + ( + "body", + wagtail.core.blocks.ListBlock( + wagtail.core.blocks.StructBlock( + [ + ( + "phrase", + wagtail.core.blocks.TextBlock(), + ), + ( + "definition", + wagtail.core.blocks.TextBlock( + required=False + ), + ), + ] + ) + ), + ), + ( + "featured_image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ] + ), + ) + ] + ), + ) ] diff --git a/core/migrations/0005_uniontimelineauthorrelationship.py b/core/migrations/0005_uniontimelineauthorrelationship.py index 4d72e6d4..a07348c4 100644 --- a/core/migrations/0005_uniontimelineauthorrelationship.py +++ b/core/migrations/0005_uniontimelineauthorrelationship.py @@ -7,20 +7,38 @@ class Migration(migrations.Migration): - dependencies = [ - ('core', '0004_auto_20200228_2153'), - ] + dependencies = [("core", "0004_auto_20200228_2153")] operations = [ migrations.CreateModel( - name='UnionTimelineAuthorRelationship', + name="UnionTimelineAuthorRelationship", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='timeline', to='core.Contributor')), - ('timeline', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='authors', to='core.UnionTimeline')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "author", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + related_name="timeline", + to="core.Contributor", + ), + ), + ( + "timeline", + modelcluster.fields.ParentalKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="authors", + to="core.UnionTimeline", + ), + ), ], - options={ - 'unique_together': {('timeline', 'author')}, - }, - ), + options={"unique_together": {("timeline", "author")}}, + ) ] diff --git a/core/models.py b/core/models.py index e39368eb..d10e5b95 100644 --- a/core/models.py +++ b/core/models.py @@ -32,7 +32,7 @@ ChoiceBlock, IntegerBlock, StreamBlock, - TextBlock + TextBlock, ) from wagtail.core.fields import RichTextField, StreamField from wagtail.core.models import Page, Orderable @@ -373,13 +373,15 @@ class GalleryPhotoBlock(StructBlock): image = ImageChooserBlock() caption = RichTextBlock(features=["italic"], required=False) + class UnionEvent(StructBlock): - title=RichTextBlock(required=True, default="") - date=RichTextBlock(required=True, default="") - body=ListBlock(StructBlock([ - ("phrase", TextBlock()), - ("definition", TextBlock(required=False)), - ])) + title = RichTextBlock(required=True, default="") + date = RichTextBlock(required=True, default="") + body = ListBlock( + StructBlock( + [("phrase", TextBlock()), ("definition", TextBlock(required=False))] + ) + ) featured_image = ImageChooserBlock(required=False) def get_text_html(self): @@ -397,19 +399,18 @@ def get_plain_text(self): builder += " " return builder[:-1] + class UnionTimeline(Page): - events=StreamField( - [("event", UnionEvent())] - ) + events = StreamField([("event", UnionEvent())]) - content_panels = [InlinePanel( - "authors", - panels=[ - AutocompletePanel("author", target_model="core.Contributor") - ], - label="Author", - ), - StreamFieldPanel("events")] + content_panels = [ + InlinePanel( + "authors", + panels=[AutocompletePanel("author", target_model="core.Contributor")], + label="Author", + ), + StreamFieldPanel("events"), + ] def get_context(self, request): context = super().get_context(request) @@ -421,7 +422,8 @@ def get_authors(self): def get_author_names(self): return [a.name for a in self.get_authors()] - + + class ArticlePage(RoutablePageMixin, Page): headline = RichTextField(features=["italic"]) subdeck = RichTextField(features=["italic"], null=True, blank=True) @@ -678,8 +680,11 @@ class ArticleAuthorRelationship(models.Model): class Meta: unique_together = [("article", "author")] + class UnionTimelineAuthorRelationship(models.Model): - timeline = ParentalKey(UnionTimeline, related_name="authors", on_delete=models.CASCADE) + timeline = ParentalKey( + UnionTimeline, related_name="authors", on_delete=models.CASCADE + ) author = models.ForeignKey( Contributor, related_name="timeline", on_delete=models.PROTECT ) diff --git a/home/migrations/0001_initial.py b/home/migrations/0001_initial.py index 8b818141..f6b06433 100644 --- a/home/migrations/0001_initial.py +++ b/home/migrations/0001_initial.py @@ -12,19 +12,251 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('wagtailcore', '0041_group_collection_permissions_verbose_name_plural'), + ("wagtailcore", "0041_group_collection_permissions_verbose_name_plural") ] operations = [ migrations.CreateModel( - name='HomePage', + 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')), - ('featured_articles', wagtail.core.fields.StreamField([('one_column', wagtail.core.blocks.StructBlock([('column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('one_ad_column', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(help_text='Image should be 22:7')), ('link', wagtail.core.blocks.URLBlock(label='target', required=False))])), ('two_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('emphasize_column', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')], help_text='Which article, if either, should appear larger.', required=False))])), ('three_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('middle_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('recent_articles', wagtail.core.blocks.StructBlock([('num_articles', wagtail.core.blocks.IntegerBlock(help_text='Number of recent articles to display.', label='Number of articles'))])), ('marquee_banner', wagtail.core.blocks.StructBlock([('body', wagtail.core.blocks.RichTextBlock(required=True)), ('banner_type', wagtail.core.blocks.ChoiceBlock(choices=[('moves', 'Rotating')], help_text='Determines whether the marquee banner is stationary or rotating. Only rotating works right now.'))]))], null=True)), + ( + "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", + ), + ), + ( + "featured_articles", + wagtail.core.fields.StreamField( + [ + ( + "one_column", + wagtail.core.blocks.StructBlock( + [ + ( + "column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=[ + "core.ArticlePage" + ] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ) + ] + ), + ), + ( + "one_ad_column", + wagtail.core.blocks.StructBlock( + [ + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + help_text="Image should be 22:7" + ), + ), + ( + "link", + wagtail.core.blocks.URLBlock( + label="target", required=False + ), + ), + ] + ), + ), + ( + "two_columns", + wagtail.core.blocks.StructBlock( + [ + ( + "left_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=[ + "core.ArticlePage" + ] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ( + "right_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=[ + "core.ArticlePage" + ] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ( + "emphasize_column", + wagtail.core.blocks.ChoiceBlock( + choices=[ + ("left", "Left"), + ("right", "Right"), + ], + help_text="Which article, if either, should appear larger.", + required=False, + ), + ), + ] + ), + ), + ( + "three_columns", + wagtail.core.blocks.StructBlock( + [ + ( + "left_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=[ + "core.ArticlePage" + ] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ( + "middle_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=[ + "core.ArticlePage" + ] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ( + "right_column", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=[ + "core.ArticlePage" + ] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ] + ), + ), + ] + ), + ), + ( + "recent_articles", + wagtail.core.blocks.StructBlock( + [ + ( + "num_articles", + wagtail.core.blocks.IntegerBlock( + help_text="Number of recent articles to display.", + label="Number of articles", + ), + ) + ] + ), + ), + ( + "marquee_banner", + wagtail.core.blocks.StructBlock( + [ + ( + "body", + wagtail.core.blocks.RichTextBlock( + required=True + ), + ), + ( + "banner_type", + wagtail.core.blocks.ChoiceBlock( + choices=[("moves", "Rotating")], + help_text="Determines whether the marquee banner is stationary or rotating. Only rotating works right now.", + ), + ), + ] + ), + ), + ], + null=True, + ), + ), ], - options={ - 'abstract': False, - }, - bases=('wagtailcore.page',), - ), + options={"abstract": False}, + bases=("wagtailcore.page",), + ) ] diff --git a/lights/migrations/0001_initial.py b/lights/migrations/0001_initial.py index bacc0092..e22979ac 100644 --- a/lights/migrations/0001_initial.py +++ b/lights/migrations/0001_initial.py @@ -7,17 +7,21 @@ class Migration(migrations.Migration): initial = True - dependencies = [ - ] + dependencies = [] operations = [ migrations.CreateModel( - name='Color', + name="Color", fields=[ - ('R', models.IntegerField(default=255)), - ('G', models.IntegerField(default=0)), - ('B', models.IntegerField(default=0)), - ('id', models.IntegerField(default=0, editable=False, primary_key=True, serialize=False)), + ("R", models.IntegerField(default=255)), + ("G", models.IntegerField(default=0)), + ("B", models.IntegerField(default=0)), + ( + "id", + models.IntegerField( + default=0, editable=False, primary_key=True, serialize=False + ), + ), ], - ), + ) ] diff --git a/newsletter/migrations/0001_initial.py b/newsletter/migrations/0001_initial.py index e0ee068c..5f92e22d 100644 --- a/newsletter/migrations/0001_initial.py +++ b/newsletter/migrations/0001_initial.py @@ -11,34 +11,103 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('wagtailcore', '0041_group_collection_permissions_verbose_name_plural'), + ("wagtailcore", "0041_group_collection_permissions_verbose_name_plural") ] operations = [ migrations.CreateModel( - name='Newsletter', + name="Newsletter", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('subject', models.CharField(max_length=255)), - ('body', wagtail.core.fields.StreamField([('article', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False)), ('summary', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's summary.", required=False))])), ('text', wagtail.core.blocks.RichTextBlock())])), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("subject", models.CharField(max_length=255)), + ( + "body", + wagtail.core.fields.StreamField( + [ + ( + "article", + wagtail.core.blocks.StructBlock( + [ + ( + "article", + wagtail.core.blocks.PageChooserBlock( + page_type=["core.ArticlePage"] + ), + ), + ( + "headline", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's headline.", + required=False, + ), + ), + ( + "summary", + wagtail.core.blocks.RichTextBlock( + help_text="Optional. Will override the article's summary.", + required=False, + ), + ), + ] + ), + ), + ("text", wagtail.core.blocks.RichTextBlock()), + ] + ), + ), ], ), migrations.CreateModel( - name='Subscription', + name="Subscription", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('email', models.EmailField(max_length=254, unique=True)), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("email", models.EmailField(max_length=254, unique=True)), ], ), migrations.CreateModel( - name='NewsletterSettings', + name="NewsletterSettings", fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('subscriptions_token', models.CharField(help_text='The token required to access the subscription list', max_length=255)), - ('site', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.Site')), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "subscriptions_token", + models.CharField( + help_text="The token required to access the subscription list", + max_length=255, + ), + ), + ( + "site", + models.OneToOneField( + editable=False, + on_delete=django.db.models.deletion.CASCADE, + to="wagtailcore.Site", + ), + ), ], - options={ - 'verbose_name': 'newsletter settings', - }, + options={"verbose_name": "newsletter settings"}, ), ] From 20ac69ece2f196baf1b19f85a26876ffa1b31afc Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Wed, 15 Apr 2020 12:27:39 -0400 Subject: [PATCH 35/36] Fixed migrations after pulling from master --- core/migrations/0001_initial.py | 935 ++++-------------- core/migrations/0002_auto_20200228_2120.py | 61 -- core/migrations/0003_auto_20200228_2122.py | 66 -- core/migrations/0004_auto_20200228_2153.py | 66 -- .../0005_uniontimelineauthorrelationship.py | 44 - core/migrations/0037_auto_20200326_1525.py | 22 - home/migrations/0001_initial.py | 252 +---- lights/migrations/0001_initial.py | 22 +- newsletter/migrations/0001_initial.py | 101 +- package-lock.json | 41 +- 10 files changed, 249 insertions(+), 1361 deletions(-) delete mode 100644 core/migrations/0002_auto_20200228_2120.py delete mode 100644 core/migrations/0003_auto_20200228_2122.py delete mode 100644 core/migrations/0004_auto_20200228_2153.py delete mode 100644 core/migrations/0005_uniontimelineauthorrelationship.py delete mode 100644 core/migrations/0037_auto_20200326_1525.py diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index e25444ef..c3ed6675 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.1 on 2020-02-28 21:14 +# Generated by Django 2.2.1 on 2020-04-15 16:24 import core.models from django.conf import settings @@ -22,842 +22,313 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ("wagtailcore", "0041_group_collection_permissions_verbose_name_plural"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ("taggit", "0002_auto_20150616_2121"), + ('wagtailcore', '0041_group_collection_permissions_verbose_name_plural'), + ('taggit', '0002_auto_20150616_2121'), ] operations = [ migrations.CreateModel( - name="ArchivesPage", + name='ArchivesPage', 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.RichTextField(blank=True, null=True)), + ('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.RichTextField(blank=True, null=True)), ], - options={"abstract": False}, - bases=( - wagtail.contrib.routable_page.models.RoutablePageMixin, - "wagtailcore.page", - ), + options={ + 'abstract': False, + }, + bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), ), migrations.CreateModel( - name="ArticlePage", + name='ArticlePage', 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", - ), - ), - ("headline", wagtail.core.fields.RichTextField()), - ("subdeck", wagtail.core.fields.RichTextField(blank=True, null=True)), - ( - "body", - wagtail.core.fields.StreamField( - [ - ("paragraph", wagtail.core.blocks.RichTextBlock()), - ( - "photo", - wagtail.core.blocks.StructBlock( - [ - ( - "image", - wagtail.images.blocks.ImageChooserBlock(), - ), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["italic"], required=False - ), - ), - ( - "size", - wagtail.core.blocks.ChoiceBlock( - choices=[ - ("small", "Small"), - ("medium", "Medium"), - ("large", "Large"), - ], - help_text="Width of image in article.", - ), - ), - ] - ), - ), - ( - "photo_gallery", - wagtail.core.blocks.ListBlock( - wagtail.core.blocks.StructBlock( - [ - ( - "image", - wagtail.images.blocks.ImageChooserBlock(), - ), - ( - "caption", - wagtail.core.blocks.RichTextBlock( - features=["italic"], required=False - ), - ), - ] - ), - icon="image", - ), - ), - ( - "embed", - wagtail.core.blocks.StructBlock( - [ - ( - "embed", - wagtail.embeds.blocks.EmbedBlock( - help_text="URL to the content to embed." - ), - ) - ] - ), - ), - ], - blank=True, - ), - ), - ( - "summary", - wagtail.core.fields.RichTextField( - blank=True, - help_text="Displayed on the home page or other places to provide a taste of what the article is about.", - null=True, - ), - ), - ( - "featured_caption", - wagtail.core.fields.RichTextField(blank=True, null=True), - ), + ('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')), + ('headline', wagtail.core.fields.RichTextField()), + ('subdeck', wagtail.core.fields.RichTextField(blank=True, null=True)), + ('body', wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('photo', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False)), ('size', wagtail.core.blocks.ChoiceBlock(choices=[('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')], help_text='Width of image in article.'))])), ('photo_gallery', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False))]), icon='image')), ('embed', wagtail.core.blocks.StructBlock([('embed', wagtail.embeds.blocks.EmbedBlock(help_text='URL to the content to embed.')), ('size', wagtail.core.blocks.ChoiceBlock(choices=[('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')], help_text='Width of video in article.'))]))], blank=True)), + ('summary', wagtail.core.fields.RichTextField(blank=True, help_text='Displayed on the home page or other places to provide a taste of what the article is about.', null=True)), + ('featured_caption', wagtail.core.fields.RichTextField(blank=True, null=True)), ], - options={"abstract": False}, - bases=( - wagtail.contrib.routable_page.models.RoutablePageMixin, - "wagtailcore.page", - ), + options={ + 'abstract': False, + }, + bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), ), migrations.CreateModel( - name="ArticlesIndexPage", + name='ArticlesIndexPage', 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", - ), - ) + ('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')), ], - options={"abstract": False}, - bases=( - wagtail.contrib.routable_page.models.RoutablePageMixin, - "wagtailcore.page", - ), + options={ + 'abstract': False, + }, + bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), ), migrations.CreateModel( - name="CandidatePage", + name='CandidatePage', 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", - ), - ), - ("rcs_id", models.CharField(max_length=255)), - ("election_site_id", models.IntegerField()), - ( - "bio", - wagtail.core.fields.RichTextField( - blank=True, max_length=3000, null=True - ), - ), + ('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')), + ('rcs_id', models.CharField(max_length=255)), + ('election_site_id', models.IntegerField()), + ('bio', wagtail.core.fields.RichTextField(blank=True, max_length=3000, null=True)), ], - options={"abstract": False}, - bases=( - wagtail.contrib.routable_page.models.RoutablePageMixin, - "wagtailcore.page", - ), + options={ + 'abstract': False, + }, + bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), ), migrations.CreateModel( - name="Contributor", + name='Contributor', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(max_length=255)), - ( - "rich_name", - wagtail.core.fields.RichTextField( - blank=True, max_length=255, null=True - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('rich_name', wagtail.core.fields.RichTextField(blank=True, max_length=255, null=True)), ], bases=(wagtail.search.index.Indexed, models.Model), ), migrations.CreateModel( - name="CustomImage", + name='CustomImage', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("title", models.CharField(max_length=255, verbose_name="title")), - ( - "file", - models.ImageField( - height_field="height", - upload_to=wagtail.images.models.get_upload_to, - verbose_name="file", - width_field="width", - ), - ), - ("width", models.IntegerField(editable=False, verbose_name="width")), - ("height", models.IntegerField(editable=False, verbose_name="height")), - ( - "created_at", - models.DateTimeField( - auto_now_add=True, db_index=True, verbose_name="created at" - ), - ), - ("focal_point_x", models.PositiveIntegerField(blank=True, null=True)), - ("focal_point_y", models.PositiveIntegerField(blank=True, null=True)), - ( - "focal_point_width", - models.PositiveIntegerField(blank=True, null=True), - ), - ( - "focal_point_height", - models.PositiveIntegerField(blank=True, null=True), - ), - ("file_size", models.PositiveIntegerField(editable=False, null=True)), - ( - "file_hash", - models.CharField(blank=True, editable=False, max_length=40), - ), - ( - "collection", - models.ForeignKey( - default=wagtail.core.models.get_root_collection_id, - on_delete=django.db.models.deletion.CASCADE, - related_name="+", - to="wagtailcore.Collection", - verbose_name="collection", - ), - ), - ( - "photographer", - models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.CASCADE, - related_name="images", - to="core.Contributor", - ), - ), - ( - "tags", - taggit.managers.TaggableManager( - blank=True, - help_text=None, - through="taggit.TaggedItem", - to="taggit.Tag", - verbose_name="tags", - ), - ), - ( - "uploaded_by_user", - models.ForeignKey( - blank=True, - editable=False, - null=True, - on_delete=django.db.models.deletion.SET_NULL, - to=settings.AUTH_USER_MODEL, - verbose_name="uploaded by user", - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=255, verbose_name='title')), + ('file', models.ImageField(height_field='height', upload_to=wagtail.images.models.get_upload_to, verbose_name='file', width_field='width')), + ('width', models.IntegerField(editable=False, verbose_name='width')), + ('height', models.IntegerField(editable=False, verbose_name='height')), + ('created_at', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='created at')), + ('focal_point_x', models.PositiveIntegerField(blank=True, null=True)), + ('focal_point_y', models.PositiveIntegerField(blank=True, null=True)), + ('focal_point_width', models.PositiveIntegerField(blank=True, null=True)), + ('focal_point_height', models.PositiveIntegerField(blank=True, null=True)), + ('file_size', models.PositiveIntegerField(editable=False, null=True)), + ('file_hash', models.CharField(blank=True, editable=False, max_length=40)), + ('collection', models.ForeignKey(default=wagtail.core.models.get_root_collection_id, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.Collection', verbose_name='collection')), + ('photographer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='images', to='core.Contributor')), + ('tags', taggit.managers.TaggableManager(blank=True, help_text=None, through='taggit.TaggedItem', to='taggit.Tag', verbose_name='tags')), + ('uploaded_by_user', models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='uploaded by user')), ], - options={"abstract": False}, + options={ + 'abstract': False, + }, bases=(wagtail.search.index.Indexed, models.Model), ), migrations.CreateModel( - name="Election", + name='Election', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(max_length=255)), - ("election_site_id", models.IntegerField(default=-1)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('election_site_id', models.IntegerField(default=-1)), ], bases=(wagtail.search.index.Indexed, models.Model), ), migrations.CreateModel( - name="ElectionIndexPage", + name='ElectionIndexPage', 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", - ), - ), - ("electionName", models.CharField(max_length=255)), - ("electionID", models.IntegerField()), - ( - "panels", - wagtail.core.fields.StreamField( - [ - ( - "three_cards", - wagtail.core.blocks.StructBlock( - [ - ( - "cards", - wagtail.core.blocks.StructBlock( - [ - ( - "office", - wagtail.snippets.blocks.SnippetChooserBlock( - core.models.Office - ), - ) - ] - ), - ) - ] - ), - ) - ], - null=True, - ), - ), + ('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')), + ('electionName', models.CharField(max_length=255)), + ('electionID', models.IntegerField()), + ('panels', wagtail.core.fields.StreamField([('three_cards', wagtail.core.blocks.StructBlock([('cards', wagtail.core.blocks.StructBlock([('office', wagtail.snippets.blocks.SnippetChooserBlock(core.models.Office))]))]))], null=True)), ], - options={"abstract": False}, - bases=( - wagtail.contrib.routable_page.models.RoutablePageMixin, - "wagtailcore.page", - ), + options={ + 'abstract': False, + }, + bases=(wagtail.contrib.routable_page.models.RoutablePageMixin, 'wagtailcore.page'), ), migrations.CreateModel( - name="Kicker", + name='Kicker', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("title", models.CharField(max_length=255)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=255)), ], ), migrations.CreateModel( - name="Office", + name='Office', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(max_length=255)), - ("elections_site_id", models.IntegerField()), - ("election_in", models.IntegerField()), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('elections_site_id', models.IntegerField()), + ('election_in', models.IntegerField()), ], bases=(wagtail.search.index.Indexed, models.Model), ), migrations.CreateModel( - name="Position", + name='Position', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("title", models.CharField(max_length=100)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=100)), ], ), migrations.CreateModel( - name="StaffIndexPage", + name='StaffIndexPage', 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", - ), - ) + ('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')), ], - options={"abstract": False}, - bases=("wagtailcore.page",), + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), ), migrations.CreateModel( - name="StaffPage", + name='StaffPage', 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", - ), - ), - ("first_name", models.CharField(max_length=100)), - ("last_name", models.CharField(max_length=100)), - ("biography", wagtail.core.fields.RichTextField(blank=True, null=True)), - ( - "email_address", - models.EmailField(blank=True, max_length=254, null=True), - ), - ( - "contributor", - models.OneToOneField( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - related_name="staff_page", - to="core.Contributor", - ), - ), - ( - "photo", - models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.CustomImage", - ), - ), + ('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')), + ('first_name', models.CharField(max_length=100)), + ('last_name', models.CharField(max_length=100)), + ('biography', wagtail.core.fields.RichTextField(blank=True, null=True)), + ('email_address', models.EmailField(blank=True, max_length=254, null=True)), + ('contributor', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='staff_page', to='core.Contributor')), + ('photo', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='core.CustomImage')), ], - options={"abstract": False}, - bases=("wagtailcore.page",), + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), ), migrations.CreateModel( - name="StaticPage", + name='StaticPage', 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.RichTextField(blank=True, null=True)), + ('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.RichTextField(blank=True, null=True)), ], - options={"abstract": False}, - bases=("wagtailcore.page",), + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), ), migrations.CreateModel( - name="UnionTimeline", + name='UnionTimeline', 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", - ), - ), - ( - "events", - wagtail.core.fields.StreamField( - [ - ( - "event", - wagtail.core.blocks.StructBlock( - [ - ( - "title", - wagtail.core.blocks.RichTextBlock( - default="", required=True - ), - ), - ( - "date", - wagtail.core.blocks.RichTextBlock( - default="", required=True - ), - ), - ( - "body", - wagtail.core.blocks.ListBlock( - wagtail.core.blocks.StructBlock( - [ - ( - "phrase", - wagtail.core.blocks.TextBlock(), - ), - ( - "definition", - wagtail.core.blocks.RichTextBlock( - required=False - ), - ), - ] - ) - ), - ), - ( - "featured_image", - wagtail.images.blocks.ImageChooserBlock( - required=False - ), - ), - ] - ), - ) - ] - ), - ), + ('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')), + ('events', wagtail.core.fields.StreamField([('event', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('date', wagtail.core.blocks.RichTextBlock(default='', required=True)), ('body', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('phrase', wagtail.core.blocks.TextBlock()), ('definition', wagtail.core.blocks.TextBlock(required=False))]))), ('featured_image', wagtail.images.blocks.ImageChooserBlock(required=False))]))])), ], - options={"abstract": False}, - bases=("wagtailcore.page",), + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), ), migrations.CreateModel( - name="Term", + name='Term', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "sort_order", - models.IntegerField(blank=True, editable=False, null=True), - ), - ("date_started", models.DateField(blank=True, null=True)), - ("date_ended", models.DateField(blank=True, null=True)), - ("acting", models.BooleanField(default=False)), - ("de_facto", models.BooleanField(default=False)), - ( - "person", - modelcluster.fields.ParentalKey( - on_delete=django.db.models.deletion.PROTECT, - related_name="terms", - to="core.StaffPage", - ), - ), - ( - "position", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, - related_name="terms", - to="core.Position", - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), + ('date_started', models.DateField(blank=True, null=True)), + ('date_ended', models.DateField(blank=True, null=True)), + ('acting', models.BooleanField(default=False)), + ('de_facto', models.BooleanField(default=False)), + ('person', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.PROTECT, related_name='terms', to='core.StaffPage')), + ('position', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='terms', to='core.Position')), ], - options={"ordering": ["sort_order"], "abstract": False}, + options={ + 'ordering': ['sort_order'], + 'abstract': False, + }, ), migrations.CreateModel( - name="OfficesOrderable", + name='OfficesOrderable', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "sort_order", - models.IntegerField(blank=True, editable=False, null=True), - ), - ( - "office", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to="core.Office" - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), + ('office', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Office')), ], - options={"ordering": ["sort_order"], "abstract": False}, + options={ + 'ordering': ['sort_order'], + 'abstract': False, + }, ), migrations.CreateModel( - name="NomCountOrderable", + name='NomCountOrderable', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "sort_order", - models.IntegerField(blank=True, editable=False, null=True), - ), - ("count", models.IntegerField(default=0)), - ("required", models.IntegerField(default=100)), - ( - "office", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, to="core.Office" - ), - ), - ( - "page", - modelcluster.fields.ParentalKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="nom_counts", - to="core.CandidatePage", - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), + ('count', models.IntegerField(default=0)), + ('required', models.IntegerField(default=100)), + ('office', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='core.Office')), + ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='nom_counts', to='core.CandidatePage')), ], - options={"ordering": ["sort_order"], "abstract": False}, + options={ + 'ordering': ['sort_order'], + 'abstract': False, + }, ), migrations.CreateModel( - name="NomCount", + name='NomCount', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("count", models.IntegerField(default=0)), - ( - "office", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, to="core.Office" - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('count', models.IntegerField(default=0)), + ('office', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='core.Office')), ], bases=(wagtail.search.index.Indexed, models.Model), ), migrations.CreateModel( - name="MigrationInformation", + name='MigrationInformation', fields=[ - ("link", models.URLField(db_index=True)), - ( - "guid", - models.CharField(max_length=255, primary_key=True, serialize=False), - ), - ( - "article", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - to="core.ArticlePage", - ), - ), + ('link', models.URLField(db_index=True)), + ('guid', models.CharField(max_length=255, primary_key=True, serialize=False)), + ('article', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='core.ArticlePage')), ], ), migrations.CreateModel( - name="CandidateRelatedArticles", + name='CandidateRelatedArticles', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "sort_order", - models.IntegerField(blank=True, editable=False, null=True), - ), - ( - "article", - models.ForeignKey( - blank=True, - on_delete=django.db.models.deletion.PROTECT, - related_name="+", - to="core.ArticlePage", - ), - ), - ( - "page", - modelcluster.fields.ParentalKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="related_articles", - to="core.CandidatePage", - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), + ('article', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='core.ArticlePage')), + ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='related_articles', to='core.CandidatePage')), ], - options={"ordering": ["sort_order"], "abstract": False}, + options={ + 'ordering': ['sort_order'], + 'abstract': False, + }, ), migrations.AddField( - model_name="candidatepage", - name="image", - field=models.ForeignKey( - blank=True, - help_text="Candidate image", - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.CustomImage", - ), + model_name='candidatepage', + name='image', + field=models.ForeignKey(blank=True, help_text='Candidate image', null=True, on_delete=django.db.models.deletion.PROTECT, to='core.CustomImage'), ), migrations.AddField( - model_name="articlepage", - name="featured_image", - field=models.ForeignKey( - blank=True, - help_text="Shown at the top of the article and on the home page.", - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.CustomImage", - ), + model_name='articlepage', + name='featured_image', + field=models.ForeignKey(blank=True, help_text='Shown at the top of the article and on the home page.', null=True, on_delete=django.db.models.deletion.PROTECT, to='core.CustomImage'), ), migrations.AddField( - model_name="articlepage", - name="kicker", - field=models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="core.Kicker", - ), + model_name='articlepage', + name='kicker', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='core.Kicker'), ), migrations.CreateModel( - name="CustomRendition", + name='UnionTimelineAuthorRelationship', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("filter_spec", models.CharField(db_index=True, max_length=255)), - ( - "file", - models.ImageField( - height_field="height", - upload_to=wagtail.images.models.get_rendition_upload_to, - width_field="width", - ), - ), - ("width", models.IntegerField(editable=False)), - ("height", models.IntegerField(editable=False)), - ( - "focal_point_key", - models.CharField( - blank=True, default="", editable=False, max_length=16 - ), - ), - ( - "image", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="renditions", - to="core.CustomImage", - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='timeline', to='core.Contributor')), + ('timeline', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='authors', to='core.UnionTimeline')), ], - options={"unique_together": {("image", "filter_spec", "focal_point_key")}}, + options={ + 'unique_together': {('timeline', 'author')}, + }, ), migrations.CreateModel( - name="ArticleAuthorRelationship", + name='CustomRendition', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "article", - modelcluster.fields.ParentalKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="authors", - to="core.ArticlePage", - ), - ), - ( - "author", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, - related_name="articles", - to="core.Contributor", - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('filter_spec', models.CharField(db_index=True, max_length=255)), + ('file', models.ImageField(height_field='height', upload_to=wagtail.images.models.get_rendition_upload_to, width_field='width')), + ('width', models.IntegerField(editable=False)), + ('height', models.IntegerField(editable=False)), + ('focal_point_key', models.CharField(blank=True, default='', editable=False, max_length=16)), + ('image', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='renditions', to='core.CustomImage')), ], - options={"unique_together": {("article", "author")}}, + options={ + 'unique_together': {('image', 'filter_spec', 'focal_point_key')}, + }, + ), + migrations.CreateModel( + name='ArticleAuthorRelationship', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('article', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='authors', to='core.ArticlePage')), + ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='articles', to='core.Contributor')), + ], + options={ + 'unique_together': {('article', 'author')}, + }, ), ] diff --git a/core/migrations/0002_auto_20200228_2120.py b/core/migrations/0002_auto_20200228_2120.py deleted file mode 100644 index 405dba70..00000000 --- a/core/migrations/0002_auto_20200228_2120.py +++ /dev/null @@ -1,61 +0,0 @@ -# Generated by Django 2.2.1 on 2020-02-28 21:20 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [("core", "0001_initial")] - - operations = [ - migrations.AlterField( - model_name="uniontimeline", - name="events", - field=wagtail.core.fields.StreamField( - [ - ( - "event", - wagtail.core.blocks.StructBlock( - [ - ( - "title", - wagtail.core.blocks.RichTextBlock( - default="", required=True - ), - ), - ( - "date", - wagtail.core.blocks.RichTextBlock( - default="", required=True - ), - ), - ( - "body", - wagtail.core.blocks.StructBlock( - [ - ("phrase", wagtail.core.blocks.TextBlock()), - ( - "definition", - wagtail.core.blocks.RichTextBlock( - required=False - ), - ), - ] - ), - ), - ( - "featured_image", - wagtail.images.blocks.ImageChooserBlock( - required=False - ), - ), - ] - ), - ) - ] - ), - ) - ] diff --git a/core/migrations/0003_auto_20200228_2122.py b/core/migrations/0003_auto_20200228_2122.py deleted file mode 100644 index 709d71a7..00000000 --- a/core/migrations/0003_auto_20200228_2122.py +++ /dev/null @@ -1,66 +0,0 @@ -# Generated by Django 2.2.1 on 2020-02-28 21:22 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [("core", "0002_auto_20200228_2120")] - - operations = [ - migrations.AlterField( - model_name="uniontimeline", - name="events", - field=wagtail.core.fields.StreamField( - [ - ( - "event", - wagtail.core.blocks.StructBlock( - [ - ( - "title", - wagtail.core.blocks.RichTextBlock( - default="", required=True - ), - ), - ( - "date", - wagtail.core.blocks.RichTextBlock( - default="", required=True - ), - ), - ( - "body", - wagtail.core.blocks.ListBlock( - wagtail.core.blocks.StructBlock( - [ - ( - "phrase", - wagtail.core.blocks.TextBlock(), - ), - ( - "definition", - wagtail.core.blocks.RichTextBlock( - required=False - ), - ), - ] - ) - ), - ), - ( - "featured_image", - wagtail.images.blocks.ImageChooserBlock( - required=False - ), - ), - ] - ), - ) - ] - ), - ) - ] diff --git a/core/migrations/0004_auto_20200228_2153.py b/core/migrations/0004_auto_20200228_2153.py deleted file mode 100644 index 2c843975..00000000 --- a/core/migrations/0004_auto_20200228_2153.py +++ /dev/null @@ -1,66 +0,0 @@ -# Generated by Django 2.2.1 on 2020-02-28 21:53 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [("core", "0003_auto_20200228_2122")] - - operations = [ - migrations.AlterField( - model_name="uniontimeline", - name="events", - field=wagtail.core.fields.StreamField( - [ - ( - "event", - wagtail.core.blocks.StructBlock( - [ - ( - "title", - wagtail.core.blocks.RichTextBlock( - default="", required=True - ), - ), - ( - "date", - wagtail.core.blocks.RichTextBlock( - default="", required=True - ), - ), - ( - "body", - wagtail.core.blocks.ListBlock( - wagtail.core.blocks.StructBlock( - [ - ( - "phrase", - wagtail.core.blocks.TextBlock(), - ), - ( - "definition", - wagtail.core.blocks.TextBlock( - required=False - ), - ), - ] - ) - ), - ), - ( - "featured_image", - wagtail.images.blocks.ImageChooserBlock( - required=False - ), - ), - ] - ), - ) - ] - ), - ) - ] diff --git a/core/migrations/0005_uniontimelineauthorrelationship.py b/core/migrations/0005_uniontimelineauthorrelationship.py deleted file mode 100644 index a07348c4..00000000 --- a/core/migrations/0005_uniontimelineauthorrelationship.py +++ /dev/null @@ -1,44 +0,0 @@ -# Generated by Django 2.2.1 on 2020-04-08 01:10 - -from django.db import migrations, models -import django.db.models.deletion -import modelcluster.fields - - -class Migration(migrations.Migration): - - dependencies = [("core", "0004_auto_20200228_2153")] - - operations = [ - migrations.CreateModel( - name="UnionTimelineAuthorRelationship", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "author", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, - related_name="timeline", - to="core.Contributor", - ), - ), - ( - "timeline", - modelcluster.fields.ParentalKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="authors", - to="core.UnionTimeline", - ), - ), - ], - options={"unique_together": {("timeline", "author")}}, - ) - ] diff --git a/core/migrations/0037_auto_20200326_1525.py b/core/migrations/0037_auto_20200326_1525.py deleted file mode 100644 index 249c26b1..00000000 --- a/core/migrations/0037_auto_20200326_1525.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.9 on 2020-03-26 15:25 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.embeds.blocks -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0036_auto_20200215_2042'), - ] - - operations = [ - migrations.AlterField( - model_name='articlepage', - name='body', - field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('photo', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False)), ('size', wagtail.core.blocks.ChoiceBlock(choices=[('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')], help_text='Width of image in article.'))])), ('photo_gallery', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.RichTextBlock(features=['italic'], required=False))]), icon='image')), ('embed', wagtail.core.blocks.StructBlock([('embed', wagtail.embeds.blocks.EmbedBlock(help_text='URL to the content to embed.')), ('size', wagtail.core.blocks.ChoiceBlock(choices=[('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')], help_text='Width of video in article.'))]))], blank=True), - ), - ] diff --git a/home/migrations/0001_initial.py b/home/migrations/0001_initial.py index f6b06433..8f54771f 100644 --- a/home/migrations/0001_initial.py +++ b/home/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.1 on 2020-02-28 21:14 +# Generated by Django 2.2.1 on 2020-04-15 16:24 from django.db import migrations, models import django.db.models.deletion @@ -12,251 +12,19 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ("wagtailcore", "0041_group_collection_permissions_verbose_name_plural") + ('wagtailcore', '0041_group_collection_permissions_verbose_name_plural'), ] operations = [ migrations.CreateModel( - name="HomePage", + 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", - ), - ), - ( - "featured_articles", - wagtail.core.fields.StreamField( - [ - ( - "one_column", - wagtail.core.blocks.StructBlock( - [ - ( - "column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=[ - "core.ArticlePage" - ] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ) - ] - ), - ), - ( - "one_ad_column", - wagtail.core.blocks.StructBlock( - [ - ( - "image", - wagtail.images.blocks.ImageChooserBlock( - help_text="Image should be 22:7" - ), - ), - ( - "link", - wagtail.core.blocks.URLBlock( - label="target", required=False - ), - ), - ] - ), - ), - ( - "two_columns", - wagtail.core.blocks.StructBlock( - [ - ( - "left_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=[ - "core.ArticlePage" - ] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "right_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=[ - "core.ArticlePage" - ] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "emphasize_column", - wagtail.core.blocks.ChoiceBlock( - choices=[ - ("left", "Left"), - ("right", "Right"), - ], - help_text="Which article, if either, should appear larger.", - required=False, - ), - ), - ] - ), - ), - ( - "three_columns", - wagtail.core.blocks.StructBlock( - [ - ( - "left_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=[ - "core.ArticlePage" - ] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "middle_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=[ - "core.ArticlePage" - ] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ( - "right_column", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=[ - "core.ArticlePage" - ] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ] - ), - ), - ] - ), - ), - ( - "recent_articles", - wagtail.core.blocks.StructBlock( - [ - ( - "num_articles", - wagtail.core.blocks.IntegerBlock( - help_text="Number of recent articles to display.", - label="Number of articles", - ), - ) - ] - ), - ), - ( - "marquee_banner", - wagtail.core.blocks.StructBlock( - [ - ( - "body", - wagtail.core.blocks.RichTextBlock( - required=True - ), - ), - ( - "banner_type", - wagtail.core.blocks.ChoiceBlock( - choices=[("moves", "Rotating")], - help_text="Determines whether the marquee banner is stationary or rotating. Only rotating works right now.", - ), - ), - ] - ), - ), - ], - null=True, - ), - ), + ('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')), + ('featured_articles', wagtail.core.fields.StreamField([('one_column', wagtail.core.blocks.StructBlock([('column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('one_ad_column', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(help_text='Image should be 22:7')), ('link', wagtail.core.blocks.URLBlock(label='target', required=False))])), ('two_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('emphasize_column', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')], help_text='Which article, if either, should appear larger.', required=False))])), ('three_columns', wagtail.core.blocks.StructBlock([('left_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('middle_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))])), ('right_column', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False))]))])), ('recent_articles', wagtail.core.blocks.StructBlock([('num_articles', wagtail.core.blocks.IntegerBlock(help_text='Number of recent articles to display.', label='Number of articles'))])), ('marquee_banner', wagtail.core.blocks.StructBlock([('body', wagtail.core.blocks.RichTextBlock(required=True)), ('banner_type', wagtail.core.blocks.ChoiceBlock(choices=[('moves', 'Rotating')], help_text='Determines whether the marquee banner is stationary or rotating. Only rotating works right now.'))]))], null=True)), ], - options={"abstract": False}, - bases=("wagtailcore.page",), - ) + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), + ), ] diff --git a/lights/migrations/0001_initial.py b/lights/migrations/0001_initial.py index e22979ac..01128c2c 100644 --- a/lights/migrations/0001_initial.py +++ b/lights/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.1 on 2019-10-15 20:21 +# Generated by Django 2.2.1 on 2020-04-15 16:24 from django.db import migrations, models @@ -7,21 +7,17 @@ class Migration(migrations.Migration): initial = True - dependencies = [] + dependencies = [ + ] operations = [ migrations.CreateModel( - name="Color", + name='Color', fields=[ - ("R", models.IntegerField(default=255)), - ("G", models.IntegerField(default=0)), - ("B", models.IntegerField(default=0)), - ( - "id", - models.IntegerField( - default=0, editable=False, primary_key=True, serialize=False - ), - ), + ('R', models.IntegerField(default=255)), + ('G', models.IntegerField(default=0)), + ('B', models.IntegerField(default=0)), + ('id', models.IntegerField(default=0, editable=False, primary_key=True, serialize=False)), ], - ) + ), ] diff --git a/newsletter/migrations/0001_initial.py b/newsletter/migrations/0001_initial.py index 5f92e22d..a9bad308 100644 --- a/newsletter/migrations/0001_initial.py +++ b/newsletter/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.1 on 2019-10-15 20:21 +# Generated by Django 2.2.1 on 2020-04-15 16:24 from django.db import migrations, models import django.db.models.deletion @@ -11,103 +11,34 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ("wagtailcore", "0041_group_collection_permissions_verbose_name_plural") + ('wagtailcore', '0041_group_collection_permissions_verbose_name_plural'), ] operations = [ migrations.CreateModel( - name="Newsletter", + name='Newsletter', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("subject", models.CharField(max_length=255)), - ( - "body", - wagtail.core.fields.StreamField( - [ - ( - "article", - wagtail.core.blocks.StructBlock( - [ - ( - "article", - wagtail.core.blocks.PageChooserBlock( - page_type=["core.ArticlePage"] - ), - ), - ( - "headline", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's headline.", - required=False, - ), - ), - ( - "summary", - wagtail.core.blocks.RichTextBlock( - help_text="Optional. Will override the article's summary.", - required=False, - ), - ), - ] - ), - ), - ("text", wagtail.core.blocks.RichTextBlock()), - ] - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('subject', models.CharField(max_length=255)), + ('body', wagtail.core.fields.StreamField([('article', wagtail.core.blocks.StructBlock([('article', wagtail.core.blocks.PageChooserBlock(page_type=['core.ArticlePage'])), ('headline', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's headline.", required=False)), ('summary', wagtail.core.blocks.RichTextBlock(help_text="Optional. Will override the article's summary.", required=False))])), ('text', wagtail.core.blocks.RichTextBlock())])), ], ), migrations.CreateModel( - name="Subscription", + name='Subscription', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("email", models.EmailField(max_length=254, unique=True)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('email', models.EmailField(max_length=254, unique=True)), ], ), migrations.CreateModel( - name="NewsletterSettings", + name='NewsletterSettings', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "subscriptions_token", - models.CharField( - help_text="The token required to access the subscription list", - max_length=255, - ), - ), - ( - "site", - models.OneToOneField( - editable=False, - on_delete=django.db.models.deletion.CASCADE, - to="wagtailcore.Site", - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('subscriptions_token', models.CharField(help_text='The token required to access the subscription list', max_length=255)), + ('site', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.Site')), ], - options={"verbose_name": "newsletter settings"}, + options={ + 'verbose_name': 'newsletter settings', + }, ), ] diff --git a/package-lock.json b/package-lock.json index 810ba0fa..94c17af2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3205,8 +3205,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -3224,13 +3223,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3243,18 +3240,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -3357,8 +3351,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -3368,7 +3361,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3381,20 +3373,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.3.5", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -3411,7 +3400,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -3484,8 +3472,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -3495,7 +3482,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -3571,8 +3557,7 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -3602,7 +3587,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3620,7 +3604,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3659,13 +3642,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.3", - "bundled": true, - "optional": true + "bundled": true } } }, From 79b837059c3cef6088323f5acfaf0dac842f8b58 Mon Sep 17 00:00:00 2001 From: Pragati Pant Date: Wed, 29 Apr 2020 15:09:23 -0400 Subject: [PATCH 36/36] Attempted to move union timeline to News section. --- core/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/models.py b/core/models.py index 3786953d..61baa0bf 100644 --- a/core/models.py +++ b/core/models.py @@ -644,7 +644,7 @@ def get_meta_tags(self): class ArticlesIndexPage(RoutablePageMixin, Page): - subpage_types = ["ArticlePage"] + subpage_types = ["ArticlePage", "UnionTimeline"] @route(r"^(\d{4})\/(\d{2})\/(.*)\/$") def post_by_date(self, request, year, month, slug, *args, **kwargs):