diff --git a/composer.lock b/composer.lock index b73870ba..c8d9d7d6 100644 --- a/composer.lock +++ b/composer.lock @@ -4108,16 +4108,16 @@ }, { "name": "drupal/hdbt", - "version": "4.4.5", + "version": "4.4.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "926a5c04b566161c55f9e81a19e8f2563c4e0a44" + "reference": "564a5a9e3a87e1a231681186f25c5b0222fe7e9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/926a5c04b566161c55f9e81a19e8f2563c4e0a44", - "reference": "926a5c04b566161c55f9e81a19e8f2563c4e0a44", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/564a5a9e3a87e1a231681186f25c5b0222fe7e9d", + "reference": "564a5a9e3a87e1a231681186f25c5b0222fe7e9d", "shasum": "" }, "require": { @@ -4132,10 +4132,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.4.5", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.4.6", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-02-08T13:07:42+00:00" + "time": "2023-02-09T13:53:25+00:00" }, { "name": "drupal/hdbt_admin", @@ -4487,16 +4487,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.17.1", + "version": "2.17.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "fec20fea5fc618d82663a1cf713205b2d52cdfc8" + "reference": "41b1bf65048f6940894031ffe1c2d3d13e9a1734" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/fec20fea5fc618d82663a1cf713205b2d52cdfc8", - "reference": "fec20fea5fc618d82663a1cf713205b2d52cdfc8", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/41b1bf65048f6940894031ffe1c2d3d13e9a1734", + "reference": "41b1bf65048f6940894031ffe1c2d3d13e9a1734", "shasum": "" }, "require": { @@ -4607,10 +4607,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.17.1", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.17.3", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-02-07T08:19:58+00:00" + "time": "2023-02-09T15:49:22+00:00" }, { "name": "drupal/helfi_proxy", @@ -4655,16 +4655,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.1.8", + "version": "2.1.9", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "b5c276d6a1fb2e777c8173f3cb438ebc76ea407d" + "reference": "922bdb0ed7fb34858a007b04624e89fa07c7d55a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/b5c276d6a1fb2e777c8173f3cb438ebc76ea407d", - "reference": "b5c276d6a1fb2e777c8173f3cb438ebc76ea407d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/922bdb0ed7fb34858a007b04624e89fa07c7d55a", + "reference": "922bdb0ed7fb34858a007b04624e89fa07c7d55a", "shasum": "" }, "require": { @@ -4690,10 +4690,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.8", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.9", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-01-25T09:12:09+00:00" + "time": "2023-02-09T13:53:30+00:00" }, { "name": "drupal/helfi_tunnistamo", diff --git a/conf/cmi/core.entity_form_display.paragraph.service_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.service_list.default.yml index 6e344934..b29faf1d 100644 --- a/conf/cmi/core.entity_form_display.paragraph.service_list.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.service_list.default.yml @@ -4,7 +4,6 @@ status: true dependencies: config: - field.field.paragraph.service_list.field_service_list_description - - field.field.paragraph.service_list.field_service_list_meta_load_mor - field.field.paragraph.service_list.field_service_list_services - field.field.paragraph.service_list.field_service_list_title - paragraphs.paragraphs_type.service_list @@ -42,14 +41,6 @@ content: rows: 5 placeholder: '' third_party_settings: { } - field_service_list_meta_load_mor: - type: string_textfield - weight: 4 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } field_service_list_services: type: select2_entity_reference weight: 1 diff --git a/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml b/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml index b9c2832f..8a3228bc 100644 --- a/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml @@ -6,7 +6,6 @@ dependencies: - field.field.paragraph.unit_search.field_unit_search_description - field.field.paragraph.unit_search.field_unit_search_meta_button - field.field.paragraph.unit_search.field_unit_search_meta_label - - field.field.paragraph.unit_search.field_unit_search_meta_load_more - field.field.paragraph.unit_search.field_unit_search_meta_placehold - field.field.paragraph.unit_search.field_unit_search_title - field.field.paragraph.unit_search.field_unit_search_units @@ -65,14 +64,6 @@ content: size: 60 placeholder: '' third_party_settings: { } - field_unit_search_meta_load_more: - type: string_textfield - weight: 7 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } field_unit_search_meta_placehold: type: string_textfield weight: 5 diff --git a/conf/cmi/core.entity_view_display.paragraph.service_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.service_list.default.yml index 411f1b9a..4cdf2f7a 100644 --- a/conf/cmi/core.entity_view_display.paragraph.service_list.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.service_list.default.yml @@ -4,7 +4,6 @@ status: true dependencies: config: - field.field.paragraph.service_list.field_service_list_description - - field.field.paragraph.service_list.field_service_list_meta_load_mor - field.field.paragraph.service_list.field_service_list_services - field.field.paragraph.service_list.field_service_list_title - paragraphs.paragraphs_type.service_list @@ -22,14 +21,6 @@ content: third_party_settings: { } weight: 1 region: content - field_service_list_meta_load_mor: - type: string - label: hidden - settings: - link_to_entity: false - third_party_settings: { } - weight: 3 - region: content field_service_list_services: type: entity_reference_entity_id label: hidden diff --git a/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml b/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml index 21ca102b..7c303474 100644 --- a/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml @@ -6,7 +6,6 @@ dependencies: - field.field.paragraph.unit_search.field_unit_search_description - field.field.paragraph.unit_search.field_unit_search_meta_button - field.field.paragraph.unit_search.field_unit_search_meta_label - - field.field.paragraph.unit_search.field_unit_search_meta_load_more - field.field.paragraph.unit_search.field_unit_search_meta_placehold - field.field.paragraph.unit_search.field_unit_search_title - field.field.paragraph.unit_search.field_unit_search_units @@ -43,14 +42,6 @@ content: third_party_settings: { } weight: 3 region: content - field_unit_search_meta_load_more: - type: string - label: above - settings: - link_to_entity: false - third_party_settings: { } - weight: 6 - region: content field_unit_search_meta_placehold: type: string label: hidden diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 225c049e..d91918df 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -145,7 +145,6 @@ module: view_unpublished: 0 views_bulk_edit: 0 views_bulk_operations: 0 - views_infinite_scroll: 0 views_ui: 0 pathauto: 1 content_translation: 10 diff --git a/conf/cmi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml b/conf/cmi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml deleted file mode 100644 index 365cb5a7..00000000 --- a/conf/cmi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: 158873a4-9e88-48af-8b16-048eb64529f9 -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_service_list_meta_load_mor - - paragraphs.paragraphs_type.service_list -id: paragraph.service_list.field_service_list_meta_load_mor -field_name: field_service_list_meta_load_mor -entity_type: paragraph -bundle: service_list -label: 'Load more label' -description: '' -required: false -translatable: false -default_value: - - - value: 'Load more services' -default_value_callback: '' -settings: { } -field_type: string diff --git a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml deleted file mode 100644 index d87a603e..00000000 --- a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 822031b5-e424-4af2-9d51-97074d3abe99 -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_unit_search_meta_load_more - - paragraphs.paragraphs_type.unit_search -_core: - default_config_hash: 0WaTq5xDRWq0Xmg0cqg-uLzngQh3yqT4JVo4CfhjJ2c -id: paragraph.unit_search.field_unit_search_meta_load_more -field_name: field_unit_search_meta_load_more -entity_type: paragraph -bundle: unit_search -label: 'Load more label' -description: '' -required: false -translatable: false -default_value: - - - value: 'Load more units' -default_value_callback: '' -settings: { } -field_type: string diff --git a/conf/cmi/field.storage.paragraph.field_service_list_meta_load_mor.yml b/conf/cmi/field.storage.paragraph.field_service_list_meta_load_mor.yml deleted file mode 100644 index 1f5d5b3d..00000000 --- a/conf/cmi/field.storage.paragraph.field_service_list_meta_load_mor.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: 179cd5e8-8a6e-4413-bfd8-ef26d4ba3de9 -langcode: en -status: true -dependencies: - module: - - paragraphs -id: paragraph.field_service_list_meta_load_mor -field_name: field_service_list_meta_load_mor -entity_type: paragraph -type: string -settings: - max_length: 255 - case_sensitive: false - is_ascii: false -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_unit_search_meta_load_more.yml b/conf/cmi/field.storage.paragraph.field_unit_search_meta_load_more.yml deleted file mode 100644 index ea034e47..00000000 --- a/conf/cmi/field.storage.paragraph.field_unit_search_meta_load_more.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 23d70b32-b2e3-4b50-ad28-c7708e910c35 -langcode: en -status: true -dependencies: - module: - - paragraphs -_core: - default_config_hash: yzpvNXUOKwE9hwT0SrUYl20p3W9px-_5oF69ZgYz0hA -id: paragraph.field_unit_search_meta_load_more -field_name: field_unit_search_meta_load_more -entity_type: paragraph -type: string -settings: - max_length: 255 - case_sensitive: false - is_ascii: false -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml deleted file mode 100644 index 391309c0..00000000 --- a/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml +++ /dev/null @@ -1,4 +0,0 @@ -label: 'Lataa lisää - otsikko' -default_value: - - - value: 'Lataa lisää palveluita' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml deleted file mode 100644 index 3af0e26f..00000000 --- a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml +++ /dev/null @@ -1,4 +0,0 @@ -label: 'Lataa lisää - otsikko' -default_value: - - - value: 'Lataa lisää toimipisteitä' diff --git a/conf/cmi/language/fi/views.view.service_list.yml b/conf/cmi/language/fi/views.view.service_list.yml index 67d2c890..452efa03 100644 --- a/conf/cmi/language/fi/views.view.service_list.yml +++ b/conf/cmi/language/fi/views.view.service_list.yml @@ -1,6 +1,6 @@ display: default: - display_title: Oletus + display_title: Isäntä display_options: exposed_form: options: @@ -12,23 +12,15 @@ display: pager: options: tags: - previous: '‹ Edellinen' - next: 'Seuraava ›' + next: Seuraava + previous: Edellinen + first: Ensimmäinen + last: Viimeinen expose: items_per_page_label: 'Merkintöjä sivua kohti' items_per_page_options_all_label: '- Kaikki -' offset_label: Offset - views_infinite_scroll: - button_text: 'Lataa lisää palveluita' - fields: - name: - separator: ', ' arguments: id: exception: title: Kaikki - empty: - area: - content: - value: "

