Skip to content

Commit

Permalink
Merge pull request #310 from City-of-Helsinki/dev
Browse files Browse the repository at this point in the history
Dev to main
  • Loading branch information
khalima authored Dec 5, 2023
2 parents d3ea8b9 + 9efbd4c commit 9d91be0
Show file tree
Hide file tree
Showing 100 changed files with 998 additions and 1,006 deletions.
2 changes: 1 addition & 1 deletion .platform/schema
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3
4
853 changes: 441 additions & 412 deletions composer.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion conf/cmi/core.entity_form_display.media.file.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- file
- path
_core:
default_config_hash: gl0sXDsaNKQXVtRsPqp-E_NPZEmscOm6LSEg3kIQ40w
default_config_hash: YBhsPqN0Om3wNF6ncvCTPmcaEKaSI2L3KYiAUXKn4Bc
id: media.file.default
targetEntityType: media
bundle: file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- field.field.media.file.field_media_file
- media.type.file
_core:
default_config_hash: wVUR6Bbq1Kk8i3ZrVcFM5cOehVHYrZwa8E8hrxlnV28
default_config_hash: mRld0RXUfZ-E4SFgfwE7yxhNEmvkYrMGQq8-u8OK7Qw
id: media.file.media_library
targetEntityType: media
bundle: file
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/core.entity_form_display.media.image.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- focal_point
- path
_core:
default_config_hash: _j-Y1d8xzIrrkE3VLGHbEks1vFdg7kMl68UaYmxSGBo
default_config_hash: 5XnT1z-KXlCTKfoiiLcFYke20noXvN-0yvpgXChCMnI
id: media.image.default
targetEntityType: media
bundle: image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
module:
- focal_point
_core:
default_config_hash: _WTCyWUZlB2FyBSgpuey9Y9okHz6R8gcAWQ3DUiyNuA
default_config_hash: vNE5u1kEJ_9nu7Y_xefiuMX65oWNd8CFdUNL-Jdp9F0
id: media.image.media_library
targetEntityType: media
bundle: image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,4 @@ content:
third_party_settings: { }
hidden:
created: true
field_load_more: true
status: true
2 changes: 1 addition & 1 deletion conf/cmi/core.entity_view_display.media.file.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
module:
- file
_core:
default_config_hash: jwQKir29dK1SOV5MVD2m4ZqCY6UdoUVAgBUBKkCu518
default_config_hash: waIRQfagGQIcsgt0xZpGzidwdNx3AL8JjnqNoyGJAgo
id: media.file.default
targetEntityType: media
bundle: file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
module:
- image
_core:
default_config_hash: yHkqxsBlN9eCZF8Nou1B9HEiZbF0JrCZWxpBMaHIj7E
default_config_hash: 5EJMyp2xv5WssrIWMB9S3x4dgQM5S55hAHjmMeZXQqI
id: media.file.media_library
targetEntityType: media
bundle: file
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/core.entity_view_display.media.image.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
module:
- image
_core:
default_config_hash: in_XCvnpxCs_Bfi1xBUEGLq1TwGghNZOnnJsyyeWqQE
default_config_hash: KH58kRvqbHk5S2FzcEOu1SXfBx587AEtktvTDOEp17k
id: media.image.default
targetEntityType: media
bundle: image
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/core.entity_view_display.media.image.image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
module:
- responsive_image
_core:
default_config_hash: wdX63yVbYS8fYfKSEdSMocu8z7Qep0ykcBTiFZfJLpI
default_config_hash: bwhS_zSf5sFH12_PlhJrKLJ-kSvuUI_5V3YHwS5A0sM
id: media.image.image
targetEntityType: media
bundle: image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
module:
- image
_core:
default_config_hash: tIr0c3VKCjIEwona_CNdAizKfL6Ila8H7tXqFA3IsOU
default_config_hash: 1TB-RghsNkJMtH5f31w2WE6YuMXWk9jvDipHKDfv4Jk
id: media.image.media_library
targetEntityType: media
bundle: image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,3 @@ content:
region: content
hidden:
field_api_url: true
field_load_more: true
2 changes: 1 addition & 1 deletion conf/cmi/field.field.media.file.field_media_file.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
module:
- file
_core:
default_config_hash: MGPZP_ILmtxTXuDm5AM6F5LncCv2HOsZOjBWNb_1JZ0
default_config_hash: tbQBN7Wysi_LBf7nY27B36duCI9IYPDydIRf_KP5qvY
id: media.file.field_media_file
field_name: field_media_file
entity_type: media
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/field.field.media.image.field_media_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ third_party_settings:
title: title
file: '0'
_core:
default_config_hash: fmlnh5VWRobLBxFZVcdtGoVBXeWcn_qqx7Daj0_2hI0
default_config_hash: ey2E4vPs6v0OHpJwtAyInKn8XaolkmyLYn0sWzjRJ7A
id: media.image.field_media_image
field_name: field_media_image
entity_type: media
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/field.field.node.landing_page.field_content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ settings:
phasing: phasing
popular_services: popular_services
target_group_links: target_group_links
hearings: hearings
unit_search: unit_search
service_list: service_list
service_list_search: service_list_search
hearings: hearings
negate: 0
target_bundles_drag_drop:
banner:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
module:
- link
_core:
default_config_hash: lGeClo15Zf7kvOo9oZobBROAy8-TnAFRtIwnSvDIArY
default_config_hash: Y-6hGxIpid7_ScRXE2GozslolF7R3tkTNiJFFaLEw4Y
id: paragraph.event_list.field_api_url
field_name: field_api_url
entity_type: paragraph
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
module:
- text
_core:
default_config_hash: SzE8z9tE3ud5ZHtE7FrtYyTUx0LHVzqMWydOAFsDDGY
default_config_hash: oPuSy256H3spbbctja0gZ-kBYwVQNKt-K6vBYmtoJlo
id: paragraph.event_list.field_event_list_description
field_name: field_event_list_description
entity_type: paragraph
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- field.storage.paragraph.field_event_list_title
- paragraphs.paragraphs_type.event_list
_core:
default_config_hash: uB2i15UibWJ0pcAIh5PjKDoPfEpaGZ4uyD3FSBh-a1Q
default_config_hash: YtZI3MFPiwRz3HS_ODT2W5QE2B2zp66zUg_lkae9g04
id: paragraph.event_list.field_event_list_title
field_name: field_event_list_title
entity_type: paragraph
Expand Down
25 changes: 0 additions & 25 deletions conf/cmi/field.field.paragraph.event_list.field_load_more.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
module:
- entity_reference_revisions
_core:
default_config_hash: OTsGV_59l_hoG4pPwa4NOFiR0nrv7j3iu9ErgLB1BZY
default_config_hash: j9vXfG4WtTJEuXDEXQawwjoMBldaY-cXXWRdb8KH9SE
id: paragraph.phasing.field_phasing_item
field_name: field_phasing_item
entity_type: paragraph
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- field.storage.paragraph.field_show_phase_numbers
- paragraphs.paragraphs_type.phasing
_core:
default_config_hash: QfUIGnsQrMlJ3FapMiG5pWo99cMyYNhO4asvnzSBRw0
default_config_hash: vRDcTxBYT2IaBCzFycJac7bbk2kSY5cabGnoZ1hrVW4
id: paragraph.phasing.field_show_phase_numbers
field_name: field_show_phase_numbers
entity_type: paragraph
Expand All @@ -20,6 +20,6 @@ default_value:
value: 0
default_value_callback: ''
settings:
on_label: Käytössä
off_label: 'Pois päältä'
on_label: 'Yes'
off_label: 'No'
field_type: boolean
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ third_party_settings:
allowed_formats:
- minimal
_core:
default_config_hash: yaQCIyGcgu2Tqe21GcXwcnBdE_hkxj_zuqFvF25JrQc
default_config_hash: R3xpZBQW6GkrWie9LRvO70PI9g5nYvm4VLVJ0ZFNmDY
id: paragraph.phasing_item.field_description
field_name: field_description
entity_type: paragraph
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
module:
- entity_reference_revisions
_core:
default_config_hash: CKBAqZLhH7NPdYAd8slbfxF_oRCcDykEhCHy7D8vxjA
default_config_hash: qTYm0oKa6o6y-wT_dXGAcVv6ChPrGltXGrpRXuqL7_I
id: paragraph.popular_services.field_service_items
field_name: field_service_items
entity_type: paragraph
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/field.storage.media.field_media_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- image
- media
_core:
default_config_hash: 24BCckkDO8WPYuWP-5Hz6VjlxJN_Bd6mvrTQrZiRxbs
default_config_hash: qtrsOGvJ2v_3m7oOVdW72qSNB-ooDXrPEWFbJmihnD0
id: media.field_media_image
field_name: field_media_image
entity_type: media
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/field.storage.media.field_media_oembed_video.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
module:
- media
_core:
default_config_hash: SJgxR5XWOesQbEKqp8VgInPyJjCFU_t2pi7UzYB78xg
default_config_hash: cNf_852Dq-fNnSaMI4LxL-J6N7bLkHuDbD9EUqOn4_U
id: media.field_media_oembed_video
field_name: field_media_oembed_video
entity_type: media
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/field.storage.media.field_photographer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
module:
- media
_core:
default_config_hash: 8Z0eiVit80ouZV9CZXXe4h7P6SnIaIJnWjN1HRrSj8A
default_config_hash: XhAv2_bHVk7jzaAbzP4SHkvVHDG0Xsy5ItNLgSXkHcE
id: media.field_photographer
field_name: field_photographer
entity_type: media
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/field.storage.paragraph.field_api_url.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- link
- paragraphs
_core:
default_config_hash: 51_U0q_ZRkzJI7CM6e-IfQjlpG0EZ6HCo2z3ETeQgE8
default_config_hash: 15a2QmfffR33UXmxDvkHEN7LpCrI4xTdCDyDJ-pna5I
id: paragraph.field_api_url
field_name: field_api_url
entity_type: paragraph
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- paragraphs
- text
_core:
default_config_hash: XT3rdLmDpDOSog8-dJ5PcIVRB8LbZ_uzZeRTU-anZS0
default_config_hash: O1iPiA9_ifYbXRj2_Yf1s6fiFDHiaxqs71MDvuzheMQ
id: paragraph.field_event_list_description
field_name: field_event_list_description
entity_type: paragraph
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
module:
- paragraphs
_core:
default_config_hash: 7-99kJ5z0R9O67TSmgkU34HhwloQMhPUZbhVAlbHiv0
default_config_hash: OwiT8ZGCn9OBU10vF7-dKTnGU2rJoyIxzXaQqYubNtQ
id: paragraph.field_event_list_title
field_name: field_event_list_title
entity_type: paragraph
Expand Down
20 changes: 0 additions & 20 deletions conf/cmi/field.storage.paragraph.field_load_more.yml

