Skip to content

Commit

Permalink
Merge pull request #74 from City-of-Helsinki/dev
Browse files Browse the repository at this point in the history
Release 13.10.2022
  • Loading branch information
khalima authored Oct 13, 2022
2 parents 9265d0d + 212fb9e commit 46f838c
Show file tree
Hide file tree
Showing 12 changed files with 198 additions and 211 deletions.
372 changes: 185 additions & 187 deletions composer.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions conf/cmi/block.block.external_header_language_links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ settings:
label_display: '0'
provider: helfi_navigation
level: 1
expand_all_items: false
depth: 1
expand_all_items: true
depth: 2
visibility: { }
4 changes: 3 additions & 1 deletion conf/cmi/config_ignore.settings.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
_core:
default_config_hash: UVH1aJ4b44UM-VdPVN7hNNuuVqfReJxwfVeDQH1Hvsk
ignored_config_entities: null
ignored_config_entities:
- 'hdbt_admin_tools.site_settings:site_settings'
- 'system.site:page.front'
2 changes: 1 addition & 1 deletion conf/cmi/eu_cookie_compliance.cookie_category.chat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies: { }
id: chat
label: 'Functional chat cookies'
description:
value: "<p>The chats on the hel.fi&nbsp; website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires.&nbsp; No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.</p>\r\n\r\n<table>\r\n\t<thead>\r\n\t\t<tr>\r\n\t\t\t<th>Name</th>\r\n\t\t\t<th>Provider</th>\r\n\t\t\t<th>Purpose of the cookie</th>\r\n\t\t\t<th>Validity</th>\r\n\t\t\t<th>Type</th>\r\n\t\t</tr>\r\n\t</thead>\r\n\t<tbody>\r\n\t\t<tr>\r\n\t\t\t<td>_genesys.widgets.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used for storing data required by the chat functionality.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>__VCAP_ID__</td>\r\n\t\t\t<td>coh-chat-app-prod.eu-de.mybluemix.net</td>\r\n\t\t\t<td>The cookie is an obligatory cookie that facilitates visiting the website.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>Third party</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>gcReturnSessionId&nbsp;<br />\r\n\t\t\tgcAlternativeReturnUrl&nbsp;<br />\r\n\t\t\tgcReturnUrl&nbsp;<br />\r\n\t\t\tgcLoginButtonState</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used for authentication in the chat.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t</tbody>\r\n</table>\r\n"
value: "<p>The chats on the hel.fi&nbsp; website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires.&nbsp; No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.</p>\r\n\r\n<table>\r\n\t<thead>\r\n\t\t<tr>\r\n\t\t\t<th>Name</th>\r\n\t\t\t<th>Provider</th>\r\n\t\t\t<th>Purpose of the cookie</th>\r\n\t\t\t<th>Validity</th>\r\n\t\t\t<th>Type</th>\r\n\t\t</tr>\r\n\t</thead>\r\n\t<tbody>\r\n\t\t<tr>\r\n\t\t\t<td>_genesys.widgets.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used for storing data required by the chat functionality.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>__VCAP_ID__</td>\r\n\t\t\t<td>coh-chat-app-prod.eu-de.mybluemix.net</td>\r\n\t\t\t<td>Used for storing data required by the chat functionality.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>Third party</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>gcReturnSessionId&nbsp;<br />\r\n\t\t\tgcAlternativeReturnUrl&nbsp;<br />\r\n\t\t\tgcReturnUrl&nbsp;<br />\r\n\t\t\tgcLoginButtonState</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used for authentication in the chat.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>\r\n\t\t\t<p>&nbsp;</p>\r\n\t\t\t</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>leijuke.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used for storing data required by the chat functionality.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>connect.sid</td>\r\n\t\t\t<td>hel-thk-botti.kuurahealth.com</td>\r\n\t\t\t<td>The Kuura cookie is used to save necessary data.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>Third party</td>\r\n\t\t</tr>\r\n\t</tbody>\r\n</table>\r\n"
format: full_html
checkbox_default_state: unchecked
weight: -5
2 changes: 1 addition & 1 deletion conf/cmi/eu_cookie_compliance.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ better_support_for_screen_readers: false
method: categories
disabled_javascripts: ''
automatic_cookies_removal: true
allowed_cookies: "essential:AWSELB\r\nessential:AWSELBCORS\r\nessential:cookiehub\r\nessential:mtm_cookie_consent\r\nessential:frosmo_quickContext\r\nessential:id\r\nessential:JSESSIONID\r\nessential:COOKIE_SUPPORT\r\npreference:httpskartta.hel.fi.SWCulture\r\npreference:icareus-device\r\npreference:VISITOR_INFO1_LIVE\r\npreference:CONSENT\r\nstatistics:Snoobisession_hel_fi\r\nstatistics:Snoobi30minute_hel_fi\r\nstatistics:SnoobiID\r\nstatistics:nmstat\r\nstatistics:Snoobisession_hel_projektit\r\nstatistics:Snoobi30minute_hel_projektit\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.141.89f6\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:__utma\r\nstatistics:__utmc\r\nstatistics:__utmz\r\nstatistics:__utmt\r\nstatistics:__utmb\r\nstatistics:__utmb\r\nstatistics:YSC\r\nmarketing:IDE\r\nchat:_genesys.widgets.*\r\nchat:__VCAP_ID__\r\nchat:gcReturnSessionId \r\nchat:gcAlternativeReturnUrl \r\nchat:gcReturnUrl \r\nchat:gcLoginButtonState\r\nchat:leijuke.*"
allowed_cookies: "essential:AWSELB\r\nessential:AWSELBCORS\r\nessential:cookiehub\r\nessential:mtm_cookie_consent\r\nessential:frosmo_quickContext\r\nessential:id\r\nessential:JSESSIONID\r\nessential:COOKIE_SUPPORT\r\npreference:httpskartta.hel.fi.SWCulture\r\npreference:icareus-device\r\npreference:VISITOR_INFO1_LIVE\r\npreference:CONSENT\r\nstatistics:Snoobisession_hel_fi\r\nstatistics:Snoobi30minute_hel_fi\r\nstatistics:SnoobiID\r\nstatistics:nmstat\r\nstatistics:Snoobisession_hel_projektit\r\nstatistics:Snoobi30minute_hel_projektit\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.141.89f6\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:__utma\r\nstatistics:__utmc\r\nstatistics:__utmz\r\nstatistics:__utmt\r\nstatistics:__utmb\r\nstatistics:__utmb\r\nstatistics:YSC\r\nmarketing:IDE\r\nchat:_genesys.widgets.*\r\nchat:__VCAP_ID__\r\nchat:gcReturnSessionId \r\nchat:gcAlternativeReturnUrl \r\nchat:gcReturnUrl \r\nchat:gcLoginButtonState\r\nchat:leijuke.*\r\nchat:connect.sid"
consent_storage_method: do_not_store
withdraw_message:
value: "<h2>Hel.fi uses cookies</h2>\r\n\r\n<p>You have given your consent for us to set cookies.</p>\r\n"
Expand Down
6 changes: 3 additions & 3 deletions conf/cmi/hdbt_admin_tools.site_settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ _core:
default_config_hash: 3ooO-bLkru7Jl91Kb8hO7pD1divveu98PTIZQiCV3pQ
langcode: en
site_settings:
theme_color: coat-of-arms
default_icon: home-smoke
theme_color: coat-of-arms
koro: basic
footer_settings:
footer_color: dark
footer_top_title: 'Contact us'
footer_top_content:
format: full_html
value: "<ul class=\"menu\"><li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Helsinki-info advisory service\" data-protocol=\"false\" href=\"https://www.hel.fi/kanslia/neuvonta-en/\">Helsinki-info advisory service</a></li><li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Contact information search\" data-protocol=\"false\" href=\"https://numerot.hel.fi/\">Contact information search</a></li><li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Give feedback\" data-protocol=\"false\" href=\"https://www.hel.fi/feedback/\">Give feedback</a></li></ul>\r\n"
footer_top_title: 'Contact us'
format: full_html
5 changes: 0 additions & 5 deletions conf/cmi/helfi_base_config.breadcrumb.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
label: 'Toiminnalliset chat-evästeet'
description:
value: "<p>Toiminnallisten chat-evästeiden avulla mahdollistetaan helfi-sivujen chattien toiminta. Jos aloitat chatin, hyväksyt sen käyttöön liittyvät toiminnalliset evästeet automaattisesti.&nbsp; Evästeiden hyväksymiseen ei tällöin tarvita erillistä suostumusta. Toiminnallisia chat-evästeitä ladataan laitteellesi vain, jos käynnistät chatin.</p>\r\n\r\n<table>\r\n\t<thead>\r\n\t\t<tr>\r\n\t\t\t<th>Nimi</th>\r\n\t\t\t<th>Tarjoaja</th>\r\n\t\t\t<th>Tarkoitus</th>\r\n\t\t\t<th>Voimassa</th>\r\n\t\t\t<th>Tyyppi</th>\r\n\t\t</tr>\r\n\t</thead>\r\n\t<tbody>\r\n\t\t<tr>\r\n\t\t\t<td>_genesys.widgets.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Käytetään chatin tarvitseman datan tallentamiseen.</td>\r\n\t\t\t<td>Istunto</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>__VCAP_ID__</td>\r\n\t\t\t<td>coh-chat-app-prod.eu-de.mybluemix.net</td>\r\n\t\t\t<td>Sivuston pakollinen eväste mahdollistaa kävijän vierailun sivustolla.</td>\r\n\t\t\t<td>Istunto</td>\r\n\t\t\t<td>Kolmas osapuoli</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>gcReturnSessionId&nbsp;<br />\r\n\t\t\tgcAlternativeReturnUrl&nbsp;<br />\r\n\t\t\tgcReturnUrl&nbsp;<br />\r\n\t\t\tgcLoginButtonState</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Käytetään tunnistautumiseen chatissa.</td>\r\n\t\t\t<td>Istunto</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t</tbody>\r\n</table>\r\n"
value: "<p>Toiminnallisten chat-evästeiden avulla mahdollistetaan helfi-sivujen chattien toiminta. Jos aloitat chatin, hyväksyt sen käyttöön liittyvät toiminnalliset evästeet automaattisesti.&nbsp; Evästeiden hyväksymiseen ei tällöin tarvita erillistä suostumusta. Toiminnallisia chat-evästeitä ladataan laitteellesi vain, jos käynnistät chatin.</p>\r\n\r\n<table>\r\n\t<thead>\r\n\t\t<tr>\r\n\t\t\t<th>Nimi</th>\r\n\t\t\t<th>Tarjoaja</th>\r\n\t\t\t<th>Tarkoitus</th>\r\n\t\t\t<th>Voimassa</th>\r\n\t\t\t<th>Tyyppi</th>\r\n\t\t</tr>\r\n\t</thead>\r\n\t<tbody>\r\n\t\t<tr>\r\n\t\t\t<td>_genesys.widgets.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Käytetään chatin tarvitseman datan tallentamiseen.</td>\r\n\t\t\t<td>Istunto</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>__VCAP_ID__</td>\r\n\t\t\t<td>coh-chat-app-prod.eu-de.mybluemix.net</td>\r\n\t\t\t<td>Sivuston pakollinen eväste mahdollistaa kävijän vierailun sivustolla.</td>\r\n\t\t\t<td>Istunto</td>\r\n\t\t\t<td>Kolmas osapuoli</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>gcReturnSessionId&nbsp;<br />\r\n\t\t\tgcAlternativeReturnUrl&nbsp;<br />\r\n\t\t\tgcReturnUrl&nbsp;<br />\r\n\t\t\tgcLoginButtonState</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Käytetään tunnistautumiseen chatissa.</td>\r\n\t\t\t<td>Istunto</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>leijuke.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Käytetään chatin tarvitseman datan tallentamiseen.</td>\r\n\t\t\t<td>Istunto</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>connect.sid</td>\r\n\t\t\t<td>hel-thk-botti.kuurahealth.com</td>\r\n\t\t\t<td>Kuuran evästettä käytetään chatin tarvitseman datan tallentamiseen.</td>\r\n\t\t\t<td>Istunto</td>\r\n\t\t\t<td>Kolmas osapuoli</td>\r\n\t\t</tr>\r\n\t</tbody>\r\n</table>\r\n"
format: full_html
4 changes: 0 additions & 4 deletions conf/cmi/language/fi/helfi_base_config.breadcrumb.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
label: 'Funktionella chattkakor'
description:
value: "<p>Chattarna på webbplatsen hel.fi&nbsp; fungerar med hjälp av funktionella chattkakor. Om du inleder en chatt godkänner du automatiskt de nödvändiga funktionella kakorna.&nbsp; Då behövs inget separat samtycke till kakor. Funktionella chattkakor laddas endast ner på din enhet om du inleder en chatt.</p>\r\n\r\n<table>\r\n\t<thead>\r\n\t\t<tr>\r\n\t\t\t<th>Namn</th>\r\n\t\t\t<th>Tjänsteleverantör</th>\r\n\t\t\t<th>Cookie syfte</th>\r\n\t\t\t<th>Giltighet</th>\r\n\t\t\t<th>Typ</th>\r\n\t\t</tr>\r\n\t</thead>\r\n\t<tbody>\r\n\t\t<tr>\r\n\t\t\t<td>_genesys.widgets.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Används för att lagra data som behövs för chatten.</td>\r\n\t\t\t<td>session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>__VCAP_ID__</td>\r\n\t\t\t<td>coh-chat-app-prod.eu-de.mybluemix.net</td>\r\n\t\t\t<td>Kakan är en obligatorisk kaka som gör det möjligt för besökaren att besöka webbplatsen.</td>\r\n\t\t\t<td>session</td>\r\n\t\t\t<td>Tredje part</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>gcReturnSessionId&nbsp;<br />\r\n\t\t\tgcAlternativeReturnUrl&nbsp;<br />\r\n\t\t\tgcReturnUrl&nbsp;<br />\r\n\t\t\tgcLoginButtonState</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Används för autentisering i chatten.</td>\r\n\t\t\t<td>session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t</tbody>\r\n</table>\r\n"
value: "<p>Chattarna på webbplatsen hel.fi&nbsp; fungerar med hjälp av funktionella chattkakor. Om du inleder en chatt godkänner du automatiskt de nödvändiga funktionella kakorna.&nbsp; Då behövs inget separat samtycke till kakor. Funktionella chattkakor laddas endast ner på din enhet om du inleder en chatt.</p>\r\n\r\n<table>\r\n\t<thead>\r\n\t\t<tr>\r\n\t\t\t<th>Namn</th>\r\n\t\t\t<th>Tjänsteleverantör</th>\r\n\t\t\t<th>Cookie syfte</th>\r\n\t\t\t<th>Giltighet</th>\r\n\t\t\t<th>Typ</th>\r\n\t\t</tr>\r\n\t</thead>\r\n\t<tbody>\r\n\t\t<tr>\r\n\t\t\t<td>_genesys.widgets.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Används för att lagra data som behövs för chatten.</td>\r\n\t\t\t<td>session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>__VCAP_ID__</td>\r\n\t\t\t<td>coh-chat-app-prod.eu-de.mybluemix.net</td>\r\n\t\t\t<td>Kakan är en obligatorisk kaka som gör det möjligt för besökaren att besöka webbplatsen.</td>\r\n\t\t\t<td>session</td>\r\n\t\t\t<td>Tredje part</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>gcReturnSessionId&nbsp;<br />\r\n\t\t\tgcAlternativeReturnUrl&nbsp;<br />\r\n\t\t\tgcReturnUrl&nbsp;<br />\r\n\t\t\tgcLoginButtonState</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Används för autentisering i chatten.</td>\r\n\t\t\t<td>session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>leijuke.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Används för att lagra data som behövs för chatten.</td>\r\n\t\t\t<td>session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>connect.sid</td>\r\n\t\t\t<td>hel-thk-botti.kuurahealth.com</td>\r\n\t\t\t<td>Kuuras kaka används för att spara de data chatten behöver.</td>\r\n\t\t\t<td>session</td>\r\n\t\t\t<td>Tredje part</td>\r\n\t\t</tr>\r\n\t</tbody>\r\n</table>\r\n"
format: full_html
4 changes: 0 additions & 4 deletions conf/cmi/language/sv/helfi_base_config.breadcrumb.yml

This file was deleted.

2 changes: 1 addition & 1 deletion conf/cmi/system.site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slogan: ''
page:
403: ''
404: ''
front: /user/login
front: /node/1
admin_compact_mode: false
weight_select_max: 100
default_langcode: en

0 comments on commit 46f838c

Please sign in to comment.