Ei tuloksia

\r\n" - format: full_html diff --git a/conf/cmi/language/fi/views.view.service_units.yml b/conf/cmi/language/fi/views.view.service_units.yml index 88fea3cf..0d18f7a3 100644 --- a/conf/cmi/language/fi/views.view.service_units.yml +++ b/conf/cmi/language/fi/views.view.service_units.yml @@ -12,14 +12,14 @@ display: pager: options: tags: - previous: '‹ Edellinen' - next: 'Seuraava ›' + next: Seuraava + previous: Edellinen + first: Ensimmäinen + last: Viimeinen expose: items_per_page_label: 'Merkintöjä sivua kohti' items_per_page_options_all_label: '- Kaikki -' offset_label: Offset - views_infinite_scroll: - button_text: 'Lataa lisää palvelupaikkoja' fields: name: separator: ', ' diff --git a/conf/cmi/language/fi/views.view.unit_search.yml b/conf/cmi/language/fi/views.view.unit_search.yml index 4d62af7b..0e540343 100644 --- a/conf/cmi/language/fi/views.view.unit_search.yml +++ b/conf/cmi/language/fi/views.view.unit_search.yml @@ -16,17 +16,24 @@ display: group_info: label: 'Kentät yhdistävä suodatin' description: '' + exposed_form: + options: + submit_button: Käytä + reset_button_label: Palauta + exposed_sorts_label: Järjestä + sort_asc_label: Nouseva + sort_desc_label: Laskeva pager: options: tags: - previous: '‹ Edellinen' - next: 'Seuraava ›' + next: Seuraava + previous: Edellinen + first: Ensimmäinen + last: Viimeinen expose: items_per_page_label: 'Merkintöjä sivua kohti' items_per_page_options_all_label: '- Kaikki -' offset_label: Offset - views_infinite_scroll: - button_text: 'Lataa lisää' fields: name: separator: ', ' diff --git a/conf/cmi/language/fi/views.view.unit_services.yml b/conf/cmi/language/fi/views.view.unit_services.yml index d86ac366..76c2da3f 100644 --- a/conf/cmi/language/fi/views.view.unit_services.yml +++ b/conf/cmi/language/fi/views.view.unit_services.yml @@ -12,14 +12,14 @@ display: pager: options: tags: - previous: '‹ Edellinen' - next: 'Seuraava ›' + next: Seuraava + previous: Edellinen + first: Ensimmäinen + last: Viimeinen expose: items_per_page_label: 'Merkintöjä sivua kohti' items_per_page_options_all_label: '- Kaikki -' offset_label: Offset - views_infinite_scroll: - button_text: 'Lataa lisää palveluita' arguments: id: exception: diff --git a/conf/cmi/language/sv/views.view.service_list.yml b/conf/cmi/language/sv/views.view.service_list.yml index e50bc03a..095760af 100644 --- a/conf/cmi/language/sv/views.view.service_list.yml +++ b/conf/cmi/language/sv/views.view.service_list.yml @@ -3,5 +3,8 @@ display: display_options: pager: options: - views_infinite_scroll: - button_text: 'Ladda fler tjänster' + tags: + next: Nästa + previous: Föregående + first: Första + last: Sista diff --git a/conf/cmi/language/sv/views.view.service_units.yml b/conf/cmi/language/sv/views.view.service_units.yml index 9244ccc0..ff02698a 100644 --- a/conf/cmi/language/sv/views.view.service_units.yml +++ b/conf/cmi/language/sv/views.view.service_units.yml @@ -12,14 +12,14 @@ display: pager: options: tags: - previous: '‹ Föregående' - next: 'Nästa ›' + next: Nästa + previous: Föregående + first: Första + last: Sista expose: items_per_page_label: 'Inlägg per sida' items_per_page_options_all_label: '- Alla -' offset_label: Kompensera - views_infinite_scroll: - button_text: 'Ladda fler serviceställen' fields: name: separator: ', ' diff --git a/conf/cmi/language/sv/views.view.unit_search.yml b/conf/cmi/language/sv/views.view.unit_search.yml index 44f83d90..33e1ab99 100644 --- a/conf/cmi/language/sv/views.view.unit_search.yml +++ b/conf/cmi/language/sv/views.view.unit_search.yml @@ -15,11 +15,20 @@ display: label: Sök group_info: description: '' + exposed_form: + options: + submit_button: Verkställ + reset_button_label: Återställ + exposed_sorts_label: 'Sortera efter' + sort_asc_label: Stigande + sort_desc_label: Fallande pager: options: tags: - previous: '‹ Föregående' - next: 'Nästa ›' + next: Nästa + previous: Föregående + first: Första + last: Sista expose: items_per_page_label: 'Inlägg per sida' items_per_page_options_all_label: '- Alla -' diff --git a/conf/cmi/language/sv/views.view.unit_services.yml b/conf/cmi/language/sv/views.view.unit_services.yml index 7f9a110b..c345918f 100644 --- a/conf/cmi/language/sv/views.view.unit_services.yml +++ b/conf/cmi/language/sv/views.view.unit_services.yml @@ -12,14 +12,14 @@ display: pager: options: tags: - previous: '‹ Föregående' - next: 'Nästa ›' + next: Nästa + previous: Föregående + first: Första + last: Sista expose: items_per_page_label: 'Inlägg per sida' items_per_page_options_all_label: '- Alla -' offset_label: Kompensera - views_infinite_scroll: - button_text: 'Ladda fler tjänster' arguments: id: exception: diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index e55785f0..4d698f31 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -7,7 +7,6 @@ dependencies: module: - helfi_tpr - user - - views_infinite_scroll id: service_list label: 'Service list' module: views @@ -103,15 +102,17 @@ display: entity_field: name_override plugin_id: field pager: - type: infinite_scroll + type: full options: offset: 0 - items_per_page: 8 + items_per_page: 4 total_pages: null id: 0 tags: - next: 'Next ›' - previous: '‹ Previous' + next: Next + previous: Previous + first: First + last: Last expose: items_per_page: false items_per_page_label: 'Items per page' @@ -120,10 +121,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - views_infinite_scroll: - button_text: 'Load more services' - automatically_load_content: false - initially_load_all_pages: false + quantity: 9 exposed_form: type: basic options: @@ -327,8 +325,7 @@ display: display_plugin: block position: 1 display_options: - display_extenders: - metatag_display_extender: { } + display_extenders: { } cache_metadata: max-age: -1 contexts: @@ -556,8 +553,7 @@ display: defaults: fields: false arguments: false - display_extenders: - metatag_display_extender: { } + display_extenders: { } cache_metadata: max-age: -1 contexts: diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml index fa19b73d..90ed2ba6 100644 --- a/conf/cmi/views.view.service_units.yml +++ b/conf/cmi/views.view.service_units.yml @@ -2,12 +2,11 @@ uuid: 30d33fd8-c968-4659-a4e1-fad7973f7adc langcode: en status: true dependencies: + config: + - core.entity_view_mode.tpr_unit.teaser_with_image module: - helfi_tpr - user - - views_infinite_scroll -_core: - default_config_hash: _Z7QJuAWq4ELCa01yjAzWc7af1YwQkfp33pQZ9uAOwI id: service_units label: 'Service units' module: views @@ -18,7 +17,7 @@ base_field: id display: default: id: default - display_title: Default + display_title: Master display_plugin: default position: 0 display_options: @@ -89,15 +88,17 @@ display: separator: ', ' field_api_classes: false pager: - type: infinite_scroll + type: full options: offset: 0 - items_per_page: 5 + items_per_page: 8 total_pages: null id: 0 tags: - next: 'Next ›' - previous: '‹ Previous' + next: Next + previous: Previous + first: First + last: Last expose: items_per_page: false items_per_page_label: 'Items per page' @@ -106,10 +107,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - views_infinite_scroll: - button_text: 'Load more service points' - automatically_load_content: false - initially_load_all_pages: false + quantity: 9 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml index 8f00aa5f..cc8bee74 100644 --- a/conf/cmi/views.view.unit_search.yml +++ b/conf/cmi/views.view.unit_search.yml @@ -8,9 +8,6 @@ dependencies: - address - helfi_tpr - user - - views_infinite_scroll -_core: - default_config_hash: CW2I1XoMjZPgOdUAa0gWChUd2sowOYiOP3BEHXmhlL4 id: unit_search label: 'Unit search' module: views @@ -416,15 +413,17 @@ display: field_api_classes: false convert_spaces: false pager: - type: infinite_scroll + type: full options: offset: 0 items_per_page: 5 total_pages: null id: 0 tags: - next: 'Next ›' - previous: '‹ Previous' + next: Next + previous: Previous + first: First + last: Last expose: items_per_page: false items_per_page_label: 'Items per page' @@ -433,20 +432,17 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - views_infinite_scroll: - button_text: 'Load more results' - automatically_load_content: false - initially_load_all_pages: false + quantity: 9 exposed_form: type: basic options: - submit_button: Käytä + submit_button: Use reset_button: false - reset_button_label: Palauta - exposed_sorts_label: Lajittele + reset_button_label: Reset + exposed_sorts_label: Sort expose_sort_order: true - sort_asc_label: Nousevasti - sort_desc_label: Laskevasti + sort_asc_label: Ascending + sort_desc_label: Descending access: type: perm options: @@ -866,8 +862,7 @@ display: position: 1 display_options: rendering_language: '***LANGUAGE_entity_translation***' - display_extenders: - metatag_display_extender: { } + display_extenders: { } cache_metadata: max-age: -1 contexts: @@ -1187,8 +1182,7 @@ display: filters: false filter_groups: false relationships: { } - display_extenders: - metatag_display_extender: { } + display_extenders: { } cache_metadata: max-age: -1 contexts: diff --git a/conf/cmi/views.view.unit_services.yml b/conf/cmi/views.view.unit_services.yml index 434f1e0a..a2b4d95c 100644 --- a/conf/cmi/views.view.unit_services.yml +++ b/conf/cmi/views.view.unit_services.yml @@ -2,12 +2,11 @@ uuid: d0dbc328-589b-4a1b-9826-17cf68487558 langcode: en status: true dependencies: + config: + - core.entity_view_mode.tpr_service.teaser module: - helfi_tpr - user - - views_infinite_scroll -_core: - default_config_hash: T2t3K6CcI37herb9On_hZftBPSL6mGvVgvuK1LmFta4 id: unit_services label: 'Unit services' module: views @@ -18,7 +17,7 @@ base_field: id display: default: id: default - display_title: Default + display_title: Master display_plugin: default position: 0 display_options: @@ -76,15 +75,17 @@ display: hide_alter_empty: true view_mode: teaser pager: - type: infinite_scroll + type: full options: offset: 0 - items_per_page: 8 + items_per_page: 4 total_pages: null id: 0 tags: - next: 'Next ›' - previous: '‹ Previous' + next: Next + previous: Previous + first: First + last: Last expose: items_per_page: false items_per_page_label: 'Items per page' @@ -93,10 +94,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - views_infinite_scroll: - button_text: 'Load more services' - automatically_load_content: false - initially_load_all_pages: false + quantity: 9 exposed_form: type: basic options: