Skip to content

Commit

Permalink
Merge pull request #106 from City-of-Helsinki/dev
Browse files Browse the repository at this point in the history
Production release 13.10.2021
  • Loading branch information
khalima authored Oct 14, 2021
2 parents b3904f7 + f0476e2 commit b49dd15
Show file tree
Hide file tree
Showing 24 changed files with 387 additions and 151 deletions.
3 changes: 3 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ DRUPAL_SYNC_SOURCE=main

# Public webroot
DRUPAL_WEBROOT=public

# Don't sync files
DRUPAL_SYNC_FILES=no
245 changes: 127 additions & 118 deletions composer.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion conf/cmi/block.block.footertopnavigation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ provider: null
plugin: 'menu_block_current_language:footer-top-navigation'
settings:
id: 'menu_block_current_language:footer-top-navigation'
label: 'Footer top navigation'
label: 'City of Helsinki'
provider: menu_block_current_language
label_display: visible
translation_providers:
Expand Down
3 changes: 1 addition & 2 deletions conf/cmi/config_ignore.settings.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ignored_config_entities:
- '*.site_settings'
ignored_config_entities: { }
_core:
default_config_hash: UVH1aJ4b44UM-VdPVN7hNNuuVqfReJxwfVeDQH1Hvsk
32 changes: 30 additions & 2 deletions conf/cmi/core.entity_form_display.paragraph.accordion.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ langcode: en
status: true
dependencies:
config:
- field.field.paragraph.accordion.field_accordion_description
- field.field.paragraph.accordion.field_accordion_design
- field.field.paragraph.accordion.field_accordion_heading_level
- field.field.paragraph.accordion.field_accordion_items
- field.field.paragraph.accordion.field_accordion_title
- field.field.paragraph.accordion.field_accordion_title_level
- paragraphs.paragraphs_type.accordion
module:
- hdbt_admin_editorial
Expand All @@ -24,14 +27,14 @@ content:
type: design_field_widget
region: content
field_accordion_heading_level:
weight: 1
weight: 4
settings: { }
third_party_settings: { }
type: options_select
region: content
field_accordion_items:
type: paragraphs
weight: 2
weight: 5
settings:
title: Lohko
title_plural: Lohkot
Expand All @@ -48,6 +51,31 @@ content:
duplicate: duplicate
third_party_settings: { }
region: content
field_accordion_description:
region: content
settings:
placeholder: ''
rows: 5
third_party_settings: { }
type: text_textarea
weight: 3
field_accordion_title:
region: content
settings:
placeholder: ''
size: 60
third_party_settings: { }
type: string_textfield
weight: 2
field_accordion_title_level:
region: content
settings: { }
third_party_settings: { }
type: options_select
weight: 1
hidden:
created: true
field_accordion_description: true
field_accordion_title: true
field_accordion_title_level: true
status: true
38 changes: 33 additions & 5 deletions conf/cmi/core.entity_view_display.paragraph.accordion.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ langcode: en
status: true
dependencies:
config:
- field.field.paragraph.accordion.field_accordion_description
- field.field.paragraph.accordion.field_accordion_design
- field.field.paragraph.accordion.field_accordion_heading_level
- field.field.paragraph.accordion.field_accordion_items
- field.field.paragraph.accordion.field_accordion_title
- field.field.paragraph.accordion.field_accordion_title_level
- paragraphs.paragraphs_type.accordion
module:
- entity_reference_revisions
Expand All @@ -19,25 +22,50 @@ mode: default
content:
field_accordion_design:
weight: 0
label: inline
label: hidden
settings: { }
third_party_settings: { }
type: list_key
region: content
field_accordion_heading_level:
weight: 1
label: inline
weight: 4
label: hidden
settings: { }
third_party_settings: { }
type: list_key
region: content
field_accordion_items:
type: entity_reference_revisions_entity_view
weight: 2
weight: 5
label: hidden
settings:
view_mode: default
link: ''
third_party_settings: { }
region: content
hidden: { }
field_accordion_description:
label: hidden
region: content
settings: { }
third_party_settings: { }
type: text_default
weight: 3
field_accordion_title:
label: hidden
region: content
settings:
link_to_entity: false
third_party_settings: { }
type: string
weight: 2
field_accordion_title_level:
label: hidden
region: content
settings: { }
third_party_settings: { }
type: list_default
weight: 1
hidden:
field_accordion_description: true
field_accordion_title: true
field_accordion_title_level: true
36 changes: 26 additions & 10 deletions conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
module:
- address
- helfi_tpr
- telephone
- imagecache_external
_core:
default_config_hash: AXRbU5CCilR4nQTh02P8e4XLOUGudpM30w32hrODeSU
id: tpr_unit.tpr_unit.teaser
Expand All @@ -20,26 +20,44 @@ mode: teaser
content:
address:
type: address_plain
weight: 1
weight: 4
region: content
label: hidden
settings: { }
third_party_settings: { }
name:
type: string
weight: 0
weight: 2
region: content
label: hidden
settings:
link_to_entity: false
third_party_settings: { }
phone:
type: telephone_link
weight: 2
name_override:
type: string
weight: 3
region: content
label: hidden
settings:
link_to_entity: false
third_party_settings: { }
picture_url:
type: imagecache_external_responsive_image
weight: 0
region: content
label: hidden
settings:
imagecache_external_responsive_style: image__3_2
imagecache_external_link: ''
third_party_settings: { }
picture_url_override:
type: entity_reference_entity_view
weight: 1
region: content
label: hidden
settings:
title: ''
view_mode: image
link: false
third_party_settings: { }
hidden:
accessibility_email: true
Expand All @@ -57,10 +75,8 @@ hidden:
langcode: true
latitude: true
longitude: true
name_override: true
opening_hours: true
picture_url: true
picture_url_override: true
phone: true
provided_languages: true
service_map_embed: true
services: true
Expand Down
3 changes: 1 addition & 2 deletions conf/cmi/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ module:
entity: 0
entity_reference_revisions: 0
entity_usage: 0
externalauth: 0
field: 0
field_group: 0
field_ui: 0
Expand All @@ -38,7 +37,6 @@ module:
hdbt_admin_tools: 0
hdbt_component_library: 0
hdbt_content: 0
hdbt_hyphenopoly: 0
helfi_announcements: 0
helfi_api_base: 0
helfi_azure_fs: 0
Expand Down Expand Up @@ -118,6 +116,7 @@ module:
views_ui: 0
pathauto: 1
content_translation: 10
externalauth: 10
views: 10
paragraphs: 11
minimal: 1000
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
uuid: 3f1a5f33-fdaa-489d-b2ce-3e26f0313ca3
langcode: en
status: true
dependencies:
config:
- field.storage.paragraph.field_accordion_description
- paragraphs.paragraphs_type.accordion
module:
- allowed_formats
- text
third_party_settings:
allowed_formats:
minimal: minimal
full_html: '0'
plain_text: '0'
id: paragraph.accordion.field_accordion_description
field_name: field_accordion_description
entity_type: paragraph
bundle: accordion
label: Description
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
field_type: text_long
19 changes: 19 additions & 0 deletions conf/cmi/field.field.paragraph.accordion.field_accordion_title.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
uuid: ccb7f413-2245-4ef6-9d76-28e83e4603d7
langcode: en
status: true
dependencies:
config:
- field.storage.paragraph.field_accordion_title
- paragraphs.paragraphs_type.accordion
id: paragraph.accordion.field_accordion_title
field_name: field_accordion_title
entity_type: paragraph
bundle: accordion
label: Title
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
field_type: string
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
uuid: db7ae88b-6f42-428e-939b-fed8599cbb15
langcode: en
status: true
dependencies:
config:
- field.storage.paragraph.field_accordion_title_level
- paragraphs.paragraphs_type.accordion
module:
- options
id: paragraph.accordion.field_accordion_title_level
field_name: field_accordion_title_level
entity_type: paragraph
bundle: accordion
label: 'Accordion title level'
description: 'Select the title level of the accordion so that they are semantically correct with the rest of the content.'
required: true
translatable: false
default_value:
-
value: '2'
default_value_callback: ''
settings: { }
field_type: list_string
19 changes: 19 additions & 0 deletions conf/cmi/field.storage.paragraph.field_accordion_description.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
uuid: 8401ce71-5932-4818-8ac4-95bde6bd9eea
langcode: en
status: true
dependencies:
module:
- paragraphs
- text
id: paragraph.field_accordion_description
field_name: field_accordion_description
entity_type: paragraph
type: text_long
settings: { }
module: text
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
21 changes: 21 additions & 0 deletions conf/cmi/field.storage.paragraph.field_accordion_title.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
uuid: 3d83c471-dd95-478d-a1df-98e29c31d915
langcode: en
status: true
dependencies:
module:
- paragraphs
id: paragraph.field_accordion_title
field_name: field_accordion_title
entity_type: paragraph
type: string
settings:
max_length: 255
is_ascii: false
case_sensitive: false
module: core
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
36 changes: 36 additions & 0 deletions conf/cmi/field.storage.paragraph.field_accordion_title_level.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
uuid: 1a94bb00-cd45-41fa-ad20-c2fe1f2dde12
langcode: en
status: true
dependencies:
module:
- options
- paragraphs
id: paragraph.field_accordion_title_level
field_name: field_accordion_title_level
entity_type: paragraph
type: list_string
settings:
allowed_values_function: ''
allowed_values:
-
value: '2'
label: h2
-
value: '3'
label: h3
-
value: '4'
label: h4
-
value: '5'
label: h5
-
value: '6'
label: h6
module: options
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
Loading

0 comments on commit b49dd15

Please sign in to comment.