Nimi | \r\n\t\t\t... | \r\n\t\t
---|---|
Tarjoaja | \r\n\t\t\t... | \r\n\t\t
Tarkoitus | \r\n\t\t\t... | \r\n\t\t
Voimassa | \r\n\t\t\t... | \r\n\t\t
Tyyppi | \r\n\t\t\t... | \r\n\t\t
Näiden evästeiden avulla voimme tarjota käyttäjille entistä tarkoituksenmukaisempaa ja yksilöllisempää sisältöä sekä tarjota ja kohdentaa tietoa Helsingin kaupungin palveluista.
\r\n
Nimi | \r\n\t\t\t... | \r\n\t\t
---|---|
Tarjoaja | \r\n\t\t\t... | \r\n\t\t
Tarkoitus | \r\n\t\t\t... | \r\n\t\t
Voimassa | \r\n\t\t\t... | \r\n\t\t
Tyyppi | \r\n\t\t\t... | \r\n\t\t
You have given your consent for us to set cookies.
\r\n" withdraw_tab_button_label: Tietosuoja-asetukset -save_preferences_button_label: 'Tallenna asetukset' +save_preferences_button_label: 'Hyväksy valitut evästeet' accept_all_categories_button_label: 'Hyväksy kaikki evästeet' diff --git a/conf/cmi/language/fi/field.field.node.page.field_sidebar_content.yml b/conf/cmi/language/fi/field.field.node.page.field_sidebar_content.yml new file mode 100644 index 00000000..2c1140fd --- /dev/null +++ b/conf/cmi/language/fi/field.field.node.page.field_sidebar_content.yml @@ -0,0 +1 @@ +label: 'Sivupalkin sisältö' diff --git a/conf/cmi/language/fi/field.field.paragraph.banner.field_banner_title.yml b/conf/cmi/language/fi/field.field.paragraph.banner.field_banner_title.yml index 0e116972..f02d7516 100644 --- a/conf/cmi/language/fi/field.field.paragraph.banner.field_banner_title.yml +++ b/conf/cmi/language/fi/field.field.paragraph.banner.field_banner_title.yml @@ -1 +1 @@ -label: 'Listauksen otsikko' +label: Otsikko diff --git a/conf/cmi/language/fi/field.field.paragraph.columns.field_columns_title.yml b/conf/cmi/language/fi/field.field.paragraph.columns.field_columns_title.yml index 0e116972..f02d7516 100644 --- a/conf/cmi/language/fi/field.field.paragraph.columns.field_columns_title.yml +++ b/conf/cmi/language/fi/field.field.paragraph.columns.field_columns_title.yml @@ -1 +1 @@ -label: 'Listauksen otsikko' +label: Otsikko diff --git a/conf/cmi/language/fi/field.field.paragraph.content_cards.field_content_cards_title.yml b/conf/cmi/language/fi/field.field.paragraph.content_cards.field_content_cards_title.yml index 249e0163..635843fa 100644 --- a/conf/cmi/language/fi/field.field.paragraph.content_cards.field_content_cards_title.yml +++ b/conf/cmi/language/fi/field.field.paragraph.content_cards.field_content_cards_title.yml @@ -1,2 +1,2 @@ -label: 'Listauksen otsikko' +label: Otsikko description: 'Sisältökortit-lohkon otsikko.' diff --git a/conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml b/conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml new file mode 100644 index 00000000..da72ec9c --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml @@ -0,0 +1,2 @@ +label: Toimipiste +description: "Lisää tähän sen sisällön otsikko jonka haluat nostaa sivulle.\r\nVoit toistaiseksi valita vain toimipisteitä." diff --git a/conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_unit.yml b/conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_unit.yml new file mode 100644 index 00000000..da72ec9c --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_unit.yml @@ -0,0 +1,2 @@ +label: Toimipiste +description: "Lisää tähän sen sisällön otsikko jonka haluat nostaa sivulle.\r\nVoit toistaiseksi valita vain toimipisteitä." diff --git a/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_cta.yml b/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_cta.yml new file mode 100644 index 00000000..2e35ce77 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_cta.yml @@ -0,0 +1,2 @@ +label: 'Linkki / toiminnallisuus' +description: 'Voit lisätä linkin tai toiminnallisuuden hero-lohkoon.' diff --git a/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_title.yml b/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_title.yml index 2224f988..7900a37f 100644 --- a/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_title.yml +++ b/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_title.yml @@ -1,2 +1,2 @@ -label: 'Listauksen otsikko' +label: Otsikko description: 'Näkyvä otsikko lohkolle. Tätä arvoa käytetään ensimmäisen tason otsikkona sivulle jos hero-lohko on lisätty sivulle.' diff --git a/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_title.yml b/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_title.yml index 5ff81509..8c5e1ec6 100644 --- a/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_title.yml +++ b/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_title.yml @@ -1,2 +1,2 @@ -label: 'Listauksen otsikko' +label: Otsikko description: 'Näkyvä otsikko lohkolle.' diff --git a/conf/cmi/language/fi/field.field.paragraph.link.field_link_design.yml b/conf/cmi/language/fi/field.field.paragraph.link.field_link_design.yml new file mode 100644 index 00000000..43fe3c20 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.link.field_link_design.yml @@ -0,0 +1,2 @@ +label: Tyyli +description: 'Valitse linkin tyyli.' diff --git a/conf/cmi/language/fi/field.field.paragraph.link.field_link_link.yml b/conf/cmi/language/fi/field.field.paragraph.link.field_link_link.yml new file mode 100644 index 00000000..d060ac6b --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.link.field_link_link.yml @@ -0,0 +1 @@ +label: Linkki diff --git a/conf/cmi/language/fi/field.field.paragraph.list_of_links.field_list_of_links_title.yml b/conf/cmi/language/fi/field.field.paragraph.list_of_links.field_list_of_links_title.yml index 13664caa..fb785124 100644 --- a/conf/cmi/language/fi/field.field.paragraph.list_of_links.field_list_of_links_title.yml +++ b/conf/cmi/language/fi/field.field.paragraph.list_of_links.field_list_of_links_title.yml @@ -1,2 +1,2 @@ -label: 'Listauksen otsikko' +label: Otsikko description: 'Linkkilistalohkon otsikko.' diff --git a/conf/cmi/language/fi/field.field.paragraph.map.field_map_title.yml b/conf/cmi/language/fi/field.field.paragraph.map.field_map_title.yml index 0e116972..f02d7516 100644 --- a/conf/cmi/language/fi/field.field.paragraph.map.field_map_title.yml +++ b/conf/cmi/language/fi/field.field.paragraph.map.field_map_title.yml @@ -1 +1 @@ -label: 'Listauksen otsikko' +label: Otsikko diff --git a/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_description.yml b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_description.yml new file mode 100644 index 00000000..ed08ca71 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_description.yml @@ -0,0 +1 @@ +label: Kuvaus 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 new file mode 100644 index 00000000..391309c0 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml @@ -0,0 +1,4 @@ +label: 'Lataa lisää - otsikko' +default_value: + - + value: 'Lataa lisää palveluita' diff --git a/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_services.yml b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_services.yml new file mode 100644 index 00000000..e1c99b01 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_services.yml @@ -0,0 +1 @@ +label: Palvelut diff --git a/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_title.yml b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_title.yml new file mode 100644 index 00000000..0e116972 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_title.yml @@ -0,0 +1 @@ +label: 'Listauksen otsikko' diff --git a/conf/cmi/language/fi/field.field.paragraph.sidebar_text.field_sidebar_text_text.yml b/conf/cmi/language/fi/field.field.paragraph.sidebar_text.field_sidebar_text_text.yml new file mode 100644 index 00000000..3a4526e3 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.sidebar_text.field_sidebar_text_text.yml @@ -0,0 +1 @@ +label: Teksti diff --git a/conf/cmi/language/fi/field.field.paragraph.sidebar_text.field_sidebar_text_title.yml b/conf/cmi/language/fi/field.field.paragraph.sidebar_text.field_sidebar_text_title.yml new file mode 100644 index 00000000..f02d7516 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.sidebar_text.field_sidebar_text_title.yml @@ -0,0 +1 @@ +label: Otsikko diff --git a/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_sidebar_content.yml b/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_sidebar_content.yml new file mode 100644 index 00000000..2c1140fd --- /dev/null +++ b/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_sidebar_content.yml @@ -0,0 +1 @@ +label: 'Sivupalkin sisältö' diff --git a/conf/cmi/language/fi/field.storage.paragraph.field_link_design.yml b/conf/cmi/language/fi/field.storage.paragraph.field_link_design.yml new file mode 100644 index 00000000..dc0c8829 --- /dev/null +++ b/conf/cmi/language/fi/field.storage.paragraph.field_link_design.yml @@ -0,0 +1,8 @@ +settings: + allowed_values: + - + label: 'Painike, täysvärinen' + - + label: 'Painike, kehystetty' + - + label: 'Painike, läpinäkyvä' diff --git a/conf/cmi/language/fi/language.entity.ru.yml b/conf/cmi/language/fi/language.entity.ru.yml deleted file mode 100644 index 4b74e16e..00000000 --- a/conf/cmi/language/fi/language.entity.ru.yml +++ /dev/null @@ -1 +0,0 @@ -label: Venäjä diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml new file mode 100644 index 00000000..1489cfe4 --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml @@ -0,0 +1,2 @@ +label: Sisältönosto +description: 'Sisältönostolla voit nostaa yksittäisen sisällön tämän sivuston sisältä. Sisällön tiedot haetaan automaattisesti viitteen kautta ja sisältö esitetään korttinäkymässä.' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.link.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.link.yml new file mode 100644 index 00000000..d060ac6b --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.link.yml @@ -0,0 +1 @@ +label: Linkki diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml index 37be6272..50a7d9c0 100644 --- a/conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml @@ -1,2 +1,2 @@ label: 'Video ulkoisesta palvelusta' -description: 'Remote video paragraph that lets you add any video from video providers. Currently only YouTube.' +description: 'Tällä lohkolla voit lisätä videon ulkoisesta palvelusta. Tukee tällä hetkellä vain YouTubea.' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.service_list.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.service_list.yml new file mode 100644 index 00000000..fed53d89 --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.service_list.yml @@ -0,0 +1,2 @@ +label: Palvelulistaus +description: 'Palvelulistaus lohkolla sisällöntuottaja voi sijoittaa listan palveluista valitsemalleen sivulle. Lohkosta valitaan julkaistut palvelut joita halutaan näyttää loppukäyttäjälle.' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.sidebar_text.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.sidebar_text.yml new file mode 100644 index 00000000..3a4526e3 --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.sidebar_text.yml @@ -0,0 +1 @@ +label: Teksti diff --git a/conf/cmi/language/fi/views.view.ahjo_issues.yml b/conf/cmi/language/fi/views.view.ahjo_issues.yml new file mode 100644 index 00000000..4be9a057 --- /dev/null +++ b/conf/cmi/language/fi/views.view.ahjo_issues.yml @@ -0,0 +1,44 @@ +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: + previous: '‹ Edellinen' + next: 'Seuraava ›' + 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: + id: + label: ID + separator: ', ' + title: + label: Otsikko + separator: ', ' + operations: + label: Toimenpiteet + filters: + combine: + expose: + label: Etsi + footer: + result: + content: 'Näytetään @start - @end / @total' + empty: + area: + content: + value: 'Ei tuloksia.' + page_1: + display_title: Sivu diff --git a/conf/cmi/language/fi/views.view.archive.yml b/conf/cmi/language/fi/views.view.archive.yml index ebb5f2dc..35bfe076 100644 --- a/conf/cmi/language/fi/views.view.archive.yml +++ b/conf/cmi/language/fi/views.view.archive.yml @@ -15,13 +15,13 @@ display: pager: options: expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' offset_label: Offset tags: previous: '‹ Edellinen' next: 'Seuraava ›' block_1: - display_title: Block + display_title: Lohko page_1: display_title: Sivu diff --git a/conf/cmi/language/fi/views.view.content.yml b/conf/cmi/language/fi/views.view.content.yml index 424e2a34..c87a67f4 100644 --- a/conf/cmi/language/fi/views.view.content.yml +++ b/conf/cmi/language/fi/views.view.content.yml @@ -13,13 +13,13 @@ display: pager: options: tags: - previous: '‹ Previous' - next: 'Next ›' + previous: '‹ Edellinen' + next: 'Seuraava ›' first: '« Ensimmäinen' last: 'Viimeinen »' fields: title: - label: 'Listauksen otsikko' + label: Otsikko type: label: Sisältötyyppi separator: ', ' @@ -40,7 +40,7 @@ display: filters: title: expose: - label: 'Listauksen otsikko' + label: Otsikko type: expose: label: Sisältötyyppi @@ -61,7 +61,7 @@ display: empty: area_text_custom: content: 'Ei sisältöä.' - display_title: Master + display_title: Isäntä page_1: display_options: menu: diff --git a/conf/cmi/language/fi/views.view.content_recent.yml b/conf/cmi/language/fi/views.view.content_recent.yml index 119ea8e4..a521f9c9 100644 --- a/conf/cmi/language/fi/views.view.content_recent.yml +++ b/conf/cmi/language/fi/views.view.content_recent.yml @@ -20,4 +20,4 @@ display: content: 'Ei sisältöä.' use_more_text: Lisää block_1: - display_title: Block + display_title: Lohko diff --git a/conf/cmi/language/fi/views.view.files.yml b/conf/cmi/language/fi/views.view.files.yml index 8984dbf6..1d1e66d2 100644 --- a/conf/cmi/language/fi/views.view.files.yml +++ b/conf/cmi/language/fi/views.view.files.yml @@ -14,11 +14,11 @@ display: pager: options: tags: - previous: '‹ Previous' - next: 'Next ›' + previous: '‹ Edellinen' + next: 'Seuraava ›' expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' offset_label: Offset fields: fid: @@ -66,11 +66,11 @@ display: pager: options: tags: - previous: '‹ Previous' - next: 'Next ›' + previous: '‹ Edellinen' + next: 'Seuraava ›' expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' offset_label: Offset fields: entity_label: @@ -85,4 +85,4 @@ display: arguments: fid: exception: - title: All + title: Kaikki diff --git a/conf/cmi/language/fi/views.view.glossary.yml b/conf/cmi/language/fi/views.view.glossary.yml index c4ca495c..c83e4e6b 100644 --- a/conf/cmi/language/fi/views.view.glossary.yml +++ b/conf/cmi/language/fi/views.view.glossary.yml @@ -13,15 +13,15 @@ display: pager: options: expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' offset_label: Offset tags: previous: '‹ Edellinen' next: 'Seuraava ›' fields: title: - label: 'Listauksen otsikko' + label: Otsikko name: label: Kirjoittaja changed: diff --git a/conf/cmi/language/fi/views.view.hauki_resource.yml b/conf/cmi/language/fi/views.view.hauki_resource.yml new file mode 100644 index 00000000..104be1ba --- /dev/null +++ b/conf/cmi/language/fi/views.view.hauki_resource.yml @@ -0,0 +1,41 @@ +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: + previous: '‹ Edellinen' + next: 'Seuraava ›' + 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: + label: Otsikko + separator: ', ' + operations: + label: Toimenpiteet + filters: + combine: + expose: + label: Etsi + footer: + result: + content: 'Näytetään @start - @end / @total' + empty: + area: + content: + value: 'Ei tuloksia.' + page_1: + display_title: Sivu diff --git a/conf/cmi/language/fi/views.view.media.yml b/conf/cmi/language/fi/views.view.media.yml index e313d7fb..963abb02 100644 --- a/conf/cmi/language/fi/views.view.media.yml +++ b/conf/cmi/language/fi/views.view.media.yml @@ -14,12 +14,12 @@ display: pager: options: expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' offset_label: Offset tags: - previous: '‹ Previous' - next: 'Next ›' + previous: '‹ Edellinen' + next: 'Seuraava ›' first: '« Ensimmäinen' last: 'Viimeinen »' fields: diff --git a/conf/cmi/language/fi/views.view.media_library.yml b/conf/cmi/language/fi/views.view.media_library.yml index 4fd412f3..ba285205 100644 --- a/conf/cmi/language/fi/views.view.media_library.yml +++ b/conf/cmi/language/fi/views.view.media_library.yml @@ -14,8 +14,8 @@ display: pager: options: expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' offset_label: Offset tags: previous: '‹ Edellinen' @@ -87,7 +87,7 @@ display: arguments: bundle: exception: - title: All + title: Kaikki header: display_link_grid: label: Ruudukko @@ -112,7 +112,7 @@ display: arguments: bundle: exception: - title: All + title: Kaikki header: display_link_grid: label: Ruudukko diff --git a/conf/cmi/language/fi/views.view.paragraphs_library.yml b/conf/cmi/language/fi/views.view.paragraphs_library.yml index 8f4928c0..611cf9f2 100644 --- a/conf/cmi/language/fi/views.view.paragraphs_library.yml +++ b/conf/cmi/language/fi/views.view.paragraphs_library.yml @@ -1,7 +1,7 @@ label: 'Uudelleenkäytettävät lohkot' display: default: - display_title: Master + display_title: Oletus display_options: exposed_form: options: @@ -16,8 +16,8 @@ display: previous: '‹ Edellinen' next: 'Seuraava ›' expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' offset_label: Offset fields: label: diff --git a/conf/cmi/language/fi/views.view.redirect.yml b/conf/cmi/language/fi/views.view.redirect.yml index 86ccbb07..fddbb538 100644 --- a/conf/cmi/language/fi/views.view.redirect.yml +++ b/conf/cmi/language/fi/views.view.redirect.yml @@ -2,7 +2,7 @@ label: Redirect description: Uudelleenohjaukset display: default: - display_title: Master + display_title: Isäntä display_options: exposed_form: options: @@ -19,8 +19,8 @@ display: first: '« ensimmäinen' last: 'viimeinen »' expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' offset_label: Offset fields: redirect_bulk_form: diff --git a/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml index 7e362d32..e43dac3a 100644 --- a/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml +++ b/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml @@ -21,7 +21,7 @@ display: node_bulk_form: action_title: Toiminto title: - label: 'Listauksen otsikko' + label: Otsikko separator: ', ' type: label: Sisältötyyppi @@ -46,7 +46,7 @@ display: filters: title: expose: - label: 'Listauksen otsikko' + label: Otsikko type: expose: label: Sisältötyyppi @@ -67,7 +67,7 @@ display: empty: area_text_custom: content: 'Ei vielä ajastettua sisältöä.' - display_title: Master + display_title: Isäntä overview: display_options: menu: @@ -85,7 +85,7 @@ display: arguments: uid: exception: - title: All + title: Kaikki empty: area_text_custom: content: '{{ arguments.uid }} käyttäjä ei ole ajastanut sisältöä.' diff --git a/conf/cmi/language/fi/views.view.service_units.yml b/conf/cmi/language/fi/views.view.service_units.yml index fb3e64df..68105663 100644 --- a/conf/cmi/language/fi/views.view.service_units.yml +++ b/conf/cmi/language/fi/views.view.service_units.yml @@ -1,29 +1,20 @@ display: default: - display_title: Master display_options: exposed_form: options: - submit_button: Käytä + submit_button: Apply reset_button_label: Palauta - exposed_sorts_label: Lajittele - sort_asc_label: Nousevasti - sort_desc_label: Laskevasti + exposed_sorts_label: Järjestä + sort_asc_label: Nouseva + sort_desc_label: Laskeva pager: options: tags: - previous: '‹ Previous' - next: 'Next ›' + previous: '‹ Edellinen' + next: 'Seuraava ›' expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' - offset_label: Offset - fields: - name: - separator: ', ' - arguments: - id: - exception: - title: All - service_units: - display_title: Block + items_per_page_label: 'Kohteita sivulla' + items_per_page_options_all_label: '- Kaikki -' + views_infinite_scroll: + button_text: 'Lataa lisää palvelupaikkoja' diff --git a/conf/cmi/language/fi/views.view.taxonomy_term.yml b/conf/cmi/language/fi/views.view.taxonomy_term.yml index c4de040f..df7a91d8 100644 --- a/conf/cmi/language/fi/views.view.taxonomy_term.yml +++ b/conf/cmi/language/fi/views.view.taxonomy_term.yml @@ -14,8 +14,8 @@ display: pager: options: expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' offset_label: Offset tags: previous: '‹ Edellinen' @@ -23,7 +23,7 @@ display: arguments: tid: exception: - title: All + title: Kaikki feed_1: display_title: Syöte page_1: diff --git a/conf/cmi/language/fi/views.view.tpr_service_list.yml b/conf/cmi/language/fi/views.view.tpr_service_list.yml index a69a2741..b9917df6 100644 --- a/conf/cmi/language/fi/views.view.tpr_service_list.yml +++ b/conf/cmi/language/fi/views.view.tpr_service_list.yml @@ -1,10 +1,9 @@ display: default: - display_title: Master display_options: exposed_form: options: - submit_button: Käytä + submit_button: Suodata reset_button_label: Palauta exposed_sorts_label: Lajittele sort_asc_label: Nousevasti @@ -17,46 +16,40 @@ display: first: '« Ensimmäinen' last: 'Viimeinen »' expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_label: 'Tuloksia sivua kohden' + items_per_page_options_all_label: '- Kaikki -' fields: tpr_service_bulk_form: - label: Massapäivitys - action_title: Toiminto - id: - label: ID - separator: ', ' + action_title: Toimenpide name: label: Nimi - separator: ', ' langcode: label: Kieli - separator: ', ' content_translation_status: label: Tila settings: format_custom_true: Julkaistu format_custom_false: Julkaisematon - separator: ', ' content_translation_changed: label: Päivitetty - separator: ', ' operations: label: Toimenpiteet filters: combine: expose: - label: Search + label: Haku langcode: expose: label: Kieli + title: 'TPR Palvelut' header: result: content: 'Näytetään @start - @end / @total' empty: area: content: - value: 'Ei tuloksia.' + value: 'Palveluita ei löytynyt.' + format: plain_text page_1: display_title: Sivu +label: 'TPR Palvelut' diff --git a/conf/cmi/language/fi/views.view.tpr_unit_list.yml b/conf/cmi/language/fi/views.view.tpr_unit_list.yml index b18baadc..72e2f9f5 100644 --- a/conf/cmi/language/fi/views.view.tpr_unit_list.yml +++ b/conf/cmi/language/fi/views.view.tpr_unit_list.yml @@ -1,27 +1,9 @@ -label: 'TPR Toimipisteet' display: default: - display_title: Master 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: - previous: '‹ Edellinen' - next: 'Seuraava ›' - first: '« Ensimmäinen' - last: 'Viimeinen »' - expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' - offset_label: Offset fields: + content_translation_changed: + label: Päivitetty tpr_unit_bulk_form: label: Massapäivitys action_title: Toiminto @@ -40,15 +22,30 @@ display: format_custom_true: Julkaistu format_custom_false: Julkaisematon separator: ', ' - content_translation_changed: - label: Päivitetty - separator: ', ' operations: label: Toimenpiteet + exposed_form: + options: + submit_button: Suodata + reset_button_label: Palauta + exposed_sorts_label: Lajittele + sort_asc_label: Nousevasti + sort_desc_label: Laskevasti + pager: + options: + tags: + previous: '‹ Edellinen' + next: 'Seuraava ›' + first: '« Ensimmäinen' + last: 'Viimeinen »' + expose: + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' + offset_label: Offset filters: combine: expose: - label: Search + label: Etsi langcode: expose: label: Kieli @@ -59,6 +56,8 @@ display: empty: area: content: - value: 'Ei tuloksia.' + value: 'Toimipisteitä ei löytynyt.' + display_title: Isäntä page_1: display_title: Sivu +label: 'TPR Toimipisteet' diff --git a/conf/cmi/language/fi/views.view.unit_search.yml b/conf/cmi/language/fi/views.view.unit_search.yml index 95c6263e..356a9386 100644 --- a/conf/cmi/language/fi/views.view.unit_search.yml +++ b/conf/cmi/language/fi/views.view.unit_search.yml @@ -1,53 +1,16 @@ display: default: display_options: + pager: + options: + views_infinite_scroll: + button_text: 'Lataa lisää' filters: combine: group_info: description: '' - label: 'Combine fields filter' - expose: - label: Search empty: area: content: - format: full_html value: "Ei tuloksia
\r\n" - pager: - options: - tags: - previous: '‹ Previous' - next: 'Next ›' - expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' - offset_label: Offset - views_infinite_scroll: - button_text: 'Lataa lisää' - fields: - name: - separator: ', ' - address__postal_code: - separator: ', ' - address__address_line1: - separator: ', ' - address__address_line2: - separator: ', ' - arguments: - id: - exception: - title: All - display_title: Master - block: - display_title: Block - entity_reference: - display_title: 'Entity Reference' - display_options: - fields: - name_override: - separator: ', ' - id: - separator: ', ' - name: - separator: ', ' -label: Toimipistehaku + format: full_html diff --git a/conf/cmi/language/fi/views.view.unit_services.yml b/conf/cmi/language/fi/views.view.unit_services.yml index 5e09f17f..edc9af05 100644 --- a/conf/cmi/language/fi/views.view.unit_services.yml +++ b/conf/cmi/language/fi/views.view.unit_services.yml @@ -1,26 +1,20 @@ display: default: - display_title: Master display_options: exposed_form: options: - submit_button: Käytä + submit_button: Apply reset_button_label: Palauta - exposed_sorts_label: Lajittele - sort_asc_label: Nousevasti - sort_desc_label: Laskevasti + exposed_sorts_label: Järjestä + sort_asc_label: Nouseva + sort_desc_label: Laskeva pager: options: tags: - previous: '‹ Previous' - next: 'Next ›' + previous: '‹ Edellinen' + next: 'Seuraava ›' expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' - offset_label: Offset - arguments: - id: - exception: - title: All - unit_services: - display_title: Block + items_per_page_label: 'Kohteita sivulla' + items_per_page_options_all_label: '- Kaikki -' + views_infinite_scroll: + button_text: 'Lataa lisää palveluita' diff --git a/conf/cmi/language/fi/views.view.user_admin_people.yml b/conf/cmi/language/fi/views.view.user_admin_people.yml index 31e247df..172a695f 100644 --- a/conf/cmi/language/fi/views.view.user_admin_people.yml +++ b/conf/cmi/language/fi/views.view.user_admin_people.yml @@ -14,13 +14,13 @@ display: pager: options: tags: - previous: '‹ Previous' - next: 'Next ›' + previous: '‹ Edellinen' + next: 'Seuraava ›' first: '« Ensimmäinen' last: 'Viimeinen »' expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' offset_label: Offset fields: user_bulk_form: diff --git a/conf/cmi/language/fi/views.view.watchdog.yml b/conf/cmi/language/fi/views.view.watchdog.yml deleted file mode 100644 index cc8594b3..00000000 --- a/conf/cmi/language/fi/views.view.watchdog.yml +++ /dev/null @@ -1,54 +0,0 @@ -label: Vahtikoira -description: 'Viimeisimmät lokimerkinnät' -display: - default: - display_title: Master - display_options: - exposed_form: - options: - submit_button: Suodatin - reset_button_label: Palauta - exposed_sorts_label: Lajittele - sort_asc_label: Nousevasti - sort_desc_label: Laskevasti - pager: - options: - expose: - items_per_page_label: 'Items per page' - items_per_page_options_all_label: '- All -' - offset_label: Offset - tags: - previous: '‹ Edellinen' - next: 'Seuraava ›' - fields: - nothing: - admin_label: Ikoni - wid: - label: WID - severity: - label: Vakavuus - type: - label: Tyyppi - timestamp: - label: Päivämäärä - message: - label: Viesti - name: - label: Käyttäjä - separator: ', ' - link: - label: Toimenpiteet - filters: - type: - expose: - label: Tyyppi - severity: - expose: - label: Vakavuus - title: 'Viimeisimmät lokimerkinnät' - empty: - area: - admin_label: 'Yhtään lokimerkintää ei ole saatavilla.' - content: 'Yhtään lokimerkintää ei ole saatavilla.' - page: - display_title: Sivu diff --git a/conf/cmi/language/ru/metatag.metatag_defaults.tpr_service.yml b/conf/cmi/language/ru/metatag.metatag_defaults.tpr_service.yml deleted file mode 100644 index eedf3028..00000000 --- a/conf/cmi/language/ru/metatag.metatag_defaults.tpr_service.yml +++ /dev/null @@ -1,2 +0,0 @@ -tags: - title: '[tpr_service:label] | City of Helsinki' diff --git a/conf/cmi/language/ru/metatag.metatag_defaults.tpr_unit.yml b/conf/cmi/language/ru/metatag.metatag_defaults.tpr_unit.yml deleted file mode 100644 index 04aae54b..00000000 --- a/conf/cmi/language/ru/metatag.metatag_defaults.tpr_unit.yml +++ /dev/null @@ -1,2 +0,0 @@ -tags: - title: '[tpr_unit:label] | City of Helsinki' diff --git a/conf/cmi/language/sv/block.block.stark_admin.yml b/conf/cmi/language/sv/block.block.stark_admin.yml deleted file mode 100644 index 908710d6..00000000 --- a/conf/cmi/language/sv/block.block.stark_admin.yml +++ /dev/null @@ -1,2 +0,0 @@ -settings: - label: Administration diff --git a/conf/cmi/language/sv/block.block.stark_branding.yml b/conf/cmi/language/sv/block.block.stark_branding.yml deleted file mode 100644 index cb211f31..00000000 --- a/conf/cmi/language/sv/block.block.stark_branding.yml +++ /dev/null @@ -1,2 +0,0 @@ -settings: - label: 'Webbplatsens varumärke' diff --git a/conf/cmi/language/sv/block.block.stark_local_tasks.yml b/conf/cmi/language/sv/block.block.stark_local_tasks.yml deleted file mode 100644 index f0bbf987..00000000 --- a/conf/cmi/language/sv/block.block.stark_local_tasks.yml +++ /dev/null @@ -1,2 +0,0 @@ -settings: - label: Flikar diff --git a/conf/cmi/language/sv/block.block.stark_messages.yml b/conf/cmi/language/sv/block.block.stark_messages.yml deleted file mode 100644 index 5de78f02..00000000 --- a/conf/cmi/language/sv/block.block.stark_messages.yml +++ /dev/null @@ -1,2 +0,0 @@ -settings: - label: Statusmeddelande diff --git a/conf/cmi/language/sv/block.block.stark_page_title.yml b/conf/cmi/language/sv/block.block.stark_page_title.yml deleted file mode 100644 index 13ecca19..00000000 --- a/conf/cmi/language/sv/block.block.stark_page_title.yml +++ /dev/null @@ -1,2 +0,0 @@ -settings: - label: Sidtitel diff --git a/conf/cmi/language/sv/block.block.stark_tools.yml b/conf/cmi/language/sv/block.block.stark_tools.yml deleted file mode 100644 index fdab496e..00000000 --- a/conf/cmi/language/sv/block.block.stark_tools.yml +++ /dev/null @@ -1,2 +0,0 @@ -settings: - label: Verktyg diff --git a/conf/cmi/language/sv/core.entity_form_display.paragraph.hero.default.yml b/conf/cmi/language/sv/core.entity_form_display.paragraph.hero.default.yml new file mode 100644 index 00000000..e435ec08 --- /dev/null +++ b/conf/cmi/language/sv/core.entity_form_display.paragraph.hero.default.yml @@ -0,0 +1,4 @@ +content: + field_hero_cta: + settings: + title: Paragraf diff --git a/conf/cmi/language/sv/field.field.paragraph.accordion_item.field_accordion_item_content.yml b/conf/cmi/language/sv/field.field.paragraph.accordion_item.field_accordion_item_content.yml index 5fe60abc..0f9163b8 100644 --- a/conf/cmi/language/sv/field.field.paragraph.accordion_item.field_accordion_item_content.yml +++ b/conf/cmi/language/sv/field.field.paragraph.accordion_item.field_accordion_item_content.yml @@ -1 +1 @@ -label: Content +label: Innehåll diff --git a/conf/cmi/language/sv/language.entity.ru.yml b/conf/cmi/language/sv/language.entity.ru.yml deleted file mode 100644 index 10074053..00000000 --- a/conf/cmi/language/sv/language.entity.ru.yml +++ /dev/null @@ -1 +0,0 @@ -label: Ryska diff --git a/conf/cmi/language/sv/views.view.content.yml b/conf/cmi/language/sv/views.view.content.yml index 9124571a..7fbc7b59 100644 --- a/conf/cmi/language/sv/views.view.content.yml +++ b/conf/cmi/language/sv/views.view.content.yml @@ -1,4 +1,4 @@ -label: Content +label: Innehåll description: 'Hitta och hantera innehåll.' display: default: @@ -57,7 +57,7 @@ display: langcode: expose: label: Språk - title: Content + title: Innehåll empty: area_text_custom: content: 'Inget innehåll tillgängligt.' @@ -65,8 +65,8 @@ display: page_1: display_options: menu: - title: Content + title: Innehåll tab_options: - title: Content + title: Innehåll description: 'Hitta och hantera innehåll' display_title: Sida diff --git a/conf/cmi/language/sv/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/sv/views.view.scheduler_scheduled_content.yml index bea91221..0a543015 100644 --- a/conf/cmi/language/sv/views.view.scheduler_scheduled_content.yml +++ b/conf/cmi/language/sv/views.view.scheduler_scheduled_content.yml @@ -67,13 +67,13 @@ display: menu: title: Schemalagd tab_options: - title: Content + title: Innehåll user_page: display_options: menu: title: Schemalagd tab_options: - title: Content + title: Innehåll arguments: uid: exception: diff --git a/conf/cmi/language/sv/views.view.watchdog.yml b/conf/cmi/language/sv/views.view.watchdog.yml deleted file mode 100644 index 656c797a..00000000 --- a/conf/cmi/language/sv/views.view.watchdog.yml +++ /dev/null @@ -1,54 +0,0 @@ -label: Övervakning -description: 'Senaste loggmeddelanden' -display: - default: - display_title: Huvud - display_options: - exposed_form: - options: - submit_button: Filtrera - reset_button_label: Återställ - exposed_sorts_label: 'Sortera efter' - sort_asc_label: Stigande - sort_desc_label: Fallande - pager: - options: - expose: - items_per_page_label: 'Inlägg per sida' - items_per_page_options_all_label: '- Alla -' - offset_label: Kompensera - tags: - previous: ‹‹ - next: ›› - fields: - nothing: - admin_label: Ikon - severity: - label: Grad - type: - label: Typ - timestamp: - label: Datum - message: - label: Meddelande - alter: - alt: '{{ meddelande }}' - name: - label: Användare - separator: ', ' - link: - label: Funktioner - filters: - type: - expose: - label: Typ - severity: - expose: - label: Grad - title: 'Senaste loggmeddelanden' - empty: - area: - admin_label: 'Inga loggmeddelanden tillgängliga.' - content: 'Inga loggmeddelanden tillgängliga.' - page: - display_title: Sida diff --git a/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml b/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml new file mode 100644 index 00000000..cac4d268 --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml @@ -0,0 +1,10 @@ +uuid: f3c88fc6-d444-4367-809a-062c898deb59 +langcode: en +status: true +dependencies: { } +id: content_liftup +label: 'Content liftup' +icon_uuid: null +icon_default: null +description: 'With content liftup you can reference to a single content inside this site. The information about the content is automatically fetched through the reference.' +behavior_plugins: { } diff --git a/conf/cmi/paragraphs.paragraphs_type.service_list.yml b/conf/cmi/paragraphs.paragraphs_type.service_list.yml new file mode 100644 index 00000000..3c0d8337 --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.service_list.yml @@ -0,0 +1,15 @@ +uuid: 67fc1c09-9e39-4eef-b767-9f779f97a09d +langcode: en +status: true +dependencies: + module: + - paragraphs_library +third_party_settings: + paragraphs_library: + allow_library_conversion: true +id: service_list +label: 'Service list' +icon_uuid: null +icon_default: null +description: 'With service list paragraph content producer can create a list of selected and published services for the end user.' +behavior_plugins: { } diff --git a/conf/cmi/paragraphs.paragraphs_type.sidebar_text.yml b/conf/cmi/paragraphs.paragraphs_type.sidebar_text.yml new file mode 100644 index 00000000..43abd952 --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.sidebar_text.yml @@ -0,0 +1,15 @@ +uuid: 44d41c92-4a04-4c05-9128-ceb019068d9a +langcode: en +status: true +dependencies: + module: + - paragraphs_library +third_party_settings: + paragraphs_library: + allow_library_conversion: true +id: sidebar_text +label: Text +icon_uuid: null +icon_default: null +description: '' +behavior_plugins: { } diff --git a/conf/cmi/pathauto.pattern.service_entity_pattern.yml b/conf/cmi/pathauto.pattern.service_entity_pattern.yml index 43ae42fe..53228a7c 100644 --- a/conf/cmi/pathauto.pattern.service_entity_pattern.yml +++ b/conf/cmi/pathauto.pattern.service_entity_pattern.yml @@ -9,7 +9,7 @@ _core: id: service_entity_pattern label: 'Service entity pattern' type: 'canonical_entities:tpr_service' -pattern: '[tpr_service:label]' +pattern: '[tpr_service:menu-link-parents]/[tpr_service:label]' selection_criteria: { } selection_logic: and weight: 0 diff --git a/conf/cmi/pathauto.pattern.unit_entity_pattern.yml b/conf/cmi/pathauto.pattern.unit_entity_pattern.yml index 28bafc91..311b1a9c 100644 --- a/conf/cmi/pathauto.pattern.unit_entity_pattern.yml +++ b/conf/cmi/pathauto.pattern.unit_entity_pattern.yml @@ -9,7 +9,7 @@ _core: id: unit_entity_pattern label: 'Unit entity pattern' type: 'canonical_entities:tpr_unit' -pattern: '[tpr_unit:label]' +pattern: '[tpr_unit:menu-link-parents]/[tpr_unit:label]' selection_criteria: { } selection_logic: and weight: 0 diff --git a/conf/cmi/pathauto.settings.yml b/conf/cmi/pathauto.settings.yml index 0329e719..0f9a11e9 100644 --- a/conf/cmi/pathauto.settings.yml +++ b/conf/cmi/pathauto.settings.yml @@ -52,5 +52,6 @@ safe_tokens: - login-url - url - url-brief + - menu-link-parents _core: default_config_hash: Ne69dMMwlFhwkLqsxAPs20dQCSMk3iibq1pr5qrHf2I diff --git a/conf/cmi/purge.logger_channels.yml b/conf/cmi/purge.logger_channels.yml new file mode 100644 index 00000000..6f16d502 --- /dev/null +++ b/conf/cmi/purge.logger_channels.yml @@ -0,0 +1,23 @@ +channels: + - + id: purgers + grants: + - 0 + - 2 + - 3 + - + id: queue + grants: + - 0 + - 2 + - 3 + - + id: diagnostics + grants: + - 3 + - + id: purger_varnish_default + grants: + - 0 + - 2 + - 3 diff --git a/conf/cmi/purge.plugins.yml b/conf/cmi/purge.plugins.yml new file mode 100644 index 00000000..92d97cfb --- /dev/null +++ b/conf/cmi/purge.plugins.yml @@ -0,0 +1,22 @@ +purgers: + - + order_index: 2 + instance_id: default + plugin_id: varnish +processors: + - + plugin_id: drush_purge_queue_work + status: true + - + plugin_id: cron + status: true +queuers: + - + plugin_id: purge_ui_block_queuer + status: false + - + plugin_id: drush_purge_queue_add + status: false + - + plugin_id: coretags + status: true diff --git a/conf/cmi/purge_queuer_coretags.settings.yml b/conf/cmi/purge_queuer_coretags.settings.yml new file mode 100644 index 00000000..bb1dab68 --- /dev/null +++ b/conf/cmi/purge_queuer_coretags.settings.yml @@ -0,0 +1,11 @@ +blacklist: + - 4xx-response + - 'config:core.extension' + - extensions + - 'config:purge' + - theme_registry + - 'config:field.storage' + - route_match + - routes +_core: + default_config_hash: lupV305oUaexr-RIL2JNFf1YeFYrY3pb5zHL1e6YRWw diff --git a/conf/cmi/raven.settings.yml b/conf/cmi/raven.settings.yml new file mode 100644 index 00000000..ef0db3c6 --- /dev/null +++ b/conf/cmi/raven.settings.yml @@ -0,0 +1,35 @@ +client_key: '' +environment: '' +release: '' +fatal_error_handler: true +fatal_error_handler_memory: 2560 +log_levels: + 1: 1 + 2: 2 + 3: 3 + 4: 0 + 5: 0 + 6: 0 + 7: 0 + 8: 0 +drush_error_handler: false +stack: true +timeout: !!float 2 +message_limit: 2048 +trace: false +javascript_error_handler: false +public_dsn: '' +ssl: verify_ssl +ca_cert: '' +ignored_channels: { } +send_user_data: false +rate_limit: 0 +send_request_body: false +request_tracing: false +traces_sample_rate: null +browser_traces_sample_rate: null +database_tracing: false +twig_tracing: false +auto_session_tracking: false +_core: + default_config_hash: 0cSFmtaooEoYv15Hw6hl0XsvZE6k1DKbqjukwUjZi6Y diff --git a/conf/cmi/syslog.settings.yml b/conf/cmi/syslog.settings.yml new file mode 100644 index 00000000..99e980c7 --- /dev/null +++ b/conf/cmi/syslog.settings.yml @@ -0,0 +1,3 @@ +identity: '' +facility: 128 +format: '!base_url|!timestamp|!type|!ip|!request_uri|!referer|!uid|!link|!message' diff --git a/conf/cmi/system.action.tpr_errand_service_publish_action.yml b/conf/cmi/system.action.tpr_errand_service_publish_action.yml index 8d1df355..a371d2cd 100644 --- a/conf/cmi/system.action.tpr_errand_service_publish_action.yml +++ b/conf/cmi/system.action.tpr_errand_service_publish_action.yml @@ -1,3 +1,4 @@ +uuid: b709269b-e4b7-40ee-8cb5-15df43920063 langcode: en status: true dependencies: @@ -8,4 +9,3 @@ label: 'Publish errand service' type: tpr_errand_service plugin: 'entity:publish_action:tpr_errand_service' configuration: { } -uuid: b709269b-e4b7-40ee-8cb5-15df43920063 diff --git a/conf/cmi/system.action.tpr_errand_service_unpublish_action.yml b/conf/cmi/system.action.tpr_errand_service_unpublish_action.yml index b9a1659c..a1b64739 100644 --- a/conf/cmi/system.action.tpr_errand_service_unpublish_action.yml +++ b/conf/cmi/system.action.tpr_errand_service_unpublish_action.yml @@ -1,3 +1,4 @@ +uuid: c88ae003-320c-4463-a06e-5c2dbc096b75 langcode: en status: true dependencies: @@ -8,4 +9,3 @@ label: 'Unpublish errand service' type: tpr_errand_service plugin: 'entity:unpublish_action:tpr_errand_service' configuration: { } -uuid: c88ae003-320c-4463-a06e-5c2dbc096b75 diff --git a/conf/cmi/system.action.tpr_service_channel_publish_action.yml b/conf/cmi/system.action.tpr_service_channel_publish_action.yml index 8e728007..d21d8d4c 100644 --- a/conf/cmi/system.action.tpr_service_channel_publish_action.yml +++ b/conf/cmi/system.action.tpr_service_channel_publish_action.yml @@ -1,3 +1,4 @@ +uuid: eedee1d9-f13e-4c72-a597-193499785a69 langcode: en status: true dependencies: @@ -8,4 +9,3 @@ label: 'Publish service channel' type: tpr_service_channel plugin: 'entity:publish_action:tpr_service_channel' configuration: { } -uuid: eedee1d9-f13e-4c72-a597-193499785a69 diff --git a/conf/cmi/system.action.tpr_service_channel_unpublish_action.yml b/conf/cmi/system.action.tpr_service_channel_unpublish_action.yml index d2c86eec..254c9f89 100644 --- a/conf/cmi/system.action.tpr_service_channel_unpublish_action.yml +++ b/conf/cmi/system.action.tpr_service_channel_unpublish_action.yml @@ -1,3 +1,4 @@ +uuid: 177faeb3-a520-41bc-8bc2-9536a218916e langcode: en status: true dependencies: @@ -8,4 +9,3 @@ label: 'Unpublish service channel' type: tpr_service_channel plugin: 'entity:unpublish_action:tpr_service_channel' configuration: { } -uuid: 177faeb3-a520-41bc-8bc2-9536a218916e diff --git a/conf/cmi/system.site.yml b/conf/cmi/system.site.yml index e58cfec3..10a2efb5 100644 --- a/conf/cmi/system.site.yml +++ b/conf/cmi/system.site.yml @@ -5,7 +5,7 @@ slogan: '' page: 403: '' 404: '' - front: /user/login + front: /front admin_compact_mode: false weight_select_max: 100 langcode: en diff --git a/conf/cmi/user.role.admin.yml b/conf/cmi/user.role.admin.yml index c8948e29..abfb39b2 100644 --- a/conf/cmi/user.role.admin.yml +++ b/conf/cmi/user.role.admin.yml @@ -5,7 +5,7 @@ dependencies: { } _core: default_config_hash: 7RTyCpgMKCMdwkxYrpzYOCq7DQDHO0SrTjB7xwFaIyI id: admin -label: Ylläpitäjä +label: Admin weight: 2 is_admin: null permissions: diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml index 828fda2e..367764af 100644 --- a/conf/cmi/user.role.authenticated.yml +++ b/conf/cmi/user.role.authenticated.yml @@ -5,13 +5,14 @@ dependencies: { } _core: default_config_hash: 83Nuup-6oYkkdAsvg3nrR2pBOgtTXEV1JrzpCCLkYLM id: authenticated -label: 'Sisäänkirjautunut käyttäjä' +label: 'Authenticated user' weight: 1 is_admin: false permissions: - 'access content' - 'display eu cookie compliance popup' - 'use text format full_html' + - 'use text format minimal' - 'view media' - 'view remote entities' - 'view tpr_service' diff --git a/conf/cmi/varnish_purger.settings.default.yml b/conf/cmi/varnish_purger.settings.default.yml new file mode 100644 index 00000000..5f5cfad1 --- /dev/null +++ b/conf/cmi/varnish_purger.settings.default.yml @@ -0,0 +1,28 @@ +uuid: 85727c8d-d176-4e6b-a897-fe0f15e13b81 +langcode: en +status: true +dependencies: { } +id: default +name: varnish +invalidationtype: tag +hostname: localhost +port: 6081 +path: / +request_method: BAN +scheme: http +verify: '0' +headers: + - + field: Cache-Tags + value: '[invalidation:expression]' + - + field: X-Cache-Tags + value: '[invalidation:expression]' +body: null +body_content_type: null +runtime_measurement: true +timeout: !!float 1 +connect_timeout: !!float 1 +cooldown_time: !!float 0 +max_requests: 100 +http_errors: true diff --git a/conf/cmi/views.view.content.yml b/conf/cmi/views.view.content.yml index ee89c553..8ac51c63 100644 --- a/conf/cmi/views.view.content.yml +++ b/conf/cmi/views.view.content.yml @@ -548,7 +548,6 @@ display: fi: fi sv: sv en: en - ru: ru group: 1 exposed: true expose: diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml new file mode 100644 index 00000000..e1c6e539 --- /dev/null +++ b/conf/cmi/views.view.er_tpr_unit.yml @@ -0,0 +1,632 @@ +uuid: 52b8818a-0ce2-4a0d-b157-33b920875491 +langcode: en +status: true +dependencies: + module: + - helfi_tpr + - user +_core: + default_config_hash: zQ42nbFfpEozSJ5KKZAtnpZJWTBMAQeUgGa0DiN9NDE +id: er_tpr_unit +label: 'Entity reference - TPR Unit' +module: views +description: '' +tag: '' +base_table: tpr_unit_field_data +base_field: id +display: + default: + display_plugin: default + id: default + display_title: Default + position: 0 + display_options: + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + query: + type: views_query + options: + disable_sql_rewrite: false + distinct: true + replica: false + query_comment: '' + query_tags: { } + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + pager: + type: mini + options: + items_per_page: 10 + offset: 0 + id: 0 + total_pages: null + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + tags: + previous: ‹‹ + next: ›› + style: + type: default + options: + row_class: '' + default_row_class: true + uses_fields: true + row: + type: fields + options: + inline: { } + separator: '' + hide_empty: false + default_field_elements: true + fields: + name: + table: tpr_unit_field_data + field: name + id: name + entity_type: null + entity_field: name + plugin_id: field + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + filters: + content_translation_status: + id: content_translation_status + table: tpr_unit_field_data + field: content_translation_status + relationship: none + group_type: group + admin_label: '' + operator: '=' + value: '1' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: tpr_unit + entity_field: content_translation_status + plugin_id: boolean + langcode: + id: langcode + table: tpr_unit_field_data + field: langcode + relationship: none + group_type: group + admin_label: '' + operator: in + value: + '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: tpr_unit + entity_field: langcode + plugin_id: language + sorts: + name: + id: name + table: tpr_unit_field_data + field: name + relationship: none + group_type: group + admin_label: '' + order: ASC + exposed: false + expose: + label: '' + entity_type: tpr_unit + entity_field: name + plugin_id: standard + title: '' + header: { } + footer: { } + empty: + area: + id: area + table: views + field: area + relationship: none + group_type: group + admin_label: '' + empty: true + tokenize: false + content: + value: 'No results' + format: full_html + plugin_id: text + relationships: { } + arguments: + id: + id: id + table: tpr_unit_field_data + field: id + relationship: none + group_type: group + admin_label: '' + default_action: ignore + exception: + value: all + title_enable: false + title: All + title_enable: false + title: '' + default_argument_type: node + default_argument_options: { } + default_argument_skip_url: false + summary_options: + base_path: '' + count: true + items_per_page: 25 + override: false + summary: + sort_order: asc + number_of_records: 0 + format: default_summary + specify_validation: true + validate: + type: 'entity:tpr_unit' + fail: 'not found' + validate_options: + operation: view + multiple: 1 + access: false + bundles: { } + glossary: false + limit: 0 + case: none + path_case: none + transform_dash: false + break_phrase: true + entity_type: tpr_unit + entity_field: id + plugin_id: string + display_extenders: { } + use_ajax: true + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions + tags: { } + entity_reference: + display_plugin: entity_reference + id: entity_reference + display_title: 'Entity Reference' + position: 2 + display_options: + display_extenders: + metatag_display_extender: { } + fields: + name_override: + id: name_override + table: tpr_unit_field_data + field: name_override + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: true + alter: + alter_text: true + text: '({{ id }}) {{ name }}' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: true + trim: false + preserve_tags: '' + html: false + element_type: '0' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: false + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: false + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: tpr_unit + entity_field: name_override + plugin_id: field + id: + id: id + table: tpr_unit_field_data + field: id + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: true + text: '{{ id__value }} ' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: true + trim: false + preserve_tags: '' + html: false + element_type: '0' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: false + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: tpr_unit + entity_field: id + plugin_id: field + name: + id: name + table: tpr_unit_field_data + field: name + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: true + text: ' {{ name__value }}' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: true + trim: false + preserve_tags: '' + html: false + element_type: '0' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: false + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: false + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: null + entity_field: name + plugin_id: field + defaults: + fields: false + filters: false + filter_groups: false + arguments: false + filters: + content_translation_status: + id: content_translation_status + table: tpr_unit_field_data + field: content_translation_status + relationship: none + group_type: group + admin_label: '' + operator: '=' + value: '1' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: tpr_unit + entity_field: content_translation_status + plugin_id: boolean + langcode: + id: langcode + table: tpr_unit_field_data + field: langcode + relationship: none + group_type: group + admin_label: '' + operator: in + value: + '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: tpr_unit + entity_field: langcode + plugin_id: language + filter_groups: + operator: AND + groups: + 1: AND + arguments: { } + style: + type: entity_reference + options: + search_fields: + name_override: name_override + id: id + name: name + pager: + type: some + options: + items_per_page: 40 + offset: 0 + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - user.permissions + tags: { } diff --git a/conf/cmi/views.view.redirect.yml b/conf/cmi/views.view.redirect.yml index 3224d905..635fe1b1 100644 --- a/conf/cmi/views.view.redirect.yml +++ b/conf/cmi/views.view.redirect.yml @@ -459,55 +459,118 @@ display: default_group: All default_group_multiple: { } group_items: - 1: - title: '300 Multiple Choices' + - + value: { } + - + value: { } + - + value: { } + - + value: { } + - + value: { } + - + value: { } + - + value: { } + - operator: '=' + title: '300 Multiple Choices' value: - value: '300' - min: '' max: '' - 2: - title: '301 Moved Permanently' + min: '' + value: '300' + - operator: '=' + title: '301 Moved Permanently' value: + max: '' + min: '' value: '301' + - + operator: '=' + title: '302 Found' + value: + max: '' min: '' + value: '302' + - + operator: '=' + title: '303 See Other' + value: max: '' - 3: - title: '302 Found' + min: '' + value: '303' + - operator: '=' + title: '304 Not Modified' value: - value: '302' + max: '' min: '' + value: '304' + - + operator: '=' + title: '305 Use Proxy' + value: max: '' - 4: - title: '303 See Other' + min: '' + value: '305' + - operator: '=' + title: '307 Temporary Redirect' value: - value: '303' + max: '' min: '' + value: '307' + - + operator: '=' + title: '300 Multiple Choices' + value: max: '' - 5: - title: '304 Not Modified' + min: '' + value: '300' + - operator: '=' + title: '301 Moved Permanently' value: - value: '304' + max: '' min: '' + value: '301' + - + operator: '=' + title: '302 Found' + value: max: '' - 6: - title: '305 Use Proxy' + min: '' + value: '302' + - operator: '=' + title: '303 See Other' value: - value: '305' + max: '' min: '' + value: '303' + - + operator: '=' + title: '304 Not Modified' + value: max: '' - 7: - title: '307 Temporary Redirect' + min: '' + value: '304' + - operator: '=' + title: '305 Use Proxy' value: - value: '307' + max: '' min: '' + value: '305' + - + operator: '=' + title: '307 Temporary Redirect' + value: max: '' + min: '' + value: '307' entity_type: redirect entity_field: status_code plugin_id: numeric @@ -576,7 +639,8 @@ display: filter_groups: operator: AND groups: - 1: AND + - AND + - AND cache_metadata: contexts: - 'languages:language_content' @@ -584,6 +648,11 @@ display: - url - url.query_args - user.permissions + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions cacheable: false max-age: 0 tags: { } @@ -602,6 +671,11 @@ display: - url - url.query_args - user.permissions + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions cacheable: false max-age: 0 tags: { } diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml new file mode 100644 index 00000000..95f6f5ea --- /dev/null +++ b/conf/cmi/views.view.service_list.yml @@ -0,0 +1,565 @@ +uuid: 3692885f-ce26-478d-b810-2e0bc233fd53 +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.tpr_service.teaser + module: + - helfi_tpr + - user + - views_infinite_scroll +id: service_list +label: 'Service list' +module: views +description: '' +tag: '' +base_table: tpr_service_field_data +base_field: id +display: + default: + display_plugin: default + id: default + display_title: Default + position: 0 + display_options: + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + query: + type: views_query + options: + disable_sql_rewrite: false + distinct: false + replica: false + query_comment: '' + query_tags: { } + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + pager: + type: infinite_scroll + options: + items_per_page: 4 + offset: 0 + id: 0 + total_pages: null + tags: + previous: '‹ Previous' + next: 'Next ›' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + 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 + style: + type: default + options: + row_class: '' + default_row_class: true + uses_fields: false + row: + type: 'entity:tpr_service' + options: + relationship: none + view_mode: teaser + fields: + name: + table: tpr_service_field_data + field: name + id: name + entity_type: null + entity_field: name + plugin_id: field + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + id: + id: id + table: tpr_service_field_data + field: id + entity_type: tpr_service + entity_field: id + plugin_id: field + name_override: + id: name_override + table: tpr_service_field_data + field: name_override + entity_type: tpr_service + entity_field: name_override + plugin_id: field + filters: + content_translation_status: + value: '1' + table: tpr_service_field_data + field: content_translation_status + plugin_id: boolean + entity_type: tpr_service + entity_field: content_translation_status + id: content_translation_status + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + group: 1 + langcode: + id: langcode + table: tpr_service_field_data + field: langcode + relationship: none + group_type: group + admin_label: '' + operator: in + value: + '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: tpr_service + entity_field: langcode + plugin_id: language + sorts: + name: + id: name + table: tpr_service_field_data + field: name + relationship: none + group_type: group + admin_label: '' + order: ASC + exposed: false + expose: + label: '' + entity_type: tpr_service + entity_field: name + plugin_id: standard + name_override: + id: name_override + table: tpr_service_field_data + field: name_override + relationship: none + group_type: group + admin_label: '' + order: ASC + exposed: false + expose: + label: '' + entity_type: tpr_service + entity_field: name_override + plugin_id: standard + title: '' + header: { } + footer: { } + empty: + area: + id: area + table: views + field: area + relationship: none + group_type: group + admin_label: '' + empty: true + tokenize: false + content: + value: 'No results' + format: full_html + plugin_id: text + relationships: { } + arguments: + id: + id: id + table: tpr_service_field_data + field: id + relationship: none + group_type: group + admin_label: '' + default_action: ignore + exception: + value: all + title_enable: false + title: All + title_enable: false + title: '' + default_argument_type: fixed + default_argument_options: + argument: '' + default_argument_skip_url: false + summary_options: + base_path: '' + count: true + items_per_page: 25 + override: false + summary: + sort_order: asc + number_of_records: 0 + format: default_summary + specify_validation: true + validate: + type: 'entity:tpr_service' + fail: 'not found' + validate_options: + operation: view + multiple: 1 + access: false + bundles: { } + glossary: false + limit: 0 + case: none + path_case: none + transform_dash: false + break_phrase: true + entity_type: tpr_service + entity_field: id + plugin_id: string + display_extenders: { } + use_ajax: true + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions + tags: { } + block: + display_plugin: block + id: block + display_title: Block + position: 1 + display_options: + display_extenders: + metatag_display_extender: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions + tags: { } + entity_reference_1: + display_plugin: entity_reference + id: entity_reference_1 + display_title: 'Entity Reference' + position: 2 + display_options: + display_extenders: + metatag_display_extender: { } + fields: + name_override: + id: name_override + table: tpr_service_field_data + field: name_override + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: true + alter: + alter_text: true + text: '({{ id }}) {{ name }}' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: true + trim: false + preserve_tags: '' + html: false + element_type: '0' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: false + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: false + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: tpr_service + entity_field: name_override + plugin_id: field + id: + id: id + table: tpr_service_field_data + field: id + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: true + text: '{{ id__value }} ' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: true + trim: false + preserve_tags: '' + html: false + element_type: '0' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: false + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: tpr_service + entity_field: id + plugin_id: field + name: + id: name + table: tpr_service_field_data + field: name + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: true + text: ' {{ name__value }}' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: true + trim: false + preserve_tags: '' + html: false + element_type: '0' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: false + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: false + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: null + entity_field: name + plugin_id: field + defaults: + fields: false + arguments: false + pager: + type: some + options: + items_per_page: 40 + offset: 0 + arguments: { } + style: + type: entity_reference + options: + search_fields: + name_override: name_override + id: id + name: name + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - user.permissions + tags: { } diff --git a/conf/cmi/views.view.tpr_service_list.yml b/conf/cmi/views.view.tpr_service_list.yml index 54fbaee0..f7f85431 100644 --- a/conf/cmi/views.view.tpr_service_list.yml +++ b/conf/cmi/views.view.tpr_service_list.yml @@ -627,7 +627,6 @@ display: fi: fi sv: sv en: en - ru: ru group: 1 exposed: true expose: diff --git a/conf/cmi/views.view.tpr_unit_list.yml b/conf/cmi/views.view.tpr_unit_list.yml index 5f9aa152..bfa93b10 100644 --- a/conf/cmi/views.view.tpr_unit_list.yml +++ b/conf/cmi/views.view.tpr_unit_list.yml @@ -627,7 +627,6 @@ display: fi: fi sv: sv en: en - ru: ru group: 1 exposed: true expose: diff --git a/conf/cmi/views.view.unit_services.yml b/conf/cmi/views.view.unit_services.yml index a85384f1..bf63ec56 100644 --- a/conf/cmi/views.view.unit_services.yml +++ b/conf/cmi/views.view.unit_services.yml @@ -50,7 +50,7 @@ display: pager: type: infinite_scroll options: - items_per_page: 8 + items_per_page: 4 offset: 0 id: 0 total_pages: null diff --git a/conf/cmi/views.view.watchdog.yml b/conf/cmi/views.view.watchdog.yml deleted file mode 100644 index c09c3aa1..00000000 --- a/conf/cmi/views.view.watchdog.yml +++ /dev/null @@ -1,711 +0,0 @@ -uuid: 06c6cb52-b232-4d8c-a476-4d605143e4ad -langcode: en -status: true -dependencies: - module: - - dblog - - user -_core: - default_config_hash: d_YYDAS1Anyj4eLOXI9DnSIAbSX6Kk-qpa71pawlLYI -id: watchdog -label: Watchdog -module: views -description: 'Recent log messages' -tag: '' -base_table: watchdog -base_field: wid -display: - default: - display_plugin: default - id: default - display_title: Default - position: 0 - display_options: - access: - type: perm - options: - perm: 'access site reports' - cache: - type: none - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Filter - reset_button: true - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: false - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: mini - options: - items_per_page: 50 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: ‹‹ - next: ›› - style: - type: table - options: - grouping: { } - row_class: '{{ type }} {{ severity }}' - default_row_class: true - override: true - sticky: false - caption: '' - summary: '' - description: '' - columns: - nothing: nothing - wid: wid - severity: severity - type: type - timestamp: timestamp - message: message - name: name - link: link - info: - nothing: - align: '' - separator: '' - empty_column: false - responsive: priority-medium - wid: - sortable: false - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low - severity: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-low - type: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-medium - timestamp: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low - message: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - name: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-medium - link: - align: '' - separator: '' - empty_column: false - responsive: priority-low - default: wid - empty_table: false - row: - type: fields - fields: - nothing: - id: nothing - table: views - field: nothing - relationship: none - group_type: group - admin_label: Icon - label: '' - exclude: false - alter: - alter_text: true - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: icon - element_label_type: '' - element_label_class: '' - element_label_colon: false - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: false - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: false - plugin_id: custom - wid: - id: wid - table: watchdog - field: wid - relationship: none - group_type: group - admin_label: '' - label: WID - exclude: true - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - plugin_id: standard - severity: - id: severity - table: watchdog - field: severity - relationship: none - group_type: group - admin_label: '' - label: Severity - exclude: true - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - machine_name: false - plugin_id: machine_name - type: - id: type - table: watchdog - field: type - relationship: none - group_type: group - admin_label: '' - label: Type - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - plugin_id: standard - timestamp: - id: timestamp - table: watchdog - field: timestamp - relationship: none - group_type: group - admin_label: '' - label: Date - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - date_format: short - custom_date_format: '' - timezone: '' - plugin_id: date - message: - id: message - table: watchdog - field: message - relationship: none - group_type: group - admin_label: '' - label: Message - exclude: false - alter: - alter_text: false - text: '' - make_link: true - path: 'admin/reports/dblog/event/{{ wid }}' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '{{ message }}' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 56 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: true - trim: true - preserve_tags: '' - html: true - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - replace_variables: true - plugin_id: dblog_message - name: - id: name - table: users_field_data - field: name - relationship: uid - group_type: group - admin_label: '' - label: User - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: user_name - settings: - link_to_entity: true - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - entity_type: user - entity_field: name - plugin_id: field - link: - id: link - table: watchdog - field: link - relationship: none - group_type: group - admin_label: '' - label: Operations - exclude: false - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - plugin_id: dblog_operations - filters: - type: - id: type - table: watchdog - field: type - relationship: none - group_type: group - admin_label: '' - operator: in - value: { } - group: 1 - exposed: true - expose: - operator_id: type_op - label: Type - description: '' - use_operator: false - operator: type_op - identifier: type - required: false - remember: false - multiple: true - remember_roles: - authenticated: authenticated - anonymous: '0' - administrator: '0' - reduce: false - operator_limit_selection: false - operator_list: { } - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - plugin_id: dblog_types - severity: - id: severity - table: watchdog - field: severity - relationship: none - group_type: group - admin_label: '' - operator: in - value: { } - group: 1 - exposed: true - expose: - operator_id: severity_op - label: Severity - description: '' - use_operator: false - operator: severity_op - identifier: severity - required: false - remember: false - multiple: true - remember_roles: - authenticated: authenticated - anonymous: '0' - administrator: '0' - reduce: false - operator_limit_selection: false - operator_list: { } - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - plugin_id: in_operator - sorts: - wid: - id: wid - table: watchdog - field: wid - relationship: none - group_type: group - admin_label: '' - order: DESC - exposed: false - expose: - label: '' - plugin_id: standard - title: 'Recent log messages' - header: { } - footer: { } - empty: - area: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: 'No log messages available.' - empty: true - tokenize: false - content: 'No log messages available.' - plugin_id: text_custom - relationships: - uid: - id: uid - table: watchdog - field: uid - relationship: none - group_type: group - admin_label: User - required: false - plugin_id: standard - arguments: { } - display_extenders: { } - filter_groups: - operator: AND - groups: - 1: AND - css_class: admin-dblog - cache_metadata: - max-age: -1 - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - user.permissions - tags: { } - page: - display_plugin: page - id: page - display_title: Page - position: 1 - display_options: - display_extenders: { } - path: admin/reports/dblog - cache_metadata: - max-age: -1 - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - user.permissions - tags: { } diff --git a/docker-compose.yml b/docker-compose.yml index c569da09..5cb44d39 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: context: ./docker/local environment: APP_ENV: "${APP_ENV:-dev}" - DRUPAL_ROUTES: "https://varnish-${DRUPAL_HOSTNAME},https://helfi-proxy.docker.so" + DRUPAL_ROUTES: "https://varnish-${DRUPAL_HOSTNAME},https://helfi-proxy.docker.so,http://strategia-varnish" DRUSH_OPTIONS_URI: "https://${DRUPAL_HOSTNAME}" DRUPAL_REVERSE_PROXY_ADDRESS: helfi-proxy.docker.so #XDEBUG_ENABLE: "true" diff --git a/docker/openshift/crons/base.sh b/docker/openshift/crons/base.sh index a95a4713..adfd2142 100644 --- a/docker/openshift/crons/base.sh +++ b/docker/openshift/crons/base.sh @@ -17,6 +17,7 @@ echo "Starting cron: $(date)" # @endcode exec "/crons/migrate-tpr.sh" & +exec "/crons/purge-queue.sh" & while true do diff --git a/docker/openshift/crons/purge-queue.sh b/docker/openshift/crons/purge-queue.sh new file mode 100644 index 00000000..9774ea6b --- /dev/null +++ b/docker/openshift/crons/purge-queue.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +echo "Running purge queue: $(date)" + +while true +do + echo "Flushing purge queue: $(date)" + drush p:queue-work --no-interaction + # Sleep for 60 seconds. + sleep 60 +done diff --git a/docker/openshift/entrypoints/20-deploy.sh b/docker/openshift/entrypoints/20-deploy.sh index 7702c3ae..8ed7f165 100644 --- a/docker/openshift/entrypoints/20-deploy.sh +++ b/docker/openshift/entrypoints/20-deploy.sh @@ -1,3 +1,22 @@ #!/bin/bash -cd /var/www/html/public && drush deploy +cd /var/www/html/public + +# Make sure we have active Drupal configuration. +if [ ! -f "../conf/cmi/system.site.yml" ]; then + echo "Codebase is not deployed properly. Exiting early." + exit 1 +fi + +if [ ! -n "$OPENSHIFT_BUILD_NAME" ]; then + echo "OPENSHIFT_BUILD_NAME is not defined. Exiting early." + exit 1 +fi + +# This script is run every time a container is spawned and certain environments might +# start more than one Drupal container. This is used to make sure we run deploy +# tasks only once per deploy. +if [ "$(drush state:get deploy_id)" != "$OPENSHIFT_BUILD_NAME" ]; then + drush state:set deploy_id $OPENSHIFT_BUILD_NAME + drush deploy +fi diff --git a/public/sites/default/development.settings.php b/public/sites/default/development.settings.php index dce803cb..c1376e52 100644 --- a/public/sites/default/development.settings.php +++ b/public/sites/default/development.settings.php @@ -2,7 +2,7 @@ $config['helfi_proxy.settings']['prefixes'] = [ 'en' => 'dev-administration', - 'fi' => 'dev-hallinto', - 'sv' => 'dev-forvaltning', + 'fi' => 'dev-paatoksenteko-ja-hallinto', + 'sv' => 'dev-beslutsfattande-och-forvaltning', 'ru' => 'dev-administration', ]; diff --git a/public/sites/default/staging.settings.php b/public/sites/default/staging.settings.php index f248b2e4..53401a7e 100644 --- a/public/sites/default/staging.settings.php +++ b/public/sites/default/staging.settings.php @@ -2,7 +2,7 @@ $config['helfi_proxy.settings']['prefixes'] = [ 'en' => 'staging-administration', - 'fi' => 'staging-hallinto', - 'sv' => 'staging-forvaltning', + 'fi' => 'staging-paatoksenteko-ja-hallinto', + 'sv' => 'staging-beslutsfattande-och-forvaltning', 'ru' => 'staging-administration', ]; diff --git a/public/sites/default/testing.settings.php b/public/sites/default/testing.settings.php index 867bb9ae..ce181720 100644 --- a/public/sites/default/testing.settings.php +++ b/public/sites/default/testing.settings.php @@ -2,8 +2,8 @@ $config['helfi_proxy.settings']['prefixes'] = [ 'en' => 'test-administration', - 'fi' => 'test-hallinto', - 'sv' => 'test-forvaltning', + 'fi' => 'test-paatoksenteko-ja-hallinto', + 'sv' => 'test-beslutsfattande-och-forvaltning', 'ru' => 'test-administration', ]; diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk index 319be463..ca24b6a6 100644 --- a/tools/make/project/install.mk +++ b/tools/make/project/install.mk @@ -1,6 +1,6 @@ ifeq ($(DRUPAL_VERSION),8) ifeq ($(DRUPAL_CONF_EXISTS),yes) - DRUPAL_NEW_TARGETS := up build drush-si drush-enable-modules drush-locale-update drush-cim drush-uli + DRUPAL_NEW_TARGETS := up build drush-si drush-locale-update drush-cr drush-uli else DRUPAL_NEW_TARGETS := up build drush-si drush-enable-modules drush-locale-update drush-uli endif