diff --git a/composer.lock b/composer.lock index 786cd362..a68caf20 100644 --- a/composer.lock +++ b/composer.lock @@ -4047,16 +4047,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": { @@ -4071,10 +4071,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", @@ -4358,16 +4358,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": { @@ -4478,10 +4478,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", @@ -4526,16 +4526,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": { @@ -4561,10 +4561,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 b9c71b13..a5868e3a 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 @@ -44,14 +43,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 34926369..3518189b 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 a4f1c88d..599005a3 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 @@ -24,14 +23,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 bb06d9fe..0321865b 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 fca63bdf..3bc7048c 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -132,7 +132,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 693b7093..00000000 --- a/conf/cmi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 38022947-8a7b-4395-860a-f3625e304ada -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_service_list_meta_load_mor - - paragraphs.paragraphs_type.service_list -_core: - default_config_hash: EdEFCfwk8vq_g20I-Z0m_5unt_C9Cq7w9HQ9A5OyYiE -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 db2a1819..00000000 --- a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 31280a26-ac5a-409f-9633-7a2f70e1de0f -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 6327b9e4..00000000 --- a/conf/cmi/field.storage.paragraph.field_service_list_meta_load_mor.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 598047e7-84d3-4c38-857d-44b1c55fed5e -langcode: en -status: true -dependencies: - module: - - paragraphs -_core: - default_config_hash: 9P94Pn1REctF0uFncki94r1jZMXy3RDNJuBNHXYpnk0 -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 a3b45a15..00000000 --- a/conf/cmi/field.storage.paragraph.field_unit_search_meta_load_more.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 014ec27e-c8dd-4db6-9578-b98eb93485ff -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 new file mode 100644 index 00000000..452efa03 --- /dev/null +++ b/conf/cmi/language/fi/views.view.service_list.yml @@ -0,0 +1,26 @@ +display: + default: + display_title: Isäntä + display_options: + exposed_form: + options: + submit_button: Käytä + reset_button_label: Palauta + exposed_sorts_label: Lajittele + sort_asc_label: Nousevasti + sort_desc_label: Laskevasti + pager: + options: + tags: + 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 + arguments: + id: + exception: + title: Kaikki diff --git a/conf/cmi/language/fi/views.view.service_units.yml b/conf/cmi/language/fi/views.view.service_units.yml new file mode 100644 index 00000000..0d18f7a3 --- /dev/null +++ b/conf/cmi/language/fi/views.view.service_units.yml @@ -0,0 +1,31 @@ +display: + default: + display_title: Oletus + display_options: + exposed_form: + options: + submit_button: Käytä + reset_button_label: Palauta + exposed_sorts_label: Lajittele + sort_asc_label: Nousevasti + sort_desc_label: Laskevasti + pager: + options: + tags: + 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 + fields: + name: + separator: ', ' + arguments: + id: + exception: + title: Kaikki + service_units: + display_title: Lohko diff --git a/conf/cmi/language/fi/views.view.unit_search.yml b/conf/cmi/language/fi/views.view.unit_search.yml new file mode 100644 index 00000000..593ca3d3 --- /dev/null +++ b/conf/cmi/language/fi/views.view.unit_search.yml @@ -0,0 +1,42 @@ +display: + default: + display_options: + filters: + combine: + group_info: + description: '' + label: 'Kentät yhdistävä suodatin' + expose: + label: Etsi + empty: + area: + content: + value: "

Ei tuloksia

