Skip to content

Commit

Permalink
UHF-10555: Merge branch 'UHF-10555' of https://github.com/City-of-Hel…
Browse files Browse the repository at this point in the history
  • Loading branch information
teroelonen committed Nov 29, 2024
2 parents f1c075f + fdbc314 commit 73dd06e
Show file tree
Hide file tree
Showing 5 changed files with 126 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- field.field.media.image.field_media_image
- field.field.media.image.field_photographer
- media.type.image
- responsive_image.styles.image__3_2
- responsive_image.styles.image_fixed
module:
- responsive_image
id: media.image.image
Expand All @@ -19,7 +19,7 @@ content:
type: responsive_image
label: hidden
settings:
responsive_image_style: image__3_2
responsive_image_style: image_fixed
image_link: ''
image_loading:
attribute: eager
Expand Down
4 changes: 2 additions & 2 deletions modules/helfi_media/helfi_media.install
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ function helfi_media_update_9013(): void {
}

/**
* UHF-10239: Add new view mode for Image media type.
* UHF-10555: Remove references to deprecated responsive image styles.
*/
function helfi_media_update_9016(): void {
function helfi_media_update_9017(): void {
// Re-import 'helfi_media' configuration.
\Drupal::service('helfi_platform_config.config_update_helper')
->update('helfi_media');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- field.field.tpr_unit.tpr_unit.field_phone_label
- field.field.tpr_unit.tpr_unit.field_phone_with_contacts
- field.field.tpr_unit.tpr_unit.field_unit_type
- responsive_image.styles.image__3_2
- responsive_image.styles.card
module:
- address
- helfi_tpr
Expand Down Expand Up @@ -48,7 +48,7 @@ content:
label: hidden
settings:
imagecache_external_link: ''
imagecache_external_responsive_style: image__3_2
imagecache_external_responsive_style: card
third_party_settings: { }
weight: 0
region: content
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
uuid: fd9accf5-a552-4c97-baa2-43d66e9dbcea
langcode: en
status: true
dependencies:
config:
- core.entity_view_mode.tpr_unit.wide_teaser
- field.field.tpr_unit.tpr_unit.field_content
- field.field.tpr_unit.tpr_unit.field_districts
- field.field.tpr_unit.tpr_unit.field_lower_content
- field.field.tpr_unit.tpr_unit.field_metatags
- field.field.tpr_unit.tpr_unit.field_phone_label
- field.field.tpr_unit.tpr_unit.field_phone_with_contacts
- field.field.tpr_unit.tpr_unit.field_unit_type
- responsive_image.styles.card
module:
- address
- helfi_tpr
- imagecache_external
- telephone
id: tpr_unit.tpr_unit.wide_teaser
targetEntityType: tpr_unit
bundle: tpr_unit
mode: wide_teaser
content:
address:
type: address_plain
label: hidden
settings: { }
third_party_settings: { }
weight: 4
region: content
name:
type: string
label: hidden
settings:
link_to_entity: false
third_party_settings: { }
weight: 2
region: content
name_override:
type: string
label: hidden
settings:
link_to_entity: false
third_party_settings: { }
weight: 3
region: content
opening_hours:
type: tpr_connection
label: hidden
settings: { }
third_party_settings: { }
weight: 6
region: content
phone:
type: telephone_link
label: hidden
settings:
title: ''
third_party_settings: { }
weight: 5
region: content
picture_url:
type: imagecache_external_responsive_image
label: hidden
settings:
imagecache_external_link: ''
imagecache_external_responsive_style: card
third_party_settings: { }
weight: 0
region: content
picture_url_override:
type: entity_reference_entity_view
label: hidden
settings:
view_mode: image
link: false
third_party_settings: { }
weight: 1
region: content
hidden:
accessibility_email: true
accessibility_phone: true
accessibility_sentences: true
accessibility_www: true
address_postal: true
call_charge_info: true
contacts: true
created: true
description: true
email: true
enrich_description: true
field_content: true
field_districts: true
field_lower_content: true
field_metatags: true
field_phone_label: true
field_phone_with_contacts: true
field_unit_type: true
hide_description: true
highlights: true
langcode: true
latitude: true
links: true
longitude: true
other_info: true
price_info: true
provided_languages: true
search_api_excerpt: true
service_map_embed: true
services: true
show_www: true
streetview_entrance_url: true
subgroup: true
toc_enabled: true
topical: true
unit_picture_caption: true
www: true
4 changes: 2 additions & 2 deletions modules/helfi_tpr_config/helfi_tpr_config.install
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,9 @@ function helfi_tpr_config_update_9069(): void {
}

/**
* UHF-9509 Add "Unit contact card" to paragraphs library.
* UHF-9509 Change unit teaser and wide_teaser image style.
*/
function helfi_tpr_config_update_9070(): void {
function helfi_tpr_config_update_9071(): void {
\Drupal::service('helfi_platform_config.config_update_helper')
->update('helfi_tpr_config');
}

0 comments on commit 73dd06e

Please sign in to comment.