Skip to content

Commit 6695e8a

Browse files
authored
Merge pull request #98 from City-of-Helsinki/dev
Dev to main
2 parents 1d960e9 + 897e457 commit 6695e8a

106 files changed

Lines changed: 1005 additions & 380 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2025 City of Helsinki
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

composer.lock

Lines changed: 136 additions & 137 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conf/cmi/core.entity_form_display.node.landing_page.default.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,6 @@ content:
3333
region: content
3434
settings: { }
3535
third_party_settings: { }
36-
field_author:
37-
type: entity_reference_autocomplete
38-
weight: 52
39-
region: content
40-
settings:
41-
match_operator: CONTAINS
42-
match_limit: 10
43-
size: 60
44-
placeholder: ''
45-
third_party_settings: { }
4636
field_content:
4737
type: paragraphs
4838
weight: 13
@@ -88,23 +78,6 @@ content:
8878
collapse_edit_all: '0'
8979
duplicate: '0'
9080
third_party_settings: { }
91-
field_is_category:
92-
type: boolean_checkbox
93-
weight: 2
94-
region: content
95-
settings:
96-
display_label: true
97-
third_party_settings: { }
98-
field_keywords:
99-
type: select2_entity_reference
100-
weight: 14
101-
region: content
102-
settings:
103-
width: 100%
104-
autocomplete: true
105-
match_operator: CONTAINS
106-
match_limit: 10
107-
third_party_settings: { }
10881
field_liftup_image:
10982
type: media_library_widget
11083
weight: 4
@@ -209,5 +182,32 @@ content:
209182
region: content
210183
settings: { }
211184
third_party_settings: { }
185+
field_author:
186+
type: entity_reference_autocomplete
187+
weight: 52
188+
region: content
189+
settings:
190+
match_operator: CONTAINS
191+
match_limit: 10
192+
size: 60
193+
placeholder: ''
194+
third_party_settings: { }
195+
field_is_category:
196+
type: boolean_checkbox
197+
weight: 2
198+
region: content
199+
settings:
200+
display_label: true
201+
third_party_settings: { }
202+
field_keywords:
203+
type: select2_entity_reference
204+
weight: 14
205+
region: content
206+
settings:
207+
width: 100%
208+
autocomplete: true
209+
match_operator: CONTAINS
210+
match_limit: 10
211+
third_party_settings: { }
212212
hidden:
213213
hide_sidebar_navigation: true

conf/cmi/core.entity_form_display.node.page.default.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,6 @@ content:
3535
region: content
3636
settings: { }
3737
third_party_settings: { }
38-
field_author:
39-
type: entity_reference_autocomplete
40-
weight: 52
41-
region: content
42-
settings:
43-
match_operator: CONTAINS
44-
match_limit: 10
45-
size: 60
46-
placeholder: ''
47-
third_party_settings: { }
4838
field_content:
4939
type: paragraphs
5040
weight: 14
@@ -134,14 +124,6 @@ content:
134124
sidebar: false
135125
use_details: true
136126
third_party_settings: { }
137-
field_search_result_text:
138-
type: string_textarea
139-
weight: 53
140-
region: content
141-
settings:
142-
rows: 5
143-
placeholder: ''
144-
third_party_settings: { }
145127
field_sidebar_content:
146128
type: paragraphs
147129
weight: 15
@@ -260,4 +242,22 @@ content:
260242
region: content
261243
settings: { }
262244
third_party_settings: { }
245+
field_author:
246+
type: entity_reference_autocomplete
247+
weight: 52
248+
region: content
249+
settings:
250+
match_operator: CONTAINS
251+
match_limit: 10
252+
size: 60
253+
placeholder: ''
254+
third_party_settings: { }
255+
field_search_result_text:
256+
type: string_textarea
257+
weight: 53
258+
region: content
259+
settings:
260+
rows: 5
261+
placeholder: ''
262+
third_party_settings: { }
263263
hidden: { }

conf/cmi/core.entity_form_display.paragraph.banner.default.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ content:
4242
weight: 4
4343
region: content
4444
settings:
45-
linkit_profile: helfi
4645
linkit_auto_link_text: false
46+
linkit_profile: helfi
4747
third_party_settings: { }
4848
field_banner_link_design:
4949
type: design_field_widget

