From 5746143f69dd91c6c7a538cc0a468762cdf11145 Mon Sep 17 00:00:00 2001 From: phillimorland <5871230+phillimorland@users.noreply.github.com> Date: Thu, 16 Jun 2022 15:50:39 +0200 Subject: [PATCH] template updates --- .../assets/scss/components/_blocks.scss | 36 ++----------------- apps/cms/blocks.py | 11 ++---- .../migrations/0012_auto_20220616_1536.py | 25 +++++++++++++ .../blocks/col_background_cta_block.html | 22 +++++++----- 4 files changed, 44 insertions(+), 50 deletions(-) create mode 100644 apps/cms/pages/migrations/0012_auto_20220616_1536.py diff --git a/adhocracy-plus/assets/scss/components/_blocks.scss b/adhocracy-plus/assets/scss/components/_blocks.scss index 2d81cd8c0..6398bbbe1 100644 --- a/adhocracy-plus/assets/scss/components/_blocks.scss +++ b/adhocracy-plus/assets/scss/components/_blocks.scss @@ -52,29 +52,6 @@ $block-padding-md: 7.5 * $padding; text-align: left; } -.block-img-col-1 { - @extend .col-md-7; - - img { - display: inline-block; - float: left; - padding-right: $padding; - } -} - -.block-img-col-2 { - @extend .col-md-5; - - .block-img-col__image { - width: 100%; - position: relative; - - @media screen and (min-width: $breakpoint-xxl) { - margin-top: 2 * $spacer; - } - } -} - // old block styling, still used in activity block .block--bordered { padding: 1em; @@ -88,7 +65,6 @@ $block-padding-md: 7.5 * $padding; // responsive padding for image, 2 col cta .homepage__wrapper { - .block-img-col-1, .block-row-2 { padding: 2 * $padding; @@ -128,26 +104,20 @@ $block-padding-md: 7.5 * $padding; width: 80px; border-bottom: solid 8px $brand-secondary; } - - .block-img-col-1 { - h2:after { - left: 0; - } - } } // coloured background block -.block-background_cta_block .block > :first-child { +.block-background_cta_block .block-light { background-color: $brand-secondary; } -.block-background_cta_block .block > :last-child { +.block-background_cta_block .block-dark { background-color: $brand-primary; color: $text-color-inverted; } // linked for specificty -.btn--transparent.block-bg_btn-2 { +.block-dark .btn--transparent { color: $text-color-inverted; border-color: $text-color-inverted; diff --git a/apps/cms/blocks.py b/apps/cms/blocks.py index 8d48f81b6..e56231f6e 100644 --- a/apps/cms/blocks.py +++ b/apps/cms/blocks.py @@ -31,15 +31,8 @@ class Meta: # 2-col, richtext, CTA btn, background colour class ColBackgroundCTABlock(blocks.StructBlock): - columns_count = blocks.ChoiceBlock(choices=[ - (1, 'One column'), - (2, 'Two columns') - - ], default=2) - - columns = blocks.ListBlock( - CallToActionBlock(label='CTA with Background') - ) + column1_bg = CallToActionBlock(label='CTA column light blue') + column2_bg = CallToActionBlock(label='CTA column dark blue') class Meta: template = 'a4_candy_cms_pages/blocks/col_background_cta_block.html' diff --git a/apps/cms/pages/migrations/0012_auto_20220616_1536.py b/apps/cms/pages/migrations/0012_auto_20220616_1536.py new file mode 100644 index 000000000..22d48a6c4 --- /dev/null +++ b/apps/cms/pages/migrations/0012_auto_20220616_1536.py @@ -0,0 +1,25 @@ +# Generated by Django 3.2.13 on 2022-06-16 13:36 + +from django.db import migrations +import wagtail.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('a4_candy_cms_pages', '0011_auto_20220616_1529'), + ] + + operations = [ + migrations.AlterField( + model_name='homepage', + name='body_streamfield_de', + field=wagtail.fields.StreamField([('background_cta_block', wagtail.blocks.StructBlock([('column1_bg', wagtail.blocks.StructBlock([('body', wagtail.blocks.RichTextBlock(required=False)), ('link', wagtail.blocks.CharBlock(required=False)), ('link_text', wagtail.blocks.CharBlock(label='Link Text', max_length=50, required=False))], label='CTA column light blue')), ('column2_bg', wagtail.blocks.StructBlock([('body', wagtail.blocks.RichTextBlock(required=False)), ('link', wagtail.blocks.CharBlock(required=False)), ('link_text', wagtail.blocks.CharBlock(label='Link Text', max_length=50, required=False))], label='CTA column dark blue'))])), ('columns_cta', wagtail.blocks.StructBlock([('columns_count', wagtail.blocks.ChoiceBlock(choices=[(1, 'One column'), (2, 'Two columns'), (3, 'Three columns')])), ('columns', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('body', wagtail.blocks.RichTextBlock(required=False)), ('link', wagtail.blocks.CharBlock(required=False)), ('link_text', wagtail.blocks.CharBlock(label='Link Text', max_length=50, required=False))], label='CTA Column')))])), ('html', wagtail.blocks.RawHTMLBlock()), ('paragraph', wagtail.blocks.RichTextBlock()), ('news', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('news_page', wagtail.blocks.PageChooserBlock(page_type=['a4_candy_cms_news.NewsIndexPage']))])), ('use_cases', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('use_cases', wagtail.blocks.ListBlock(wagtail.blocks.PageChooserBlock(page_type=['a4_candy_cms_use_cases.UseCasePage']))), ('demo_platform', wagtail.blocks.URLBlock()), ('use_case_page', wagtail.blocks.PageChooserBlock(page_type=['a4_candy_cms_use_cases.UseCaseIndexPage']))]))], blank=True, use_json_field=True), + ), + migrations.AlterField( + model_name='homepage', + name='body_streamfield_en', + field=wagtail.fields.StreamField([('background_cta_block', wagtail.blocks.StructBlock([('column1_bg', wagtail.blocks.StructBlock([('body', wagtail.blocks.RichTextBlock(required=False)), ('link', wagtail.blocks.CharBlock(required=False)), ('link_text', wagtail.blocks.CharBlock(label='Link Text', max_length=50, required=False))], label='CTA column light blue')), ('column2_bg', wagtail.blocks.StructBlock([('body', wagtail.blocks.RichTextBlock(required=False)), ('link', wagtail.blocks.CharBlock(required=False)), ('link_text', wagtail.blocks.CharBlock(label='Link Text', max_length=50, required=False))], label='CTA column dark blue'))])), ('columns_cta', wagtail.blocks.StructBlock([('columns_count', wagtail.blocks.ChoiceBlock(choices=[(1, 'One column'), (2, 'Two columns'), (3, 'Three columns')])), ('columns', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('body', wagtail.blocks.RichTextBlock(required=False)), ('link', wagtail.blocks.CharBlock(required=False)), ('link_text', wagtail.blocks.CharBlock(label='Link Text', max_length=50, required=False))], label='CTA Column')))])), ('html', wagtail.blocks.RawHTMLBlock()), ('paragraph', wagtail.blocks.RichTextBlock()), ('news', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('news_page', wagtail.blocks.PageChooserBlock(page_type=['a4_candy_cms_news.NewsIndexPage']))])), ('use_cases', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock()), ('use_cases', wagtail.blocks.ListBlock(wagtail.blocks.PageChooserBlock(page_type=['a4_candy_cms_use_cases.UseCasePage']))), ('demo_platform', wagtail.blocks.URLBlock()), ('use_case_page', wagtail.blocks.PageChooserBlock(page_type=['a4_candy_cms_use_cases.UseCaseIndexPage']))]))], blank=True, use_json_field=True), + ), + ] diff --git a/apps/cms/pages/templates/a4_candy_cms_pages/blocks/col_background_cta_block.html b/apps/cms/pages/templates/a4_candy_cms_pages/blocks/col_background_cta_block.html index ecad65b6a..02fbf98ff 100644 --- a/apps/cms/pages/templates/a4_candy_cms_pages/blocks/col_background_cta_block.html +++ b/apps/cms/pages/templates/a4_candy_cms_pages/blocks/col_background_cta_block.html @@ -1,14 +1,20 @@ {% load wagtailcore_tags %}
- {% for column in value.columns %} -
- {{ column.body }} - {% if column.link %} -
- {{ column.link_text }} -
+
+ {{ value.column1.body }} + {% if value.column1.link %} +
+ {{ column1.link_text }} +
{% endif %} +
+
+ {{ column2.body }} + {% if value.column2.link %} +
+ {{ column2.link_text }}
- {% endfor %} + {% endif %} +