\r\n" + 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: + 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 + arguments: + id: + exception: + title: Kaikki + display_title: Oletus + block: + display_title: Lohko + entity_reference: + display_title: Entiteettiviittaus +label: Toimipistehaku diff --git a/conf/cmi/language/fi/views.view.unit_services.yml b/conf/cmi/language/fi/views.view.unit_services.yml new file mode 100644 index 00000000..76c2da3f --- /dev/null +++ b/conf/cmi/language/fi/views.view.unit_services.yml @@ -0,0 +1,28 @@ +display: + default: + display_title: Oletus + display_options: + exposed_form: + options: + submit_button: Käytä + reset_button_label: Palauta + exposed_sorts_label: Lajittele + sort_asc_label: Nousevasti + sort_desc_label: Laskevasti + pager: + options: + tags: + 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 + arguments: + id: + exception: + title: Kaikki + unit_services: + display_title: Lohko diff --git a/conf/cmi/language/sv/views.view.service_list.yml b/conf/cmi/language/sv/views.view.service_list.yml new file mode 100644 index 00000000..095760af --- /dev/null +++ b/conf/cmi/language/sv/views.view.service_list.yml @@ -0,0 +1,10 @@ +display: + default: + display_options: + pager: + options: + 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 new file mode 100644 index 00000000..ff02698a --- /dev/null +++ b/conf/cmi/language/sv/views.view.service_units.yml @@ -0,0 +1,31 @@ +display: + default: + display_title: Förvald + display_options: + 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: + 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 + fields: + name: + separator: ', ' + arguments: + id: + exception: + title: Alla + service_units: + display_title: Block diff --git a/conf/cmi/language/sv/views.view.unit_search.yml b/conf/cmi/language/sv/views.view.unit_search.yml new file mode 100644 index 00000000..8161ff66 --- /dev/null +++ b/conf/cmi/language/sv/views.view.unit_search.yml @@ -0,0 +1,40 @@ +display: + default: + display_title: Förvald + display_options: + 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: + 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 + filters: + combine: + expose: + label: Sök + group_info: + label: 'Kombinera filterfält' + empty: + area: + content: + value: 'Inget resultat' + arguments: + id: + exception: + title: Alla + block: + display_title: Block + entity_reference: + display_title: Objektsreferens diff --git a/conf/cmi/language/sv/views.view.unit_services.yml b/conf/cmi/language/sv/views.view.unit_services.yml new file mode 100644 index 00000000..c345918f --- /dev/null +++ b/conf/cmi/language/sv/views.view.unit_services.yml @@ -0,0 +1,28 @@ +display: + default: + display_title: Förvald + display_options: + 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: + 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 + arguments: + id: + exception: + title: Alla + unit_services: + display_title: Block diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index fc51eb4a..7e0cf64d 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -7,9 +7,6 @@ dependencies: module: - helfi_tpr - user - - views_infinite_scroll -_core: - default_config_hash: u2kGMEiL58EmyughTDgEKVqwb4AR_AyozihG6eraqeQ id: service_list label: 'Service list' module: views @@ -105,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' @@ -122,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: diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml index 7aa619a5..54c9b438 100644 --- a/conf/cmi/views.view.service_units.yml +++ b/conf/cmi/views.view.service_units.yml @@ -2,12 +2,11 @@ uuid: 309babea-a33d-4cfd-89c7-d6433022c5f2 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: Vw1au_Yhhw3jvptqBDFcWyHS8-5JCXl6CkwkL-zeJhI id: service_units label: 'Service units' module: views @@ -89,15 +88,17 @@ display: separator: ', ' field_api_classes: false pager: - type: infinite_scroll + type: full options: offset: 0 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 735c8e9d..c234e144 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: Qi_H9S0h8L3oK0pwRXFvyfqE1rtbScL6G5En1FHfQ9I id: unit_search label: 'Unit search' module: views @@ -284,15 +281,17 @@ display: separator: ', ' field_api_classes: 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' @@ -301,20 +300,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: diff --git a/conf/cmi/views.view.unit_services.yml b/conf/cmi/views.view.unit_services.yml index 6ce67469..ecbf9aad 100644 --- a/conf/cmi/views.view.unit_services.yml +++ b/conf/cmi/views.view.unit_services.yml @@ -2,12 +2,11 @@ uuid: 00948a9c-6b4d-4711-859c-d0b8b469440c langcode: en status: true dependencies: + config: + - core.entity_view_mode.tpr_service.teaser module: - helfi_tpr - user - - views_infinite_scroll -_core: - default_config_hash: Bbz5kfyh5dUl4YR8_LDJF1-zBh7fbmlQQOTrX4uiew0 id: unit_services label: 'Unit services' module: views @@ -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: