Commit 72e6361f authored by ancoats's avatar ancoats
Browse files

Add Glassfrog and Mattermost blocks and fine-tune Global Sets

parent 3aa038dc
......@@ -35,6 +35,8 @@ fieldLayouts:
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
-
type: craft\fieldlayoutelements\HorizontalRule
-
fieldUid: a1aa748c-854b-454a-a405-0f0bddf32397
instructions: null
......@@ -44,8 +46,6 @@ fieldLayouts:
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
-
type: craft\fieldlayoutelements\HorizontalRule
-
fieldUid: 1aa8d13c-e77b-4034-8b99-fa32109bb8d5
instructions: null
......
contentColumnType: string(160)
fieldGroup: 1db93c19-04db-4f04-b04e-93a299dee1e8
handle: blockButtonLabelGlassfrog
instructions: ''
name: 'Button label'
searchable: false
settings:
byteLimit: null
charLimit: 40
code: ''
columnType: null
initialRows: '4'
multiline: ''
placeholder: ''
uiMode: normal
translationKeyFormat: null
translationMethod: site
type: craft\fields\PlainText
contentColumnType: string(160)
fieldGroup: 33354744-ac6c-4573-8240-086bdc3068e2
handle: blockButtonLabelMattermost
instructions: ''
name: 'Button label'
searchable: true
settings:
byteLimit: null
charLimit: 40
code: ''
columnType: null
initialRows: '4'
multiline: ''
placeholder: ''
uiMode: normal
translationKeyFormat: null
translationMethod: site
type: craft\fields\PlainText
contentColumnType: text
fieldGroup: 1db93c19-04db-4f04-b04e-93a299dee1e8
handle: blockDescriptionGlassfrog
instructions: ''
name: Description
searchable: false
settings:
byteLimit: null
charLimit: null
code: ''
columnType: null
initialRows: '4'
multiline: ''
placeholder: ''
uiMode: normal
translationKeyFormat: null
translationMethod: site
type: craft\fields\PlainText
contentColumnType: text
fieldGroup: 33354744-ac6c-4573-8240-086bdc3068e2
handle: blockDescriptionMattermost
instructions: ''
name: Description
searchable: true
settings:
byteLimit: null
charLimit: null
code: ''
columnType: null
initialRows: '4'
multiline: ''
placeholder: ''
uiMode: normal
translationKeyFormat: null
translationMethod: site
type: craft\fields\PlainText
contentColumnType: text
fieldGroup: 1db93c19-04db-4f04-b04e-93a299dee1e8
handle: blockHeadingGlassfrog
instructions: ''
name: Heading
searchable: false
settings:
byteLimit: null
charLimit: null
code: ''
columnType: null
initialRows: '4'
multiline: ''
placeholder: ''
uiMode: normal
translationKeyFormat: null
translationMethod: site
type: craft\fields\PlainText
contentColumnType: text
fieldGroup: 33354744-ac6c-4573-8240-086bdc3068e2
handle: blockHeadingMattermost
instructions: ''
name: Heading
searchable: true
settings:
byteLimit: null
charLimit: null
code: ''
columnType: null
initialRows: '4'
multiline: ''
placeholder: ''
uiMode: normal
translationKeyFormat: null
translationMethod: site
type: craft\fields\PlainText
fieldLayouts:
798d3c2a-bcad-4e75-9a04-32da25319536:
tabs:
-
elements:
-
fieldUid: 92746ce8-77e2-4aa7-9541-93297eb954dc
instructions: ''
label: ''
required: '1'
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
-
type: craft\fieldlayoutelements\HorizontalRule
-
fieldUid: a1aa748c-854b-454a-a405-0f0bddf32397
instructions: null
label: null
required: false
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
-
fieldUid: 1aa8d13c-e77b-4034-8b99-fa32109bb8d5
instructions: ''
label: ''
required: ''
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
-
fieldUid: 1609b55d-86e9-4989-b64d-76c8e1583f59
instructions: ''
label: ''
required: ''
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: Content
sortOrder: 1
-
elements:
-
fieldUid: 45bb4a25-ce75-458e-b571-8563a2739579
instructions: ''
label: ''
required: '1'
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: Attributes
sortOrder: 2
handle: banner
name: Banner
......@@ -4,7 +4,7 @@ fieldLayouts:
-
elements:
-
fieldUid: 92746ce8-77e2-4aa7-9541-93297eb954dc
fieldUid: e67d9a87-18b8-4bb3-a6b9-ddbbe1a50f27
instructions: null
label: null
required: '1'
......@@ -13,9 +13,7 @@ fieldLayouts:
warning: null
width: 100
-
type: craft\fieldlayoutelements\HorizontalRule
-
fieldUid: 1aa8d13c-e77b-4034-8b99-fa32109bb8d5
fieldUid: 56c4d5fc-571a-43fc-b20e-efe66e1592fa
instructions: null
label: null
required: '1'
......@@ -24,7 +22,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: 1609b55d-86e9-4989-b64d-76c8e1583f59
fieldUid: a7a10a34-a6f4-4e03-8e7c-a9aaa2bd2984
instructions: null
label: null
required: '1'
......@@ -32,10 +30,12 @@ fieldLayouts:
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: Discourse
sortOrder: 1
-
elements:
-
type: craft\fieldlayoutelements\HorizontalRule
-
fieldUid: 45bb4a25-ce75-458e-b571-8563a2739579
fieldUid: f20a9600-efa4-40a1-9c20-836ee4b87380
instructions: null
label: null
required: '1'
......@@ -43,12 +43,8 @@ fieldLayouts:
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: Banner
sortOrder: 1
-
elements:
-
fieldUid: bda4af5d-e9ac-4f42-8460-4f67a51264f6
fieldUid: 0bf94a07-315f-4fae-82bb-4debc0d1812f
instructions: null
label: null
required: '1'
......@@ -57,7 +53,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: 4b0a95fe-8259-42ef-9f01-eff32d007259
fieldUid: 276a6f35-d22c-4150-b956-cd86690ff38c
instructions: null
label: null
required: '1'
......@@ -65,52 +61,74 @@ fieldLayouts:
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: Gitbook
sortOrder: 2
-
elements:
-
fieldUid: 297a1b92-9759-4b45-934c-0daabce941bc
instructions: ''
label: ''
required: '1'
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
-
fieldUid: 58b63aff-f9cf-4f56-b0aa-34183d67046d
instructions: null
label: null
fieldUid: 2ed55133-b08a-48fb-bfee-1346e1ec357e
instructions: ''
label: ''
required: '1'
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: 'Rebels Manager'
sortOrder: 2
-
fieldUid: 5706cdfb-6588-45bb-8206-75ac89bb55b2
instructions: ''
label: ''
required: '1'
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: Glassfrog
sortOrder: 3
-
elements:
-
fieldUid: e15e693f-1db4-404b-8d40-dd44a094c56a
instructions: null
label: null
fieldUid: 17ee5608-200c-4038-920a-3b1fc5be1fd1
instructions: ''
label: ''
required: '1'
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
-
fieldUid: 10ea4242-a43b-4671-9f17-b8dabbd23c47
instructions: null
label: null
fieldUid: 323f3fbc-acc7-423e-9192-2b5bc55bb1d7
instructions: ''
label: ''
required: '1'
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
-
fieldUid: 8472ef0c-2d2d-4057-88a5-505d384d3384
instructions: null
label: null
fieldUid: 8f65f223-f830-4308-9bf8-b2d305f8d77e
instructions: ''
label: ''
required: '1'
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: Newsletter
sortOrder: 3
name: Mattermost
sortOrder: 4
-
elements:
-
fieldUid: 54040011-d501-4a9d-8469-9f893c181d97
fieldUid: e15e693f-1db4-404b-8d40-dd44a094c56a
instructions: null
label: null
required: '1'
......@@ -119,7 +137,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: eaac2bcf-37e7-4283-a3f8-b49c85c1af51
fieldUid: 10ea4242-a43b-4671-9f17-b8dabbd23c47
instructions: null
label: null
required: '1'
......@@ -128,7 +146,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: 630034a4-de21-4525-ac31-af43c6e552ce
fieldUid: 8472ef0c-2d2d-4057-88a5-505d384d3384
instructions: null
label: null
required: '1'
......@@ -136,12 +154,12 @@ fieldLayouts:
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: 'Open Collective'
sortOrder: 4
name: Newsletter
sortOrder: 5
-
elements:
-
fieldUid: e67d9a87-18b8-4bb3-a6b9-ddbbe1a50f27
fieldUid: 54040011-d501-4a9d-8469-9f893c181d97
instructions: null
label: null
required: '1'
......@@ -150,7 +168,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: 56c4d5fc-571a-43fc-b20e-efe66e1592fa
fieldUid: eaac2bcf-37e7-4283-a3f8-b49c85c1af51
instructions: null
label: null
required: '1'
......@@ -159,7 +177,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: a7a10a34-a6f4-4e03-8e7c-a9aaa2bd2984
fieldUid: 630034a4-de21-4525-ac31-af43c6e552ce
instructions: null
label: null
required: '1'
......@@ -167,12 +185,12 @@ fieldLayouts:
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: Discourse
sortOrder: 5
name: 'Open Collective'
sortOrder: 6
-
elements:
-
fieldUid: f20a9600-efa4-40a1-9c20-836ee4b87380
fieldUid: bda4af5d-e9ac-4f42-8460-4f67a51264f6
instructions: null
label: null
required: '1'
......@@ -181,7 +199,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: 0bf94a07-315f-4fae-82bb-4debc0d1812f
fieldUid: 4b0a95fe-8259-42ef-9f01-eff32d007259
instructions: null
label: null
required: '1'
......@@ -190,7 +208,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: 276a6f35-d22c-4150-b956-cd86690ff38c
fieldUid: 58b63aff-f9cf-4f56-b0aa-34183d67046d
instructions: null
label: null
required: '1'
......@@ -198,7 +216,7 @@ fieldLayouts:
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: Gitbook
sortOrder: 6
name: 'Rebels Manager'
sortOrder: 7
handle: blocks
name: Blocks
......@@ -32,5 +32,5 @@ fieldLayouts:
width: 100
name: Global
sortOrder: 1
handle: notifications
name: Notifications
handle: notification
name: Notification
......@@ -4,7 +4,7 @@ fieldLayouts:
-
elements:
-
fieldUid: 87de24e2-127f-47a4-9c10-4ae9092363fe
fieldUid: 07bb7f76-1c12-41a9-8ae3-cddcbb87ab10
instructions: null
label: null
required: '1'
......@@ -13,7 +13,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: 07bb7f76-1c12-41a9-8ae3-cddcbb87ab10
fieldUid: 87de24e2-127f-47a4-9c10-4ae9092363fe
instructions: null
label: null
required: '1'
......@@ -22,7 +22,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: 17208eeb-318a-4370-b433-3f13b987e246
fieldUid: da417e39-35e5-46d5-b2e3-cf04f9845ba2
instructions: null
label: null
required: '1'
......@@ -31,7 +31,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: ff706236-96e1-4567-8e1a-695191febc91
fieldUid: 41861cd7-716f-4755-834e-991c5c9c667d
instructions: null
label: null
required: '1'
......@@ -40,7 +40,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: 8fd226c9-9355-4c14-bc31-1a643ec10863
fieldUid: 7c7bf5d2-41a5-4055-8dc9-3d708be48c45
instructions: null
label: null
required: '1'
......@@ -49,7 +49,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: 7c7bf5d2-41a5-4055-8dc9-3d708be48c45
fieldUid: 17208eeb-318a-4370-b433-3f13b987e246
instructions: null
label: null
required: '1'
......@@ -58,7 +58,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: dbb950aa-2658-4ac1-bafd-a392f7fc367b
fieldUid: 8fd226c9-9355-4c14-bc31-1a643ec10863
instructions: null
label: null
required: '1'
......@@ -67,7 +67,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: da417e39-35e5-46d5-b2e3-cf04f9845ba2
fieldUid: dbb950aa-2658-4ac1-bafd-a392f7fc367b
instructions: null
label: null
required: '1'
......@@ -76,7 +76,7 @@ fieldLayouts:
warning: null
width: 100
-
fieldUid: 41861cd7-716f-4755-834e-991c5c9c667d
fieldUid: ff706236-96e1-4567-8e1a-695191febc91
instructions: null
label: null
required: '1'
......
dateModified: 1612514489
dateModified: 1612519762
email:
fromEmail: it@extinctionrebellion.be
fromName: 'Extinction Rebellion Belgium'
......
......@@ -9,7 +9,8 @@
<footer class="r-page-footer" id="page-footer">
{% block prefooter %}
{% block a %}
{% include '_partials/components/shared/block-open-collective.twig' with {
{% include '_partials/components/shared/block.twig' with {
handle: 'open-collective',
class: 'c-box--center u-background-color-yellow'
} %}
{% endblock %}
......
......@@ -14,7 +14,7 @@
{% if isPageFirst %}
<div class="rebel-for-life">
{% include '_partials/components/shared/banner.twig' with {
banner: entry.bannerFeatured.one()
banner: entry.bannerFeatured|length ? entry.bannerFeatured.one() : craft.globalSets().handle('banner').one()
} %}
{% include '_partials/components/shared/tile.twig' with {
tileTheme: 'shockface'
......
......@@ -34,7 +34,8 @@
{% block prefooter %}
{% block a %}
{% include '_partials/components/shared/block-newsletter.twig' with {
{% include '_partials/components/shared/block.twig' with {
handle: 'newsletter',
class: 'c-box--center u-background-color-yellow'
} %}
{% endblock %}
......
......@@ -62,7 +62,8 @@
{% block prefooter %}
{% block a %}
{% include '_partials/components/shared/block-discourse.twig' with {
{% include '_partials/components/shared/block.twig' with {
handle: 'discourse',
class: 'c-box--center u-background-color-yellow'
} %}
{% endblock %}
......