This file was deleted.

4 changes: 2 additions & 2 deletions conf/cmi/hdbt_admin_tools.site_settings.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
_core:
default_config_hash: AOXdYmkvKEWQ90i8bbStpi07jONjN29ny1BcgITQFSM
default_config_hash: OgPHnjkIjDn42IHAwLRXhNzdhX825gq2SrlYKw4kbQ8
langcode: en
path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json
site_settings:
default_icon: group
theme_color: silver
koro: basic
footer_settings:
footer_color: dark
path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
label: 'Näytetään etusivulla'
settings:
on_label: Käytössä
off_label: 'Pois päältä'
on_label: Kyllä
off_label: Ei
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
label: Julkaistu
settings:
on_label: Kyllä
off_label: Ei
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
label: 'Ylläpidollinen otsikko'
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
label: 'Näytetään etusivulla'
settings:
on_label: Käytössä
off_label: 'Pois päältä'
on_label: Kyllä
off_label: Ei
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
label: Julkaistu
settings:
on_label: Kyllä
off_label: Ei
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
label: 'Näytetään etusivulla'
settings:
on_label: Käytössä
off_label: 'Pois päältä'
on_label: Kyllä
off_label: Ei
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
label: Julkaistu
settings:
on_label: Kyllä
off_label: Ei
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ content:
errand_services:
settings:
sort_order:
ESERVICE:
label: E-service
CHAT:
label: Chat
EMAIL:
Expand All @@ -12,15 +10,3 @@ content:
label: Puhelin
PRINTABLE_FORM:
label: Lomake
LOCAL:
label: 'Local service'
SMS:
label: SMS
WEBPAGE:
label: Webpage
MAIL:
label: 'Postal mail'
TELEFAX:
label: Telefax
OFFICE:
label: Palvelupiste
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
label: 'Näytä kaikilla sivuilla'
settings:
on_label: Käytössä
off_label: 'Pois päältä'
on_label: Kyllä
off_label: Ei
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
description: 'Ingressi näkyy sisältösivulla sekä nostoissa, hakutuloksissa ja sosiaalisen median jaoissa.'
label: Ingressi
description: 'Ingressi näkyy sisältösivulla sekä nostoissa, hakutuloksissa ja sosiaalisen median jaoissa.'
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
label: Tapahtumapaikka
description: 'Näytä "tapahtumapaikka" -suodatin. Älä käytä yhtä aikaa "Etätapahtumat" -suodattimen kanssa.'
settings:
on_label: Kyllä
off_label: Ei
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
label: Ajankohta
description: 'Näytä "ajankohta" -suodatin.'
settings:
on_label: Kyllä
off_label: Ei
Loading

0 comments on commit 9d91be0

Please sign in to comment.