Skip to content

Commit

Permalink
Merge pull request #719 from City-of-Helsinki/dev
Browse files Browse the repository at this point in the history
Dev to main
  • Loading branch information
teroelonen authored Oct 4, 2024
2 parents 8908284 + fb71750 commit 8e41bd1
Show file tree
Hide file tree
Showing 31 changed files with 208 additions and 102 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,11 @@ the links are defined there for each display.

_News update_ is used on updating news items, and it can be referred to the `field_news_item_updating_news` field. This
is the only place it can be used, and it essentially contains the information of one update on an ongoing news story.
For example, if there is an updating news story about a soccer match, a new goal would be one news update.
For example, if there is an updating news story about a soccer match, a new goal would be one news update. Every time
a new update is added the news item's publishing time is updated to use the latest updates time so that the news item
remains on the top of time based listings while updating. Because of this the publishing time on the node page is
altered to display the oldest news update time as the publishing time to give the readers more correct information. The
other views of the news such as the teaser still use the news item's normal publishing time however.

#### Top news (front_page_top_news)

Expand Down
152 changes: 78 additions & 74 deletions composer.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ content:
weight: 4
region: content
hidden:
annif_keywords: true
field_content: true
field_hero_design: true
field_lead_in: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ content:
weight: 0
region: content
hidden:
annif_keywords: true
in_recommendations: true
langcode: true
published_at: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ content:
weight: 3
region: content
hidden:
annif_keywords: true
field_content: true
field_hero_design: true
field_lead_in: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ content:
weight: 4
region: content
hidden:
annif_keywords: true
field_content: true
field_hero_design: true
field_lead_in: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ content:
weight: 1
region: content
hidden:
annif_keywords: true
field_hero_design: true
field_main_image: true
field_main_image_caption: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ content:
weight: 2
region: content
hidden:
annif_keywords: true
field_content: true
field_hero_design: true
field_lead_in: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ content:
weight: 4
region: content
hidden:
annif_keywords: true
field_annif_keywords: true
field_content: true
field_lead_in: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ content:
weight: 3
region: content
hidden:
annif_keywords: true
field_news_groups: true
field_news_item_tags: true
field_news_item_updating_news: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ content:
weight: 3
region: content
hidden:
annif_keywords: true
field_content: true
field_lead_in: true
field_main_image: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ content:
weight: 4
region: content
hidden:
annif_keywords: true
field_content: true
field_lead_in: true
field_main_image_caption: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ content:
weight: 0
region: content
hidden:
annif_keywords: true
field_main_image: true
field_main_image_caption: true
field_news_groups: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ content:
weight: 2
region: content
hidden:
annif_keywords: true
field_content: true
field_lead_in: true
field_main_image: true
Expand Down
4 changes: 2 additions & 2 deletions conf/cmi/eu_cookie_compliance.cookie_category.essential.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ langcode: en
status: true
dependencies: { }
_core:
default_config_hash: tsGLdAqnFNOsUkYbiBTtLnQLwrg4ySe6BnJzSBpAkFk
default_config_hash: 6_XedB0R6X-mo9oj-a1V_0wlGQWBzGMlKvDNs-f7KB0
id: essential
label: 'Essential cookies'
description:
value: '<p>Essential cookies help to make the website usable by allowing basic functions, navigating the page and using the protected areas of the site. The website will not work properly without these cookies and their consent is not required.</p><figure class="table" tabindex="0"><table><thead><tr><th>Name</th><th>Provider</th><th>Purpose of the cookie</th><th>Validity</th><th>Type</th></tr></thead><tbody><tr><td>cookiehub</td><td>cookiehub.com</td><td>Used by CookieHub to store information about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.</td><td>365 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-version</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about what version of the cookie consent the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-categories</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about what cookie categories the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to store information&nbsp;about whether visitors have given or declined the use of cookie categories used on the avustukset.hel.fi site.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-version</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to store information&nbsp;about what version of the cookie consent the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-categories</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to store information&nbsp;about what cookie categories the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>SSESS*</td><td>www.hel.fi</td><td>A cookie related to the operation of the content management system.</td><td>23 days</td><td>&nbsp;</td></tr><tr><td>SSESS*</td><td>avustukset.hel.fi</td><td>A cookie related to the operation of the content management system.</td><td>23 days</td><td>&nbsp;</td></tr><tr><td>AWSELBCORS</td><td>siteimproveanalytics.io</td><td>The cookie is related to a load distribution function used to direct requests to servers with the least traffic.</td><td>Session</td><td>Third party</td></tr><tr><td>mtm_cookie_consent</td><td>kartta.hel.fi</td><td>A technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.</td><td>10950 days</td><td>&nbsp;</td></tr><tr><td>JSESSIONID</td><td><p>helsinkikanava.fi</p><p>coh-chat-app-prod.eu-de.mybluemix.net</p></td><td>The cookie is an obligatory cookie that facilitates visiting the website.</td><td>Session</td><td>Third party</td></tr><tr><td>JSESSIONID</td><td>coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloud</td><td>Used for chat app functionality. Its value is used to access session data on server of the application.</td><td>Session</td><td>Third party</td></tr><tr><td>COOKIE_SUPPORT</td><td>helsinkikanava.fi</td><td>The cookie facilitates managing cookies on the website.</td><td>365 days</td><td>Third party</td></tr><tr><td>GUEST_LANGUAGE_ID</td><td>helsinkikanava.fi</td><td>This cookie is generated by the Liferay, its&nbsp;function is to store the language preferences.</td><td>365 days</td><td>Third party</td></tr><tr><td>helfi-settings</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about closed announcements and accordions'' state.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.visitor.autologout_login</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to automatically logout user after a period of inactivity.</td><td>365 days</td><td>&nbsp;</td></tr><tr><td>editoria11yResultCount</td><td>www.hel.fi</td><td>Tracks accessibility issues for the current page when logged in as an editor on hel.fi.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.gin.sidebarExpanded.desktop</td><td>www.hel.fi</td><td>Stores whether the admin sidebar is expanded or collapsed on desktop when logged in as an editor on hel.fi.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.gin.sidebarExpanded.mobile</td><td>www.hel.fi</td><td>Stores whether the admin sidebar is expanded or collapsed on mobile when logged in as an editor on hel.fi.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.gin.darkmode</td><td>www.hel.fi</td><td>Stores the user''s dark mode preference in the admin theme when logged in as an editor on hel.fi.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.toolbar.subtrees.*</td><td>www.hel.fi</td><td>Stores the expanded or collapsed state of submenus in the Drupal admin toolbar for a logged-in editor, ensuring consistency across page loads.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.off-canvas.css.*</td><td>www.hel.fi</td><td>Stores cached CKEditor CSS in localStorage for a logged-in editor, using a key with a cache-busting query to ensure the latest CSS is loaded.</td><td>-</td><td>Local storage</td></tr><tr><td>ed11ySeen</td><td>www.hel.fi</td><td>Tracks which accessibility issues a logged-in editor has already seen to avoid duplicate notifications.</td><td>-</td><td>Local storage</td></tr><tr><td>editoria11yResultCount</td><td>www.hel.fi</td><td>Tracks the number of accessibility issues found on specific pages for a logged-in editor, helping monitor and address them.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.toolbar.toolbarState</td><td>www.hel.fi</td><td>Stores the state of the admin toolbar for a logged-in editor, including its orientation, active tab and state of expansion.</td><td>Session</td><td>Session storage</td></tr><tr><td>escapeAdminPath</td><td>www.hel.fi</td><td>Stores the URL to redirect a logged-in editor from the admin interface back to the main site.</td><td>Session</td><td>Session storage</td></tr></tbody></table></figure>'
value: '<p>Essential cookies help to make the website usable by allowing basic functions, navigating the page and using the protected areas of the site. The website will not work properly without these cookies and their consent is not required.</p><figure class="table" tabindex="0"><table><thead><tr><th>Name</th><th>Provider</th><th>Purpose of the cookie</th><th>Validity</th><th>Type</th></tr></thead><tbody><tr><td>cookiehub</td><td>cookiehub.com</td><td>Used by CookieHub to store information about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.</td><td>365 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-version</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about what version of the cookie consent the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-categories</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about what cookie categories the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to store information&nbsp;about whether visitors have given or declined the use of cookie categories used on the avustukset.hel.fi site.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-version</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to store information&nbsp;about what version of the cookie consent the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-categories</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to store information&nbsp;about what cookie categories the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>SSESS*</td><td>www.hel.fi</td><td>A cookie related to the operation of the content management system.</td><td>23 days</td><td>&nbsp;</td></tr><tr><td>SSESS*</td><td>avustukset.hel.fi</td><td>A cookie related to the operation of the content management system.</td><td>23 days</td><td>&nbsp;</td></tr><tr><td>AWSELBCORS</td><td>siteimproveanalytics.io</td><td>The cookie is related to a load distribution function used to direct requests to servers with the least traffic.</td><td>Session</td><td>Third party</td></tr><tr><td>mtm_cookie_consent</td><td>kartta.hel.fi</td><td>A technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.</td><td>10950 days</td><td>&nbsp;</td></tr><tr><td>JSESSIONID</td><td><p>helsinkikanava.fi</p><p>coh-chat-app-prod.eu-de.mybluemix.net</p></td><td>The cookie is an obligatory cookie that facilitates visiting the website.</td><td>Session</td><td>Third party</td></tr><tr><td>JSESSIONID</td><td>coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloud</td><td>Used for chat app functionality. Its value is used to access session data on server of the application.</td><td>Session</td><td>Third party</td></tr><tr><td>COOKIE_SUPPORT</td><td>helsinkikanava.fi</td><td>The cookie facilitates managing cookies on the website.</td><td>365 days</td><td>Third party</td></tr><tr><td>GUEST_LANGUAGE_ID</td><td>helsinkikanava.fi</td><td>This cookie is generated by the Liferay, its&nbsp;function is to store the language preferences.</td><td>365 days</td><td>Third party</td></tr><tr><td>helfi-settings</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about closed announcements and accordions'' state.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.visitor.autologout_login</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to automatically logout user after a period of inactivity.</td><td>365 days</td><td>&nbsp;</td></tr><tr><td>Drupal.gin.sidebarExpanded.desktop</td><td>www.hel.fi</td><td>Stores whether the admin sidebar is expanded or collapsed on desktop when logged in as an editor on hel.fi.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.gin.sidebarExpanded.mobile</td><td>www.hel.fi</td><td>Stores whether the admin sidebar is expanded or collapsed on mobile when logged in as an editor on hel.fi.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.gin.darkmode</td><td>www.hel.fi</td><td>Stores the user''s dark mode preference in the admin theme when logged in as an editor on hel.fi.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.toolbar.subtrees.*</td><td>www.hel.fi</td><td>Stores the expanded or collapsed state of submenus in the Drupal admin toolbar for a logged-in editor, ensuring consistency across page loads.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.off-canvas.css.*</td><td>www.hel.fi</td><td>Stores cached CKEditor CSS in localStorage for a logged-in editor, using a key with a cache-busting query to ensure the latest CSS is loaded.</td><td>-</td><td>Local storage</td></tr><tr><td>ed11ySeen</td><td>www.hel.fi</td><td>Tracks which accessibility issues a logged-in editor has already seen to avoid duplicate notifications.</td><td>-</td><td>Local storage</td></tr><tr><td>editoria11yResultCount</td><td>www.hel.fi</td><td>Tracks the number of accessibility issues found on specific pages for a logged-in editor, helping monitor and address them.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.toolbar.toolbarState</td><td>www.hel.fi</td><td>Stores the state of the admin toolbar for a logged-in editor, including its orientation, active tab and state of expansion.</td><td>Session</td><td>Session storage</td></tr><tr><td>escapeAdminPath</td><td>www.hel.fi</td><td>Stores the URL to redirect a logged-in editor from the admin interface back to the main site.</td><td>Session</td><td>Session storage</td></tr></tbody></table></figure>'
format: full_html
checkbox_default_state: required
weight: -9
7 changes: 7 additions & 0 deletions conf/cmi/file.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,10 @@ description:
icon:
directory: core/modules/file/icons
make_unused_managed_files_temporary: false
filename_sanitization:
transliterate: true
replace_whitespace: true
replace_non_alphanumeric: true
deduplicate_separators: true
lowercase: true
replacement_character: _
Loading

0 comments on commit 8e41bd1

Please sign in to comment.