diff --git a/.build b/.build new file mode 100644 index 00000000..5f0e7d7c --- /dev/null +++ b/.build @@ -0,0 +1 @@ +Tue 21 Sep 2021 07:42:56 PM EDT diff --git a/Darkmode/pipeline b/Darkmode/pipeline new file mode 160000 index 00000000..d43f1ad7 --- /dev/null +++ b/Darkmode/pipeline @@ -0,0 +1 @@ +Subproject commit d43f1ad75c98d00fcd3ebda682bcfc0d4d85863b diff --git a/Pipfile b/Pipfile index e25d3e16..9b9bb614 100644 --- a/Pipfile +++ b/Pipfile @@ -4,8 +4,8 @@ verify_ssl = true name = "pypi" [packages] -wagtail = "<=2.7" -Django = "<2.2.11" +wagtail = "<=2.15" +Django = "<2.3.9" django-debug-toolbar = "==2.1" django-webpack-loader = "*" "beautifulsoup4" = "==4.6.0" diff --git a/core/migrations/0038_articlepage_color.py b/core/migrations/0038_articlepage_color.py new file mode 100644 index 00000000..9662278f --- /dev/null +++ b/core/migrations/0038_articlepage_color.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.9 on 2021-12-07 01:15 + +from django.db import migrations +import wagtail_color_panel.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0037_auto_20200326_1525'), + ] + + operations = [ + migrations.AddField( + model_name='articlepage', + name='color', + field=wagtail_color_panel.fields.ColorField(default='#DA1E05', max_length=7), + ), + ] diff --git a/core/migrations/0039_auto_20211207_0140.py b/core/migrations/0039_auto_20211207_0140.py new file mode 100644 index 00000000..23da734e --- /dev/null +++ b/core/migrations/0039_auto_20211207_0140.py @@ -0,0 +1,29 @@ +# Generated by Django 3.2.9 on 2021-12-07 01:40 + +from django.db import migrations +import wagtail_color_panel.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0038_articlepage_color'), + ] + + operations = [ + migrations.RenameField( + model_name='articlepage', + old_name='color', + new_name='header_color', + ), + migrations.AddField( + model_name='articlepage', + name='background_color', + field=wagtail_color_panel.fields.ColorField(default='#FFFFFF', max_length=7), + ), + migrations.AddField( + model_name='articlepage', + name='font_color', + field=wagtail_color_panel.fields.ColorField(default='#000000', max_length=7), + ), + ] diff --git a/core/migrations/0040_articlepage_lightheader_color.py b/core/migrations/0040_articlepage_lightheader_color.py new file mode 100644 index 00000000..ceeb4cf6 --- /dev/null +++ b/core/migrations/0040_articlepage_lightheader_color.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.9 on 2021-12-07 02:20 + +from django.db import migrations +import wagtail_color_panel.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0039_auto_20211207_0140'), + ] + + operations = [ + migrations.AddField( + model_name='articlepage', + name='lightheader_color', + field=wagtail_color_panel.fields.ColorField(default='#e0402b', max_length=7), + ), + ] diff --git a/core/models.py b/core/models.py index 99af0056..42278860 100644 --- a/core/models.py +++ b/core/models.py @@ -51,6 +51,8 @@ from wagtail.images.models import Image, AbstractImage, AbstractRendition from wagtailautocomplete.edit_handlers import AutocompletePanel from modelcluster.fields import ParentalKey, ParentalManyToManyField +from wagtail_color_panel.fields import ColorField +from wagtail_color_panel.edit_handlers import NativeColorPanel logger = logging.getLogger("pipeline") @@ -380,6 +382,11 @@ class ArticlePage(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) + lightheader_color = ColorField(default="#e0402b") + header_color = ColorField(default="#DA1E05") + font_color = ColorField(default="#000000") + background_color = ColorField(default="#FFFFFF") + body = StreamField( [ ("paragraph", RichTextBlock()), @@ -404,10 +411,21 @@ class ArticlePage(RoutablePageMixin, Page): ) featured_caption = RichTextField(features=["italic"], blank=True, null=True) + content_panels = [ MultiFieldPanel( [FieldPanel("headline", classname="title"), FieldPanel("subdeck")] ), + MultiFieldPanel( + [ + NativeColorPanel('header_color'), + NativeColorPanel('lightheader_color'), + NativeColorPanel('font_color'), + NativeColorPanel('background_color'), + ], + heading="Style", + classname="collapsible" + ), MultiFieldPanel( [ InlinePanel( diff --git a/core/templates/core/article_page.html b/core/templates/core/article_page.html index 45305e42..5e8ebbbf 100644 --- a/core/templates/core/article_page.html +++ b/core/templates/core/article_page.html @@ -8,11 +8,28 @@ {% for tag, val in page.get_meta_tags.items %} {% endfor %} + {% endblock %} {% block body_class %}template-articlepage{% endblock %} {% block content %} +
{% if page.kicker %} @@ -156,4 +173,3 @@

{{ article.headline|richtext_unwrapped }} +