Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .build
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Tue 21 Sep 2021 07:42:56 PM EDT
1 change: 1 addition & 0 deletions Darkmode/pipeline
Submodule pipeline added at d43f1a
4 changes: 2 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
19 changes: 19 additions & 0 deletions core/migrations/0038_articlepage_color.py
Original file line number Diff line number Diff line change
@@ -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),
),
]
29 changes: 29 additions & 0 deletions core/migrations/0039_auto_20211207_0140.py
Original file line number Diff line number Diff line change
@@ -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),
),
]
19 changes: 19 additions & 0 deletions core/migrations/0040_articlepage_lightheader_color.py
Original file line number Diff line number Diff line change
@@ -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),
),
]
18 changes: 18 additions & 0 deletions core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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()),
Expand All @@ -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(
Expand Down
18 changes: 17 additions & 1 deletion core/templates/core/article_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,28 @@
{% for tag, val in page.get_meta_tags.items %}
<meta property="{{tag}}" content="{{val}}">
{% endfor %}
<style>
#colorhead{
{% if page.header_color %}
background: {{page.header_color}} linear-gradient(180deg,{{page.lightheader_color}},{{page.header_color}}) repeat-x !important

{% endif %}
}
#colorbody{
{% if page.font_color %}
color:{{page.font_color}} !important;
{% endif %}
{% if page.background_color %}
background-color:{{page.background_color}}!important;
{% endif %}
}
</style>
{% endblock %}

{% block body_class %}template-articlepage{% endblock %}

{% block content %}

<article>
<div class="container narrow">
{% if page.kicker %}
Expand Down Expand Up @@ -156,4 +173,3 @@ <h3 class="mb-2 headline text-dark">{{ article.headline|richtext_unwrapped }}</h
{% endif %}
{% endblock %}
{% endcache %}

2 changes: 1 addition & 1 deletion core/templates/core/tags/top_menu.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load core_menu wagtailcore_tags static %}
<div class="nav-scroller py-1 mb-4 box-shadow bg-white"{% if is_home %} data-controller="navigation" data-action="scroll@window->navigation#onScroll" data-target="navigation.scroller"{% endif %}>
<div class="nav-scroller py-1 mb-4 box-shadow"{% if is_home %} data-controller="navigation" data-action="scroll@window->navigation#onScroll" data-target="navigation.scroller"{% endif %}>
<div class="container">
<nav class="nav d-flex flex-nowrap justify-content-between">
{% if is_home %}
Expand Down
21 changes: 21 additions & 0 deletions home/migrations/0005_auto_20210924_2122.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 2.2.10 on 2021-09-24 21:22

from django.db import migrations
import wagtail.core.blocks
import wagtail.core.fields
import wagtail.images.blocks


class Migration(migrations.Migration):

dependencies = [
('home', '0004_auto_20191106_0215'),
]

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)), ('image', wagtail.images.blocks.ImageChooserBlock(help_text='Optional. Ovverides the image on the post.', 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)), ('image', wagtail.images.blocks.ImageChooserBlock(help_text='Optional. Ovverides the image on the post.', 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)), ('image', wagtail.images.blocks.ImageChooserBlock(help_text='Optional. Ovverides the image on the post.', 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)), ('image', wagtail.images.blocks.ImageChooserBlock(help_text='Optional. Ovverides the image on the post.', 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)), ('image', wagtail.images.blocks.ImageChooserBlock(help_text='Optional. Ovverides the image on the post.', 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)), ('image', wagtail.images.blocks.ImageChooserBlock(help_text='Optional. Ovverides the image on the post.', 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),
),
]
Loading