conf/cmi/core.entity_form_display.paragraph.contact_card.default.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,19 @@ dependencies:
88
- field.field.paragraph.contact_card.field_contact_image_photographer
99
- field.field.paragraph.contact_card.field_contact_name
1010
- field.field.paragraph.contact_card.field_contact_social_media
11+
- field.field.paragraph.contact_card.field_contact_social_media_link
1112
- field.field.paragraph.contact_card.field_contact_title
1213
- field.field.paragraph.contact_card.field_email
1314
- field.field.paragraph.contact_card.field_phone_number
1415
- image.style.thumbnail
1516
- paragraphs.paragraphs_type.contact_card
1617
module:
1718
- focal_point
19+
- link
1820
- paragraphs
1921
- telephone
2022
_core:
21-
default_config_hash: 2fg4jQrKOkMM-2FA9Rr6hYBXxtU9NVZNa2Gsy0eALnk
23+
default_config_hash: YDSv_lQM9OkDPrZy_gI0k4dUlKswEjQX8YV-v17cgQ8
2224
id: paragraph.contact_card.default
2325
targetEntityType: paragraph
2426
bundle: contact_card
@@ -76,6 +78,14 @@ content:
7678
collapse_edit_all: collapse_edit_all
7779
duplicate: duplicate
7880
third_party_settings: { }
81+
field_contact_social_media_link:
82+
type: link_default
83+
weight: 8
84+
region: content
85+
settings:
86+
placeholder_url: ''
87+
placeholder_title: ''
88+
third_party_settings: { }
7989
field_contact_title:
8090
type: string_textfield
8191
weight: 3

conf/cmi/core.entity_form_display.paragraph.embed.default.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ dependencies:
1212
- paragraphs.paragraphs_type.embed
1313
module:
1414
- link
15-
- media_library
1615
- text
1716
id: paragraph.embed.default
1817
targetEntityType: paragraph
@@ -21,51 +20,45 @@ mode: default
2120
content:
2221
field_embed_code:
2322
type: string_textfield
24-
weight: 3
23+
weight: 0
2524
region: content
2625
settings:
2726
size: 60
2827
placeholder: ''
2928
third_party_settings: { }
3029
field_embed_code_id:
3130
type: string_textfield
32-
weight: 4
31+
weight: 1
3332
region: content
3433
settings:
3534
size: 60
3635
placeholder: ''
3736
third_party_settings: { }
3837
field_embed_link:
3938
type: link_default
40-
weight: 5
39+
weight: 2
4140
region: content
4241
settings:
4342
placeholder_url: ''
4443
placeholder_title: ''
4544
third_party_settings: { }
4645
field_embed_title:
4746
type: string_textfield
48-
weight: 6
47+
weight: 3
4948
region: content
5049
settings:
5150
size: 60
5251
placeholder: ''
5352
third_party_settings: { }
54-
field_embed_video:
55-
type: media_library_widget
56-
weight: 2
57-
region: content
58-
settings:
59-
media_types: { }
60-
third_party_settings: { }
6153
field_text_for_screen_readers:
6254
type: text_textarea
63-
weight: 7
55+
weight: 4
6456
region: content
6557
settings:
6658
rows: 5
6759
placeholder: ''
6860
third_party_settings: { }
6961
hidden:
7062
created: true
63+
field_embed_video: true
7164
status: true

conf/cmi/core.entity_form_display.paragraph.hero.default.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ targetEntityType: paragraph
2222
bundle: hero
2323
mode: default
2424
content:
25-
field_display_search_field:
26-
type: boolean_checkbox
27-
weight: 7
28-
region: content
29-
settings:
30-
display_label: true
31-
third_party_settings: { }
3225
field_hero_desc:
3326
type: formatted_text_character_counter
3427
weight: 3
@@ -81,6 +74,13 @@ content:
8174
size: 60
8275
placeholder: ''
8376
third_party_settings: { }
77+
field_display_search_field:
78+
type: boolean_checkbox
79+
weight: 7
80+
region: content
81+
settings:
82+
display_label: true
83+
third_party_settings: { }
8484
hidden:
8585
created: true
8686
status: true

conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ content:
4040
weight: 1
4141
region: content
4242
settings:
43-
linkit_profile: helfi
4443
linkit_auto_link_text: false
44+
linkit_profile: helfi
4545
third_party_settings: { }
4646
hidden:
4747
created: true

conf/cmi/core.entity_form_display.paragraph.sidebar_text.default.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ dependencies:
99
module:
1010
- allowed_formats
1111
- text
12+
_core:
13+
default_config_hash: FzZd7zVbakTCCXMCrwciO6_E3Dsy8ABVX3xkaczl3KE
1214
id: paragraph.sidebar_text.default
1315
targetEntityType: paragraph
1416
bundle: sidebar_text

0 commit comments

Comments
 (0)