From e9941e0da7bf8641e05a9e279b943e2b2696d5a7 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 7 Nov 2024 17:19:41 +0200 Subject: [PATCH 01/59] UHF-10771: Add the new hero variant for Front page instance --- public/modules/custom/helfi_etusivu/helfi_etusivu.module | 1 + 1 file changed, 1 insertion(+) diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index b159a3a7..65373abb 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -246,6 +246,7 @@ function helfi_etusivu_entity_insert(EntityInterface $entity) : void { function helfi_etusivu_helfi_hero_design_alter(array &$designs, FieldStorageDefinitionInterface $definition, FieldableEntityInterface|null $entity) : void { if ($entity instanceof ParagraphInterface) { $designs['with-search'] = t('With search'); + $designs['with-helsinki-near-you'] = t('With Helsinki near you'); } } From 8aedc130d7cdadb7f7d855d996785d2b276289f0 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 8 Nov 2024 18:18:30 +0200 Subject: [PATCH 02/59] UHF-10771: Add graphics paragraph styles and configuration --- .../helfi_etusivu/helfi_etusivu.install | 8 +++++ .../custom/helfi_etusivu/helfi_etusivu.module | 1 + .../hdbt_subtheme/dist/css/styles.min.css | 2 +- .../custom/hdbt_subtheme/hdbt_subtheme.theme | 26 +++++++++++++++++ .../custom/hdbt_subtheme/package-lock.json | 12 ++++---- .../hdbt_subtheme/src/images/photographer.svg | 19 ++++++++++++ .../06_components/paragraphs/__index.scss | 1 + .../06_components/paragraphs/_graphics.scss | 29 +++++++++++++++++++ .../paragraph/paragraph--graphics.html.twig | 18 ++++++++++++ 9 files changed, 109 insertions(+), 7 deletions(-) create mode 100644 public/themes/custom/hdbt_subtheme/src/images/photographer.svg create mode 100644 public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_graphics.scss create mode 100644 public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--graphics.html.twig diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.install b/public/modules/custom/helfi_etusivu/helfi_etusivu.install index f3aa65a4..5294230e 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.install +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.install @@ -256,3 +256,11 @@ function helfi_etusivu_update_9011() : void { } } } + +/** + * UHF-10771: Add 'graphics' paragraph to landing page. + */ +function helfi_etusivu_update_9012(): void { + \Drupal::service('helfi_platform_config.config_update_helper') + ->update('helfi_etusivu'); +} diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index 65373abb..d9478501 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -113,6 +113,7 @@ function helfi_etusivu_helfi_paragraph_types() : array { 'front_page_latest_news' => 17, 'event_list' => 18, 'news_archive' => 19, + 'graphics' => 20, ], ], 'page' => [ diff --git a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css index 772ba8c3..9b1dd71d 100644 --- a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css +++ b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css @@ -1 +1 @@ -.table-of-contents--news-update{padding-left:16px;padding-right:16px;--item-title-lineheight: 1.875rem}@media(min-width: 768px){.table-of-contents--news-update{padding-left:32px;padding-right:32px}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__container{border-left:none}[dir="rtl"] .table-of-contents--news-update .table-of-contents__container{border-right:none}.table-of-contents--news-update .table-of-contents__title+.table-of-contents__content{padding-top:16px}.table-of-contents--news-update .table-of-contents__item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:flex;flex-direction:column;padding-top:16px;padding-bottom:16px;padding-left:16px;padding-right:16px;position:relative}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__item{flex-direction:row}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::before,[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::after{left:8px}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::before,.table-of-contents--news-update .table-of-contents__item::after{content:"";display:block;position:absolute}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::after{background-color:#000;height:calc(100% + 32px + 8px);top:-16px;transform:translateX(calc(var(--lang-direction) * -50%));width:2px;z-index:0}.table-of-contents--news-update .table-of-contents__item:first-of-type::after{height:100%;top:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:last-of-type::after{height:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:only-child::after{display:none}.table-of-contents--news-update .table-of-contents__item::before{background-color:#fff;border:3px solid #000;border-radius:50%;height:16px;top:calc(16px + var(--item-title-lineheight)*.5);transform:translate(calc(var(--lang-direction) * -50%), -50%);width:16px;z-index:1}.table-of-contents--news-update time{padding-left:16px}@media(min-width: 768px){.table-of-contents--news-update time{flex:none;width:110px}}[dir="rtl"] .table-of-contents--news-update time{padding-left:0;padding-right:16px}.table-of-contents--news-update .table-of-contents__link{margin-left:16px}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__link{margin-left:32px}}[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-left:0;margin-right:16px}@media(min-width: 768px){[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-right:32px}}.block--main-news{padding-left:16px;padding-right:16px;max-width:1296px;margin-top:32px;margin:auto;width:100%}@media(min-width: 768px){.block--main-news{padding-left:32px;padding-right:32px}}@media(min-width: 768px){.block--main-news{max-width:1328px}}@media(min-width: 992px){.block--main-news{margin-top:64px}}.block--main-news h2{margin-bottom:48px;margin-top:0}.component--news-of-interest{margin-top:32px;background-color:#f2f2f2;margin-left:16px;margin-right:16px;padding:32px 16px 32px}@media(min-width: 992px){.component--news-of-interest{margin-top:64px}}@media(min-width: 768px){.component--news-of-interest{padding:48px 32px 48px}}.component--news-of-interest .card{padding:24px}.component--news-of-interest .empty-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.component--current{background-color:var(--hdbt-color-palette--secondary);color:var(--hdbt-color-palette-text--secondary)}.current__content{display:flex;flex-direction:column;margin-left:auto;margin-right:auto;max-width:1264px}@media(min-width: 768px){.current__content{flex-direction:row}}.current__content__list{margin-bottom:0;margin-top:0}.current__content__list-item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-bottom:2px;margin-top:0;padding-top:7px;padding-bottom:7px;vertical-align:top}.current__links-container{padding-bottom:16px;padding-top:16px}@media(min-width: 576px){.current__links-container{padding-bottom:24px;padding-top:24px}}@media(min-width: 768px){.current__links-container{padding-right:16px}}@media(min-width: 992px){.current__links-container{padding-bottom:48px;padding-top:48px}}@media(min-width: 992px){.current__links-container{padding-bottom:64px;padding-top:64px}}.current{display:flex;flex-direction:column}@media(min-width: 768px){.current__illustration-container{margin-left:auto;margin-top:-32px}}@media(min-width: 992px){.current__illustration-container{margin-top:-48px}}@media(min-width: 1248px){.current__illustration-container{margin-top:-64px}}.current__seasonal-illustration{aspect-ratio:1;display:block;width:258px}@media(min-width: 992px){.current__seasonal-illustration{width:378px}}@media(min-width: 1248px){.current__seasonal-illustration{width:486px}}.component--latest-news--cards{background-color:#f2f2f2}.component--latest-news .latest-news__link-wrapper{margin-top:32px}@media(min-width: 768px){.component--latest-news .latest-news__link-wrapper{margin-top:64px}}[dir="ltr"] .component--top-news .news-listing{padding-left:0}[dir="rtl"] .component--top-news .news-listing{padding-right:0}.component--top-news .news-listing__item{position:relative}.component--top-news--news .component__container{background-color:#e8f3fc;padding:24px 24px 32px}@media(min-width: 768px){.component--top-news--news .component__container{padding:32px 32px 48px}}.component--top-news--news .component__title+.component__content{margin-top:0}@media(min-width: 768px){.component--top-news--news .component__title+.component__content{grid-template-columns:repeat(2, 1fr);margin-top:32px}}.component--top-news--news .news-listing--medium-teasers{display:grid;margin-bottom:0;margin-top:24px}@media(min-width: 768px){.component--top-news--news .news-listing--medium-teasers{grid-column-gap:24px;grid-row-gap:32px;grid-template-columns:repeat(2, 1fr);margin-top:48px}}.component--top-news--news .news-listing__medium-teaser{padding:0}[dir=rtl] .component--top-news--news .news-listing__medium-teaser{padding:0}.component--top-news--news .news-listing__medium-teaser::before{display:none}.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.component--top-news--news .news-listing__medium-teaser .news-listing__datetime{margin-top:8px}.component--news-update{border-bottom:1px solid #ccc;padding-bottom:32px}@media(min-width: 768px){.component--news-update{padding-bottom:48px}}.component--news-update time{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);display:inline-block;margin-top:16px}.component--news-update .component__content{margin-top:32px}@media(min-width: 768px){.component--news-update .component__content{margin-top:48px}}*~.component--news-update,.component--news-update~.component--news-update{margin-top:32px}@media(min-width: 768px){*~.component--news-update,.component--news-update~.component--news-update{margin-top:48px}} +.table-of-contents--news-update{padding-left:16px;padding-right:16px;--item-title-lineheight: 1.875rem}@media(min-width: 768px){.table-of-contents--news-update{padding-left:32px;padding-right:32px}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__container{border-left:none}[dir="rtl"] .table-of-contents--news-update .table-of-contents__container{border-right:none}.table-of-contents--news-update .table-of-contents__title+.table-of-contents__content{padding-top:16px}.table-of-contents--news-update .table-of-contents__item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:flex;flex-direction:column;padding-top:16px;padding-bottom:16px;padding-left:16px;padding-right:16px;position:relative}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__item{flex-direction:row}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::before,[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::after{left:8px}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::before,.table-of-contents--news-update .table-of-contents__item::after{content:"";display:block;position:absolute}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::after{background-color:#000;height:calc(100% + 32px + 8px);top:-16px;transform:translateX(calc(var(--lang-direction) * -50%));width:2px;z-index:0}.table-of-contents--news-update .table-of-contents__item:first-of-type::after{height:100%;top:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:last-of-type::after{height:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:only-child::after{display:none}.table-of-contents--news-update .table-of-contents__item::before{background-color:#fff;border:3px solid #000;border-radius:50%;height:16px;top:calc(16px + var(--item-title-lineheight)*.5);transform:translate(calc(var(--lang-direction) * -50%), -50%);width:16px;z-index:1}.table-of-contents--news-update time{padding-left:16px}@media(min-width: 768px){.table-of-contents--news-update time{flex:none;width:110px}}[dir="rtl"] .table-of-contents--news-update time{padding-left:0;padding-right:16px}.table-of-contents--news-update .table-of-contents__link{margin-left:16px}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__link{margin-left:32px}}[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-left:0;margin-right:16px}@media(min-width: 768px){[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-right:32px}}.block--main-news{padding-left:16px;padding-right:16px;max-width:1296px;margin-top:32px;margin:auto;width:100%}@media(min-width: 768px){.block--main-news{padding-left:32px;padding-right:32px}}@media(min-width: 768px){.block--main-news{max-width:1328px}}@media(min-width: 992px){.block--main-news{margin-top:64px}}.block--main-news h2{margin-bottom:48px;margin-top:0}.component--news-of-interest{margin-top:32px;background-color:#f2f2f2;margin-left:16px;margin-right:16px;padding:32px 16px 32px}@media(min-width: 992px){.component--news-of-interest{margin-top:64px}}@media(min-width: 768px){.component--news-of-interest{padding:48px 32px 48px}}.component--news-of-interest .card{padding:24px}.component--news-of-interest .empty-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.component--current{background-color:var(--hdbt-color-palette--secondary);color:var(--hdbt-color-palette-text--secondary)}.current__content{display:flex;flex-direction:column;margin-left:auto;margin-right:auto;max-width:1264px}@media(min-width: 768px){.current__content{flex-direction:row}}.current__content__list{margin-bottom:0;margin-top:0}.current__content__list-item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-bottom:2px;margin-top:0;padding-top:7px;padding-bottom:7px;vertical-align:top}.current__links-container{padding-bottom:16px;padding-top:16px}@media(min-width: 576px){.current__links-container{padding-bottom:24px;padding-top:24px}}@media(min-width: 768px){.current__links-container{padding-right:16px}}@media(min-width: 992px){.current__links-container{padding-bottom:48px;padding-top:48px}}@media(min-width: 992px){.current__links-container{padding-bottom:64px;padding-top:64px}}.current{display:flex;flex-direction:column}@media(min-width: 768px){.current__illustration-container{margin-left:auto;margin-top:-32px}}@media(min-width: 992px){.current__illustration-container{margin-top:-48px}}@media(min-width: 1248px){.current__illustration-container{margin-top:-64px}}.current__seasonal-illustration{aspect-ratio:1;display:block;width:258px}@media(min-width: 992px){.current__seasonal-illustration{width:378px}}@media(min-width: 1248px){.current__seasonal-illustration{width:486px}}.component--latest-news--cards{background-color:#f2f2f2}.component--latest-news .latest-news__link-wrapper{margin-top:32px}@media(min-width: 768px){.component--latest-news .latest-news__link-wrapper{margin-top:64px}}[dir="ltr"] .component--top-news .news-listing{padding-left:0}[dir="rtl"] .component--top-news .news-listing{padding-right:0}.component--top-news .news-listing__item{position:relative}.component--top-news--news .component__container{background-color:#e8f3fc;padding:24px 24px 32px}@media(min-width: 768px){.component--top-news--news .component__container{padding:32px 32px 48px}}.component--top-news--news .component__title+.component__content{margin-top:0}@media(min-width: 768px){.component--top-news--news .component__title+.component__content{grid-template-columns:repeat(2, 1fr);margin-top:32px}}.component--top-news--news .news-listing--medium-teasers{display:grid;margin-bottom:0;margin-top:24px}@media(min-width: 768px){.component--top-news--news .news-listing--medium-teasers{grid-column-gap:24px;grid-row-gap:32px;grid-template-columns:repeat(2, 1fr);margin-top:48px}}.component--top-news--news .news-listing__medium-teaser{padding:0}[dir=rtl] .component--top-news--news .news-listing__medium-teaser{padding:0}.component--top-news--news .news-listing__medium-teaser::before{display:none}.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.component--top-news--news .news-listing__medium-teaser .news-listing__datetime{margin-top:8px}.component--news-update{border-bottom:1px solid #ccc;padding-bottom:32px}@media(min-width: 768px){.component--news-update{padding-bottom:48px}}.component--news-update time{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);display:inline-block;margin-top:16px}.component--news-update .component__content{margin-top:32px}@media(min-width: 768px){.component--news-update .component__content{margin-top:48px}}*~.component--news-update,.component--news-update~.component--news-update{margin-top:32px}@media(min-width: 768px){*~.component--news-update,.component--news-update~.component--news-update{margin-top:48px}}@media(min-width: 992px){.graphics{align-items:center;display:flex;justify-content:space-between}}@media(min-width: 992px){.graphics__text-container{min-height:300px}}.graphics__title{margin-top:0}.graphics__illustration-container{margin-top:64px}@media(min-width: 992px){.graphics__illustration-container{margin-top:0}}.graphics__illustration{max-width:100%} diff --git a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme index 7ada5a45..86f00a9f 100644 --- a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme +++ b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme @@ -214,3 +214,29 @@ function hdbt_subtheme_preprocess_node__news_item(array &$variables): void { // Attach the updating news table of contents library to the news item page. $variables['#attached']['library'][] = 'hdbt_subtheme/updating-news-table-of-contents'; } + +/** + * Implements hook_preprocess_paragraph__HOOK(). + */ +function hdbt_subtheme_preprocess_paragraph__graphics(&$variables) { + $paragraph = $variables['paragraph']; + + /** @var \Drupal\Core\File\FileUrlGeneratorInterface $service */ + $service = \Drupal::service('file_url_generator'); + $theme = \Drupal::service('theme_handler')->getTheme('hdbt_subtheme'); + + // Add theme path to as variable. + $path = $service->generate("{$theme->getPath()}/src/images/") + ->toString(TRUE)->getGeneratedUrl(); + + $illustration = match($paragraph->get('field_graphics_illustrations')->value) { + 'photographer' => [ + 'url' => $path . 'photographer.svg', + 'photographer' => 'Lille Santanen', + ], + }; + + if ($illustration) { + $variables['selected_illustration'] = $illustration; + } +} diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index 28279b24..2ef07ff1 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -3325,9 +3325,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001676", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001676.tgz", - "integrity": "sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==", + "version": "1.0.30001679", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001679.tgz", + "integrity": "sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA==", "funding": [ { "type": "opencollective", @@ -13159,9 +13159,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001676", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001676.tgz", - "integrity": "sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==" + "version": "1.0.30001679", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001679.tgz", + "integrity": "sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA==" }, "chalk": { "version": "2.4.2", diff --git a/public/themes/custom/hdbt_subtheme/src/images/photographer.svg b/public/themes/custom/hdbt_subtheme/src/images/photographer.svg new file mode 100644 index 00000000..12576cdf --- /dev/null +++ b/public/themes/custom/hdbt_subtheme/src/images/photographer.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/__index.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/__index.scss index 25912d37..342cd0cd 100644 --- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/__index.scss +++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/__index.scss @@ -2,3 +2,4 @@ @import 'latest-news'; @import 'top-news'; @import 'news-update'; +@import 'graphics'; diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_graphics.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_graphics.scss new file mode 100644 index 00000000..cfa70dac --- /dev/null +++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_graphics.scss @@ -0,0 +1,29 @@ +.graphics { + @include breakpoint($breakpoint-l) { + align-items: center; + display: flex; + justify-content: space-between; + } +} + +.graphics__text-container { + @include breakpoint($breakpoint-l) { + min-height: 300px; // This height is from design to align the text nicely with the illustration. + } +} + +.graphics__title { + margin-top: 0; +} + +.graphics__illustration-container { + margin-top: $spacing-quadruple; + + @include breakpoint($breakpoint-l) { + margin-top: 0; + } +} + +.graphics__illustration { + max-width: 100%; +} diff --git a/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--graphics.html.twig b/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--graphics.html.twig new file mode 100644 index 00000000..d8f09f3e --- /dev/null +++ b/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--graphics.html.twig @@ -0,0 +1,18 @@ +{% embed "@hdbt/misc/component.twig" with + { + component_classes: [ + 'component--graphics', + ], + component_content_class: 'graphics', + } +%} + {% block component_content %} +
+

{{ content.field_graphics_title }}

+
{{ content.field_graphics_desc }}
+
+
+ {{ selected_illustration.alt }} +
+ {% endblock component_content %} +{% endembed %} From 1846304e40227baf5432db0e5fd64ffdb1089d92 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 8 Nov 2024 18:26:15 +0200 Subject: [PATCH 03/59] UHF-10771: Add graphics paragraph configuration --- ...orm_display.paragraph.graphics.default.yml | 41 +++++++++++++++++++ ...iew_display.paragraph.graphics.default.yml | 41 +++++++++++++++++++ ....field.node.landing_page.field_content.yml | 5 +++ ...paragraph.graphics.field_graphics_desc.yml | 29 +++++++++++++ ....graphics.field_graphics_illustrations.yml | 23 +++++++++++ ...aragraph.graphics.field_graphics_title.yml | 19 +++++++++ ....storage.paragraph.field_graphics_desc.yml | 19 +++++++++ ...paragraph.field_graphics_illustrations.yml | 24 +++++++++++ ...storage.paragraph.field_graphics_title.yml | 21 ++++++++++ .../paragraphs.paragraphs_type.graphics.yml | 10 +++++ 10 files changed, 232 insertions(+) create mode 100644 conf/cmi/core.entity_form_display.paragraph.graphics.default.yml create mode 100644 conf/cmi/core.entity_view_display.paragraph.graphics.default.yml create mode 100644 conf/cmi/field.field.paragraph.graphics.field_graphics_desc.yml create mode 100644 conf/cmi/field.field.paragraph.graphics.field_graphics_illustrations.yml create mode 100644 conf/cmi/field.field.paragraph.graphics.field_graphics_title.yml create mode 100644 conf/cmi/field.storage.paragraph.field_graphics_desc.yml create mode 100644 conf/cmi/field.storage.paragraph.field_graphics_illustrations.yml create mode 100644 conf/cmi/field.storage.paragraph.field_graphics_title.yml create mode 100644 conf/cmi/paragraphs.paragraphs_type.graphics.yml diff --git a/conf/cmi/core.entity_form_display.paragraph.graphics.default.yml b/conf/cmi/core.entity_form_display.paragraph.graphics.default.yml new file mode 100644 index 00000000..46427473 --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.graphics.default.yml @@ -0,0 +1,41 @@ +uuid: b6116e12-4755-4837-b234-ba4adcb31ef5 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.graphics.field_graphics_desc + - field.field.paragraph.graphics.field_graphics_illustrations + - field.field.paragraph.graphics.field_graphics_title + - paragraphs.paragraphs_type.graphics + module: + - text +id: paragraph.graphics.default +targetEntityType: paragraph +bundle: graphics +mode: default +content: + field_graphics_desc: + type: text_textarea + weight: 1 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_graphics_illustrations: + type: options_select + weight: 2 + region: content + settings: { } + third_party_settings: { } + field_graphics_title: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + created: true + status: true diff --git a/conf/cmi/core.entity_view_display.paragraph.graphics.default.yml b/conf/cmi/core.entity_view_display.paragraph.graphics.default.yml new file mode 100644 index 00000000..cd182da1 --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.graphics.default.yml @@ -0,0 +1,41 @@ +uuid: 987c8204-0148-4c9d-ae35-f4e74db50882 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.graphics.field_graphics_desc + - field.field.paragraph.graphics.field_graphics_illustrations + - field.field.paragraph.graphics.field_graphics_title + - paragraphs.paragraphs_type.graphics + module: + - options + - text +id: paragraph.graphics.default +targetEntityType: paragraph +bundle: graphics +mode: default +content: + field_graphics_desc: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 1 + region: content + field_graphics_illustrations: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 2 + region: content + field_graphics_title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content +hidden: + search_api_excerpt: true diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml index d5cbd87a..40329327 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -15,6 +15,7 @@ dependencies: - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.front_page_latest_news - paragraphs.paragraphs_type.front_page_top_news + - paragraphs.paragraphs_type.graphics - paragraphs.paragraphs_type.hearings - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links @@ -61,6 +62,7 @@ settings: target_group_links: target_group_links hearings: hearings curated_event_list: curated_event_list + graphics: graphics negate: 0 target_bundles_drag_drop: banner: @@ -93,6 +95,9 @@ settings: front_page_top_news: weight: 16 enabled: true + graphics: + weight: 20 + enabled: true hearings: weight: 14 enabled: true diff --git a/conf/cmi/field.field.paragraph.graphics.field_graphics_desc.yml b/conf/cmi/field.field.paragraph.graphics.field_graphics_desc.yml new file mode 100644 index 00000000..a1ce34ef --- /dev/null +++ b/conf/cmi/field.field.paragraph.graphics.field_graphics_desc.yml @@ -0,0 +1,29 @@ +uuid: 1d670e56-73d9-44cb-a04e-89efadbee6c8 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_graphics_desc + - filter.format.full_html + - paragraphs.paragraphs_type.graphics + module: + - allowed_formats + - text +third_party_settings: + allowed_formats: + allowed_formats: + - full_html +id: paragraph.graphics.field_graphics_desc +field_name: field_graphics_desc +entity_type: paragraph +bundle: graphics +label: Description +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + allowed_formats: + - full_html +field_type: text_long diff --git a/conf/cmi/field.field.paragraph.graphics.field_graphics_illustrations.yml b/conf/cmi/field.field.paragraph.graphics.field_graphics_illustrations.yml new file mode 100644 index 00000000..eb715a5f --- /dev/null +++ b/conf/cmi/field.field.paragraph.graphics.field_graphics_illustrations.yml @@ -0,0 +1,23 @@ +uuid: 7974f176-2462-4e0e-9b37-58cdf24dff4e +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_graphics_illustrations + - paragraphs.paragraphs_type.graphics + module: + - options +id: paragraph.graphics.field_graphics_illustrations +field_name: field_graphics_illustrations +entity_type: paragraph +bundle: graphics +label: Illustration +description: '' +required: true +translatable: false +default_value: + - + value: photographer +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/conf/cmi/field.field.paragraph.graphics.field_graphics_title.yml b/conf/cmi/field.field.paragraph.graphics.field_graphics_title.yml new file mode 100644 index 00000000..6a0e09be --- /dev/null +++ b/conf/cmi/field.field.paragraph.graphics.field_graphics_title.yml @@ -0,0 +1,19 @@ +uuid: 7c5f292c-d1ae-4ad3-ba01-997f11dc990a +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_graphics_title + - paragraphs.paragraphs_type.graphics +id: paragraph.graphics.field_graphics_title +field_name: field_graphics_title +entity_type: paragraph +bundle: graphics +label: Title +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/conf/cmi/field.storage.paragraph.field_graphics_desc.yml b/conf/cmi/field.storage.paragraph.field_graphics_desc.yml new file mode 100644 index 00000000..f493f5c4 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_graphics_desc.yml @@ -0,0 +1,19 @@ +uuid: 44ab76f6-0521-42dd-a0b1-0df9f03d73da +langcode: en +status: true +dependencies: + module: + - paragraphs + - text +id: paragraph.field_graphics_desc +field_name: field_graphics_desc +entity_type: paragraph +type: text_long +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_graphics_illustrations.yml b/conf/cmi/field.storage.paragraph.field_graphics_illustrations.yml new file mode 100644 index 00000000..6bb34547 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_graphics_illustrations.yml @@ -0,0 +1,24 @@ +uuid: 38dcb3c0-af03-4078-810d-dbb496573524 +langcode: en +status: true +dependencies: + module: + - options + - paragraphs +id: paragraph.field_graphics_illustrations +field_name: field_graphics_illustrations +entity_type: paragraph +type: list_string +settings: + allowed_values: + - + value: photographer + label: Photographer + allowed_values_function: '' +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_graphics_title.yml b/conf/cmi/field.storage.paragraph.field_graphics_title.yml new file mode 100644 index 00000000..ca131055 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_graphics_title.yml @@ -0,0 +1,21 @@ +uuid: 53f35359-3816-4f71-9e36-ccb2edfb856e +langcode: en +status: true +dependencies: + module: + - paragraphs +id: paragraph.field_graphics_title +field_name: field_graphics_title +entity_type: paragraph +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/paragraphs.paragraphs_type.graphics.yml b/conf/cmi/paragraphs.paragraphs_type.graphics.yml new file mode 100644 index 00000000..ddb8babf --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.graphics.yml @@ -0,0 +1,10 @@ +uuid: e39d7aec-16d8-4a5f-88a5-249bb9e70d06 +langcode: en +status: true +dependencies: { } +id: graphics +label: Graphics +icon_uuid: null +icon_default: null +description: 'Used on situations where you need to provide information next to svg-graphics.' +behavior_plugins: { } From 84fa59c507397c72b263a49d08ff5d3db405dfa1 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 8 Nov 2024 19:26:02 +0200 Subject: [PATCH 04/59] UHF-10771: Add translations for graphics paragraph --- .../fi/field.field.paragraph.graphics.field_graphics_desc.yml | 1 + ....field.paragraph.graphics.field_graphics_illustrations.yml | 1 + .../field.field.paragraph.graphics.field_graphics_title.yml | 1 + .../field.storage.paragraph.field_graphics_illustrations.yml | 4 ++++ conf/cmi/language/fi/paragraphs.paragraphs_type.graphics.yml | 2 ++ 5 files changed, 9 insertions(+) create mode 100644 conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_desc.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_illustrations.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_title.yml create mode 100644 conf/cmi/language/fi/field.storage.paragraph.field_graphics_illustrations.yml create mode 100644 conf/cmi/language/fi/paragraphs.paragraphs_type.graphics.yml diff --git a/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_desc.yml b/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_desc.yml new file mode 100644 index 00000000..ed08ca71 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_desc.yml @@ -0,0 +1 @@ +label: Kuvaus diff --git a/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_illustrations.yml b/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_illustrations.yml new file mode 100644 index 00000000..bc71c449 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_illustrations.yml @@ -0,0 +1 @@ +label: Kuvitus diff --git a/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_title.yml b/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_title.yml new file mode 100644 index 00000000..f02d7516 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_title.yml @@ -0,0 +1 @@ +label: Otsikko diff --git a/conf/cmi/language/fi/field.storage.paragraph.field_graphics_illustrations.yml b/conf/cmi/language/fi/field.storage.paragraph.field_graphics_illustrations.yml new file mode 100644 index 00000000..9c821388 --- /dev/null +++ b/conf/cmi/language/fi/field.storage.paragraph.field_graphics_illustrations.yml @@ -0,0 +1,4 @@ +settings: + allowed_values: + - + label: Kuvaaja diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.graphics.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.graphics.yml new file mode 100644 index 00000000..153725f2 --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.graphics.yml @@ -0,0 +1,2 @@ +label: Grafiikka +description: 'Käytetään sivustolla kun käyttäjälle on tarpeen kertoa jotain tietoa svg-tyyppiä olevan kuvan kanssa yhdessä.' From c697248669fa9943a8468d99c218701800baaa5a Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Tue, 12 Nov 2024 17:52:44 +0200 Subject: [PATCH 05/59] UHF-10771: Replace the paragraph implementation with hardcoded route and moved elements to the route, removed unnecessary code --- ...orm_display.paragraph.graphics.default.yml | 41 ----------------- ...iew_display.paragraph.graphics.default.yml | 41 ----------------- ....field.node.landing_page.field_content.yml | 4 -- ...paragraph.graphics.field_graphics_desc.yml | 29 ------------ ....graphics.field_graphics_illustrations.yml | 23 ---------- ...aragraph.graphics.field_graphics_title.yml | 19 -------- ....storage.paragraph.field_graphics_desc.yml | 19 -------- ...paragraph.field_graphics_illustrations.yml | 24 ---------- ...storage.paragraph.field_graphics_title.yml | 21 --------- ...paragraph.graphics.field_graphics_desc.yml | 1 - ....graphics.field_graphics_illustrations.yml | 1 - ...aragraph.graphics.field_graphics_title.yml | 1 - ...paragraph.field_graphics_illustrations.yml | 4 -- .../paragraphs.paragraphs_type.graphics.yml | 2 - .../paragraphs.paragraphs_type.graphics.yml | 10 ----- .../custom/helfi_etusivu/helfi_etusivu.module | 35 ++++++++++++++- .../helfi_etusivu/helfi_etusivu.routing.yml | 15 +++++++ .../Controller/HelsinkiNearYouController.php | 32 ++++++++++++++ .../HelsinkiNearYouResultsController.php | 23 ++++++++++ .../helsinki-near-you-landing-page.html.twig | 1 + .../custom/hdbt_subtheme/hdbt_subtheme.theme | 26 ----------- .../src/scss/06_components/pages/__index.scss | 1 + .../_helsinki-near-you.scss} | 0 .../06_components/paragraphs/__index.scss | 1 - .../helsinki-near-you-landing-page.html.twig | 44 +++++++++++++++++++ .../paragraph/paragraph--graphics.html.twig | 18 -------- .../custom/hdbt_subtheme/translations/fi.po | 20 +++++++++ .../custom/hdbt_subtheme/translations/sv.po | 20 +++++++++ 28 files changed, 190 insertions(+), 286 deletions(-) delete mode 100644 conf/cmi/core.entity_form_display.paragraph.graphics.default.yml delete mode 100644 conf/cmi/core.entity_view_display.paragraph.graphics.default.yml delete mode 100644 conf/cmi/field.field.paragraph.graphics.field_graphics_desc.yml delete mode 100644 conf/cmi/field.field.paragraph.graphics.field_graphics_illustrations.yml delete mode 100644 conf/cmi/field.field.paragraph.graphics.field_graphics_title.yml delete mode 100644 conf/cmi/field.storage.paragraph.field_graphics_desc.yml delete mode 100644 conf/cmi/field.storage.paragraph.field_graphics_illustrations.yml delete mode 100644 conf/cmi/field.storage.paragraph.field_graphics_title.yml delete mode 100644 conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_desc.yml delete mode 100644 conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_illustrations.yml delete mode 100644 conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_title.yml delete mode 100644 conf/cmi/language/fi/field.storage.paragraph.field_graphics_illustrations.yml delete mode 100644 conf/cmi/language/fi/paragraphs.paragraphs_type.graphics.yml delete mode 100644 conf/cmi/paragraphs.paragraphs_type.graphics.yml create mode 100644 public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml create mode 100644 public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouController.php create mode 100644 public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php create mode 100644 public/modules/custom/helfi_etusivu/templates/helsinki-near-you-landing-page.html.twig rename public/themes/custom/hdbt_subtheme/src/scss/06_components/{paragraphs/_graphics.scss => pages/_helsinki-near-you.scss} (100%) create mode 100644 public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-landing-page.html.twig delete mode 100644 public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--graphics.html.twig diff --git a/conf/cmi/core.entity_form_display.paragraph.graphics.default.yml b/conf/cmi/core.entity_form_display.paragraph.graphics.default.yml deleted file mode 100644 index 46427473..00000000 --- a/conf/cmi/core.entity_form_display.paragraph.graphics.default.yml +++ /dev/null @@ -1,41 +0,0 @@ -uuid: b6116e12-4755-4837-b234-ba4adcb31ef5 -langcode: en -status: true -dependencies: - config: - - field.field.paragraph.graphics.field_graphics_desc - - field.field.paragraph.graphics.field_graphics_illustrations - - field.field.paragraph.graphics.field_graphics_title - - paragraphs.paragraphs_type.graphics - module: - - text -id: paragraph.graphics.default -targetEntityType: paragraph -bundle: graphics -mode: default -content: - field_graphics_desc: - type: text_textarea - weight: 1 - region: content - settings: - rows: 5 - placeholder: '' - third_party_settings: { } - field_graphics_illustrations: - type: options_select - weight: 2 - region: content - settings: { } - third_party_settings: { } - field_graphics_title: - type: string_textfield - weight: 0 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } -hidden: - created: true - status: true diff --git a/conf/cmi/core.entity_view_display.paragraph.graphics.default.yml b/conf/cmi/core.entity_view_display.paragraph.graphics.default.yml deleted file mode 100644 index cd182da1..00000000 --- a/conf/cmi/core.entity_view_display.paragraph.graphics.default.yml +++ /dev/null @@ -1,41 +0,0 @@ -uuid: 987c8204-0148-4c9d-ae35-f4e74db50882 -langcode: en -status: true -dependencies: - config: - - field.field.paragraph.graphics.field_graphics_desc - - field.field.paragraph.graphics.field_graphics_illustrations - - field.field.paragraph.graphics.field_graphics_title - - paragraphs.paragraphs_type.graphics - module: - - options - - text -id: paragraph.graphics.default -targetEntityType: paragraph -bundle: graphics -mode: default -content: - field_graphics_desc: - type: text_default - label: hidden - settings: { } - third_party_settings: { } - weight: 1 - region: content - field_graphics_illustrations: - type: list_default - label: above - settings: { } - third_party_settings: { } - weight: 2 - region: content - field_graphics_title: - type: string - label: hidden - settings: - link_to_entity: false - third_party_settings: { } - weight: 0 - region: content -hidden: - search_api_excerpt: true diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml index 40329327..7d356a68 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -62,7 +62,6 @@ settings: target_group_links: target_group_links hearings: hearings curated_event_list: curated_event_list - graphics: graphics negate: 0 target_bundles_drag_drop: banner: @@ -95,9 +94,6 @@ settings: front_page_top_news: weight: 16 enabled: true - graphics: - weight: 20 - enabled: true hearings: weight: 14 enabled: true diff --git a/conf/cmi/field.field.paragraph.graphics.field_graphics_desc.yml b/conf/cmi/field.field.paragraph.graphics.field_graphics_desc.yml deleted file mode 100644 index a1ce34ef..00000000 --- a/conf/cmi/field.field.paragraph.graphics.field_graphics_desc.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: 1d670e56-73d9-44cb-a04e-89efadbee6c8 -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_graphics_desc - - filter.format.full_html - - paragraphs.paragraphs_type.graphics - module: - - allowed_formats - - text -third_party_settings: - allowed_formats: - allowed_formats: - - full_html -id: paragraph.graphics.field_graphics_desc -field_name: field_graphics_desc -entity_type: paragraph -bundle: graphics -label: Description -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - allowed_formats: - - full_html -field_type: text_long diff --git a/conf/cmi/field.field.paragraph.graphics.field_graphics_illustrations.yml b/conf/cmi/field.field.paragraph.graphics.field_graphics_illustrations.yml deleted file mode 100644 index eb715a5f..00000000 --- a/conf/cmi/field.field.paragraph.graphics.field_graphics_illustrations.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 7974f176-2462-4e0e-9b37-58cdf24dff4e -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_graphics_illustrations - - paragraphs.paragraphs_type.graphics - module: - - options -id: paragraph.graphics.field_graphics_illustrations -field_name: field_graphics_illustrations -entity_type: paragraph -bundle: graphics -label: Illustration -description: '' -required: true -translatable: false -default_value: - - - value: photographer -default_value_callback: '' -settings: { } -field_type: list_string diff --git a/conf/cmi/field.field.paragraph.graphics.field_graphics_title.yml b/conf/cmi/field.field.paragraph.graphics.field_graphics_title.yml deleted file mode 100644 index 6a0e09be..00000000 --- a/conf/cmi/field.field.paragraph.graphics.field_graphics_title.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 7c5f292c-d1ae-4ad3-ba01-997f11dc990a -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_graphics_title - - paragraphs.paragraphs_type.graphics -id: paragraph.graphics.field_graphics_title -field_name: field_graphics_title -entity_type: paragraph -bundle: graphics -label: Title -description: '' -required: true -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: string diff --git a/conf/cmi/field.storage.paragraph.field_graphics_desc.yml b/conf/cmi/field.storage.paragraph.field_graphics_desc.yml deleted file mode 100644 index f493f5c4..00000000 --- a/conf/cmi/field.storage.paragraph.field_graphics_desc.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 44ab76f6-0521-42dd-a0b1-0df9f03d73da -langcode: en -status: true -dependencies: - module: - - paragraphs - - text -id: paragraph.field_graphics_desc -field_name: field_graphics_desc -entity_type: paragraph -type: text_long -settings: { } -module: text -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_graphics_illustrations.yml b/conf/cmi/field.storage.paragraph.field_graphics_illustrations.yml deleted file mode 100644 index 6bb34547..00000000 --- a/conf/cmi/field.storage.paragraph.field_graphics_illustrations.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 38dcb3c0-af03-4078-810d-dbb496573524 -langcode: en -status: true -dependencies: - module: - - options - - paragraphs -id: paragraph.field_graphics_illustrations -field_name: field_graphics_illustrations -entity_type: paragraph -type: list_string -settings: - allowed_values: - - - value: photographer - label: Photographer - allowed_values_function: '' -module: options -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_graphics_title.yml b/conf/cmi/field.storage.paragraph.field_graphics_title.yml deleted file mode 100644 index ca131055..00000000 --- a/conf/cmi/field.storage.paragraph.field_graphics_title.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: 53f35359-3816-4f71-9e36-ccb2edfb856e -langcode: en -status: true -dependencies: - module: - - paragraphs -id: paragraph.field_graphics_title -field_name: field_graphics_title -entity_type: paragraph -type: string -settings: - max_length: 255 - case_sensitive: false - is_ascii: false -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_desc.yml b/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_desc.yml deleted file mode 100644 index ed08ca71..00000000 --- a/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_desc.yml +++ /dev/null @@ -1 +0,0 @@ -label: Kuvaus diff --git a/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_illustrations.yml b/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_illustrations.yml deleted file mode 100644 index bc71c449..00000000 --- a/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_illustrations.yml +++ /dev/null @@ -1 +0,0 @@ -label: Kuvitus diff --git a/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_title.yml b/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_title.yml deleted file mode 100644 index f02d7516..00000000 --- a/conf/cmi/language/fi/field.field.paragraph.graphics.field_graphics_title.yml +++ /dev/null @@ -1 +0,0 @@ -label: Otsikko diff --git a/conf/cmi/language/fi/field.storage.paragraph.field_graphics_illustrations.yml b/conf/cmi/language/fi/field.storage.paragraph.field_graphics_illustrations.yml deleted file mode 100644 index 9c821388..00000000 --- a/conf/cmi/language/fi/field.storage.paragraph.field_graphics_illustrations.yml +++ /dev/null @@ -1,4 +0,0 @@ -settings: - allowed_values: - - - label: Kuvaaja diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.graphics.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.graphics.yml deleted file mode 100644 index 153725f2..00000000 --- a/conf/cmi/language/fi/paragraphs.paragraphs_type.graphics.yml +++ /dev/null @@ -1,2 +0,0 @@ -label: Grafiikka -description: 'Käytetään sivustolla kun käyttäjälle on tarpeen kertoa jotain tietoa svg-tyyppiä olevan kuvan kanssa yhdessä.' diff --git a/conf/cmi/paragraphs.paragraphs_type.graphics.yml b/conf/cmi/paragraphs.paragraphs_type.graphics.yml deleted file mode 100644 index ddb8babf..00000000 --- a/conf/cmi/paragraphs.paragraphs_type.graphics.yml +++ /dev/null @@ -1,10 +0,0 @@ -uuid: e39d7aec-16d8-4a5f-88a5-249bb9e70d06 -langcode: en -status: true -dependencies: { } -id: graphics -label: Graphics -icon_uuid: null -icon_default: null -description: 'Used on situations where you need to provide information next to svg-graphics.' -behavior_plugins: { } diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index d9478501..b1bdf37d 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -247,7 +247,18 @@ function helfi_etusivu_entity_insert(EntityInterface $entity) : void { function helfi_etusivu_helfi_hero_design_alter(array &$designs, FieldStorageDefinitionInterface $definition, FieldableEntityInterface|null $entity) : void { if ($entity instanceof ParagraphInterface) { $designs['with-search'] = t('With search'); - $designs['with-helsinki-near-you'] = t('With Helsinki near you'); + } +} + +/** + * Implements hook_preprocess_HOOK(). + */ +function helfi_etusivu_preprocess_html(&$variables): void { + $route = \Drupal::routeMatch()->getRouteName(); + + // Set the theme color to engel on Helsinki near you landing page. + if ($route === 'helfi_etusivu.helsinki_near_you') { + $variables['theme_color'] = 'engel'; } } @@ -256,6 +267,13 @@ function helfi_etusivu_helfi_hero_design_alter(array &$designs, FieldStorageDefi */ function helfi_etusivu_preprocess_page(&$variables): void { $route = \Drupal::routeMatch()->getRouteName(); + + // There is hero block on Helsinki near you landing page but since it isn't a paragraph we must set this + // variable manually. + if ($route === 'helfi_etusivu.helsinki_near_you') { + $variables['has_hero'] = TRUE; + } + $ordered_news_list = [ 'view.ordered_news_list.ordered_news', 'view.ordered_news_articles_list.ordered_news_articles', @@ -302,3 +320,18 @@ function helfi_etusivu_preprocess_node__news_item__full(array &$variables): void $variables['published_at'] = $updating_news_publish_date; } } + +/** + * Implements hook_theme(). + */ +function helfi_etusivu_theme() : array { + return [ + 'helsinki_near_you_landing_page' => [ + 'variables' => [ + 'content' => NULL, + 'illustration' => NULL, + ], + 'template' => 'helsinki_near_you_landing_page', + ], + ]; +} diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml b/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml new file mode 100644 index 00000000..d0cc3c05 --- /dev/null +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml @@ -0,0 +1,15 @@ +helfi_etusivu.helsinki_near_you: + path: '/helsinki-near-you' + defaults: + _controller: '\Drupal\helfi_etusivu\Controller\HelsinkiNearYouController::content' + _title: 'Helsinki near you' + requirements: + _permission: 'access content' + +helfi_etusivu.helsinki_near_you_results: + path: '/helsinki-near-you/results' + defaults: + _controller: '\Drupal\helfi_etusivu\Controller\HelsinkiNearYouResultsController::content' + _title: 'Services, events and news near your address' + requirements: + _permission: 'access content' diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouController.php new file mode 100644 index 00000000..fcdd06bf --- /dev/null +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouController.php @@ -0,0 +1,32 @@ +getTheme('hdbt_subtheme'); + + // Add theme path to as variable. + $path = $service->generate("{$theme->getPath()}/src/images/") + ->toString(TRUE)->getGeneratedUrl(); + + $build = [ + '#theme' => 'helsinki_near_you_landing_page', + '#illustration' => $path . 'photographer.svg', + ]; + + return $build; + } + +} diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php new file mode 100644 index 00000000..a25fee76 --- /dev/null +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php @@ -0,0 +1,23 @@ + $this->t('Helsinki near you'), + ]; + + return $build; + } + +} diff --git a/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-landing-page.html.twig b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-landing-page.html.twig new file mode 100644 index 00000000..cddd0709 --- /dev/null +++ b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-landing-page.html.twig @@ -0,0 +1 @@ +{{ content }} diff --git a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme index 86f00a9f..7ada5a45 100644 --- a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme +++ b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme @@ -214,29 +214,3 @@ function hdbt_subtheme_preprocess_node__news_item(array &$variables): void { // Attach the updating news table of contents library to the news item page. $variables['#attached']['library'][] = 'hdbt_subtheme/updating-news-table-of-contents'; } - -/** - * Implements hook_preprocess_paragraph__HOOK(). - */ -function hdbt_subtheme_preprocess_paragraph__graphics(&$variables) { - $paragraph = $variables['paragraph']; - - /** @var \Drupal\Core\File\FileUrlGeneratorInterface $service */ - $service = \Drupal::service('file_url_generator'); - $theme = \Drupal::service('theme_handler')->getTheme('hdbt_subtheme'); - - // Add theme path to as variable. - $path = $service->generate("{$theme->getPath()}/src/images/") - ->toString(TRUE)->getGeneratedUrl(); - - $illustration = match($paragraph->get('field_graphics_illustrations')->value) { - 'photographer' => [ - 'url' => $path . 'photographer.svg', - 'photographer' => 'Lille Santanen', - ], - }; - - if ($illustration) { - $variables['selected_illustration'] = $illustration; - } -} diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/__index.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/__index.scss index 1797e8b9..a8c1272a 100644 --- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/__index.scss +++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/__index.scss @@ -1 +1,2 @@ @import 'news-page'; +@import 'helsinki-near-you'; diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_graphics.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss similarity index 100% rename from public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_graphics.scss rename to public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/__index.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/__index.scss index 342cd0cd..25912d37 100644 --- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/__index.scss +++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/__index.scss @@ -2,4 +2,3 @@ @import 'latest-news'; @import 'top-news'; @import 'news-update'; -@import 'graphics'; diff --git a/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-landing-page.html.twig b/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-landing-page.html.twig new file mode 100644 index 00000000..f3835c6d --- /dev/null +++ b/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-landing-page.html.twig @@ -0,0 +1,44 @@ +{% set form %} + +{% endset %} + + +{% embed '@hdbt/component/hero.twig' with { + design: 'with-helsinki-near-you', + title: 'Helsinki near you'|t({}, {'context': 'Helsinki near you'}), + description: 'Find services, events and news close to you. Start by searching with your address.'|t({}, {'context': 'Helsinki near you'}), + form: form, +} %} +{% endembed %} + +{% embed "@hdbt/misc/component.twig" with + { + component_classes: [ + 'component--graphics', + ], + component_content_class: 'graphics', + } +%} + {% block component_content %} +
+

{{ 'First make a search with your address'|t({}, {'context': 'Helsinki near you'}) }}

+
+

{{ 'Fill in your address to the search bar above and find services, events and news near you.'|t({}, {'context': 'Helsinki near you'}) }}

+
+
+
+ +
+ {% endblock component_content %} +{% endembed %} + diff --git a/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--graphics.html.twig b/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--graphics.html.twig deleted file mode 100644 index d8f09f3e..00000000 --- a/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--graphics.html.twig +++ /dev/null @@ -1,18 +0,0 @@ -{% embed "@hdbt/misc/component.twig" with - { - component_classes: [ - 'component--graphics', - ], - component_content_class: 'graphics', - } -%} - {% block component_content %} -
-

{{ content.field_graphics_title }}

-
{{ content.field_graphics_desc }}
-
-
- {{ selected_illustration.alt }} -
- {% endblock component_content %} -{% endembed %} diff --git a/public/themes/custom/hdbt_subtheme/translations/fi.po b/public/themes/custom/hdbt_subtheme/translations/fi.po index a59a5282..0c28c55f 100644 --- a/public/themes/custom/hdbt_subtheme/translations/fi.po +++ b/public/themes/custom/hdbt_subtheme/translations/fi.po @@ -20,3 +20,23 @@ msgstr "Syvenny ja inspiroidu" msgctxt "Front page news of interest title" msgid "You might be interested in" msgstr "Sinua voisi kiinnostaa" + +msgctxt "Helsinki near you" +msgid "Address" +msgstr "Osoite" + +msgctxt "Helsinki near you" +msgid "For example, Mannerheimintie 1" +msgstr "Esim. Mannerheimintie 1" + +msgctxt "Helsinki near you" +msgid "Search" +msgstr "Etsi" + +msgctxt "Helsinki near you" +msgid "First make a search with your address" +msgstr "Tee aluksi haku osoitteellasi" + +msgctxt "Helsinki near you" +msgid "Fill in your address to the search bar above and find services, events and news near you." +msgstr "Täytä osoitteesi yllä olevaan hakuun ja löydä palveluita, tapahtumia ja uutisia läheltäsi." diff --git a/public/themes/custom/hdbt_subtheme/translations/sv.po b/public/themes/custom/hdbt_subtheme/translations/sv.po index 2d691694..bdae616b 100644 --- a/public/themes/custom/hdbt_subtheme/translations/sv.po +++ b/public/themes/custom/hdbt_subtheme/translations/sv.po @@ -20,3 +20,23 @@ msgstr "Läs mer och få inspiration" msgctxt "Front page news of interest title" msgid "You might be interested in" msgstr "Du kanske är intresserad av" + +msgctxt "Helsinki near you" +msgid "Address" +msgstr "Adress" + +msgctxt "Helsinki near you" +msgid "For example, Mannerheimintie 1" +msgstr "T.ex. Mannerheimvägen 1" + +msgctxt "Helsinki near you" +msgid "Search" +msgstr "Sök" + +msgctxt "Helsinki near you" +msgid "First make a search with your address" +msgstr "Först gör en sökning med din adress" + +msgctxt "Helsinki near you" +msgid "Fill in your address to the search bar above and find services, events and news near you." +msgstr "Fyll i din adress i sökfältet ovan och hitta tjänster, evenemang och nyheter nära dig." From aa6808d561dbca3ac9eba818d8dbe50c15b5c60a Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Wed, 13 Nov 2024 16:55:21 +0200 Subject: [PATCH 06/59] UHF-10771: Added routes with aliases and styled the helsinki-near-you-results and -landing pages, moved translations --- .../helfi_etusivu/helfi_etusivu.install | 30 +++++++- .../custom/helfi_etusivu/helfi_etusivu.module | 29 ++++++-- .../Controller/HelsinkiNearYouController.php | 37 ++++++++-- .../HelsinkiNearYouResultsController.php | 12 ++-- .../Plugin/Block/HelsinkiNearYouHeroBlock.php | 45 ++++++++++++ .../helsinki-near-you-hero-block.html.twig | 11 +++ .../helsinki-near-you-landing-page.html.twig | 3 +- .../helsinki-near-you-results-page.html.twig | 7 ++ .../custom/helfi_etusivu/translations/fi.po | 36 ++++++++++ .../custom/helfi_etusivu/translations/sv.po | 36 ++++++++++ .../hdbt_subtheme/dist/css/styles.min.css | 2 +- .../custom/hdbt_subtheme/package-lock.json | 12 ++-- .../pages/_helsinki-near-you.scss | 8 +++ .../helsinki-near-you-hero-block.html.twig | 21 ++++++ .../helsinki-near-you-landing-page.html.twig | 71 +++++++------------ .../helsinki-near-you-results-page.html.twig | 20 ++++++ .../custom/hdbt_subtheme/translations/fi.po | 20 ------ .../custom/hdbt_subtheme/translations/sv.po | 20 ------ 18 files changed, 312 insertions(+), 108 deletions(-) create mode 100644 public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php create mode 100644 public/modules/custom/helfi_etusivu/templates/helsinki-near-you-hero-block.html.twig create mode 100644 public/modules/custom/helfi_etusivu/templates/helsinki-near-you-results-page.html.twig create mode 100644 public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-hero-block.html.twig create mode 100644 public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-results-page.html.twig diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.install b/public/modules/custom/helfi_etusivu/helfi_etusivu.install index 5294230e..cdbe7ea0 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.install +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.install @@ -9,6 +9,7 @@ declare(strict_types=1); use Drupal\Core\Database\Database; use Drupal\node\Entity\Node; +use Drupal\path_alias\Entity\PathAlias; /** * Implements hook_install(). @@ -258,9 +259,32 @@ function helfi_etusivu_update_9011() : void { } /** - * UHF-10771: Add 'graphics' paragraph to landing page. + * UHF-10771: Add path aliases for helsinki-near-you url. */ function helfi_etusivu_update_9012(): void { - \Drupal::service('helfi_platform_config.config_update_helper') - ->update('helfi_etusivu'); + $paths = [ + [ + 'path' => '/helsinki-near-you', + 'alias' => '/helsinki-lahellasi', + 'langcode' => 'fi', + ], + [ + 'path' => '/helsinki-near-you', + 'alias' => '/helsingfors-nara-dig', + 'langcode' => 'sv', + ], + [ + 'path' => '/helsinki-near-you/results', + 'alias' => '/helsinki-lahellasi/tulokset', + 'langcode' => 'fi', + ], + [ + 'path' => '/helsinki-near-you/results', + 'alias' => '/helsingfors-nara-dig/resultat', + 'langcode' => 'sv', + ], + ]; + foreach ($paths as $path) { + PathAlias::create($path)->save(); + } } diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index b1bdf37d..e2a782f3 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -268,8 +268,8 @@ function helfi_etusivu_preprocess_html(&$variables): void { function helfi_etusivu_preprocess_page(&$variables): void { $route = \Drupal::routeMatch()->getRouteName(); - // There is hero block on Helsinki near you landing page but since it isn't a paragraph we must set this - // variable manually. + // There is hero block on Helsinki near you landing page but + // since it isn't a paragraph we must set this variable manually. if ($route === 'helfi_etusivu.helsinki_near_you') { $variables['has_hero'] = TRUE; } @@ -328,10 +328,31 @@ function helfi_etusivu_theme() : array { return [ 'helsinki_near_you_landing_page' => [ 'variables' => [ - 'content' => NULL, + 'title' => NULL, + 'description' => NULL, 'illustration' => NULL, + 'illustration_caption' => NULL, ], - 'template' => 'helsinki_near_you_landing_page', + 'template' => 'helsinki-near-you-landing-page', + ], + 'helsinki_near_you_results_page' => [ + 'variables' => [ + 'title' => NULL, + 'back_link_url' => NULL, + 'back_link_label' => NULL, + ], + 'template' => 'helsinki-near-you-results-page', + ], + 'helsinki_near_you_hero_block' => [ + 'variables' => [ + 'result_page_url' => NULL, + 'form_item_label' => NULL, + 'form_item_placeholder' => NULL, + 'form_item_submit' => NULL, + 'hero_title' => NULL, + 'hero_description' => NULL, + ], + 'template' => 'helsinki-near-you-hero-block', ], ]; } diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouController.php index fcdd06bf..3622e9e7 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouController.php @@ -3,27 +3,54 @@ namespace Drupal\helfi_etusivu\Controller; use Drupal\Core\Controller\ControllerBase; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; +use Drupal\Core\Extension\ThemeHandlerInterface; +use Drupal\Core\File\FileUrlGeneratorInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Helsinki near you controller. */ -class HelsinkiNearYouController extends ControllerBase { +final class HelsinkiNearYouController extends ControllerBase implements ContainerInjectionInterface { + + /** + * Constructs a new instance. + */ + public function __construct( + protected readonly FileUrlGeneratorInterface $fileUrlGenerator, + protected readonly ThemeHandlerInterface $themeHandler, + ) { + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container) { + return new static( + $container->get('file_url_generator'), + $container->get('theme_handler'), + ); + } /** * Returns a renderable array. */ public function content() : array { - /** @var \Drupal\Core\File\FileUrlGeneratorInterface $service */ - $service = \Drupal::service('file_url_generator'); - $theme = \Drupal::service('theme_handler')->getTheme('hdbt_subtheme'); + $theme_path = $this->themeHandler + ->getTheme('hdbt_subtheme') + ->getPath(); // Add theme path to as variable. - $path = $service->generate("{$theme->getPath()}/src/images/") + $path = $this->fileUrlGenerator + ->generate("$theme_path/src/images/") ->toString(TRUE)->getGeneratedUrl(); $build = [ '#theme' => 'helsinki_near_you_landing_page', + '#title' => $this->t('First make a search with your address', [], ['context' => 'Helsinki near you']), + '#description' => $this->t('Fill in your address to the search bar above and find services, events and news near you.', [], ['context' => 'Helsinki near you']), '#illustration' => $path . 'photographer.svg', + '#illustration_caption' => $this->t('Picture: Lille Santanen', [], ['context' => 'Helsinki near you']), ]; return $build; diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php index a25fee76..28c799ad 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php @@ -1,8 +1,11 @@ $this->t('Helsinki near you'), + return [ + '#theme' => 'helsinki_near_you_results_page', + '#title' => $this->t('Services, events and news near your address @address', ['@address' => 'HEIJERE'], ['context' => 'Helsinki near you']), + '#back_link_url' => Url::fromRoute('helfi_etusivu.helsinki_near_you'), + '#back_link_label' => $this->t('Edit address', [], ['context' => 'Helsinki near you']), ]; - - return $build; } } diff --git a/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php b/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php new file mode 100644 index 00000000..73f4a41c --- /dev/null +++ b/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php @@ -0,0 +1,45 @@ + 'helsinki_near_you_hero_block', + '#result_page_url' => Url::fromRoute('helfi_etusivu.helsinki_near_you_results'), + '#form_item_label' => $this->t('Address', [], ['context' => 'Helsinki near you']), + '#form_item_placeholder' => $this->t('For example, Mannerheimintie 1', [], ['context' => 'Helsinki near you']), + '#form_item_submit' => $this->t('Search', [], ['context' => 'Helsinki near you']), + '#hero_title' => $this->t('Helsinki near you', [], ['context' => 'Helsinki near you']), + '#hero_description' => $this->t('Find services, events and news close to you. Start by searching with your address.', [], ['context' => 'Helsinki near you']), + ]; + return $build; + } + + /** + * {@inheritDoc} + */ + public function getCacheContexts() : array { + return Cache::mergeContexts(parent::getCacheContexts(), ['route']); + } + +} diff --git a/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-hero-block.html.twig b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-hero-block.html.twig new file mode 100644 index 00000000..e9fff44d --- /dev/null +++ b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-hero-block.html.twig @@ -0,0 +1,11 @@ + diff --git a/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-landing-page.html.twig b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-landing-page.html.twig index cddd0709..869da441 100644 --- a/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-landing-page.html.twig +++ b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-landing-page.html.twig @@ -1 +1,2 @@ -{{ content }} +

{{ title }}

+

{{ description }}

diff --git a/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-results-page.html.twig b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-results-page.html.twig new file mode 100644 index 00000000..cd8ba72c --- /dev/null +++ b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-results-page.html.twig @@ -0,0 +1,7 @@ +{% set back_link_attributes = { + 'class': [ + 'back-link', + ], +} %} + +{{ link(back_link_label, back_link_url, back_link_attributes) }} diff --git a/public/modules/custom/helfi_etusivu/translations/fi.po b/public/modules/custom/helfi_etusivu/translations/fi.po index f166c2da..55c6c0d8 100644 --- a/public/modules/custom/helfi_etusivu/translations/fi.po +++ b/public/modules/custom/helfi_etusivu/translations/fi.po @@ -30,3 +30,39 @@ msgstr "Uusimmat päivitykset" msgctxt "Updating news" msgid "News update published" msgstr "Uutispäivityksen julkaisuaika" + +msgctxt "Helsinki near you" +msgid "Helsinki near you" +msgstr "Helsinki lähelläsi" + +msgctxt "Helsinki near you" +msgid "Find services, events and news close to you. Start by searching with your address." +msgstr "Löydä palvelut, tapahtumat ja uutiset läheltäsi. Aloita kirjoittamalla osoitteesi." + +msgctxt "Helsinki near you" +msgid "Address" +msgstr "Osoite" + +msgctxt "Helsinki near you" +msgid "For example, Mannerheimintie 1" +msgstr "Esim. Mannerheimintie 1" + +msgctxt "Helsinki near you" +msgid "Search" +msgstr "Etsi" + +msgctxt "Helsinki near you" +msgid "First make a search with your address" +msgstr "Tee aluksi haku osoitteellasi" + +msgctxt "Helsinki near you" +msgid "Fill in your address to the search bar above and find services, events and news near you." +msgstr "Täytä osoitteesi yllä olevaan hakuun ja löydä palveluita, tapahtumia ja uutisia läheltäsi." + +msgctxt "Helsinki near you" +msgid "Picture: Lille Santanen" +msgstr "Kuva: Lille Santanen" + +msgctxt "Helsinki near you" +msgid "Edit address" +msgstr "Muokkaa osoitetta" diff --git a/public/modules/custom/helfi_etusivu/translations/sv.po b/public/modules/custom/helfi_etusivu/translations/sv.po index 1481bff5..b57d4126 100644 --- a/public/modules/custom/helfi_etusivu/translations/sv.po +++ b/public/modules/custom/helfi_etusivu/translations/sv.po @@ -19,3 +19,39 @@ msgstr "Senaste uppdateringar" msgctxt "Updating news" msgid "News update published time" msgstr "Uppdatering publicerad tid" + +msgctxt "Helsinki near you" +msgid "Helsinki near you" +msgstr "Helsingfors nära dig" + +msgctxt "Helsinki near you" +msgid "Find services, events and news close to you. Start by searching with your address." +msgstr "Hitta tjänster, evenemang och nyheter nära dig. Börja med att söka med din adress." + +msgctxt "Helsinki near you" +msgid "Address" +msgstr "Adress" + +msgctxt "Helsinki near you" +msgid "For example, Mannerheimintie 1" +msgstr "T.ex. Mannerheimvägen 1" + +msgctxt "Helsinki near you" +msgid "Search" +msgstr "Sök" + +msgctxt "Helsinki near you" +msgid "First make a search with your address" +msgstr "Först gör en sökning med din adress" + +msgctxt "Helsinki near you" +msgid "Fill in your address to the search bar above and find services, events and news near you." +msgstr "Fyll i din adress i sökfältet ovan och hitta tjänster, evenemang och nyheter nära dig." + +msgctxt "Helsinki near you" +msgid "Picture: Lille Santanen" +msgstr "Bild: Lille Santanen" + +msgctxt "Helsinki near you" +msgid "Edit address" +msgstr "Redigera adress" diff --git a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css index 9b1dd71d..1c31f6a4 100644 --- a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css +++ b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css @@ -1 +1 @@ -.table-of-contents--news-update{padding-left:16px;padding-right:16px;--item-title-lineheight: 1.875rem}@media(min-width: 768px){.table-of-contents--news-update{padding-left:32px;padding-right:32px}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__container{border-left:none}[dir="rtl"] .table-of-contents--news-update .table-of-contents__container{border-right:none}.table-of-contents--news-update .table-of-contents__title+.table-of-contents__content{padding-top:16px}.table-of-contents--news-update .table-of-contents__item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:flex;flex-direction:column;padding-top:16px;padding-bottom:16px;padding-left:16px;padding-right:16px;position:relative}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__item{flex-direction:row}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::before,[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::after{left:8px}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::before,.table-of-contents--news-update .table-of-contents__item::after{content:"";display:block;position:absolute}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::after{background-color:#000;height:calc(100% + 32px + 8px);top:-16px;transform:translateX(calc(var(--lang-direction) * -50%));width:2px;z-index:0}.table-of-contents--news-update .table-of-contents__item:first-of-type::after{height:100%;top:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:last-of-type::after{height:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:only-child::after{display:none}.table-of-contents--news-update .table-of-contents__item::before{background-color:#fff;border:3px solid #000;border-radius:50%;height:16px;top:calc(16px + var(--item-title-lineheight)*.5);transform:translate(calc(var(--lang-direction) * -50%), -50%);width:16px;z-index:1}.table-of-contents--news-update time{padding-left:16px}@media(min-width: 768px){.table-of-contents--news-update time{flex:none;width:110px}}[dir="rtl"] .table-of-contents--news-update time{padding-left:0;padding-right:16px}.table-of-contents--news-update .table-of-contents__link{margin-left:16px}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__link{margin-left:32px}}[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-left:0;margin-right:16px}@media(min-width: 768px){[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-right:32px}}.block--main-news{padding-left:16px;padding-right:16px;max-width:1296px;margin-top:32px;margin:auto;width:100%}@media(min-width: 768px){.block--main-news{padding-left:32px;padding-right:32px}}@media(min-width: 768px){.block--main-news{max-width:1328px}}@media(min-width: 992px){.block--main-news{margin-top:64px}}.block--main-news h2{margin-bottom:48px;margin-top:0}.component--news-of-interest{margin-top:32px;background-color:#f2f2f2;margin-left:16px;margin-right:16px;padding:32px 16px 32px}@media(min-width: 992px){.component--news-of-interest{margin-top:64px}}@media(min-width: 768px){.component--news-of-interest{padding:48px 32px 48px}}.component--news-of-interest .card{padding:24px}.component--news-of-interest .empty-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.component--current{background-color:var(--hdbt-color-palette--secondary);color:var(--hdbt-color-palette-text--secondary)}.current__content{display:flex;flex-direction:column;margin-left:auto;margin-right:auto;max-width:1264px}@media(min-width: 768px){.current__content{flex-direction:row}}.current__content__list{margin-bottom:0;margin-top:0}.current__content__list-item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-bottom:2px;margin-top:0;padding-top:7px;padding-bottom:7px;vertical-align:top}.current__links-container{padding-bottom:16px;padding-top:16px}@media(min-width: 576px){.current__links-container{padding-bottom:24px;padding-top:24px}}@media(min-width: 768px){.current__links-container{padding-right:16px}}@media(min-width: 992px){.current__links-container{padding-bottom:48px;padding-top:48px}}@media(min-width: 992px){.current__links-container{padding-bottom:64px;padding-top:64px}}.current{display:flex;flex-direction:column}@media(min-width: 768px){.current__illustration-container{margin-left:auto;margin-top:-32px}}@media(min-width: 992px){.current__illustration-container{margin-top:-48px}}@media(min-width: 1248px){.current__illustration-container{margin-top:-64px}}.current__seasonal-illustration{aspect-ratio:1;display:block;width:258px}@media(min-width: 992px){.current__seasonal-illustration{width:378px}}@media(min-width: 1248px){.current__seasonal-illustration{width:486px}}.component--latest-news--cards{background-color:#f2f2f2}.component--latest-news .latest-news__link-wrapper{margin-top:32px}@media(min-width: 768px){.component--latest-news .latest-news__link-wrapper{margin-top:64px}}[dir="ltr"] .component--top-news .news-listing{padding-left:0}[dir="rtl"] .component--top-news .news-listing{padding-right:0}.component--top-news .news-listing__item{position:relative}.component--top-news--news .component__container{background-color:#e8f3fc;padding:24px 24px 32px}@media(min-width: 768px){.component--top-news--news .component__container{padding:32px 32px 48px}}.component--top-news--news .component__title+.component__content{margin-top:0}@media(min-width: 768px){.component--top-news--news .component__title+.component__content{grid-template-columns:repeat(2, 1fr);margin-top:32px}}.component--top-news--news .news-listing--medium-teasers{display:grid;margin-bottom:0;margin-top:24px}@media(min-width: 768px){.component--top-news--news .news-listing--medium-teasers{grid-column-gap:24px;grid-row-gap:32px;grid-template-columns:repeat(2, 1fr);margin-top:48px}}.component--top-news--news .news-listing__medium-teaser{padding:0}[dir=rtl] .component--top-news--news .news-listing__medium-teaser{padding:0}.component--top-news--news .news-listing__medium-teaser::before{display:none}.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.component--top-news--news .news-listing__medium-teaser .news-listing__datetime{margin-top:8px}.component--news-update{border-bottom:1px solid #ccc;padding-bottom:32px}@media(min-width: 768px){.component--news-update{padding-bottom:48px}}.component--news-update time{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);display:inline-block;margin-top:16px}.component--news-update .component__content{margin-top:32px}@media(min-width: 768px){.component--news-update .component__content{margin-top:48px}}*~.component--news-update,.component--news-update~.component--news-update{margin-top:32px}@media(min-width: 768px){*~.component--news-update,.component--news-update~.component--news-update{margin-top:48px}}@media(min-width: 992px){.graphics{align-items:center;display:flex;justify-content:space-between}}@media(min-width: 992px){.graphics__text-container{min-height:300px}}.graphics__title{margin-top:0}.graphics__illustration-container{margin-top:64px}@media(min-width: 992px){.graphics__illustration-container{margin-top:0}}.graphics__illustration{max-width:100%} +.table-of-contents--news-update{padding-left:16px;padding-right:16px;--item-title-lineheight: 1.875rem}@media(min-width: 768px){.table-of-contents--news-update{padding-left:32px;padding-right:32px}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__container{border-left:none}[dir="rtl"] .table-of-contents--news-update .table-of-contents__container{border-right:none}.table-of-contents--news-update .table-of-contents__title+.table-of-contents__content{padding-top:16px}.table-of-contents--news-update .table-of-contents__item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:flex;flex-direction:column;padding-top:16px;padding-bottom:16px;padding-left:16px;padding-right:16px;position:relative}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__item{flex-direction:row}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::before,[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::after{left:8px}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::before,.table-of-contents--news-update .table-of-contents__item::after{content:"";display:block;position:absolute}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::after{background-color:#000;height:calc(100% + 32px + 8px);top:-16px;transform:translateX(calc(var(--lang-direction) * -50%));width:2px;z-index:0}.table-of-contents--news-update .table-of-contents__item:first-of-type::after{height:100%;top:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:last-of-type::after{height:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:only-child::after{display:none}.table-of-contents--news-update .table-of-contents__item::before{background-color:#fff;border:3px solid #000;border-radius:50%;height:16px;top:calc(16px + var(--item-title-lineheight)*.5);transform:translate(calc(var(--lang-direction) * -50%), -50%);width:16px;z-index:1}.table-of-contents--news-update time{padding-left:16px}@media(min-width: 768px){.table-of-contents--news-update time{flex:none;width:110px}}[dir="rtl"] .table-of-contents--news-update time{padding-left:0;padding-right:16px}.table-of-contents--news-update .table-of-contents__link{margin-left:16px}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__link{margin-left:32px}}[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-left:0;margin-right:16px}@media(min-width: 768px){[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-right:32px}}.block--main-news{padding-left:16px;padding-right:16px;max-width:1296px;margin-top:32px;margin:auto;width:100%}@media(min-width: 768px){.block--main-news{padding-left:32px;padding-right:32px}}@media(min-width: 768px){.block--main-news{max-width:1328px}}@media(min-width: 992px){.block--main-news{margin-top:64px}}.block--main-news h2{margin-bottom:48px;margin-top:0}.component--news-of-interest{margin-top:32px;background-color:#f2f2f2;margin-left:16px;margin-right:16px;padding:32px 16px 32px}@media(min-width: 992px){.component--news-of-interest{margin-top:64px}}@media(min-width: 768px){.component--news-of-interest{padding:48px 32px 48px}}.component--news-of-interest .card{padding:24px}.component--news-of-interest .empty-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.component--graphics{max-width:100%}@media(min-width: 992px){.graphics{align-items:center;display:flex;justify-content:space-between}}@media(min-width: 992px){.graphics__text-container{min-height:300px}}.graphics__title{margin-top:0}.graphics__illustration-container{margin-top:64px}@media(min-width: 992px){.graphics__illustration-container{margin-top:0}}.graphics__illustration{max-width:100%}.page-title+article>.components--helsinki-near-you-results:first-child{margin-top:16px}.component--current{background-color:var(--hdbt-color-palette--secondary);color:var(--hdbt-color-palette-text--secondary)}.current__content{display:flex;flex-direction:column;margin-left:auto;margin-right:auto;max-width:1264px}@media(min-width: 768px){.current__content{flex-direction:row}}.current__content__list{margin-bottom:0;margin-top:0}.current__content__list-item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-bottom:2px;margin-top:0;padding-top:7px;padding-bottom:7px;vertical-align:top}.current__links-container{padding-bottom:16px;padding-top:16px}@media(min-width: 576px){.current__links-container{padding-bottom:24px;padding-top:24px}}@media(min-width: 768px){.current__links-container{padding-right:16px}}@media(min-width: 992px){.current__links-container{padding-bottom:48px;padding-top:48px}}@media(min-width: 992px){.current__links-container{padding-bottom:64px;padding-top:64px}}.current{display:flex;flex-direction:column}@media(min-width: 768px){.current__illustration-container{margin-left:auto;margin-top:-32px}}@media(min-width: 992px){.current__illustration-container{margin-top:-48px}}@media(min-width: 1248px){.current__illustration-container{margin-top:-64px}}.current__seasonal-illustration{aspect-ratio:1;display:block;width:258px}@media(min-width: 992px){.current__seasonal-illustration{width:378px}}@media(min-width: 1248px){.current__seasonal-illustration{width:486px}}.component--latest-news--cards{background-color:#f2f2f2}.component--latest-news .latest-news__link-wrapper{margin-top:32px}@media(min-width: 768px){.component--latest-news .latest-news__link-wrapper{margin-top:64px}}[dir="ltr"] .component--top-news .news-listing{padding-left:0}[dir="rtl"] .component--top-news .news-listing{padding-right:0}.component--top-news .news-listing__item{position:relative}.component--top-news--news .component__container{background-color:#e8f3fc;padding:24px 24px 32px}@media(min-width: 768px){.component--top-news--news .component__container{padding:32px 32px 48px}}.component--top-news--news .component__title+.component__content{margin-top:0}@media(min-width: 768px){.component--top-news--news .component__title+.component__content{grid-template-columns:repeat(2, 1fr);margin-top:32px}}.component--top-news--news .news-listing--medium-teasers{display:grid;margin-bottom:0;margin-top:24px}@media(min-width: 768px){.component--top-news--news .news-listing--medium-teasers{grid-column-gap:24px;grid-row-gap:32px;grid-template-columns:repeat(2, 1fr);margin-top:48px}}.component--top-news--news .news-listing__medium-teaser{padding:0}[dir=rtl] .component--top-news--news .news-listing__medium-teaser{padding:0}.component--top-news--news .news-listing__medium-teaser::before{display:none}.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.component--top-news--news .news-listing__medium-teaser .news-listing__datetime{margin-top:8px}.component--news-update{border-bottom:1px solid #ccc;padding-bottom:32px}@media(min-width: 768px){.component--news-update{padding-bottom:48px}}.component--news-update time{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);display:inline-block;margin-top:16px}.component--news-update .component__content{margin-top:32px}@media(min-width: 768px){.component--news-update .component__content{margin-top:48px}}*~.component--news-update,.component--news-update~.component--news-update{margin-top:32px}@media(min-width: 768px){*~.component--news-update,.component--news-update~.component--news-update{margin-top:48px}} diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index 2ef07ff1..939a4dc0 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -3325,9 +3325,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001679", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001679.tgz", - "integrity": "sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA==", + "version": "1.0.30001680", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz", + "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==", "funding": [ { "type": "opencollective", @@ -13159,9 +13159,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001679", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001679.tgz", - "integrity": "sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA==" + "version": "1.0.30001680", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz", + "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==" }, "chalk": { "version": "2.4.2", diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss index cfa70dac..fed5f22b 100644 --- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss +++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss @@ -1,3 +1,7 @@ +.component--graphics { + max-width: 100%; +} + .graphics { @include breakpoint($breakpoint-l) { align-items: center; @@ -27,3 +31,7 @@ .graphics__illustration { max-width: 100%; } + +.page-title + article > .components--helsinki-near-you-results:first-child { + margin-top: $spacing; +} diff --git a/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-hero-block.html.twig b/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-hero-block.html.twig new file mode 100644 index 00000000..a6dabfa9 --- /dev/null +++ b/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-hero-block.html.twig @@ -0,0 +1,21 @@ +{% set form %} + +{% endset %} + +{% embed '@hdbt/component/hero.twig' with { + design: 'with-helsinki-near-you', + title: hero_title, + description: hero_description, + form: form, +} %} +{% endembed %} diff --git a/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-landing-page.html.twig b/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-landing-page.html.twig index f3835c6d..6696bcc4 100644 --- a/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-landing-page.html.twig +++ b/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-landing-page.html.twig @@ -1,44 +1,27 @@ -{% set form %} - -{% endset %} - - -{% embed '@hdbt/component/hero.twig' with { - design: 'with-helsinki-near-you', - title: 'Helsinki near you'|t({}, {'context': 'Helsinki near you'}), - description: 'Find services, events and news close to you. Start by searching with your address.'|t({}, {'context': 'Helsinki near you'}), - form: form, -} %} -{% endembed %} - -{% embed "@hdbt/misc/component.twig" with - { - component_classes: [ - 'component--graphics', - ], - component_content_class: 'graphics', - } -%} - {% block component_content %} -
-

{{ 'First make a search with your address'|t({}, {'context': 'Helsinki near you'}) }}

-
-

{{ 'Fill in your address to the search bar above and find services, events and news near you.'|t({}, {'context': 'Helsinki near you'}) }}

-
-
-
- -
- {% endblock component_content %} -{% endembed %} - +
+
+ {% embed "@hdbt/misc/component.twig" with + { + component_classes: [ + 'component--graphics', + ], + component_content_class: 'graphics', + } + %} + {% block component_content %} +
+

{{ title }}

+
+

{{ description }}

+
+
+
+
+ +
{{ illustration_caption }}
+
+
+ {% endblock component_content %} + {% endembed %} +
+
diff --git a/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-results-page.html.twig b/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-results-page.html.twig new file mode 100644 index 00000000..8adc2518 --- /dev/null +++ b/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-results-page.html.twig @@ -0,0 +1,20 @@ +
+
+ {% embed "@hdbt/misc/component.twig" with + { + component_classes: [ + 'component--back-to-link', + ], + } + %} + {% block component_content %} + {% include '@hdbt/navigation/link-button.html.twig' with { + type: 'supplementary', + label: back_link_label, + url: back_link_url, + link_options: {'class': ['back-link']}, + } %} + {% endblock component_content %} + {% endembed %} +
+
diff --git a/public/themes/custom/hdbt_subtheme/translations/fi.po b/public/themes/custom/hdbt_subtheme/translations/fi.po index 0c28c55f..a59a5282 100644 --- a/public/themes/custom/hdbt_subtheme/translations/fi.po +++ b/public/themes/custom/hdbt_subtheme/translations/fi.po @@ -20,23 +20,3 @@ msgstr "Syvenny ja inspiroidu" msgctxt "Front page news of interest title" msgid "You might be interested in" msgstr "Sinua voisi kiinnostaa" - -msgctxt "Helsinki near you" -msgid "Address" -msgstr "Osoite" - -msgctxt "Helsinki near you" -msgid "For example, Mannerheimintie 1" -msgstr "Esim. Mannerheimintie 1" - -msgctxt "Helsinki near you" -msgid "Search" -msgstr "Etsi" - -msgctxt "Helsinki near you" -msgid "First make a search with your address" -msgstr "Tee aluksi haku osoitteellasi" - -msgctxt "Helsinki near you" -msgid "Fill in your address to the search bar above and find services, events and news near you." -msgstr "Täytä osoitteesi yllä olevaan hakuun ja löydä palveluita, tapahtumia ja uutisia läheltäsi." diff --git a/public/themes/custom/hdbt_subtheme/translations/sv.po b/public/themes/custom/hdbt_subtheme/translations/sv.po index bdae616b..2d691694 100644 --- a/public/themes/custom/hdbt_subtheme/translations/sv.po +++ b/public/themes/custom/hdbt_subtheme/translations/sv.po @@ -20,23 +20,3 @@ msgstr "Läs mer och få inspiration" msgctxt "Front page news of interest title" msgid "You might be interested in" msgstr "Du kanske är intresserad av" - -msgctxt "Helsinki near you" -msgid "Address" -msgstr "Adress" - -msgctxt "Helsinki near you" -msgid "For example, Mannerheimintie 1" -msgstr "T.ex. Mannerheimvägen 1" - -msgctxt "Helsinki near you" -msgid "Search" -msgstr "Sök" - -msgctxt "Helsinki near you" -msgid "First make a search with your address" -msgstr "Först gör en sökning med din adress" - -msgctxt "Helsinki near you" -msgid "Fill in your address to the search bar above and find services, events and news near you." -msgstr "Fyll i din adress i sökfältet ovan och hitta tjänster, evenemang och nyheter nära dig." From ab7b24e85dfbfc3610ef8d1d4eb0bfbc95b1a01f Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Wed, 13 Nov 2024 17:00:51 +0200 Subject: [PATCH 07/59] UHF-10771: Remove heijere placeholder to more understandable one --- .../src/Controller/HelsinkiNearYouResultsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php index 28c799ad..c0badf06 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php @@ -18,7 +18,7 @@ class HelsinkiNearYouResultsController extends ControllerBase { public function content() : array { return [ '#theme' => 'helsinki_near_you_results_page', - '#title' => $this->t('Services, events and news near your address @address', ['@address' => 'HEIJERE'], ['context' => 'Helsinki near you']), + '#title' => $this->t('Services, events and news near your address @address', ['@address' => 'ADDRESS_GOES_HERE'], ['context' => 'Helsinki near you']), '#back_link_url' => Url::fromRoute('helfi_etusivu.helsinki_near_you'), '#back_link_label' => $this->t('Edit address', [], ['context' => 'Helsinki near you']), ]; From 08018310742c9010543c141ebc2ce72fbf144912 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 14 Nov 2024 09:20:30 +0200 Subject: [PATCH 08/59] UHF-10771: Remove graphics paragraph reference from configuration --- conf/cmi/field.field.node.landing_page.field_content.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml index 7d356a68..d5cbd87a 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -15,7 +15,6 @@ dependencies: - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.front_page_latest_news - paragraphs.paragraphs_type.front_page_top_news - - paragraphs.paragraphs_type.graphics - paragraphs.paragraphs_type.hearings - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links From 9db60241f1d7c16d0f58fd688df54cf6eee548d7 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 14 Nov 2024 09:22:15 +0200 Subject: [PATCH 09/59] UHF-10771: Remove graphics paragraph reference from helfi_etusivu module --- public/modules/custom/helfi_etusivu/helfi_etusivu.module | 1 - 1 file changed, 1 deletion(-) diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index e2a782f3..8418f2cc 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -113,7 +113,6 @@ function helfi_etusivu_helfi_paragraph_types() : array { 'front_page_latest_news' => 17, 'event_list' => 18, 'news_archive' => 19, - 'graphics' => 20, ], ], 'page' => [ From 5c757f52db9653fe976428e3263c836de6ba15a0 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 14 Nov 2024 09:30:12 +0200 Subject: [PATCH 10/59] UHF-10771: Fix class naming on helsinki near you results page --- .../templates/helsinki-near-you-results-page.html.twig | 2 +- .../helfi-etusivu/helsinki-near-you-results-page.html.twig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-results-page.html.twig b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-results-page.html.twig index cd8ba72c..8653db50 100644 --- a/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-results-page.html.twig +++ b/public/modules/custom/helfi_etusivu/templates/helsinki-near-you-results-page.html.twig @@ -1,6 +1,6 @@ {% set back_link_attributes = { 'class': [ - 'back-link', + 'back-to-edit-link', ], } %} diff --git a/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-results-page.html.twig b/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-results-page.html.twig index 8adc2518..70da59f0 100644 --- a/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-results-page.html.twig +++ b/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-results-page.html.twig @@ -3,7 +3,7 @@ {% embed "@hdbt/misc/component.twig" with { component_classes: [ - 'component--back-to-link', + 'component--back-to-edit-link', ], } %} @@ -12,7 +12,7 @@ type: 'supplementary', label: back_link_label, url: back_link_url, - link_options: {'class': ['back-link']}, + link_options: {'class': ['back-to-edit-link']}, } %} {% endblock component_content %} {% endembed %} From accf00bbc749af0cfa0704991be9aa2d9e3fe27f Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 14 Nov 2024 09:36:14 +0200 Subject: [PATCH 11/59] UHF-10771: Add strict_types=1 for a php file that was missing it --- .../helfi_etusivu/src/Controller/HelsinkiNearYouController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouController.php index 3622e9e7..f234116d 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouController.php @@ -1,5 +1,7 @@ Date: Thu, 14 Nov 2024 10:14:34 +0200 Subject: [PATCH 12/59] UHF-10771: Add helsinki-near-you-hero-block configuration --- ...hdbt_subtheme_helsinkinearyouheroblock.yml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 conf/cmi/block.block.hdbt_subtheme_helsinkinearyouheroblock.yml diff --git a/conf/cmi/block.block.hdbt_subtheme_helsinkinearyouheroblock.yml b/conf/cmi/block.block.hdbt_subtheme_helsinkinearyouheroblock.yml new file mode 100644 index 00000000..69ee888c --- /dev/null +++ b/conf/cmi/block.block.hdbt_subtheme_helsinkinearyouheroblock.yml @@ -0,0 +1,25 @@ +uuid: 04dcf865-ab62-4795-a169-ce57d1da73d7 +langcode: fi +status: true +dependencies: + module: + - helfi_etusivu + - system + theme: + - hdbt_subtheme +id: hdbt_subtheme_helsinkinearyouheroblock +theme: hdbt_subtheme +region: before_content +weight: 0 +provider: null +plugin: helsinki_near_you_hero_block +settings: + id: helsinki_near_you_hero_block + label: 'Helsinki near you hero block' + label_display: '0' + provider: helfi_etusivu +visibility: + request_path: + id: request_path + negate: false + pages: "/helsinki-near-you\r\n/helsinki-lahellasi\r\n/helsingfors-nara-dig" From 02d05a81fa766a56ea13d933a276ee1ac006bd56 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 14 Nov 2024 10:15:32 +0200 Subject: [PATCH 13/59] UHF-10771: Change the configuration to correct langcode --- conf/cmi/block.block.hdbt_subtheme_helsinkinearyouheroblock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cmi/block.block.hdbt_subtheme_helsinkinearyouheroblock.yml b/conf/cmi/block.block.hdbt_subtheme_helsinkinearyouheroblock.yml index 69ee888c..5716b0d9 100644 --- a/conf/cmi/block.block.hdbt_subtheme_helsinkinearyouheroblock.yml +++ b/conf/cmi/block.block.hdbt_subtheme_helsinkinearyouheroblock.yml @@ -1,5 +1,5 @@ uuid: 04dcf865-ab62-4795-a169-ce57d1da73d7 -langcode: fi +langcode: en status: true dependencies: module: From 1e6b62f5f5410e926c059ca304b594bf6453c75a Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 14 Nov 2024 10:32:03 +0200 Subject: [PATCH 14/59] UHF-10771: Add missing translations --- public/modules/custom/helfi_etusivu/translations/fi.po | 4 ++++ public/modules/custom/helfi_etusivu/translations/sv.po | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/public/modules/custom/helfi_etusivu/translations/fi.po b/public/modules/custom/helfi_etusivu/translations/fi.po index 55c6c0d8..ebf30f80 100644 --- a/public/modules/custom/helfi_etusivu/translations/fi.po +++ b/public/modules/custom/helfi_etusivu/translations/fi.po @@ -66,3 +66,7 @@ msgstr "Kuva: Lille Santanen" msgctxt "Helsinki near you" msgid "Edit address" msgstr "Muokkaa osoitetta" + +msgctxt "Helsinki near you" +msgid "Services, events and news near your address @address" +msgstr "Palvelut, tapahtumat ja uutiset osoitteella @address" diff --git a/public/modules/custom/helfi_etusivu/translations/sv.po b/public/modules/custom/helfi_etusivu/translations/sv.po index b57d4126..373958a3 100644 --- a/public/modules/custom/helfi_etusivu/translations/sv.po +++ b/public/modules/custom/helfi_etusivu/translations/sv.po @@ -55,3 +55,7 @@ msgstr "Bild: Lille Santanen" msgctxt "Helsinki near you" msgid "Edit address" msgstr "Redigera adress" + +msgctxt "Helsinki near you" +msgid "Services, events and news near your address @address" +msgstr "Tjänster, evenemang och nyheter nära din adress @address" From e77664a7952ccc1ad743bfe9ae2a603067b95ec5 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 14 Nov 2024 11:20:07 +0200 Subject: [PATCH 15/59] UHF-10771: Add missing translations for route titles --- public/modules/custom/helfi_etusivu/translations/fi.po | 6 ++++++ public/modules/custom/helfi_etusivu/translations/sv.po | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/public/modules/custom/helfi_etusivu/translations/fi.po b/public/modules/custom/helfi_etusivu/translations/fi.po index ebf30f80..f76b1964 100644 --- a/public/modules/custom/helfi_etusivu/translations/fi.po +++ b/public/modules/custom/helfi_etusivu/translations/fi.po @@ -70,3 +70,9 @@ msgstr "Muokkaa osoitetta" msgctxt "Helsinki near you" msgid "Services, events and news near your address @address" msgstr "Palvelut, tapahtumat ja uutiset osoitteella @address" + +msgid "Helsinki near you" +msgstr "Helsinki lähelläsi" + +msgid "Services, events and news near your address" +msgstr "Palvelut, tapahtumat ja uutiset osoitteesi lähellä" diff --git a/public/modules/custom/helfi_etusivu/translations/sv.po b/public/modules/custom/helfi_etusivu/translations/sv.po index 373958a3..94746ae8 100644 --- a/public/modules/custom/helfi_etusivu/translations/sv.po +++ b/public/modules/custom/helfi_etusivu/translations/sv.po @@ -59,3 +59,9 @@ msgstr "Redigera adress" msgctxt "Helsinki near you" msgid "Services, events and news near your address @address" msgstr "Tjänster, evenemang och nyheter nära din adress @address" + +msgid "Helsinki near you" +msgstr "Helsingfors nära dig" + +msgid "Services, events and news near your address" +msgstr "Tjänster, evenemang och nyheter nära din adress" From b97ba0ef4ebdc63d89c61767b42c02bb13f46598 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Thu, 21 Nov 2024 06:31:23 +0000 Subject: [PATCH 16/59] Update configuration --- composer.lock | 58 ++++++------- .../block.block.eucookiecomplianceblock.yml | 31 ------- ....hdbt_subtheme_eucookiecomplianceblock.yml | 31 ------- ...ty_form_display.node.news_item.default.yml | 14 ---- conf/cmi/core.extension.yml | 3 +- ...cookie_compliance.cookie_category.chat.yml | 13 --- ...e_compliance.cookie_category.essential.yml | 13 --- ..._compliance.cookie_category.preference.yml | 13 --- ..._compliance.cookie_category.statistics.yml | 13 --- conf/cmi/eu_cookie_compliance.settings.yml | 82 ------------------- conf/cmi/hdbt_cookie_banner.settings.yml | 6 ++ ...cookie_compliance.cookie_consent_intro.yml | 7 -- ..._compliance.cookie_category.statistics.yml | 1 - ..._compliance.cookie_category.statistics.yml | 1 - ...cookie_compliance.cookie_consent_intro.yml | 2 - ..._compliance.cookie_category.statistics.yml | 1 - ..._compliance.cookie_category.statistics.yml | 1 - ..._compliance.cookie_category.statistics.yml | 1 - .../fi/core.entity_view_mode.media.image.yml | 2 +- ...cookie_compliance.cookie_category.chat.yml | 4 - ...e_compliance.cookie_category.essential.yml | 4 - ..._compliance.cookie_category.preference.yml | 4 - ..._compliance.cookie_category.statistics.yml | 4 - .../fi/eu_cookie_compliance.settings.yml | 11 --- ...ld.field.media.image.field_media_image.yml | 2 +- ...graph.contact_card.field_contact_image.yml | 2 +- ....field.paragraph.hero.field_hero_image.yml | 2 +- ...th_image.field_liftup_with_image_image.yml | 2 +- ...f_links_item.field_list_of_links_image.yml | 2 +- .../fi/hdbt_cookie_banner.settings.yml | 3 + ...cookie_compliance.cookie_consent_intro.yml | 5 -- conf/cmi/language/fi/media.type.image.yml | 2 +- .../fi/paragraphs.paragraphs_type.image.yml | 2 +- ..._compliance.cookie_category.statistics.yml | 1 - ...cookie_compliance.cookie_consent_intro.yml | 2 - ..._compliance.cookie_category.statistics.yml | 1 - .../sv/core.entity_view_mode.media.image.yml | 2 +- ...cookie_compliance.cookie_category.chat.yml | 4 - ...e_compliance.cookie_category.essential.yml | 4 - ..._compliance.cookie_category.preference.yml | 4 - ..._compliance.cookie_category.statistics.yml | 4 - .../sv/eu_cookie_compliance.settings.yml | 11 --- ...ld.field.media.image.field_media_image.yml | 2 +- ...graph.contact_card.field_contact_image.yml | 2 +- ....field.paragraph.hero.field_hero_image.yml | 2 +- ...th_image.field_liftup_with_image_image.yml | 2 +- ...f_links_item.field_list_of_links_image.yml | 2 +- .../sv/hdbt_cookie_banner.settings.yml | 3 + ...cookie_compliance.cookie_consent_intro.yml | 5 -- conf/cmi/language/sv/media.type.image.yml | 2 +- .../sv/paragraphs.paragraphs_type.image.yml | 2 +- ..._compliance.cookie_category.statistics.yml | 1 - ..._compliance.cookie_category.statistics.yml | 1 - conf/cmi/user.role.admin.yml | 5 +- conf/cmi/user.role.anonymous.yml | 2 - conf/cmi/user.role.authenticated.yml | 2 - 56 files changed, 60 insertions(+), 348 deletions(-) delete mode 100644 conf/cmi/block.block.eucookiecomplianceblock.yml delete mode 100644 conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml delete mode 100644 conf/cmi/eu_cookie_compliance.cookie_category.chat.yml delete mode 100644 conf/cmi/eu_cookie_compliance.cookie_category.essential.yml delete mode 100644 conf/cmi/eu_cookie_compliance.cookie_category.preference.yml delete mode 100644 conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/eu_cookie_compliance.settings.yml create mode 100644 conf/cmi/hdbt_cookie_banner.settings.yml delete mode 100644 conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml delete mode 100644 conf/cmi/language/ar/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/language/de/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/language/de/helfi_eu_cookie_compliance.cookie_consent_intro.yml delete mode 100644 conf/cmi/language/es/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/language/et/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/language/fa/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml delete mode 100644 conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml delete mode 100644 conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml delete mode 100644 conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/language/fi/eu_cookie_compliance.settings.yml create mode 100644 conf/cmi/language/fi/hdbt_cookie_banner.settings.yml delete mode 100644 conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml delete mode 100644 conf/cmi/language/fr/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/language/fr/helfi_eu_cookie_compliance.cookie_consent_intro.yml delete mode 100644 conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml delete mode 100644 conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml delete mode 100644 conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml delete mode 100644 conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/language/sv/eu_cookie_compliance.settings.yml create mode 100644 conf/cmi/language/sv/hdbt_cookie_banner.settings.yml delete mode 100644 conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml delete mode 100644 conf/cmi/language/uk/eu_cookie_compliance.cookie_category.statistics.yml delete mode 100644 conf/cmi/language/zh-hans/eu_cookie_compliance.cookie_category.statistics.yml diff --git a/composer.lock b/composer.lock index 5672410e..b86e0309 100644 --- a/composer.lock +++ b/composer.lock @@ -2360,16 +2360,16 @@ }, { "name": "drupal/core", - "version": "10.3.8", + "version": "10.3.9", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "4006024a8dd7c9976fad0a2af7c9034d120c8e44" + "reference": "42a6516491b4793158542a2326dc6ad1fe2aa5bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/4006024a8dd7c9976fad0a2af7c9034d120c8e44", - "reference": "4006024a8dd7c9976fad0a2af7c9034d120c8e44", + "url": "https://api.github.com/repos/drupal/core/zipball/42a6516491b4793158542a2326dc6ad1fe2aa5bd", + "reference": "42a6516491b4793158542a2326dc6ad1fe2aa5bd", "shasum": "" }, "require": { @@ -2518,13 +2518,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.3.8" + "source": "https://github.com/drupal/core/tree/10.3.9" }, - "time": "2024-11-12T09:52:10+00:00" + "time": "2024-11-20T17:59:45+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.3.8", + "version": "10.3.9", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -2568,7 +2568,7 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.8" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.9" }, "time": "2024-08-22T14:31:34+00:00" }, @@ -3571,7 +3571,7 @@ ], "authors": [ { - "name": "Lullabot", + "name": "lullabot", "homepage": "https://www.drupal.org/user/3815489" }, { @@ -3579,7 +3579,7 @@ "homepage": "https://www.drupal.org/user/1288796" }, { - "name": "seanB", + "name": "seanb", "homepage": "https://www.drupal.org/user/545912" } ], @@ -4255,16 +4255,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.8", + "version": "6.8.9", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "9ef262cd864f75cf4972075624e5b6415c909999" + "reference": "01dac91a676828e19a6ace8b6e53a9e2a4c26b7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/9ef262cd864f75cf4972075624e5b6415c909999", - "reference": "9ef262cd864f75cf4972075624e5b6415c909999", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/01dac91a676828e19a6ace8b6e53a9e2a4c26b7a", + "reference": "01dac91a676828e19a6ace8b6e53a9e2a4c26b7a", "shasum": "" }, "require": { @@ -4283,10 +4283,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.8", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.9", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-11-20T08:03:52+00:00" + "time": "2024-11-20T13:11:33+00:00" }, { "name": "drupal/hdbt_admin", @@ -4595,16 +4595,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.7.5", + "version": "4.8.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "760d470ec819fcc7749d77d319b904a42812ac85" + "reference": "d93cdc55e761665a2bb68503f466ab376a745c10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/760d470ec819fcc7749d77d319b904a42812ac85", - "reference": "760d470ec819fcc7749d77d319b904a42812ac85", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d93cdc55e761665a2bb68503f466ab376a745c10", + "reference": "d93cdc55e761665a2bb68503f466ab376a745c10", "shasum": "" }, "require": { @@ -4731,10 +4731,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.7.5", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.0", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-11-19T09:09:39+00:00" + "time": "2024-11-20T11:35:52+00:00" }, { "name": "drupal/helfi_proxy", @@ -5811,17 +5811,17 @@ }, { "name": "drupal/migrate_plus", - "version": "6.0.4", + "version": "6.0.5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/migrate_plus.git", - "reference": "6.0.4" + "reference": "6.0.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/migrate_plus-6.0.4.zip", - "reference": "6.0.4", - "shasum": "0357c416d2a9fd3f4211dd13c6585ed8072fabe7" + "url": "https://ftp.drupal.org/files/projects/migrate_plus-6.0.5.zip", + "reference": "6.0.5", + "shasum": "441e91086feaca7a6f1acf1735023fff0dfc5e1e" }, "require": { "drupal/core": ">=9.1", @@ -5838,8 +5838,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.4", - "datestamp": "1721745585", + "version": "6.0.5", + "datestamp": "1732124623", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/block.block.eucookiecomplianceblock.yml b/conf/cmi/block.block.eucookiecomplianceblock.yml deleted file mode 100644 index 1db12c1e..00000000 --- a/conf/cmi/block.block.eucookiecomplianceblock.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: adf1ba49-197b-4ce6-8519-6d457e2a52e6 -langcode: en -status: true -dependencies: - module: - - eu_cookie_compliance - - system - theme: - - hdbt -_core: - default_config_hash: 28-kb7jihf_0-XOrfhlEDbsUyoxMcH4YtOMyietA-vA -id: eucookiecomplianceblock -theme: hdbt -region: after_content -weight: -9 -provider: null -plugin: eu_cookie_compliance_block -settings: - id: eu_cookie_compliance_block - label: 'EU Cookie Compliance Block' - label_display: '0' - provider: eu_cookie_compliance - eu_cookie_compliance_block_settings: - description: - value: '' - format: full_html -visibility: - request_path: - id: request_path - negate: false - pages: /cookie-information-and-settings diff --git a/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml b/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml deleted file mode 100644 index 8071c60a..00000000 --- a/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: b0a7de24-c8bb-4e32-95a9-e00225b68b6d -langcode: en -status: true -dependencies: - module: - - eu_cookie_compliance - - system - theme: - - hdbt_subtheme -_core: - default_config_hash: 28-kb7jihf_0-XOrfhlEDbsUyoxMcH4YtOMyietA-vA -id: hdbt_subtheme_eucookiecomplianceblock -theme: hdbt_subtheme -region: after_content -weight: -13 -provider: null -plugin: eu_cookie_compliance_block -settings: - id: eu_cookie_compliance_block - label: 'EU Cookie Compliance Block' - label_display: '0' - provider: eu_cookie_compliance - eu_cookie_compliance_block_settings: - description: - value: '' - format: full_html -visibility: - request_path: - id: request_path - negate: false - pages: /cookie-information-and-settings diff --git a/conf/cmi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/core.entity_form_display.node.news_item.default.yml index af9126e7..77983f78 100644 --- a/conf/cmi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/core.entity_form_display.node.news_item.default.yml @@ -114,20 +114,6 @@ targetEntityType: node bundle: news_item mode: default content: - annif_keywords: - type: readonly_field_widget - weight: 2 - region: content - settings: - label: above - formatter_type: entity_reference_label - formatter_settings: - entity_reference_entity_view: - view_mode: default - entity_reference_label: - link: false - show_description: false - third_party_settings: { } annif_suggested_topics: type: suggested_topics_reference weight: 26 diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 2f4ed76a..9e39ecee 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -43,6 +43,7 @@ module: gin_toolbar: 0 hal: 0 hdbt_admin_tools: 0 + hdbt_cookie_banner: 0 health_check: 0 helfi_alt_lang_fallback: 0 helfi_annif: 0 @@ -53,7 +54,6 @@ module: helfi_etusivu: 0 helfi_etusivu_config: 0 helfi_etusivu_entities: 0 - helfi_eu_cookie_compliance: 0 helfi_global_navigation: 0 helfi_image_styles: 0 helfi_media: 0 @@ -190,7 +190,6 @@ module: paragraphs: 11 publication_date: 99 minimal: 1000 - eu_cookie_compliance: 1001 theme: claro: 0 stable9: 0 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml deleted file mode 100644 index e01b3b2c..00000000 --- a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml +++ /dev/null @@ -1,13 +0,0 @@ -uuid: 5a4055e2-a144-4e85-997d-5a1d69c7fe2a -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: Fo0xGa_NGmRHechfzeoRkN1cxRB2-z_P0gHmfGny4E8 -id: chat -label: 'Functional chat cookies' -description: - value: '

The chats on the www.hel.fi  website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires.  No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.

NameProviderPurpose of the cookieValidityType
_genesys.widgets.*www.hel.fiUsed for storing data required by the chat functionality.Session 
leijuke.*www.hel.fiUsed for storing data required by the chat functionality.Session 
aiap-wbc-chat-app-button-statewww.hel.fiUsed for chat app functionality. Stores chat app button settings and configuration data.Session 
aiap-chat-app-v1-statewww.hel.fiUsed for chat app functionality. Stores chat app settings and configuration data.Session 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudUsed for chat app functionality. Stores chat app conversation token for authentication and data access purposes.SessionThird party
CallGuide.languagewww.hel.fiACE Chat: The language used in the ACE Web SDK is derived from the browsers' preferred language setting and ACE Web SDK settings.-Local storage
CallGuide.config_services_*www.hel.fiACE Chat: Configuring customer service integrations on a web page. Reduces web traffic when loading and navigating a page-Local storage
*_CGWebSDK_windowGUIDwds.ace.teliacompany.comACE Chat: The unique identity of this browser window. Is used if the browser has more than one open window for a website-Local storage
*_CGWebSDK_videoShowerwds.ace.teliacompany.comACE Chat: Only one window at a time can display video. This information tracks which of them (if any).-Local storage
*_CGWebSDK_videoClientswds.ace.teliacompany.comACE Chat: A list of all windows that are likely to display the video-Local storage
*_ACEChatState_ActiveClientwds.ace.teliacompany.comACE Chat: A website can have more than one chat client. This item tracks which customer the current chat belongs to.-Local storage
*_chatEntrancewds.ace.teliacompany.comACE Chat: Name of the chat entrance to the system-Local storage
*_chatUIDwds.ace.teliacompany.comACE Chat: Chat session ID when communicating with ACE-Local storage
humany-*www.hel.fiACE Chat: Preserves widget status when page reloads-Local storage
ARRAffinity.hel.humany.netACE Chat: Load balancing in the backend systemSessionThird party
ARRAffinitySameSite.hel.humany.netACE Chat: Load balancing in the backend systemSessionThird party
' - format: full_html -checkbox_default_state: unchecked -weight: -5 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml deleted file mode 100644 index ad0977a8..00000000 --- a/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml +++ /dev/null @@ -1,13 +0,0 @@ -uuid: d1201d1d-833a-4378-93ed-1275f4e7a838 -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: 6_XedB0R6X-mo9oj-a1V_0wlGQWBzGMlKvDNs-f7KB0 -id: essential -label: 'Essential cookies' -description: - value: '

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.

NameProviderPurpose of the cookieValidityType
cookiehubcookiehub.comUsed by CookieHub to store information about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.365 days 
cookie-agreedwww.hel.fiUsed by www.hel.fi Drupal to store information about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.100 days 
cookie-agreed-versionwww.hel.fiUsed by www.hel.fi Drupal to store information about what version of the cookie consent the user has agreed to.100 days 
cookie-agreed-categorieswww.hel.fiUsed by www.hel.fi Drupal to store information about what cookie categories the user has agreed to.100 days 
cookie-agreedavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about whether visitors have given or declined the use of cookie categories used on the avustukset.hel.fi site.100 days 
cookie-agreed-versionavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about what version of the cookie consent the user has agreed to.100 days 
cookie-agreed-categoriesavustukset.hel.fiUsed by avustukset.hel.fi Drupal to store information about what cookie categories the user has agreed to.100 days 
SSESS*www.hel.fiA cookie related to the operation of the content management system.23 days 
SSESS*avustukset.hel.fiA cookie related to the operation of the content management system.23 days 
AWSELBCORSsiteimproveanalytics.ioThe cookie is related to a load distribution function used to direct requests to servers with the least traffic.SessionThird party
mtm_cookie_consentkartta.hel.fiA technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.10950 days 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

The cookie is an obligatory cookie that facilitates visiting the website.SessionThird party
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudUsed for chat app functionality. Its value is used to access session data on server of the application.SessionThird party
COOKIE_SUPPORThelsinkikanava.fiThe cookie facilitates managing cookies on the website.365 daysThird party
GUEST_LANGUAGE_IDhelsinkikanava.fiThis cookie is generated by the Liferay, its function is to store the language preferences.365 daysThird party
helfi-settingswww.hel.fiUsed by www.hel.fi Drupal to store information about closed announcements and accordions'' state.-Local storage
Drupal.visitor.autologout_loginavustukset.hel.fiUsed by avustukset.hel.fi Drupal to automatically logout user after a period of inactivity.365 days 
Drupal.gin.sidebarExpanded.desktopwww.hel.fiStores whether the admin sidebar is expanded or collapsed on desktop when logged in as an editor on hel.fi.-Local storage
Drupal.gin.sidebarExpanded.mobilewww.hel.fiStores whether the admin sidebar is expanded or collapsed on mobile when logged in as an editor on hel.fi.-Local storage
Drupal.gin.darkmodewww.hel.fiStores the user''s dark mode preference in the admin theme when logged in as an editor on hel.fi.-Local storage
Drupal.toolbar.subtrees.*www.hel.fiStores the expanded or collapsed state of submenus in the Drupal admin toolbar for a logged-in editor, ensuring consistency across page loads.-Local storage
Drupal.off-canvas.css.*www.hel.fiStores 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.-Local storage
ed11ySeenwww.hel.fiTracks which accessibility issues a logged-in editor has already seen to avoid duplicate notifications.-Local storage
editoria11yResultCountwww.hel.fiTracks the number of accessibility issues found on specific pages for a logged-in editor, helping monitor and address them.-Local storage
Drupal.toolbar.toolbarStatewww.hel.fiStores the state of the admin toolbar for a logged-in editor, including its orientation, active tab and state of expansion.SessionSession storage
escapeAdminPathwww.hel.fiStores the URL to redirect a logged-in editor from the admin interface back to the main site.SessionSession storage
' - format: full_html -checkbox_default_state: required -weight: -9 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml deleted file mode 100644 index 0dbc2a93..00000000 --- a/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml +++ /dev/null @@ -1,13 +0,0 @@ -uuid: ac307372-6c18-4643-a930-42593422c634 -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: 2nukTq0GW1ah8MZEHNDaOJ0Ygil0hTpw48HeCYekkZY -id: preference -label: Preference -description: - value: '

Preference cookies modify the visuals and functions of the website based on the user''s previous sessions.

NameProviderPurpose of the cookieValidityType
httpskartta.hel.fi.SWCulturekartta.hel.fiThe City''s map service cookie saves the language in which the service is used.1826 days 
icareus-devicehelsinkikanava.fiThe Helsinki Channel video server cookie facilitates including videos as part of the website''s content.365 daysThird party
VISITOR_INFO1_LIVEyoutube.comThe YouTube cookie selects the old or new video player depending on the connection speed.180 daysThird party
CONSENTyoutube.comUsed by Google to store user consent preferences5947 days, 15 hoursThird party
activeTabwww.hel.fiUsed for storing active tab data when user is using high school search.Session 
activeContentwww.hel.fiUsed for storing active content data when user is using high school search.Session 
' - format: full_html -checkbox_default_state: unchecked -weight: -8 diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index d9c74db4..00000000 --- a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1,13 +0,0 @@ -uuid: 8cfb3a53-1feb-4632-b367-f34c8ccd24ca -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: DocxmYG5rysx8IQZ_Mu2ZhNcPnpkNpXJAYeRDWSRMds -id: statistics -label: Statistics -description: - value: '

The information collected by statistics cookies is used for developing the website.

NameProviderPurpose of the cookieValidityType
nmstatwww.hel.fiThe Siteimprove statistics cookie collects information about the use of the website.1000 days 
_pk_id.*www.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.141.89f6www.hel.fi-1 hour 
_pk_id.*kartta.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*kartta.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
_pk_id.*palvelukartta.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*palvelukartta.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
_pk_id.*avustukset.hel.fiMatomo Analytics - used to store a few details about the user such as the unique visitor ID393 days 
_pk_ses.*avustukset.hel.fiMatomo Analytics - short lived cookies used to temporarily store data for the visit1 hour 
rnsbidreactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
rnsbid_tsreactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
rns_reaction_*reactandshare.com

A record related to the operation of the 

Askem

 react buttons.

-Local storage
YSCyoutube.comThe YouTube cookie facilitates including videos as part of the website''s content.SessionThird party
' - format: full_html -checkbox_default_state: unchecked -weight: -7 diff --git a/conf/cmi/eu_cookie_compliance.settings.yml b/conf/cmi/eu_cookie_compliance.settings.yml deleted file mode 100644 index 519e31d7..00000000 --- a/conf/cmi/eu_cookie_compliance.settings.yml +++ /dev/null @@ -1,82 +0,0 @@ -langcode: en -dependencies: - config: - - filter.format.full_html -popup_enabled: true -popup_clicking_confirmation: false -popup_scrolling_confirmation: false -eu_only: false -eu_only_js: false -popup_position: false -fixed_top_position: true -popup_info: - value: "

Hel.fi uses cookies

\r\n\r\n

We use essential cookies on our website to make the site work. Also third party cookies are used if you give us your permission.

\r\n" - format: full_html -mobile_popup_info: - value: '' - format: full_html -popup_info_template: new -popup_agree_button_message: Accept -popup_more_info_button_message: 'Show cookies' -mobile_breakpoint: 768 -popup_agreed_enabled: false -popup_hide_agreed: false -disagree_button_label: 'No, thanks' -popup_agreed: - value: '

Thank you for accepting cookies

You can now hide this message or find out more about cookies.

' - format: full_html -popup_find_more_button_message: 'Show cookies' -popup_hide_button_message: Hide -popup_link: /cookie-information-and-settings -popup_link_new_window: false -popup_height: null -popup_width: '' -popup_delay: 1000 -show_more_info: true -popup_bg_hex: '' -popup_text_hex: '' -domain: '' -domains_option: 1 -domains_list: '' -exclude_paths: "/admin\r\n/admin/*\r\n/batch\r\n/node/add*\r\n/node/*/*\r\n/user/*/*" -exclude_admin_theme: false -cookie_session: 0 -set_cookie_session_zero_on_disagree: 0 -cookie_lifetime: 100 -use_mobile_message: false -use_bare_css: true -use_olivero_css: false -disagree_do_not_show_popup: false -reload_page: true -reload_options: 0 -reload_routes_list: '' -cookie_name: '' -exclude_uid_1: false -better_support_for_screen_readers: false -method: categories -disabled_javascripts: '' -automatic_cookies_removal: true -allowed_cookies: "helfi_accordions_open\r\nessential:AWSELBCORS\r\nessential:cookiehub\r\nessential:mtm_cookie_consent\r\nessential:JSESSIONID\r\nessential:COOKIE_SUPPORT\r\nessential:GUEST_LANGUAGE_ID\r\npreference:httpskartta.hel.fi.SWCulture\r\npreference:icareus-device\r\npreference:VISITOR_INFO1_LIVE\r\npreference:CONSENT\r\nstatistics:nmstat\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:rnsbid\r\nstatistics:rnsbid_ts\r\nstatistics:rns_reaction_*\r\nstatistics:YSC\r\nchat:_genesys.widgets.*\r\nchat:leijuke.*" -consent_storage_method: do_not_store -withdraw_message: - value: '

Hel.fi uses cookies

You have given your consent for us to set cookies.

' - format: full_html -withdraw_tab_button_label: 'Privacy settings' -withdraw_action_button_label: 'Withdraw consent' -withdraw_enabled: false -withdraw_button_on_info_popup: false -save_preferences_button_label: 'Accept selected cookies' -accept_all_categories_button_label: 'Accept all cookies' -enable_save_preferences_button: true -domain_all_sites: true -settings_tab_enabled: false -containing_element: body -cookie_policy_version: 1.2.5 -cookie_value_disagreed: '0' -cookie_value_agreed_show_thank_you: '1' -cookie_value_agreed: '2' -accessibility_focus: false -close_button_action: close_banner -reject_button_label: '' -reject_button_enabled: false -close_button_enabled: false diff --git a/conf/cmi/hdbt_cookie_banner.settings.yml b/conf/cmi/hdbt_cookie_banner.settings.yml new file mode 100644 index 00000000..fae82ee6 --- /dev/null +++ b/conf/cmi/hdbt_cookie_banner.settings.yml @@ -0,0 +1,6 @@ +_core: + default_config_hash: y-QliARbuZ0u4VXlTAbsDzeY15OrDBGBbaP6LtSPb3c +langcode: en +cookie_information: + title: 'Cookie information' + content: "A cookie is a small-scale data storage program that a computer browser installs on a user's computer hard drive. Whenever the user's browser retrieves the site from the City of Helsinki's servers, the message is sent back to the user's computer. Javascript and server logs are used to record, for example, the number of users, country of use, usage time and browser used, as well as the content that the visitor has visited. The cookie does not damage the drive.\r\n\r\nCookies are used to speed up, analyze and develop the website and to target content to each user." diff --git a/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml deleted file mode 100644 index 368a0db9..00000000 --- a/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml +++ /dev/null @@ -1,7 +0,0 @@ -_core: - default_config_hash: eVNvfbEgjm25gLyG5DH8zDbCi17xs8djPZt0XHD_Q9s -cc: - title: 'Cookie settings' - content: - value: "

A cookie is a small-scale data storage program that a computer browser installs on a user's computer hard drive. Whenever the user's browser retrieves the site from the City of Helsinki's servers, the message is sent back to the user's computer. Javascript and server logs are used to record, for example, the number of users, country of use, usage time and browser used, as well as the content that the visitor has visited. The cookie does not damage the drive.

Cookies are used to speed up, analyze and develop the website and to target content to each user.

" - format: full_html diff --git a/conf/cmi/language/ar/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/ar/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index 298e3d7c..00000000 --- a/conf/cmi/language/ar/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1 +0,0 @@ -label: Statistics diff --git a/conf/cmi/language/de/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/de/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index 298e3d7c..00000000 --- a/conf/cmi/language/de/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1 +0,0 @@ -label: Statistics diff --git a/conf/cmi/language/de/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/language/de/helfi_eu_cookie_compliance.cookie_consent_intro.yml deleted file mode 100644 index ca5834f1..00000000 --- a/conf/cmi/language/de/helfi_eu_cookie_compliance.cookie_consent_intro.yml +++ /dev/null @@ -1,2 +0,0 @@ -cc: - title: Cookie-Einstellungen diff --git a/conf/cmi/language/es/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/es/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index 298e3d7c..00000000 --- a/conf/cmi/language/es/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1 +0,0 @@ -label: Statistics diff --git a/conf/cmi/language/et/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/et/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index 298e3d7c..00000000 --- a/conf/cmi/language/et/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1 +0,0 @@ -label: Statistics diff --git a/conf/cmi/language/fa/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/fa/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index 298e3d7c..00000000 --- a/conf/cmi/language/fa/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1 +0,0 @@ -label: Statistics diff --git a/conf/cmi/language/fi/core.entity_view_mode.media.image.yml b/conf/cmi/language/fi/core.entity_view_mode.media.image.yml index 38b20463..22ed4bd4 100644 --- a/conf/cmi/language/fi/core.entity_view_mode.media.image.yml +++ b/conf/cmi/language/fi/core.entity_view_mode.media.image.yml @@ -1 +1 @@ -label: 'Kuva (tuettu muilla kielillä)' +label: Kuva diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml deleted file mode 100644 index b554bf87..00000000 --- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml +++ /dev/null @@ -1,4 +0,0 @@ -description: - value: '

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.  Evästeiden hyväksymiseen ei tällöin tarvita erillistä suostumusta. Toiminnallisia chat-evästeitä ladataan laitteellesi vain, jos käynnistät chatin.

NimiTarjoajaTarkoitusVoimassaTyyppi
_genesys.widgets.*www.hel.fiKäytetään chatin tarvitseman datan tallentamiseen.Istunto 
leijuke.*www.hel.fiKäytetään chatin tarvitseman datan tallentamiseen.Istunto 
aiap-wbc-chat-app-button-statewww.hel.fiKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen painikkeen asetukset ja kokoonpanotiedot.Istunto 
aiap-chat-app-v1-statewww.hel.fiKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen asetukset ja kokoonpanotiedot.Istunto 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudKäytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen keskustelutunnisteen istunnnon tunnistamista ja tietojen hakemista varten.IstuntoKolmas osapuoli
CallGuide.languagewww.hel.fiACE Chat: ACE Web SDK:ssa käytettävä kieli, joka on johdettu selainten ensisijaisesta kieliasetuksesta ja ACE Web SDK - asetuksista.-Local storage
CallGuide.config_services_*www.hel.fiACE Chat: Asiakaspalveluintegraatioiden määritys verkkosivulla. Vähentää verkkoliikennettä sivun lataamisen ja navigoinnin yhteydessä.-Local storage
*_CGWebSDK_windowGUIDwds.ace.teliacompany.comACE Chat: Tämän selainikkunan yksilöllinen identiteetti. Käytetään, jos selaimessa on useampi kuin yksi avoin ikkuna verkkosivustolle.-Local storage
*_CGWebSDK_videoShowerwds.ace.teliacompany.comACE Chat: Vain yksi ikkuna kerrallaan voi näyttää videota. Nämä tiedot seuraavat, mikä niistä (jos sellainen on).-Local storage
*_CGWebSDK_videoClientswds.ace.teliacompany.comACE Chat: Luettelo kaikista ikkunoista, jotka ovat todennäköisiä videon näyttämiseen.-Local storage
*_ACEChatState_ActiveClientwds.ace.teliacompany.comACE Chat: Verkkosivustolla voi olla useampi kuin yksi chat-asiakasohjelma. Tämä kohde seuraa, mihin asiakkaaseen nykyinen chat kuuluu.-Local storage
*_chatEntrancewds.ace.teliacompany.comACE Chat: Järjestelmän chat-sisäänkäynnin nimi-Local storage
*_chatUIDwds.ace.teliacompany.comACE Chat: Keskustelun istuntotunnus kommunikoitaessa ACE:n kanssa-Local storage
humany-*www.hel.fiACE Chat: Säilyttää widgetin tilan, kun sivu ladataan uudelleen -Local storage
ARRAffinity.hel.humany.netACE Chat: Kuormituksen tasaus taustajärjestelmässäIstuntoKolmas osapuoli
ARRAffinitySameSite.hel.humany.netACE Chat: Kuormituksen tasaus taustajärjestelmässäIstuntoKolmas osapuoli
' - format: full_html -label: 'Toiminnalliset chat-evästeet' diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml deleted file mode 100644 index 0652c9f2..00000000 --- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.essential.yml +++ /dev/null @@ -1,4 +0,0 @@ -description: - value: '

Välttämättömät evästeet auttavat tekemään verkkosivustosta käyttökelpoisen sallimalla perustoimintoja, kuten sivulla siirtymisen ja sivuston suojattujen alueiden käytön. Verkkosivusto ei toimi kunnolla ilman näitä evästeitä eikä niihin tarvita suostumusta.

NimiTarjoajaTarkoitusVoimassaTyyppi
cookiehubCookiehubMahdollistaa evästehallinnan www.hel.fi sivuilla.365 päivää 
cookie-agreedwww.hel.fiSivusto käyttää tätä evästettä tietojen tallentamiseen siitä, ovatko kävijät antaneet hyväksyntänsä tai kieltäytyneet evästeiden käytöstä.100 päivää 
cookie-agreed-versionwww.hel.fiTähän evästeeseen tallennetaan käyttäjän hyväksymän evästeselosteen versio.100 päivää 
cookie-agreed-categorieswww.hel.fiTähän evästeeseen on tallennettu käyttäjän hyväksymät evästekategoriat.100 päivää 
cookie-agreedavustukset.hel.fiSivusto käyttää tätä evästettä tietojen tallentamiseen siitä, ovatko kävijät antaneet hyväksyntänsä tai kieltäytyneet evästeiden käytöstä.100 päivää 
cookie-agreed-versionavustukset.hel.fiTähän evästeeseen tallennetaan käyttäjän hyväksymän evästeselosteen versio.100 päivää 
cookie-agreed-categoriesavustukset.hel.fiTähän evästeeseen on tallennettu käyttäjän hyväksymät evästekategoriat.100 päivää 
SSESS*www.hel.fiSisällönhallintajärjestelmän toimintaan liittyvä eväste.23 päivää 
SSESS*avustukset.hel.fiSisällönhallintajärjestelmän toimintaan liittyvä eväste.23 päivää 
AWSELBCORSsiteimproveanalytics.ioEväste liittyy palvelinten kuormanjakotoiminnallisuuteen, jolla ohjataan pyynnöt vähimmällä käytöllä olevalle palvelimille.IstuntoKolmas osapuoli
mtm_cookie_consentkartta.hel.fiTekninen eväste johon talletetaan tieto valinnastasi evästeiden käytöstä kertovan bannerin kohdalla10950 päivää 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

Sivuston pakollinen eväste mahdollistaa kävijän vierailun sivustolla.IstuntoKolmas osapuoli
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudKäytetään chat-sovellustoiminnallisuutta varten. Evästettä käytetään sovelluksen palvelimella olevan istuntotiedon hakemiseen.IstuntoKolmas osapuoli
COOKIE_SUPPORThelsinkikanava.fiMahdollistaa evästeiden hallinnan sivustolla.365 päivääKolmas osapuoli
GUEST_LANGUAGE_IDhelsinkikanava.fiTämän evästeen on luonut Liferay, se tallentaa kieliasetukset.365 päivääKolmas osapuoli
helfi-settingswww.hel.fiSivusto käyttää tätä tietuetta tietojen tallentamiseen siitä, mitä poikkeusilmoituksia on suljettu ja mikä on avattavien sisältöalueiden tila.-Local storage
Drupal.visitor.autologout_loginavustukset.hel.fiKäytetään käyttäjän automaattiseen uloskirjautumiseen.365 päivää 
Drupal.gin.sidebarExpanded.desktopwww.hel.fiTallentaa tiedon sisällöntuottajan käyttöliittymän sivupalkin näkyvyydestä työpöytänäkymässä.-Local storage
Drupal.gin.sidebarExpanded.mobilewww.hel.fiTallentaa tiedon sisällöntuottajan käyttöliittymän sivupalkin näkyvyydestä mobiilinäkymässä.-Local storage
Drupal.gin.darkmodewww.hel.fiTallentaa tiedon sisällöntuottajan valitsemasta "tumma tila"-asetuksesta.-Local storage
Drupal.toolbar.subtrees.*www.hel.fiTallentaa sisällöntuottajan näkymissä alivalikoiden tilan (laajennettu tai kutistettu), jotta se säilyy yhdenmukaisena sivulatausten välillä.-Local storage
Drupal.off-canvas.css.*www.hel.fiTallentaa sisällöntuottajan käyttämän wysiwyg-editorin tyylit välimuistiin varmistaakseen viimeisimpien CSS-tyylien latauksen.-Local storage
ed11ySeenwww.hel.fiTallentaa sisällöntuottajan näkemät saavutettavuusongelmat, jotta vältetään ongelmien kaksoisilmoitukset.-Local storage
editoria11yResultCountwww.hel.fiTallentaa löydettyjen saavutettavuusongelmien määrän sisällöntuottajalle, auttaen seuraamaan ja korjaamaan ne.-Local storage
Drupal.toolbar.toolbarStatewww.hel.fiTallentaa sisällöntuottajan hallintatyökalupalkin orientaation, aktiivisen välilehden ja laajennustilan.IstuntoSession storage
escapeAdminPathwww.hel.fiTallentaa URL-osoitteen, jota käytetään ohjaamaan kirjautunut sisällöntuottaja hallintaliittymästä takaisin pääsivustolle.IstuntoSession storage
' - format: full_html -label: 'Välttämättömät toiminnalliset evästeet' diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml deleted file mode 100644 index 93f9ff7d..00000000 --- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.preference.yml +++ /dev/null @@ -1,4 +0,0 @@ -label: Personointi -description: - value: '

Mieltymysevästeet mukauttavat sivuston ulkoasua ja toimintaa käyttäjän aiemman käytön perusteella.

NimiTarjoajaTarkoitusVoimassaTyyppi
httpskartta.hel.fi.SWCulturekartta.hel.fiKaupungin karttapalvelun evästeeseen tallennetaan kieli, jolla palvelua käytetään.1826 päivää 
icareus-devicehelsinkikanava.fiHelsinki-kanavan videopalvelimen eväste.365 päivääKolmas osapuoli
VISITOR_INFO1_LIVEyoutube.comYouTuben eväste valitsee yhteyden nopeuden mukaan, joko vanhan tai uuden videosoittimen.180 päivääKolmas osapuoli
CONSENTyoutube.comGooglen eväste tallentaa kävijän evästehyväskynnän.5947 päivää, 15 tuntiaKolmas osapuoli
activeTabwww.hel.fiKäytetään aktiivisten välilehtien tietojen tallentamiseen, kun käyttäjä käyttää lukioiden suodatushakua.Istunto 
activeContentwww.hel.fiKäytetään aktiivisen sisältötietojen tallentamiseen, kun käyttäjä käyttää lukioiden hakua.Istunto 
' - format: full_html diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index b4707d04..00000000 --- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1,4 +0,0 @@ -description: - value: '

Tilastointievästeiden keräämää tietoa käytetään verkkosivuston kehittämiseen.

NimiTarjoajaTarkoitusVoimassaTyyppi
nmstatwww.hel.fiSiteimproven tilastointieväste kerää tietoa kävijän sivujen käytöstä.1000 päivää 
_pk_id.*www.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.141.89f6www.hel.fi-1 tunti 
_pk_id.*kartta.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*kartta.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
_pk_id.*palvelukartta.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*palvelukartta.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
_pk_id.*avustukset.hel.fiMatomo-tilastointijärjestelmän eväste.393 päivää 
_pk_ses.*avustukset.hel.fiMatomo-tilastointijärjestelmän eväste.1 tunti 
rnsbidreactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Local storage
rnsbid_tsreactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Local storage
rns_reaction_*reactandshare.comAskem-reaktionappien toimintaan liittyvä tietue.-Local storage
YSCyoutube.comYouTuben eväste mahdollistaa videoiden upottamisen sivustolle.IstuntoKolmas osapuoli
' - format: full_html -label: Tilastointi diff --git a/conf/cmi/language/fi/eu_cookie_compliance.settings.yml b/conf/cmi/language/fi/eu_cookie_compliance.settings.yml deleted file mode 100644 index 053fc5a4..00000000 --- a/conf/cmi/language/fi/eu_cookie_compliance.settings.yml +++ /dev/null @@ -1,11 +0,0 @@ -popup_agree_button_message: Hyväksy -popup_more_info_button_message: 'Näytä evästeet' -popup_find_more_button_message: 'Näytä evästeet' -popup_hide_button_message: Piilossa -popup_info: - value: '

Hel.fi käyttää evästeitä

Tämä sivusto käyttää välttämättömiä evästeitä suorituskyvyn varmistamiseksi sekä yleisen käytön seurantaan. Lisäksi käytämme kohdennusevästeitä käyttäjäkokemuksen parantamiseksi, analytiikkaan ja kohdistetun sisällön näyttämiseen.

' -popup_link: /cookie-information-and-settings -disagree_button_label: 'Ei kiitos' -withdraw_tab_button_label: Tietosuoja-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.media.image.field_media_image.yml b/conf/cmi/language/fi/field.field.media.image.field_media_image.yml index 38b20463..22ed4bd4 100644 --- a/conf/cmi/language/fi/field.field.media.image.field_media_image.yml +++ b/conf/cmi/language/fi/field.field.media.image.field_media_image.yml @@ -1 +1 @@ -label: 'Kuva (tuettu muilla kielillä)' +label: Kuva diff --git a/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml b/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml index b557868c..4c1abb8a 100644 --- a/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml +++ b/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml @@ -1,2 +1,2 @@ -label: 'Kuva (tuettu muilla kielillä)' +label: Kuva description: 'Vaaka- ja pystykuvat rajataan neliöiksi. Rajatun kuvan keskipisteen voi valita kuvan latauksen yhteydessä. ' diff --git a/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml b/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml index 3242ced4..efbe0e1d 100644 --- a/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml +++ b/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml @@ -1,2 +1,2 @@ -label: 'Kuva (tuettu muilla kielillä)' +label: Kuva description: 'Heron kuva.' diff --git a/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml b/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml index fae02d7c..649890cb 100644 --- a/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml +++ b/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml @@ -1,2 +1,2 @@ -label: 'Kuva (tuettu muilla kielillä)' +label: Kuva description: 'Kuvallisen noston kuva.' diff --git a/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml b/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml index 6649dad5..c29db2ef 100644 --- a/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml +++ b/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml @@ -1,2 +1,2 @@ -label: 'Kuva (tuettu muilla kielillä)' +label: Kuva description: 'Valitse kuva, joka näytetään linkin yhteydessä.' diff --git a/conf/cmi/language/fi/hdbt_cookie_banner.settings.yml b/conf/cmi/language/fi/hdbt_cookie_banner.settings.yml new file mode 100644 index 00000000..26d5fef4 --- /dev/null +++ b/conf/cmi/language/fi/hdbt_cookie_banner.settings.yml @@ -0,0 +1,3 @@ +cookie_information: + title: Evästeasetukset + content: "Eväste (engl. cookie) on pienikokoinen tekstitiedosto, jonka verkkoselain tallentaa käyttäjän tietokoneelle tai mobiililaitteelle, kun vierailet verkkosivustolla. Se ei vahingoita käyttäjän laitetta tai tiedostoja. Evästeitä ei voi käyttää haittaohjelmien levittämiseen.\r\n\r\nEvästeistä saatava käyttäjätieto auttaa meitä varmistamaan sivuston teknisen toimivuuden ja parantamaan digitaalisten palveluidemme laatua. Niiden avulla voimme kehittää sivuston käyttäjäystävällisyyttä ja helpottaa tiedon löytymistä." diff --git a/conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml deleted file mode 100644 index 8b78ae23..00000000 --- a/conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml +++ /dev/null @@ -1,5 +0,0 @@ -cc: - content: - value: '

Eväste (engl. cookie) on pienikokoinen tekstitiedosto, jonka verkkoselain tallentaa käyttäjän tietokoneelle tai mobiililaitteelle, kun vierailet verkkosivustolla. Se ei vahingoita käyttäjän laitetta tai tiedostoja. Evästeitä ei voi käyttää haittaohjelmien levittämiseen.

Evästeistä saatava käyttäjätieto auttaa meitä varmistamaan sivuston teknisen toimivuuden ja parantamaan digitaalisten palveluidemme laatua. Niiden avulla voimme kehittää sivuston käyttäjäystävällisyyttä ja helpottaa tiedon löytymistä.

' - format: full_html - title: Evästeasetukset diff --git a/conf/cmi/language/fi/media.type.image.yml b/conf/cmi/language/fi/media.type.image.yml index 8ee56872..808a8328 100644 --- a/conf/cmi/language/fi/media.type.image.yml +++ b/conf/cmi/language/fi/media.type.image.yml @@ -1,2 +1,2 @@ -label: 'Kuva (tuettu muilla kielillä)' +label: Kuva description: 'Mediatyyppi kuville.' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml index ac17bc3c..20cc99c3 100644 --- a/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml @@ -1,2 +1,2 @@ -label: 'Kuva (tuettu muilla kielillä)' +label: Kuva description: 'Kuva kuvatekstillä' diff --git a/conf/cmi/language/fr/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/fr/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index 298e3d7c..00000000 --- a/conf/cmi/language/fr/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1 +0,0 @@ -label: Statistics diff --git a/conf/cmi/language/fr/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/language/fr/helfi_eu_cookie_compliance.cookie_consent_intro.yml deleted file mode 100644 index b20eb771..00000000 --- a/conf/cmi/language/fr/helfi_eu_cookie_compliance.cookie_consent_intro.yml +++ /dev/null @@ -1,2 +0,0 @@ -cc: - title: 'Cookie settings' diff --git a/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index 298e3d7c..00000000 --- a/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1 +0,0 @@ -label: Statistics diff --git a/conf/cmi/language/sv/core.entity_view_mode.media.image.yml b/conf/cmi/language/sv/core.entity_view_mode.media.image.yml index cef092dc..b7c0a450 100644 --- a/conf/cmi/language/sv/core.entity_view_mode.media.image.yml +++ b/conf/cmi/language/sv/core.entity_view_mode.media.image.yml @@ -1 +1 @@ -label: 'Bild (stöds på andra språk)' +label: Bild diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml deleted file mode 100644 index 9715a41b..00000000 --- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml +++ /dev/null @@ -1,4 +0,0 @@ -description: - value: '

Chattarna på webbplatsen www.hel.fi  fungerar med hjälp av funktionella chattkakor. Om du inleder en chatt godkänner du automatiskt de nödvändiga funktionella kakorna.  Då behövs inget separat samtycke till kakor. Funktionella chattkakor laddas endast ner på din enhet om du inleder en chatt.

NamnTjänsteleverantörCookie syfteGiltighetTyp
_genesys.widgets.*www.hel.fiAnvänds för att lagra data som behövs för chatten.session 
leijuke.*www.hel.fiAnvänds för att lagra data som behövs för chatten.session 
aiap-wbc-chat-app-button-statewww.hel.fiAnvänds för chattapplikationens funktionalitet. Lagrar inställningar och konfigurationsdata för chattapplikationens knapp.session 
aiap-chat-app-v1-statewww.hel.fiAnvänds för chattapplikationens funktionalitet. Lagrar inställningar och konfigurationsdata för chattapplikationen.session 
conversationTokenhttps://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudAnvänds för chattapplikationens funktionalitet. Lagrar konversationstoken för autentisering och åtkomst till dataändamål.sessionTredje part
CallGuide.languagewww.hel.fiACE Chat: Språket som används i ACE Web SDK härleds från webbläsarnas föredragna språkinställning och ACE Web SDK-inställningar.-Local storage
CallGuide.config_services_*www.hel.fiACE Chatt: Konfigurera kundtjänstintegrationer på en webbsida. Minskar webbtrafiken när du läser in och navigerar på en sida.-Local storage
*_CGWebSDK_windowGUIDwds.ace.teliacompany.comACE Chatt: Den unika identiteten för det här webbläsarfönstret. Används om webbläsaren har mer än ett öppet fönster för en webbplats.-Local storage
*_CGWebSDK_videoShowerwds.ace.teliacompany.comACE Chatt: Endast ett fönster i taget kan visa video. Den här informationen spårar vilka av dem (om några).-Local storage
*_CGWebSDK_videoClientswds.ace.teliacompany.comACE Chatt: En lista över alla fönster som sannolikt kommer att visa videon.-Local storage
*_ACEChatState_ActiveClientwds.ace.teliacompany.comACE Chatt: En webbplats kan ha mer än en chattklient. Det här objektet spårar vilken kund den aktuella chatten tillhör.-Local storage
*_chatEntrancewds.ace.teliacompany.comACE Chatt: Namnet på chattingången till systemet-Local storage
*_chatUIDwds.ace.teliacompany.comACE Chatt: Chattsessions-ID vid kommunikation med ACE-Local storage
humany-*www.hel.fiACE Chatt: Bevarar widgetstatus när sidan laddas om-Local storage
ARRAffinity.hel.humany.netACE Chatt: Lastbalansering i backend-systemetSessionTredje part
ARRAffinitySameSite.hel.humany.netACE Chatt: Lastbalansering i backend-systemetSessionTredje part
' - format: full_html -label: 'Funktionella chattkakor' diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml deleted file mode 100644 index 1a90fe7a..00000000 --- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.essential.yml +++ /dev/null @@ -1,4 +0,0 @@ -description: - value: '

Nödvändiga cookies hjälper till att göra webbplatsen användbar genom att tillåta grundläggande funktioner som att navigera på sidan och använda de skyddade områdena på webbplatsen. Webbplatsen fungerar inte korrekt utan dessa cookies och kräver inte samtycke.

NamnTjänsteleverantörCookie syfteGiltighetTyp
cookiehubcookiehub.comCookie möjliggör hantering av cookies på www.hel.fi webbplatsen.365 dagar 
cookie-agreedwww.hel.fiCookie möjliggör hantering av cookies på webbplatsen.100 dagar 
cookie-agreed-versionwww.hel.fiAnvänds för att lagra information om versionen av cookies samtycke som användaren har godkänt.100 dagar 
cookie-agreed-categorieswww.hel.fiAnvänds för att lagra information om vilka cookie -kategorier användaren har godkänt.100 dagar 
cookie-agreedavustukset.hel.fiCookie möjliggör hantering av cookies på webbplatsen.100 dagar 
cookie-agreed-versionavustukset.hel.fiAnvänds för att lagra information om versionen av cookies samtycke som användaren har godkänt.100 dagar 
cookie-agreed-categoriesavustukset.hel.fiAnvänds för att lagra information om vilka cookie -kategorier användaren har godkänt.100 dagar 
SSESS*www.hel.fiEn cookie relaterad till driften av innehållshanteringssystemet.23 dagar 
SSESS*avustukset.hel.fiEn cookie relaterad till driften av innehållshanteringssystemet.23 dagar 
AWSELBCORSsiteimproveanalytics.ioCookie är kopplad till funktionen för lastfördelning som styr begäran till en server med mindre belastning.sessionTredje part
mtm_cookie_consentkartta.hel.fiA technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.10950 dagar 
JSESSIONID

helsinkikanava.fi

coh-chat-app-prod.eu-de.mybluemix.net

Kakan är en obligatorisk kaka som gör det möjligt för besökaren att besöka webbplatsen.sessionTredje part
JSESSIONIDcoh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloudAnvänds för chattapplikationens funktionalitet. Dess värde används för att få tillgång till sessiondata på applikationens server.sessionTredje part
COOKIE_SUPPORThelsinkikanava.fiKakan möjliggör hanteringen av kakor på webbplatsen.365 dagarTredje part
GUEST_LANGUAGE_IDhelsinkikanava.fiDenna cookie genereras av Liferay, dess funktion är att lagra språkinställningarna.365 dagarTredje part
helfi-settingswww.hel.fiAnvänds av www.hel.fi Drupal för att lagra information om stängda meddelanden och accordions'' tillstånd.-Local storage
Drupal.visitor.autologout_loginavustukset.hel.fiAnvänds av avustukset.hel.fi Drupal för att automatiskt logga ut användare efter en period av inaktivitet.365 dagar 
Drupal.gin.sidebarExpanded.desktopwww.hel.fiLagrar om admin-sidopanelen är expanderad eller kollapsad på skrivbordet när du är inloggad som redaktör på hel.fi.-Local storage
Drupal.gin.sidebarExpanded.mobilewww.hel.fiLagrar om admin-sidopanelen är expanderad eller kollapsad på mobil när du är inloggad som redaktör på hel.fi.-Local storage
Drupal.gin.darkmodewww.hel.fiLagrar användarens mörkt läge-inställning i admin-temat när du är inloggad som redaktör på hel.fi.-Local storage
Drupal.toolbar.subtrees.*www.hel.fiLagrar tillståndet för expanderade eller kollapsade undermenyer i Drupals admin-verktygsfält för en inloggad redaktör, vilket säkerställer konsekvens mellan sidladdningar.-Local storage
Drupal.off-canvas.css.*www.hel.fiLagrar cachelagrad CKEditor CSS i localStorage för en inloggad redaktör, med en nyckel som använder en cache-brytande fråga för att säkerställa att den senaste CSS-filen laddas.-Local storage
ed11ySeenwww.hel.fiSpårar vilka tillgänglighetsproblem en inloggad redaktör redan har sett för att undvika dubbla aviseringar.-Local storage
editoria11yResultCountwww.hel.fiSpårar antalet tillgänglighetsproblem som hittats på specifika sidor för en inloggad redaktör, vilket hjälper till att övervaka och åtgärda dem.-Local storage
Drupal.toolbar.toolbarStatewww.hel.fiLagrar tillståndet för admin-verktygsfältet för en inloggad redaktör, inklusive dess orientering, aktiva flik och expanderade tillstånd.SessionSession storage
escapeAdminPathwww.hel.fiLagrar URL för att omdirigera en inloggad redaktör från admin-gränssnittet tillbaka till huvudsidan.-Session storage
' - format: full_html -label: 'Nödvändiga funktionella cookies' diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml deleted file mode 100644 index cef60a8e..00000000 --- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.preference.yml +++ /dev/null @@ -1,4 +0,0 @@ -label: Preferens -description: - value: '

Preferenscookies ändrar webbplatsens utseende och funktioner enligt användarens tidigare användning.

NamnTjänsteleverantörCookie syfteGiltighetTyp
httpskartta.hel.fi.SWCulturekartta.hel.fiI kakan på stadens kaktjänst sparas det språk som användaren använder i tjänsten.1826 dagar 
icareus-devicehelsinkikanava.fiHelsinki-kanavas kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen.365 dagarTredje part
VISITOR_INFO1_LIVEyoutube.comYouTubes kaka väljer antingen den nya eller gamla videospelaren enligt förbindelsens hastighet.180 dagarTredje part
CONSENTyoutube.comAnvänds av Google för att lagra inställningar för användarens samtycke.5947 dagar, 15 timmarTredje part
activeTabwww.hel.fiAnvänds för att lagra aktiv flikdata när användaren använder gymnasiesökning.Session 
activeContentwww.hel.fiAnvänds för att lagra aktivt innehållsdata när användaren använder gymnasiesökning.Session 

 

' - format: full_html diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index 92e0cd64..00000000 --- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1,4 +0,0 @@ -description: - value: '

De uppgifter statistikkakorna samlar in används för att utveckla webbplatsen.

NamnTjänsteleverantörCookie syfteGiltighetTyp
nmstatwww.hel.fiSiteimproves kaka samlar information om hur webbplatsen används.1000 dagar 
_pk_id.*www.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.141.89f6www.hel.fi-1 timme 
_pk_id.*kartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*kartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
_pk_id.*palvelukartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*palvelukartta.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
_pk_id.*avustukset.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.393 dagar 
_pk_ses.*avustukset.hel.fiMatomo-statistiksystemets kaka samlar information om hur webbplatsen används.1 timme 
rnsbidreactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Local storage
rnsbid_tsreactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Local storage
rns_reaction_*reactandshare.com

En post relaterad till driften av reaktionsknappen 

Askem

.

-Local storage
YSCyoutube.comYouTubes kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen.sessionTredje part

 

' - format: full_html -label: Statistik diff --git a/conf/cmi/language/sv/eu_cookie_compliance.settings.yml b/conf/cmi/language/sv/eu_cookie_compliance.settings.yml deleted file mode 100644 index df981cb7..00000000 --- a/conf/cmi/language/sv/eu_cookie_compliance.settings.yml +++ /dev/null @@ -1,11 +0,0 @@ -popup_agree_button_message: Accepterar -popup_more_info_button_message: 'Visa cookies' -popup_find_more_button_message: 'Visa cookies' -popup_hide_button_message: Dölj -popup_info: - value: '

Hel.fi använder cookies

Vi använder viktiga cookies på vår webbplats för att få webbplatsen att fungera. Även tredjepartscookies används om du ger oss ditt tillstånd.

' -disagree_button_label: 'Nej, tack' -withdraw_action_button_label: 'Återkalla samtycke' -withdraw_tab_button_label: Sekretessinställningar -save_preferences_button_label: 'Acceptera valda cookies' -accept_all_categories_button_label: 'Acceptera alla cookies' diff --git a/conf/cmi/language/sv/field.field.media.image.field_media_image.yml b/conf/cmi/language/sv/field.field.media.image.field_media_image.yml index cef092dc..b7c0a450 100644 --- a/conf/cmi/language/sv/field.field.media.image.field_media_image.yml +++ b/conf/cmi/language/sv/field.field.media.image.field_media_image.yml @@ -1 +1 @@ -label: 'Bild (stöds på andra språk)' +label: Bild diff --git a/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml b/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml index cef092dc..b7c0a450 100644 --- a/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml +++ b/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml @@ -1 +1 @@ -label: 'Bild (stöds på andra språk)' +label: Bild diff --git a/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml b/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml index cef092dc..b7c0a450 100644 --- a/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml +++ b/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml @@ -1 +1 @@ -label: 'Bild (stöds på andra språk)' +label: Bild diff --git a/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml b/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml index cef092dc..b7c0a450 100644 --- a/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml +++ b/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml @@ -1 +1 @@ -label: 'Bild (stöds på andra språk)' +label: Bild diff --git a/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml b/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml index cef092dc..b7c0a450 100644 --- a/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml +++ b/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml @@ -1 +1 @@ -label: 'Bild (stöds på andra språk)' +label: Bild diff --git a/conf/cmi/language/sv/hdbt_cookie_banner.settings.yml b/conf/cmi/language/sv/hdbt_cookie_banner.settings.yml new file mode 100644 index 00000000..e079a63d --- /dev/null +++ b/conf/cmi/language/sv/hdbt_cookie_banner.settings.yml @@ -0,0 +1,3 @@ +cookie_information: + title: 'Cookie -inställningar' + content: "En kaka (eng. cookie) är en liten textfil som webbläsaren sparar i användarens dator eller mobila enhet när hen besöker en webbplats. Den skadar inte användarens enhet eller filer. Kakor kan inte användas för att sprida skadeprogram.\r\n\r\nAnvändarinformationen som fås från kakorna hjälper oss att säkerställa webbplatsens funktionalitet och förbättra kvaliteten på våra digitala tjänster. Med hjälp av dem kan vi utveckla webbplatsens användarvänlighet och göra det lättare att hitta information." diff --git a/conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml deleted file mode 100644 index 46d695ef..00000000 --- a/conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml +++ /dev/null @@ -1,5 +0,0 @@ -cc: - content: - value: '

En kaka (eng. cookie) är en liten textfil som webbläsaren sparar i användarens dator eller mobila enhet när hen besöker en webbplats. Den skadar inte användarens enhet eller filer. Kakor kan inte användas för att sprida skadeprogram.

Användarinformationen som fås från kakorna hjälper oss att säkerställa webbplatsens funktionalitet och förbättra kvaliteten på våra digitala tjänster. Med hjälp av dem kan vi utveckla webbplatsens användarvänlighet och göra det lättare att hitta information.

' - format: full_html - title: 'Cookie -inställningar' diff --git a/conf/cmi/language/sv/media.type.image.yml b/conf/cmi/language/sv/media.type.image.yml index cef092dc..b7c0a450 100644 --- a/conf/cmi/language/sv/media.type.image.yml +++ b/conf/cmi/language/sv/media.type.image.yml @@ -1 +1 @@ -label: 'Bild (stöds på andra språk)' +label: Bild diff --git a/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml b/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml index cef092dc..b7c0a450 100644 --- a/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml +++ b/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml @@ -1 +1 @@ -label: 'Bild (stöds på andra språk)' +label: Bild diff --git a/conf/cmi/language/uk/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/uk/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index 298e3d7c..00000000 --- a/conf/cmi/language/uk/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1 +0,0 @@ -label: Statistics diff --git a/conf/cmi/language/zh-hans/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/zh-hans/eu_cookie_compliance.cookie_category.statistics.yml deleted file mode 100644 index 298e3d7c..00000000 --- a/conf/cmi/language/zh-hans/eu_cookie_compliance.cookie_category.statistics.yml +++ /dev/null @@ -1 +0,0 @@ -label: Statistics diff --git a/conf/cmi/user.role.admin.yml b/conf/cmi/user.role.admin.yml index 8e546292..91f0ddef 100644 --- a/conf/cmi/user.role.admin.yml +++ b/conf/cmi/user.role.admin.yml @@ -26,9 +26,9 @@ dependencies: - content_translation - editoria11y - entity_usage - - eu_cookie_compliance - file - filter + - hdbt_cookie_banner - helfi_api_base - locale - media @@ -70,8 +70,7 @@ permissions: - 'access toolbar' - 'access user profiles' - 'administer blocks' - - 'administer eu cookie compliance categories' - - 'administer eu cookie compliance popup' + - 'administer hdbt_cookie_banner' - 'administer menu' - 'administer nodes' - 'administer paragraphs library' diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml index 6e8a9d76..13468dfc 100644 --- a/conf/cmi/user.role.anonymous.yml +++ b/conf/cmi/user.role.anonymous.yml @@ -7,7 +7,6 @@ dependencies: - rest.resource.helfi_global_mobile_menu - rest.resource.helfi_menu_link_collection module: - - eu_cookie_compliance - external_entities - helfi_api_base - helfi_global_navigation @@ -25,7 +24,6 @@ is_admin: false permissions: - 'access content' - 'access openapi api docs' - - 'display eu cookie compliance popup' - 'restful get helfi_global_menu_collection' - 'restful get helfi_global_mobile_menu' - 'restful get helfi_menu_link_collection' diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml index 5e973964..c89993fe 100644 --- a/conf/cmi/user.role.authenticated.yml +++ b/conf/cmi/user.role.authenticated.yml @@ -8,7 +8,6 @@ dependencies: - rest.resource.helfi_menu_link_collection module: - draggableviews - - eu_cookie_compliance - external_entities - file - helfi_api_base @@ -34,7 +33,6 @@ permissions: - 'access toolbar' - 'delete own files' - 'disable own tfa' - - 'display eu cookie compliance popup' - 'restful get helfi_global_menu_collection' - 'restful get helfi_global_mobile_menu' - 'restful get helfi_menu_link_collection' From d11fffba449480ad823abf6607ac001828b9a6b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Thu, 21 Nov 2024 08:52:40 +0200 Subject: [PATCH 17/59] =?UTF-8?q?Reverted=20'tuettu=20muilla=20kielill?= =?UTF-8?q?=C3=A4'=20texts.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/cmi/language/fi/core.entity_view_mode.media.image.yml | 2 +- .../language/fi/field.field.media.image.field_media_image.yml | 2 +- .../field.field.paragraph.contact_card.field_contact_image.yml | 2 +- .../language/fi/field.field.paragraph.hero.field_hero_image.yml | 2 +- ...d.field.paragraph.image_gallery_item.field_gallery_image.yml | 2 +- ...aragraph.liftup_with_image.field_liftup_with_image_image.yml | 2 +- ...d.paragraph.list_of_links_item.field_list_of_links_image.yml | 2 +- conf/cmi/language/fi/media.type.image.yml | 2 +- conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml | 2 +- .../language/sv/field.field.media.image.field_media_image.yml | 2 +- .../field.field.paragraph.contact_card.field_contact_image.yml | 2 +- .../language/sv/field.field.paragraph.hero.field_hero_image.yml | 2 +- ...aragraph.liftup_with_image.field_liftup_with_image_image.yml | 2 +- ...d.paragraph.list_of_links_item.field_list_of_links_image.yml | 2 +- conf/cmi/language/sv/media.type.image.yml | 2 +- conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conf/cmi/language/fi/core.entity_view_mode.media.image.yml b/conf/cmi/language/fi/core.entity_view_mode.media.image.yml index 22ed4bd4..38b20463 100644 --- a/conf/cmi/language/fi/core.entity_view_mode.media.image.yml +++ b/conf/cmi/language/fi/core.entity_view_mode.media.image.yml @@ -1 +1 @@ -label: Kuva +label: 'Kuva (tuettu muilla kielillä)' diff --git a/conf/cmi/language/fi/field.field.media.image.field_media_image.yml b/conf/cmi/language/fi/field.field.media.image.field_media_image.yml index 22ed4bd4..38b20463 100644 --- a/conf/cmi/language/fi/field.field.media.image.field_media_image.yml +++ b/conf/cmi/language/fi/field.field.media.image.field_media_image.yml @@ -1 +1 @@ -label: Kuva +label: 'Kuva (tuettu muilla kielillä)' diff --git a/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml b/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml index 4c1abb8a..b557868c 100644 --- a/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml +++ b/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml @@ -1,2 +1,2 @@ -label: Kuva +label: 'Kuva (tuettu muilla kielillä)' description: 'Vaaka- ja pystykuvat rajataan neliöiksi. Rajatun kuvan keskipisteen voi valita kuvan latauksen yhteydessä. ' diff --git a/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml b/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml index efbe0e1d..3242ced4 100644 --- a/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml +++ b/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml @@ -1,2 +1,2 @@ -label: Kuva +label: 'Kuva (tuettu muilla kielillä)' description: 'Heron kuva.' diff --git a/conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image.yml b/conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image.yml index 22ed4bd4..38b20463 100644 --- a/conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image.yml +++ b/conf/cmi/language/fi/field.field.paragraph.image_gallery_item.field_gallery_image.yml @@ -1 +1 @@ -label: Kuva +label: 'Kuva (tuettu muilla kielillä)' diff --git a/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml b/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml index 649890cb..fae02d7c 100644 --- a/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml +++ b/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml @@ -1,2 +1,2 @@ -label: Kuva +label: 'Kuva (tuettu muilla kielillä)' description: 'Kuvallisen noston kuva.' diff --git a/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml b/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml index c29db2ef..6649dad5 100644 --- a/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml +++ b/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml @@ -1,2 +1,2 @@ -label: Kuva +label: 'Kuva (tuettu muilla kielillä)' description: 'Valitse kuva, joka näytetään linkin yhteydessä.' diff --git a/conf/cmi/language/fi/media.type.image.yml b/conf/cmi/language/fi/media.type.image.yml index 808a8328..8ee56872 100644 --- a/conf/cmi/language/fi/media.type.image.yml +++ b/conf/cmi/language/fi/media.type.image.yml @@ -1,2 +1,2 @@ -label: Kuva +label: 'Kuva (tuettu muilla kielillä)' description: 'Mediatyyppi kuville.' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml index 20cc99c3..ac17bc3c 100644 --- a/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml @@ -1,2 +1,2 @@ -label: Kuva +label: 'Kuva (tuettu muilla kielillä)' description: 'Kuva kuvatekstillä' diff --git a/conf/cmi/language/sv/field.field.media.image.field_media_image.yml b/conf/cmi/language/sv/field.field.media.image.field_media_image.yml index b7c0a450..cef092dc 100644 --- a/conf/cmi/language/sv/field.field.media.image.field_media_image.yml +++ b/conf/cmi/language/sv/field.field.media.image.field_media_image.yml @@ -1 +1 @@ -label: Bild +label: 'Bild (stöds på andra språk)' diff --git a/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml b/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml index b7c0a450..cef092dc 100644 --- a/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml +++ b/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml @@ -1 +1 @@ -label: Bild +label: 'Bild (stöds på andra språk)' diff --git a/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml b/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml index b7c0a450..cef092dc 100644 --- a/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml +++ b/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml @@ -1 +1 @@ -label: Bild +label: 'Bild (stöds på andra språk)' diff --git a/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml b/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml index b7c0a450..cef092dc 100644 --- a/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml +++ b/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml @@ -1 +1 @@ -label: Bild +label: 'Bild (stöds på andra språk)' diff --git a/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml b/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml index b7c0a450..cef092dc 100644 --- a/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml +++ b/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml @@ -1 +1 @@ -label: Bild +label: 'Bild (stöds på andra språk)' diff --git a/conf/cmi/language/sv/media.type.image.yml b/conf/cmi/language/sv/media.type.image.yml index b7c0a450..cef092dc 100644 --- a/conf/cmi/language/sv/media.type.image.yml +++ b/conf/cmi/language/sv/media.type.image.yml @@ -1 +1 @@ -label: Bild +label: 'Bild (stöds på andra språk)' diff --git a/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml b/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml index b7c0a450..cef092dc 100644 --- a/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml +++ b/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml @@ -1 +1 @@ -label: Bild +label: 'Bild (stöds på andra språk)' From 81a368468466b35c51693b970b11c31c1abd8dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Thu, 21 Nov 2024 09:12:41 +0200 Subject: [PATCH 18/59] Updated news item groups in node edit form. --- ...ty_form_display.node.news_item.default.yml | 10 +++---- ...ty_form_display.node.news_item.default.yml | 30 ++++++++----------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/conf/cmi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/core.entity_form_display.node.news_item.default.yml index 77983f78..60575c84 100644 --- a/conf/cmi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/core.entity_form_display.node.news_item.default.yml @@ -19,13 +19,13 @@ dependencies: module: - field_group - hdbt_admin_tools + - helfi_annif - linkit - media_library - paragraphs - path - publication_date - radioactivity - - readonly_field_widget - scheduler - select2 third_party_settings: @@ -95,11 +95,11 @@ third_party_settings: children: - in_recommendations - show_annif_block - - annif_keywords + - annif_suggested_topics label: 'Automatically recommended content' region: content parent_name: '' - weight: 25 + weight: 28 format_type: fieldset format_settings: classes: '' @@ -170,7 +170,7 @@ content: third_party_settings: { } field_news_groups: type: select2_entity_reference - weight: 26 + weight: 25 region: content settings: width: 100% @@ -198,7 +198,7 @@ content: third_party_settings: { } field_news_item_tags: type: select2_entity_reference - weight: 19 + weight: 26 region: content settings: width: 100% diff --git a/public/modules/custom/helfi_etusivu_config/config/rewrite/core.entity_form_display.node.news_item.default.yml b/public/modules/custom/helfi_etusivu_config/config/rewrite/core.entity_form_display.node.news_item.default.yml index c36161b6..fdb9dba3 100644 --- a/public/modules/custom/helfi_etusivu_config/config/rewrite/core.entity_form_display.node.news_item.default.yml +++ b/public/modules/custom/helfi_etusivu_config/config/rewrite/core.entity_form_display.node.news_item.default.yml @@ -18,13 +18,13 @@ dependencies: module: - field_group - hdbt_admin_tools + - helfi_annif - linkit - media_library - paragraphs - path - publication_date - radioactivity - - readonly_field_widget - scheduler - select2 third_party_settings: @@ -48,11 +48,11 @@ third_party_settings: children: - in_recommendations - show_annif_block - - annif_keywords + - annif_suggested_topics label: 'Automatically recommended content' region: content parent_name: '' - weight: 25 + weight: 28 format_type: fieldset format_settings: classes: '' @@ -82,6 +82,16 @@ content: duplicate: '0' third_party_settings: { } field_news_groups: + type: select2_entity_reference + weight: 25 + region: content + settings: + width: 100% + autocomplete: false + match_operator: CONTAINS + match_limit: 10 + third_party_settings: { } + field_news_item_tags: type: select2_entity_reference weight: 26 region: content @@ -107,20 +117,6 @@ content: region: content settings: { } third_party_settings: { } - annif_keywords: - type: readonly_field_widget - weight: 2 - region: content - settings: - label: above - formatter_type: entity_reference_label - formatter_settings: - entity_reference_entity_view: - view_mode: default - entity_reference_label: - link: false - show_description: false - third_party_settings: { } in_recommendations: type: boolean_checkbox weight: 0 From 3098c57f6ac998408a754caf1d9dcd2e7a075303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Thu, 21 Nov 2024 09:13:47 +0200 Subject: [PATCH 19/59] =?UTF-8?q?Reverted=20'tuettu=20muilla=20kielill?= =?UTF-8?q?=C3=A4'=20texts.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/cmi/language/sv/core.entity_view_mode.media.image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cmi/language/sv/core.entity_view_mode.media.image.yml b/conf/cmi/language/sv/core.entity_view_mode.media.image.yml index b7c0a450..cef092dc 100644 --- a/conf/cmi/language/sv/core.entity_view_mode.media.image.yml +++ b/conf/cmi/language/sv/core.entity_view_mode.media.image.yml @@ -1 +1 @@ -label: Bild +label: 'Bild (stöds på andra språk)' From 63cc59cda62eb1323356d4d0acbcc1011119ab02 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Sun, 24 Nov 2024 12:07:32 +0000 Subject: [PATCH 20/59] Updated node modules based on npm audit fix --- public/themes/custom/hdbt_subtheme/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index 28279b24..cf9c3f75 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -3707,9 +3707,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -13441,9 +13441,9 @@ } }, "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", From 96ef0f822c055f3e31b3ebb31e7b0dcebbf32101 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Mon, 25 Nov 2024 08:25:32 +0200 Subject: [PATCH 21/59] UHF-10771: Add logical components to near you pages --- .../custom/helfi_etusivu/helfi_etusivu.module | 6 +- .../helfi_etusivu/helfi_etusivu.routing.yml | 7 ++ .../helfi_etusivu/helfi_etusivu.services.yml | 3 + .../HelsinkiNearYouResultsController.php | 119 +++++++++++++++++- .../helfi_etusivu/src/Form/NearYouForm.php | 50 ++++++++ .../Plugin/Block/HelsinkiNearYouHeroBlock.php | 3 + .../custom/helfi_etusivu/src/Servicemap.php | 57 +++++++++ .../custom/helfi_etusivu/translations/fi.po | 4 + .../custom/helfi_etusivu/translations/sv.po | 4 + .../hdbt_subtheme/dist/css/styles.min.css | 2 +- .../custom/hdbt_subtheme/package-lock.json | 12 +- .../pages/_helsinki-near-you.scss | 17 +++ .../helsinki-near-you-hero-block.html.twig | 12 +- 13 files changed, 271 insertions(+), 25 deletions(-) create mode 100644 public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php create mode 100644 public/modules/custom/helfi_etusivu/src/Servicemap.php diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index 8418f2cc..14cde5cb 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -336,9 +336,10 @@ function helfi_etusivu_theme() : array { ], 'helsinki_near_you_results_page' => [ 'variables' => [ - 'title' => NULL, - 'back_link_url' => NULL, 'back_link_label' => NULL, + 'back_link_url' => NULL, + 'coordinates' => NULL, + 'title' => NULL, ], 'template' => 'helsinki-near-you-results-page', ], @@ -350,6 +351,7 @@ function helfi_etusivu_theme() : array { 'form_item_submit' => NULL, 'hero_title' => NULL, 'hero_description' => NULL, + 'autosuggest_form' => NULL, ], 'template' => 'helsinki-near-you-hero-block', ], diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml b/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml index d0cc3c05..f45600e2 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml @@ -13,3 +13,10 @@ helfi_etusivu.helsinki_near_you_results: _title: 'Services, events and news near your address' requirements: _permission: 'access content' + +helfi_etusivu.helsinki_near_you_autocomplete: + path: '/helsinki-near-you/results/autocomplete' + defaults: + _controller: '\Drupal\helfi_etusivu\Controller\HelsinkiNearYouResultsController::addressSuggestions' + requirements: + _permission: 'access content' diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml b/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml index 84ce05cd..f4c7194d 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml @@ -3,3 +3,6 @@ services: class: Drupal\helfi_etusivu\Token\NewsNodeImageBuilder tags: - { name: helfi_platform_config.og_image_builder } + Drupal\helfi_etusivu\Servicemap: + class: Drupal\helfi_etusivu\Servicemap + arguments: ['@http_client', '@language_manager'] diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php index c0badf06..43e643c6 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php @@ -4,24 +4,133 @@ namespace Drupal\helfi_etusivu\Controller; +use Drupal\Component\Utility\Xss; use Drupal\Core\Controller\ControllerBase; +use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Url; +use Drupal\helfi_etusivu\Servicemap; +use stdClass; +use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Request; /** * Helsinki near you controller. */ -class HelsinkiNearYouResultsController extends ControllerBase { +class HelsinkiNearYouResultsController extends ControllerBase implements ContainerInjectionInterface { + /** + * Constructs a new instance. + */ + public function __construct( + protected readonly Servicemap $servicemap + ) { + } /** * Returns a renderable array. + * + * @param \Symfony\Component\HttpFoundation\Request $request + * The request. + * + * @return array */ - public function content() : array { + public function content(Request $request) : array|RedirectResponse { + $address = $request->query->get('q'); + $return_url = Url::fromRoute('helfi_etusivu.helsinki_near_you'); + + if (!$address) { + \Drupal::messenger()->addMessage($this->t('Please enter an address', [], ['context' => 'Helsinki near you']), 'error'); + return $this->redirect('helfi_etusivu.helsinki_near_you'); + } + + $addressData = $this->getCoordinates( + Xss::filter( + urldecode($address) + ) + ); + + if (!$addressData) { + \Drupal::messenger()->addMessage($this->t('Address not found', [], ['context' => 'Helsinki near you']), 'error'); + return $this->redirect('helfi_etusivu.helsinki_near_you'); + } + return [ - '#theme' => 'helsinki_near_you_results_page', - '#title' => $this->t('Services, events and news near your address @address', ['@address' => 'ADDRESS_GOES_HERE'], ['context' => 'Helsinki near you']), - '#back_link_url' => Url::fromRoute('helfi_etusivu.helsinki_near_you'), '#back_link_label' => $this->t('Edit address', [], ['context' => 'Helsinki near you']), + '#back_link_url' => $return_url, + '#coordinates' => $addressData ? $addressData['coordinates'] : null, + '#theme' => 'helsinki_near_you_results_page', + '#title' => $this->t( + 'Services, events and news near your address @address', + ['@address' => $addressData ? $this->resolveTranslation($addressData['address_translations']) : ''], + ['context' => 'Helsinki near you'] + ), ]; } + /** + * Serves autocomplete suggestions for the search form. + * + * @param \Symfony\Component\HttpFoundation\Request $request + * The request. + * + * @return array + */ + public function addressSuggestions(Request $request) { + $q = $request->query->get('q'); + $suggestions = []; + + $results = $this->servicemap->query($q, 10); + + foreach($results as $result) { + $name = $this->resolveTranslation($result->name); + + $suggestions[] = [ + 'label' => $name, + 'value' => $name, + ]; + } + + return new JsonResponse($suggestions); + } + + /** + * Get coordinates from servicemap API. + * + * @param string $address + * The address. + * + * @return array + */ + protected function getCoordinates(string $address) : ?array { + $results = $this->servicemap->query($address); + + if ( + isset($results['0']->name) && + isset($results['0']->location->coordinates) + ) { + return [ + 'address_translations' => $results['0']->name, + 'coordinates' => $results['0']->location->coordinates + ]; + } + + return null; + } + + /** + * Resolves the translation string for given translation object. + * + * Returns the translation for the current language if it exists, otherwise + * returns the Finnish translation. + * + * @param stdClass $translations + * The translations object. + * + * @return string + * The translated string. + */ + protected function resolveTranslation(stdClass $translations) : string { + $langcode = $this->languageManager()->getCurrentLanguage()->getId(); + return $translations->{"$langcode"} ?? $translations->fi; + } } diff --git a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php new file mode 100644 index 00000000..95fd48a5 --- /dev/null +++ b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php @@ -0,0 +1,50 @@ + 'helfi_etusivu.helsinki_near_you_autocomplete', + '#placeholder' => $this->t('Eg. Vaasankatu 5', [], ['context' => 'Helsinki near you']), + '#required' => TRUE, + '#title' => $this->t('Address'), + '#type' => 'textfield', + ]; + + $form['actions']['#type'] = 'actions'; + $form['actions']['submit'] = [ + '#type' => 'submit', + '#value' => $this->t('Search'), + ]; + + return $form; + } + + /** + * {@inheritdoc} + */ + public function submitForm(array &$form, FormStateInterface $form_state) { + $form_state->setRedirect('helfi_etusivu.helsinki_near_you_results', ['q' => urlencode($form_state->getValue('q'))]); + } +} diff --git a/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php b/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php index 73f4a41c..257751f3 100644 --- a/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php +++ b/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php @@ -23,7 +23,10 @@ final class HelsinkiNearYouHeroBlock extends BlockBase { * {@inheritdoc} */ public function build() : array { + $autosuggest_form = \Drupal::formBuilder()->getForm('Drupal\helfi_etusivu\Form\NearYouForm'); + $build['helsinki_near_you_hero_block'] = [ + '#autosuggest_form' => $autosuggest_form, '#theme' => 'helsinki_near_you_hero_block', '#result_page_url' => Url::fromRoute('helfi_etusivu.helsinki_near_you_results'), '#form_item_label' => $this->t('Address', [], ['context' => 'Helsinki near you']), diff --git a/public/modules/custom/helfi_etusivu/src/Servicemap.php b/public/modules/custom/helfi_etusivu/src/Servicemap.php new file mode 100644 index 00000000..4bee5e54 --- /dev/null +++ b/public/modules/custom/helfi_etusivu/src/Servicemap.php @@ -0,0 +1,57 @@ +client->get(self::API_URL, [ + 'query' => [ + 'format' => 'json', + 'municipality' => 'helsinki', + 'page_size' => $page_size, + 'q' => $address, + 'type' => 'address', + ] + ]); + } catch (GuzzleException $e) { + // @todo log error + return []; + } + + $result = json_decode($response->getBody()->getContents()); + + if (!isset($result->results)) { + // @todo log unexpected response + return []; + } + + return $result->results; + } + +} diff --git a/public/modules/custom/helfi_etusivu/translations/fi.po b/public/modules/custom/helfi_etusivu/translations/fi.po index f76b1964..f14365a5 100644 --- a/public/modules/custom/helfi_etusivu/translations/fi.po +++ b/public/modules/custom/helfi_etusivu/translations/fi.po @@ -76,3 +76,7 @@ msgstr "Helsinki lähelläsi" msgid "Services, events and news near your address" msgstr "Palvelut, tapahtumat ja uutiset osoitteesi lähellä" + +msgctxt "Helsinki near you" +msgid "Eg. Vaasankatu 5" +msgstr "Esimerkiksi Vaasankatu 5" diff --git a/public/modules/custom/helfi_etusivu/translations/sv.po b/public/modules/custom/helfi_etusivu/translations/sv.po index 94746ae8..480151b0 100644 --- a/public/modules/custom/helfi_etusivu/translations/sv.po +++ b/public/modules/custom/helfi_etusivu/translations/sv.po @@ -65,3 +65,7 @@ msgstr "Helsingfors nära dig" msgid "Services, events and news near your address" msgstr "Tjänster, evenemang och nyheter nära din adress" + +msgctxt "Helsinki near you" +msgid "Eg. Vaasankatu 5" +msgstr "Till exempel Vasagatan 5" diff --git a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css index 1c31f6a4..2f1e3880 100644 --- a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css +++ b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css @@ -1 +1 @@ -.table-of-contents--news-update{padding-left:16px;padding-right:16px;--item-title-lineheight: 1.875rem}@media(min-width: 768px){.table-of-contents--news-update{padding-left:32px;padding-right:32px}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__container{border-left:none}[dir="rtl"] .table-of-contents--news-update .table-of-contents__container{border-right:none}.table-of-contents--news-update .table-of-contents__title+.table-of-contents__content{padding-top:16px}.table-of-contents--news-update .table-of-contents__item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:flex;flex-direction:column;padding-top:16px;padding-bottom:16px;padding-left:16px;padding-right:16px;position:relative}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__item{flex-direction:row}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::before,[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::after{left:8px}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::before,.table-of-contents--news-update .table-of-contents__item::after{content:"";display:block;position:absolute}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::after{background-color:#000;height:calc(100% + 32px + 8px);top:-16px;transform:translateX(calc(var(--lang-direction) * -50%));width:2px;z-index:0}.table-of-contents--news-update .table-of-contents__item:first-of-type::after{height:100%;top:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:last-of-type::after{height:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:only-child::after{display:none}.table-of-contents--news-update .table-of-contents__item::before{background-color:#fff;border:3px solid #000;border-radius:50%;height:16px;top:calc(16px + var(--item-title-lineheight)*.5);transform:translate(calc(var(--lang-direction) * -50%), -50%);width:16px;z-index:1}.table-of-contents--news-update time{padding-left:16px}@media(min-width: 768px){.table-of-contents--news-update time{flex:none;width:110px}}[dir="rtl"] .table-of-contents--news-update time{padding-left:0;padding-right:16px}.table-of-contents--news-update .table-of-contents__link{margin-left:16px}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__link{margin-left:32px}}[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-left:0;margin-right:16px}@media(min-width: 768px){[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-right:32px}}.block--main-news{padding-left:16px;padding-right:16px;max-width:1296px;margin-top:32px;margin:auto;width:100%}@media(min-width: 768px){.block--main-news{padding-left:32px;padding-right:32px}}@media(min-width: 768px){.block--main-news{max-width:1328px}}@media(min-width: 992px){.block--main-news{margin-top:64px}}.block--main-news h2{margin-bottom:48px;margin-top:0}.component--news-of-interest{margin-top:32px;background-color:#f2f2f2;margin-left:16px;margin-right:16px;padding:32px 16px 32px}@media(min-width: 992px){.component--news-of-interest{margin-top:64px}}@media(min-width: 768px){.component--news-of-interest{padding:48px 32px 48px}}.component--news-of-interest .card{padding:24px}.component--news-of-interest .empty-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.component--graphics{max-width:100%}@media(min-width: 992px){.graphics{align-items:center;display:flex;justify-content:space-between}}@media(min-width: 992px){.graphics__text-container{min-height:300px}}.graphics__title{margin-top:0}.graphics__illustration-container{margin-top:64px}@media(min-width: 992px){.graphics__illustration-container{margin-top:0}}.graphics__illustration{max-width:100%}.page-title+article>.components--helsinki-near-you-results:first-child{margin-top:16px}.component--current{background-color:var(--hdbt-color-palette--secondary);color:var(--hdbt-color-palette-text--secondary)}.current__content{display:flex;flex-direction:column;margin-left:auto;margin-right:auto;max-width:1264px}@media(min-width: 768px){.current__content{flex-direction:row}}.current__content__list{margin-bottom:0;margin-top:0}.current__content__list-item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-bottom:2px;margin-top:0;padding-top:7px;padding-bottom:7px;vertical-align:top}.current__links-container{padding-bottom:16px;padding-top:16px}@media(min-width: 576px){.current__links-container{padding-bottom:24px;padding-top:24px}}@media(min-width: 768px){.current__links-container{padding-right:16px}}@media(min-width: 992px){.current__links-container{padding-bottom:48px;padding-top:48px}}@media(min-width: 992px){.current__links-container{padding-bottom:64px;padding-top:64px}}.current{display:flex;flex-direction:column}@media(min-width: 768px){.current__illustration-container{margin-left:auto;margin-top:-32px}}@media(min-width: 992px){.current__illustration-container{margin-top:-48px}}@media(min-width: 1248px){.current__illustration-container{margin-top:-64px}}.current__seasonal-illustration{aspect-ratio:1;display:block;width:258px}@media(min-width: 992px){.current__seasonal-illustration{width:378px}}@media(min-width: 1248px){.current__seasonal-illustration{width:486px}}.component--latest-news--cards{background-color:#f2f2f2}.component--latest-news .latest-news__link-wrapper{margin-top:32px}@media(min-width: 768px){.component--latest-news .latest-news__link-wrapper{margin-top:64px}}[dir="ltr"] .component--top-news .news-listing{padding-left:0}[dir="rtl"] .component--top-news .news-listing{padding-right:0}.component--top-news .news-listing__item{position:relative}.component--top-news--news .component__container{background-color:#e8f3fc;padding:24px 24px 32px}@media(min-width: 768px){.component--top-news--news .component__container{padding:32px 32px 48px}}.component--top-news--news .component__title+.component__content{margin-top:0}@media(min-width: 768px){.component--top-news--news .component__title+.component__content{grid-template-columns:repeat(2, 1fr);margin-top:32px}}.component--top-news--news .news-listing--medium-teasers{display:grid;margin-bottom:0;margin-top:24px}@media(min-width: 768px){.component--top-news--news .news-listing--medium-teasers{grid-column-gap:24px;grid-row-gap:32px;grid-template-columns:repeat(2, 1fr);margin-top:48px}}.component--top-news--news .news-listing__medium-teaser{padding:0}[dir=rtl] .component--top-news--news .news-listing__medium-teaser{padding:0}.component--top-news--news .news-listing__medium-teaser::before{display:none}.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.component--top-news--news .news-listing__medium-teaser .news-listing__datetime{margin-top:8px}.component--news-update{border-bottom:1px solid #ccc;padding-bottom:32px}@media(min-width: 768px){.component--news-update{padding-bottom:48px}}.component--news-update time{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);display:inline-block;margin-top:16px}.component--news-update .component__content{margin-top:32px}@media(min-width: 768px){.component--news-update .component__content{margin-top:48px}}*~.component--news-update,.component--news-update~.component--news-update{margin-top:32px}@media(min-width: 768px){*~.component--news-update,.component--news-update~.component--news-update{margin-top:48px}} +.table-of-contents--news-update{padding-left:16px;padding-right:16px;--item-title-lineheight: 1.875rem}@media(min-width: 768px){.table-of-contents--news-update{padding-left:32px;padding-right:32px}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__container{border-left:none}[dir="rtl"] .table-of-contents--news-update .table-of-contents__container{border-right:none}.table-of-contents--news-update .table-of-contents__title+.table-of-contents__content{padding-top:16px}.table-of-contents--news-update .table-of-contents__item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:flex;flex-direction:column;padding-top:16px;padding-bottom:16px;padding-left:16px;padding-right:16px;position:relative}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__item{flex-direction:row}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::before,[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::after{left:8px}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::before,.table-of-contents--news-update .table-of-contents__item::after{content:"";display:block;position:absolute}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::after{background-color:#000;height:calc(100% + 32px + 8px);top:-16px;transform:translateX(calc(var(--lang-direction) * -50%));width:2px;z-index:0}.table-of-contents--news-update .table-of-contents__item:first-of-type::after{height:100%;top:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:last-of-type::after{height:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:only-child::after{display:none}.table-of-contents--news-update .table-of-contents__item::before{background-color:#fff;border:3px solid #000;border-radius:50%;height:16px;top:calc(16px + var(--item-title-lineheight)*.5);transform:translate(calc(var(--lang-direction) * -50%), -50%);width:16px;z-index:1}.table-of-contents--news-update time{padding-left:16px}@media(min-width: 768px){.table-of-contents--news-update time{flex:none;width:110px}}[dir="rtl"] .table-of-contents--news-update time{padding-left:0;padding-right:16px}.table-of-contents--news-update .table-of-contents__link{margin-left:16px}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__link{margin-left:32px}}[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-left:0;margin-right:16px}@media(min-width: 768px){[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-right:32px}}.block--main-news{padding-left:16px;padding-right:16px;max-width:1296px;margin-top:32px;margin:auto;width:100%}@media(min-width: 768px){.block--main-news{padding-left:32px;padding-right:32px}}@media(min-width: 768px){.block--main-news{max-width:1328px}}@media(min-width: 992px){.block--main-news{margin-top:64px}}.block--main-news h2{margin-bottom:48px;margin-top:0}.component--news-of-interest{margin-top:32px;background-color:#f2f2f2;margin-left:16px;margin-right:16px;padding:32px 16px 32px}@media(min-width: 992px){.component--news-of-interest{margin-top:64px}}@media(min-width: 768px){.component--news-of-interest{padding:48px 32px 48px}}.component--news-of-interest .card{padding:24px}.component--news-of-interest .empty-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.component--graphics{max-width:100%}@media(min-width: 992px){.graphics{align-items:center;display:flex;justify-content:space-between}}@media(min-width: 992px){.graphics__text-container{min-height:300px}}.graphics__title{margin-top:0}.graphics__illustration-container{margin-top:64px}@media(min-width: 992px){.graphics__illustration-container{margin-top:0}}.graphics__illustration{max-width:100%}.page-title+article>.components--helsinki-near-you-results:first-child{margin-top:16px}.helfi-etusivu-near-you-form .form-item-q{margin-bottom:24px}.ui-menu.ui-front .ui-menu-item-wrapper{color:#000;display:inline-block;padding:16px;width:100%}.ui-menu.ui-front .ui-menu-item-wrapper.ui-state-active{background-color:#f0f0ff;border:1px solid #0000bf}.component--current{background-color:var(--hdbt-color-palette--secondary);color:var(--hdbt-color-palette-text--secondary)}.current__content{display:flex;flex-direction:column;margin-left:auto;margin-right:auto;max-width:1264px}@media(min-width: 768px){.current__content{flex-direction:row}}.current__content__list{margin-bottom:0;margin-top:0}.current__content__list-item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-bottom:2px;margin-top:0;padding-top:7px;padding-bottom:7px;vertical-align:top}.current__links-container{padding-bottom:16px;padding-top:16px}@media(min-width: 576px){.current__links-container{padding-bottom:24px;padding-top:24px}}@media(min-width: 768px){.current__links-container{padding-right:16px}}@media(min-width: 992px){.current__links-container{padding-bottom:48px;padding-top:48px}}@media(min-width: 992px){.current__links-container{padding-bottom:64px;padding-top:64px}}.current{display:flex;flex-direction:column}@media(min-width: 768px){.current__illustration-container{margin-left:auto;margin-top:-32px}}@media(min-width: 992px){.current__illustration-container{margin-top:-48px}}@media(min-width: 1248px){.current__illustration-container{margin-top:-64px}}.current__seasonal-illustration{aspect-ratio:1;display:block;width:258px}@media(min-width: 992px){.current__seasonal-illustration{width:378px}}@media(min-width: 1248px){.current__seasonal-illustration{width:486px}}.component--latest-news--cards{background-color:#f2f2f2}.component--latest-news .latest-news__link-wrapper{margin-top:32px}@media(min-width: 768px){.component--latest-news .latest-news__link-wrapper{margin-top:64px}}[dir="ltr"] .component--top-news .news-listing{padding-left:0}[dir="rtl"] .component--top-news .news-listing{padding-right:0}.component--top-news .news-listing__item{position:relative}.component--top-news--news .component__container{background-color:#e8f3fc;padding:24px 24px 32px}@media(min-width: 768px){.component--top-news--news .component__container{padding:32px 32px 48px}}.component--top-news--news .component__title+.component__content{margin-top:0}@media(min-width: 768px){.component--top-news--news .component__title+.component__content{grid-template-columns:repeat(2, 1fr);margin-top:32px}}.component--top-news--news .news-listing--medium-teasers{display:grid;margin-bottom:0;margin-top:24px}@media(min-width: 768px){.component--top-news--news .news-listing--medium-teasers{grid-column-gap:24px;grid-row-gap:32px;grid-template-columns:repeat(2, 1fr);margin-top:48px}}.component--top-news--news .news-listing__medium-teaser{padding:0}[dir=rtl] .component--top-news--news .news-listing__medium-teaser{padding:0}.component--top-news--news .news-listing__medium-teaser::before{display:none}.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.component--top-news--news .news-listing__medium-teaser .news-listing__datetime{margin-top:8px}.component--news-update{border-bottom:1px solid #ccc;padding-bottom:32px}@media(min-width: 768px){.component--news-update{padding-bottom:48px}}.component--news-update time{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);display:inline-block;margin-top:16px}.component--news-update .component__content{margin-top:32px}@media(min-width: 768px){.component--news-update .component__content{margin-top:48px}}*~.component--news-update,.component--news-update~.component--news-update{margin-top:32px}@media(min-width: 768px){*~.component--news-update,.component--news-update~.component--news-update{margin-top:48px}} diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index 939a4dc0..318d3eb2 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -3325,9 +3325,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001680", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz", - "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==", + "version": "1.0.30001684", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz", + "integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==", "funding": [ { "type": "opencollective", @@ -13159,9 +13159,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001680", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz", - "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==" + "version": "1.0.30001684", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz", + "integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==" }, "chalk": { "version": "2.4.2", diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss index fed5f22b..c0761053 100644 --- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss +++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss @@ -35,3 +35,20 @@ .page-title + article > .components--helsinki-near-you-results:first-child { margin-top: $spacing; } + +.helfi-etusivu-near-you-form .form-item-q { + margin-bottom: $spacing-and-half; +} + +// Built in classes with no way to change them +.ui-menu.ui-front .ui-menu-item-wrapper { + color: $color-black; + display: inline-block; + padding: $spacing; + width: 100%; +} + +.ui-menu.ui-front .ui-menu-item-wrapper.ui-state-active { + background-color: $color-bus-light; + border: 1px solid $color-bus; +} diff --git a/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-hero-block.html.twig b/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-hero-block.html.twig index a6dabfa9..3c136d4c 100644 --- a/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-hero-block.html.twig +++ b/public/themes/custom/hdbt_subtheme/templates/module/helfi-etusivu/helsinki-near-you-hero-block.html.twig @@ -1,15 +1,5 @@ {% set form %} - + {{ autosuggest_form }} {% endset %} {% embed '@hdbt/component/hero.twig' with { From 7054867ddbea690d0a24d546ef1e74fb1e918100 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Mon, 25 Nov 2024 08:51:56 +0200 Subject: [PATCH 22/59] UHF-10771: Add error logging --- .../custom/helfi_etusivu/helfi_etusivu.services.yml | 5 ++++- public/modules/custom/helfi_etusivu/src/Servicemap.php | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml b/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml index f4c7194d..660ee227 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml @@ -1,8 +1,11 @@ services: + logger.channel.helfi_etusivu: + parent: logger.channel_base + arguments: ['helfi_etusivu'] Drupal\helfi_etusivu\Token\NewsNodeImageBuilder: class: Drupal\helfi_etusivu\Token\NewsNodeImageBuilder tags: - { name: helfi_platform_config.og_image_builder } Drupal\helfi_etusivu\Servicemap: class: Drupal\helfi_etusivu\Servicemap - arguments: ['@http_client', '@language_manager'] + arguments: ['@http_client', '@language_manager', '@logger.channel.helfi_etusivu'] diff --git a/public/modules/custom/helfi_etusivu/src/Servicemap.php b/public/modules/custom/helfi_etusivu/src/Servicemap.php index 4bee5e54..f7686fe9 100644 --- a/public/modules/custom/helfi_etusivu/src/Servicemap.php +++ b/public/modules/custom/helfi_etusivu/src/Servicemap.php @@ -4,15 +4,18 @@ use Drupal\Component\Utility\Xss; use Drupal\Core\Language\LanguageManager; +use Error; use GuzzleHttp\Client; use GuzzleHttp\Exception\GuzzleException; +use Psr\Log\LoggerInterface; class Servicemap { const API_URL = 'https://api.hel.fi/servicemap/v2/search/'; public function __construct( protected readonly Client $client, - protected readonly LanguageManager $languageManager + protected readonly LanguageManager $languageManager, + protected readonly LoggerInterface $logger ) { } @@ -40,14 +43,14 @@ public function query(string $address, int $page_size = 1) : array { ] ]); } catch (GuzzleException $e) { - // @todo log error + $this->logger->error('Servicemap query failed: ' . $e->getMessage()); return []; } $result = json_decode($response->getBody()->getContents()); if (!isset($result->results)) { - // @todo log unexpected response + $this->logger->error('Servicemap query failed: Unexpected response. Results not present.'); return []; } From 9834df7ece888eb95c129fb27dfa00c5e094fae1 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 25 Nov 2024 10:24:39 +0200 Subject: [PATCH 23/59] UHF-11006: check for empty value and use created-time if published is not set --- .../helfi_node_news_article/src/Entity/Node/NewsArticle.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php b/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php index de06460d..dbb94a3a 100644 --- a/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php +++ b/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php @@ -18,7 +18,8 @@ final class NewsArticle extends RecommendableBase { * The human-readable "published at" time. */ public function getPublishedHumanReadable(): string { - return \Drupal::service('date.formatter')->format($this->get('published_at')->value, 'publication_date_format'); + $published = !$this->get('published_at')->isEmpty() ? $this->get('published_at')->value : $this->getCreatedTime(); + return \Drupal::service('date.formatter')->format((int)$published, 'publication_date_format'); } /** @@ -28,7 +29,8 @@ public function getPublishedHumanReadable(): string { * The machine-readabe "published at" time. */ public function getPublishedMachineReadable(): string { - return \Drupal::service('date.formatter')->format($this->get('published_at')->value, 'custom', 'Y-m-d\TH:i'); + $published = !$this->get('published_at')->isEmpty() ? $this->get('published_at')->value : $this->getCreatedTime(); + return \Drupal::service('date.formatter')->format((int)$published, 'custom', 'Y-m-d\TH:i'); } /** From 67f06fb22c8a71945b9dbc2ab0c1b73a160d6f1b Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 25 Nov 2024 10:50:03 +0200 Subject: [PATCH 24/59] UHF-11006: fix typo --- .../helfi_node_news_article/src/Entity/Node/NewsArticle.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php b/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php index dbb94a3a..cefcaaa7 100644 --- a/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php +++ b/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php @@ -26,7 +26,7 @@ public function getPublishedHumanReadable(): string { * Get machine-readable "published at" time of the News article. * * @return string - * The machine-readabe "published at" time. + * The machine-readable "published at" time. */ public function getPublishedMachineReadable(): string { $published = !$this->get('published_at')->isEmpty() ? $this->get('published_at')->value : $this->getCreatedTime(); From 3b6bda115abdc68000cde3fc8b58ce526723a47d Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 25 Nov 2024 11:23:41 +0200 Subject: [PATCH 25/59] UHF-11006: use null coalescing instead of ternary --- .../helfi_node_news_article/src/Entity/Node/NewsArticle.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php b/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php index cefcaaa7..ed34cfca 100644 --- a/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php +++ b/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php @@ -18,7 +18,7 @@ final class NewsArticle extends RecommendableBase { * The human-readable "published at" time. */ public function getPublishedHumanReadable(): string { - $published = !$this->get('published_at')->isEmpty() ? $this->get('published_at')->value : $this->getCreatedTime(); + $published = $this->get('published_at')->value ?? $this->getCreatedTime(); return \Drupal::service('date.formatter')->format((int)$published, 'publication_date_format'); } @@ -29,7 +29,7 @@ public function getPublishedHumanReadable(): string { * The machine-readable "published at" time. */ public function getPublishedMachineReadable(): string { - $published = !$this->get('published_at')->isEmpty() ? $this->get('published_at')->value : $this->getCreatedTime(); + $published = $this->get('published_at')->value ?? $this->getCreatedTime(); return \Drupal::service('date.formatter')->format((int)$published, 'custom', 'Y-m-d\TH:i'); } From 8471ef754ad817c87a28da2981bea97b99a69d36 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 25 Nov 2024 11:57:46 +0200 Subject: [PATCH 26/59] UHF-11006: added space after casting --- .../helfi_node_news_article/src/Entity/Node/NewsArticle.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php b/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php index ed34cfca..0f6f1398 100644 --- a/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php +++ b/public/modules/custom/helfi_node_news_article/src/Entity/Node/NewsArticle.php @@ -19,7 +19,7 @@ final class NewsArticle extends RecommendableBase { */ public function getPublishedHumanReadable(): string { $published = $this->get('published_at')->value ?? $this->getCreatedTime(); - return \Drupal::service('date.formatter')->format((int)$published, 'publication_date_format'); + return \Drupal::service('date.formatter')->format((int) $published, 'publication_date_format'); } /** @@ -30,7 +30,7 @@ public function getPublishedHumanReadable(): string { */ public function getPublishedMachineReadable(): string { $published = $this->get('published_at')->value ?? $this->getCreatedTime(); - return \Drupal::service('date.formatter')->format((int)$published, 'custom', 'Y-m-d\TH:i'); + return \Drupal::service('date.formatter')->format((int) $published, 'custom', 'Y-m-d\TH:i'); } /** From 567e43c5957c353dbc72e75a51a17156443a18de Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Mon, 25 Nov 2024 17:17:57 +0200 Subject: [PATCH 27/59] UHF-10771: Setup autowire + phpcs fixes --- .../helfi_etusivu/helfi_etusivu.services.yml | 8 ++-- .../HelsinkiNearYouResultsController.php | 33 ++++++++------ .../helfi_etusivu/src/Form/NearYouForm.php | 4 +- .../Plugin/Block/HelsinkiNearYouHeroBlock.php | 45 ++++++++++++++++++- .../custom/helfi_etusivu/src/Servicemap.php | 44 +++++++++++++----- 5 files changed, 105 insertions(+), 29 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml b/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml index 660ee227..0c81b815 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml @@ -1,4 +1,7 @@ services: + _defaults: + autowire: true + autoconfigure: true logger.channel.helfi_etusivu: parent: logger.channel_base arguments: ['helfi_etusivu'] @@ -6,6 +9,5 @@ services: class: Drupal\helfi_etusivu\Token\NewsNodeImageBuilder tags: - { name: helfi_platform_config.og_image_builder } - Drupal\helfi_etusivu\Servicemap: - class: Drupal\helfi_etusivu\Servicemap - arguments: ['@http_client', '@language_manager', '@logger.channel.helfi_etusivu'] + Drupal\helfi_etusivu\Servicemap: ~ + Drupal\helfi_etusivu\Controller\HelsinkiNearYouResultsController: ~ diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php index 43e643c6..1a3d8798 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php @@ -6,10 +6,9 @@ use Drupal\Component\Utility\Xss; use Drupal\Core\Controller\ControllerBase; -use Drupal\Core\DependencyInjection\ContainerInjectionInterface; +use Drupal\Core\Messenger\MessengerInterface; use Drupal\Core\Url; use Drupal\helfi_etusivu\Servicemap; -use stdClass; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; @@ -17,9 +16,13 @@ /** * Helsinki near you controller. */ -class HelsinkiNearYouResultsController extends ControllerBase implements ContainerInjectionInterface { +class HelsinkiNearYouResultsController extends ControllerBase { + /** * Constructs a new instance. + * + * @param \Drupal\helfi_etusivu\Servicemap $servicemap + * The servicemap service. */ public function __construct( protected readonly Servicemap $servicemap @@ -33,13 +36,14 @@ public function __construct( * The request. * * @return array + * A renderable array. */ public function content(Request $request) : array|RedirectResponse { $address = $request->query->get('q'); $return_url = Url::fromRoute('helfi_etusivu.helsinki_near_you'); if (!$address) { - \Drupal::messenger()->addMessage($this->t('Please enter an address', [], ['context' => 'Helsinki near you']), 'error'); + $this->messenger->addMessage($this->t('Please enter an address', [], ['context' => 'Helsinki near you']), 'error'); return $this->redirect('helfi_etusivu.helsinki_near_you'); } @@ -50,14 +54,14 @@ public function content(Request $request) : array|RedirectResponse { ); if (!$addressData) { - \Drupal::messenger()->addMessage($this->t('Address not found', [], ['context' => 'Helsinki near you']), 'error'); + $this->messenger->addMessage($this->t('Address not found', [], ['context' => 'Helsinki near you']), 'error'); return $this->redirect('helfi_etusivu.helsinki_near_you'); } return [ '#back_link_label' => $this->t('Edit address', [], ['context' => 'Helsinki near you']), '#back_link_url' => $return_url, - '#coordinates' => $addressData ? $addressData['coordinates'] : null, + '#coordinates' => $addressData ? $addressData['coordinates'] : NULL, '#theme' => 'helsinki_near_you_results_page', '#title' => $this->t( 'Services, events and news near your address @address', @@ -73,15 +77,16 @@ public function content(Request $request) : array|RedirectResponse { * @param \Symfony\Component\HttpFoundation\Request $request * The request. * - * @return array + * @return JsonResponse + * The result as JSON. */ - public function addressSuggestions(Request $request) { + public function addressSuggestions(Request $request) : JsonResponse { $q = $request->query->get('q'); $suggestions = []; $results = $this->servicemap->query($q, 10); - foreach($results as $result) { + foreach ($results as $result) { $name = $this->resolveTranslation($result->name); $suggestions[] = [ @@ -100,6 +105,7 @@ public function addressSuggestions(Request $request) { * The address. * * @return array + * The coordinates. */ protected function getCoordinates(string $address) : ?array { $results = $this->servicemap->query($address); @@ -110,11 +116,11 @@ protected function getCoordinates(string $address) : ?array { ) { return [ 'address_translations' => $results['0']->name, - 'coordinates' => $results['0']->location->coordinates + 'coordinates' => $results['0']->location->coordinates, ]; } - return null; + return NULL; } /** @@ -123,14 +129,15 @@ protected function getCoordinates(string $address) : ?array { * Returns the translation for the current language if it exists, otherwise * returns the Finnish translation. * - * @param stdClass $translations + * @param \stdClass $translations * The translations object. * * @return string * The translated string. */ - protected function resolveTranslation(stdClass $translations) : string { + protected function resolveTranslation(\stdClass $translations) : string { $langcode = $this->languageManager()->getCurrentLanguage()->getId(); return $translations->{"$langcode"} ?? $translations->fi; } + } diff --git a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php index 95fd48a5..a560766c 100644 --- a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php +++ b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php @@ -1,10 +1,11 @@ setRedirect('helfi_etusivu.helsinki_near_you_results', ['q' => urlencode($form_state->getValue('q'))]); } + } diff --git a/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php b/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php index 257751f3..ea2720fc 100644 --- a/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php +++ b/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php @@ -7,8 +7,11 @@ use Drupal\Core\Block\Attribute\Block; use Drupal\Core\Block\BlockBase; use Drupal\Core\Cache\Cache; +use Drupal\Core\Form\FormBuilderInterface; +use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\StringTranslation\TranslatableMarkup; use Drupal\Core\Url; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Provides a 'HelsinkiNearYouHeroBlock' block. @@ -17,13 +20,51 @@ id: "helsinki_near_you_hero_block", admin_label: new TranslatableMarkup("Helsinki near you hero block"), )] -final class HelsinkiNearYouHeroBlock extends BlockBase { +final class HelsinkiNearYouHeroBlock extends BlockBase implements ContainerFactoryPluginInterface { + + /** + * {@inheritdoc} + */ + public static function create( + ContainerInterface $container, + $configuration, + $plugin_id, + $plugin_definition + ) { + return new static( + $configuration, + $plugin_id, + $plugin_definition, + $container->get('form_builder'), + ); + } + + /** + * Constructs a new HelsinkiNearYouHeroBlock object. + * + * @param array $configuration + * A configuration array containing information about the plugin instance. + * @param string $plugin_id + * The plugin_id for the plugin instance. + * @param array $plugin_definition + * The plugin implementation definition. + * @param \Drupal\Core\Form\FormBuilderInterface $formBuilder + * The form builder. + */ + public function __construct( + array $configuration, + string $plugin_id, + array $plugin_definition, + private readonly FormBuilderInterface $formBuilder, + ) { + parent::__construct($configuration, $plugin_id, $plugin_definition); + } /** * {@inheritdoc} */ public function build() : array { - $autosuggest_form = \Drupal::formBuilder()->getForm('Drupal\helfi_etusivu\Form\NearYouForm'); + $autosuggest_form = $this->formBuilder->getForm('Drupal\helfi_etusivu\Form\NearYouForm'); $build['helsinki_near_you_hero_block'] = [ '#autosuggest_form' => $autosuggest_form, diff --git a/public/modules/custom/helfi_etusivu/src/Servicemap.php b/public/modules/custom/helfi_etusivu/src/Servicemap.php index f7686fe9..6e151f39 100644 --- a/public/modules/custom/helfi_etusivu/src/Servicemap.php +++ b/public/modules/custom/helfi_etusivu/src/Servicemap.php @@ -1,21 +1,43 @@ $page_size, 'q' => $address, 'type' => 'address', - ] + ], ]); - } catch (GuzzleException $e) { + } + catch (GuzzleException $e) { $this->logger->error('Servicemap query failed: ' . $e->getMessage()); return []; } From d563163007134b4804b3ef4372d97a7c97c030ea Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Mon, 25 Nov 2024 18:07:27 +0200 Subject: [PATCH 28/59] UHF-10771: Move Drupal throbber to create space --- .../src/Controller/HelsinkiNearYouResultsController.php | 5 ++--- .../src/Plugin/Block/HelsinkiNearYouHeroBlock.php | 2 +- public/themes/custom/hdbt_subtheme/dist/css/styles.min.css | 2 +- .../src/scss/06_components/pages/_helsinki-near-you.scss | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php index 1a3d8798..29275a9f 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php @@ -6,7 +6,6 @@ use Drupal\Component\Utility\Xss; use Drupal\Core\Controller\ControllerBase; -use Drupal\Core\Messenger\MessengerInterface; use Drupal\Core\Url; use Drupal\helfi_etusivu\Servicemap; use Symfony\Component\HttpFoundation\JsonResponse; @@ -25,7 +24,7 @@ class HelsinkiNearYouResultsController extends ControllerBase { * The servicemap service. */ public function __construct( - protected readonly Servicemap $servicemap + protected readonly Servicemap $servicemap, ) { } @@ -77,7 +76,7 @@ public function content(Request $request) : array|RedirectResponse { * @param \Symfony\Component\HttpFoundation\Request $request * The request. * - * @return JsonResponse + * @return \Symfony\Component\HttpFoundation\JsonResponse * The result as JSON. */ public function addressSuggestions(Request $request) : JsonResponse { diff --git a/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php b/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php index ea2720fc..82001254 100644 --- a/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php +++ b/public/modules/custom/helfi_etusivu/src/Plugin/Block/HelsinkiNearYouHeroBlock.php @@ -29,7 +29,7 @@ public static function create( ContainerInterface $container, $configuration, $plugin_id, - $plugin_definition + $plugin_definition, ) { return new static( $configuration, diff --git a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css index 2f1e3880..d0844749 100644 --- a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css +++ b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css @@ -1 +1 @@ -.table-of-contents--news-update{padding-left:16px;padding-right:16px;--item-title-lineheight: 1.875rem}@media(min-width: 768px){.table-of-contents--news-update{padding-left:32px;padding-right:32px}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__container{border-left:none}[dir="rtl"] .table-of-contents--news-update .table-of-contents__container{border-right:none}.table-of-contents--news-update .table-of-contents__title+.table-of-contents__content{padding-top:16px}.table-of-contents--news-update .table-of-contents__item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:flex;flex-direction:column;padding-top:16px;padding-bottom:16px;padding-left:16px;padding-right:16px;position:relative}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__item{flex-direction:row}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::before,[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::after{left:8px}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::before,.table-of-contents--news-update .table-of-contents__item::after{content:"";display:block;position:absolute}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::after{background-color:#000;height:calc(100% + 32px + 8px);top:-16px;transform:translateX(calc(var(--lang-direction) * -50%));width:2px;z-index:0}.table-of-contents--news-update .table-of-contents__item:first-of-type::after{height:100%;top:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:last-of-type::after{height:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:only-child::after{display:none}.table-of-contents--news-update .table-of-contents__item::before{background-color:#fff;border:3px solid #000;border-radius:50%;height:16px;top:calc(16px + var(--item-title-lineheight)*.5);transform:translate(calc(var(--lang-direction) * -50%), -50%);width:16px;z-index:1}.table-of-contents--news-update time{padding-left:16px}@media(min-width: 768px){.table-of-contents--news-update time{flex:none;width:110px}}[dir="rtl"] .table-of-contents--news-update time{padding-left:0;padding-right:16px}.table-of-contents--news-update .table-of-contents__link{margin-left:16px}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__link{margin-left:32px}}[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-left:0;margin-right:16px}@media(min-width: 768px){[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-right:32px}}.block--main-news{padding-left:16px;padding-right:16px;max-width:1296px;margin-top:32px;margin:auto;width:100%}@media(min-width: 768px){.block--main-news{padding-left:32px;padding-right:32px}}@media(min-width: 768px){.block--main-news{max-width:1328px}}@media(min-width: 992px){.block--main-news{margin-top:64px}}.block--main-news h2{margin-bottom:48px;margin-top:0}.component--news-of-interest{margin-top:32px;background-color:#f2f2f2;margin-left:16px;margin-right:16px;padding:32px 16px 32px}@media(min-width: 992px){.component--news-of-interest{margin-top:64px}}@media(min-width: 768px){.component--news-of-interest{padding:48px 32px 48px}}.component--news-of-interest .card{padding:24px}.component--news-of-interest .empty-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.component--graphics{max-width:100%}@media(min-width: 992px){.graphics{align-items:center;display:flex;justify-content:space-between}}@media(min-width: 992px){.graphics__text-container{min-height:300px}}.graphics__title{margin-top:0}.graphics__illustration-container{margin-top:64px}@media(min-width: 992px){.graphics__illustration-container{margin-top:0}}.graphics__illustration{max-width:100%}.page-title+article>.components--helsinki-near-you-results:first-child{margin-top:16px}.helfi-etusivu-near-you-form .form-item-q{margin-bottom:24px}.ui-menu.ui-front .ui-menu-item-wrapper{color:#000;display:inline-block;padding:16px;width:100%}.ui-menu.ui-front .ui-menu-item-wrapper.ui-state-active{background-color:#f0f0ff;border:1px solid #0000bf}.component--current{background-color:var(--hdbt-color-palette--secondary);color:var(--hdbt-color-palette-text--secondary)}.current__content{display:flex;flex-direction:column;margin-left:auto;margin-right:auto;max-width:1264px}@media(min-width: 768px){.current__content{flex-direction:row}}.current__content__list{margin-bottom:0;margin-top:0}.current__content__list-item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-bottom:2px;margin-top:0;padding-top:7px;padding-bottom:7px;vertical-align:top}.current__links-container{padding-bottom:16px;padding-top:16px}@media(min-width: 576px){.current__links-container{padding-bottom:24px;padding-top:24px}}@media(min-width: 768px){.current__links-container{padding-right:16px}}@media(min-width: 992px){.current__links-container{padding-bottom:48px;padding-top:48px}}@media(min-width: 992px){.current__links-container{padding-bottom:64px;padding-top:64px}}.current{display:flex;flex-direction:column}@media(min-width: 768px){.current__illustration-container{margin-left:auto;margin-top:-32px}}@media(min-width: 992px){.current__illustration-container{margin-top:-48px}}@media(min-width: 1248px){.current__illustration-container{margin-top:-64px}}.current__seasonal-illustration{aspect-ratio:1;display:block;width:258px}@media(min-width: 992px){.current__seasonal-illustration{width:378px}}@media(min-width: 1248px){.current__seasonal-illustration{width:486px}}.component--latest-news--cards{background-color:#f2f2f2}.component--latest-news .latest-news__link-wrapper{margin-top:32px}@media(min-width: 768px){.component--latest-news .latest-news__link-wrapper{margin-top:64px}}[dir="ltr"] .component--top-news .news-listing{padding-left:0}[dir="rtl"] .component--top-news .news-listing{padding-right:0}.component--top-news .news-listing__item{position:relative}.component--top-news--news .component__container{background-color:#e8f3fc;padding:24px 24px 32px}@media(min-width: 768px){.component--top-news--news .component__container{padding:32px 32px 48px}}.component--top-news--news .component__title+.component__content{margin-top:0}@media(min-width: 768px){.component--top-news--news .component__title+.component__content{grid-template-columns:repeat(2, 1fr);margin-top:32px}}.component--top-news--news .news-listing--medium-teasers{display:grid;margin-bottom:0;margin-top:24px}@media(min-width: 768px){.component--top-news--news .news-listing--medium-teasers{grid-column-gap:24px;grid-row-gap:32px;grid-template-columns:repeat(2, 1fr);margin-top:48px}}.component--top-news--news .news-listing__medium-teaser{padding:0}[dir=rtl] .component--top-news--news .news-listing__medium-teaser{padding:0}.component--top-news--news .news-listing__medium-teaser::before{display:none}.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.component--top-news--news .news-listing__medium-teaser .news-listing__datetime{margin-top:8px}.component--news-update{border-bottom:1px solid #ccc;padding-bottom:32px}@media(min-width: 768px){.component--news-update{padding-bottom:48px}}.component--news-update time{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);display:inline-block;margin-top:16px}.component--news-update .component__content{margin-top:32px}@media(min-width: 768px){.component--news-update .component__content{margin-top:48px}}*~.component--news-update,.component--news-update~.component--news-update{margin-top:32px}@media(min-width: 768px){*~.component--news-update,.component--news-update~.component--news-update{margin-top:48px}} +.table-of-contents--news-update{padding-left:16px;padding-right:16px;--item-title-lineheight: 1.875rem}@media(min-width: 768px){.table-of-contents--news-update{padding-left:32px;padding-right:32px}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__container{border-left:none}[dir="rtl"] .table-of-contents--news-update .table-of-contents__container{border-right:none}.table-of-contents--news-update .table-of-contents__title+.table-of-contents__content{padding-top:16px}.table-of-contents--news-update .table-of-contents__item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:flex;flex-direction:column;padding-top:16px;padding-bottom:16px;padding-left:16px;padding-right:16px;position:relative}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__item{flex-direction:row}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::before,[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::after{left:8px}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::before,.table-of-contents--news-update .table-of-contents__item::after{content:"";display:block;position:absolute}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::after{background-color:#000;height:calc(100% + 32px + 8px);top:-16px;transform:translateX(calc(var(--lang-direction) * -50%));width:2px;z-index:0}.table-of-contents--news-update .table-of-contents__item:first-of-type::after{height:100%;top:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:last-of-type::after{height:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:only-child::after{display:none}.table-of-contents--news-update .table-of-contents__item::before{background-color:#fff;border:3px solid #000;border-radius:50%;height:16px;top:calc(16px + var(--item-title-lineheight)*.5);transform:translate(calc(var(--lang-direction) * -50%), -50%);width:16px;z-index:1}.table-of-contents--news-update time{padding-left:16px}@media(min-width: 768px){.table-of-contents--news-update time{flex:none;width:110px}}[dir="rtl"] .table-of-contents--news-update time{padding-left:0;padding-right:16px}.table-of-contents--news-update .table-of-contents__link{margin-left:16px}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__link{margin-left:32px}}[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-left:0;margin-right:16px}@media(min-width: 768px){[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-right:32px}}.block--main-news{padding-left:16px;padding-right:16px;max-width:1296px;margin-top:32px;margin:auto;width:100%}@media(min-width: 768px){.block--main-news{padding-left:32px;padding-right:32px}}@media(min-width: 768px){.block--main-news{max-width:1328px}}@media(min-width: 992px){.block--main-news{margin-top:64px}}.block--main-news h2{margin-bottom:48px;margin-top:0}.component--news-of-interest{margin-top:32px;background-color:#f2f2f2;margin-left:16px;margin-right:16px;padding:32px 16px 32px}@media(min-width: 992px){.component--news-of-interest{margin-top:64px}}@media(min-width: 768px){.component--news-of-interest{padding:48px 32px 48px}}.component--news-of-interest .card{padding:24px}.component--news-of-interest .empty-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.component--graphics{max-width:100%}@media(min-width: 992px){.graphics{align-items:center;display:flex;justify-content:space-between}}@media(min-width: 992px){.graphics__text-container{min-height:300px}}.graphics__title{margin-top:0}.graphics__illustration-container{margin-top:64px}@media(min-width: 992px){.graphics__illustration-container{margin-top:0}}.graphics__illustration{max-width:100%}.page-title+article>.components--helsinki-near-you-results:first-child{margin-top:16px}.helfi-etusivu-near-you-form .form-item-q{margin-bottom:24px}.helfi-etusivu-near-you-form .form-item-q .form-autocomplete{background-position:98% center}.ui-menu.ui-front .ui-menu-item-wrapper{color:#000;display:inline-block;padding:16px;width:100%}.ui-menu.ui-front .ui-menu-item-wrapper.ui-state-active{background-color:#f0f0ff;border:1px solid #0000bf}.component--current{background-color:var(--hdbt-color-palette--secondary);color:var(--hdbt-color-palette-text--secondary)}.current__content{display:flex;flex-direction:column;margin-left:auto;margin-right:auto;max-width:1264px}@media(min-width: 768px){.current__content{flex-direction:row}}.current__content__list{margin-bottom:0;margin-top:0}.current__content__list-item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-bottom:2px;margin-top:0;padding-top:7px;padding-bottom:7px;vertical-align:top}.current__links-container{padding-bottom:16px;padding-top:16px}@media(min-width: 576px){.current__links-container{padding-bottom:24px;padding-top:24px}}@media(min-width: 768px){.current__links-container{padding-right:16px}}@media(min-width: 992px){.current__links-container{padding-bottom:48px;padding-top:48px}}@media(min-width: 992px){.current__links-container{padding-bottom:64px;padding-top:64px}}.current{display:flex;flex-direction:column}@media(min-width: 768px){.current__illustration-container{margin-left:auto;margin-top:-32px}}@media(min-width: 992px){.current__illustration-container{margin-top:-48px}}@media(min-width: 1248px){.current__illustration-container{margin-top:-64px}}.current__seasonal-illustration{aspect-ratio:1;display:block;width:258px}@media(min-width: 992px){.current__seasonal-illustration{width:378px}}@media(min-width: 1248px){.current__seasonal-illustration{width:486px}}.component--latest-news--cards{background-color:#f2f2f2}.component--latest-news .latest-news__link-wrapper{margin-top:32px}@media(min-width: 768px){.component--latest-news .latest-news__link-wrapper{margin-top:64px}}[dir="ltr"] .component--top-news .news-listing{padding-left:0}[dir="rtl"] .component--top-news .news-listing{padding-right:0}.component--top-news .news-listing__item{position:relative}.component--top-news--news .component__container{background-color:#e8f3fc;padding:24px 24px 32px}@media(min-width: 768px){.component--top-news--news .component__container{padding:32px 32px 48px}}.component--top-news--news .component__title+.component__content{margin-top:0}@media(min-width: 768px){.component--top-news--news .component__title+.component__content{grid-template-columns:repeat(2, 1fr);margin-top:32px}}.component--top-news--news .news-listing--medium-teasers{display:grid;margin-bottom:0;margin-top:24px}@media(min-width: 768px){.component--top-news--news .news-listing--medium-teasers{grid-column-gap:24px;grid-row-gap:32px;grid-template-columns:repeat(2, 1fr);margin-top:48px}}.component--top-news--news .news-listing__medium-teaser{padding:0}[dir=rtl] .component--top-news--news .news-listing__medium-teaser{padding:0}.component--top-news--news .news-listing__medium-teaser::before{display:none}.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.component--top-news--news .news-listing__medium-teaser .news-listing__datetime{margin-top:8px}.component--news-update{border-bottom:1px solid #ccc;padding-bottom:32px}@media(min-width: 768px){.component--news-update{padding-bottom:48px}}.component--news-update time{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);display:inline-block;margin-top:16px}.component--news-update .component__content{margin-top:32px}@media(min-width: 768px){.component--news-update .component__content{margin-top:48px}}*~.component--news-update,.component--news-update~.component--news-update{margin-top:32px}@media(min-width: 768px){*~.component--news-update,.component--news-update~.component--news-update{margin-top:48px}} diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss index c0761053..03f893fa 100644 --- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss +++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss @@ -40,6 +40,11 @@ margin-bottom: $spacing-and-half; } +// Tweak Drupal throbber position, needs specific selector +.helfi-etusivu-near-you-form .form-item-q .form-autocomplete { + background-position: 98% center; +} + // Built in classes with no way to change them .ui-menu.ui-front .ui-menu-item-wrapper { color: $color-black; From de863f9377c90790f18edb543a62b36292968dfa Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Tue, 26 Nov 2024 08:17:48 +0200 Subject: [PATCH 29/59] UHF-10771: Add linkedevent url generation --- .../custom/helfi_etusivu/helfi_etusivu.info.yml | 1 + .../HelsinkiNearYouResultsController.php | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.info.yml b/public/modules/custom/helfi_etusivu/helfi_etusivu.info.yml index 40cb743c..65bd3c07 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.info.yml +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.info.yml @@ -11,5 +11,6 @@ dependencies: - helfi_api_base:helfi_api_base - helfi_annif:helfi_annif - simple_sitemap:simple_sitemap + - helfi_react_search:helfi_react_search 'interface translation project': helfi_etusivu 'interface translation server pattern': modules/custom/helfi_etusivu/translations/%language.po diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php index 29275a9f..c4dfa4ab 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php @@ -8,6 +8,7 @@ use Drupal\Core\Controller\ControllerBase; use Drupal\Core\Url; use Drupal\helfi_etusivu\Servicemap; +use Drupal\helfi_react_search\LinkedEvents; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; @@ -22,9 +23,12 @@ class HelsinkiNearYouResultsController extends ControllerBase { * * @param \Drupal\helfi_etusivu\Servicemap $servicemap * The servicemap service. + * @param \Drupal\helfi_react_search\LinkedEvents $linkedEvents + * The linked events service. */ public function __construct( protected readonly Servicemap $servicemap, + protected readonly LinkedEvents $linkedEvents, ) { } @@ -58,6 +62,16 @@ public function content(Request $request) : array|RedirectResponse { } return [ + '#attached' => [ + 'drupalSettings' => [ + 'helsinki_near_you' => [ + 'events_api_url' => $this->linkedEvents->getEventsRequest([ + 'dwithin_origin' => $addressData['coordinates'], + 'dwithin_distance' => 1000, + ]), + ], + ], + ], '#back_link_label' => $this->t('Edit address', [], ['context' => 'Helsinki near you']), '#back_link_url' => $return_url, '#coordinates' => $addressData ? $addressData['coordinates'] : NULL, From 4c69ca59f6af86b3aef082997772cb2f878a6fc3 Mon Sep 17 00:00:00 2001 From: tuutti <771113+tuutti@users.noreply.github.com> Date: Tue, 26 Nov 2024 07:00:10 +0000 Subject: [PATCH 30/59] Update configuration --- compose.yaml | 5 +- composer.lock | 154 +++++++++--------- ...form_display.node.landing_page.default.yml | 2 +- ...image_gallery_item.field_gallery_image.yml | 2 +- conf/cmi/search_api.index.news.yml | 15 +- conf/cmi/search_api.index.news_terms.yml | 3 +- docker/openshift/crons/menu-queue.sh | 17 ++ docker/openshift/crons/revision-queue.sh | 11 ++ public/sites/default/settings.php | 34 ++-- 9 files changed, 136 insertions(+), 107 deletions(-) create mode 100644 docker/openshift/crons/menu-queue.sh create mode 100644 docker/openshift/crons/revision-queue.sh diff --git a/compose.yaml b/compose.yaml index c680d449..8e5cc53e 100644 --- a/compose.yaml +++ b/compose.yaml @@ -151,13 +151,12 @@ services: - search artemis: container_name: "${COMPOSE_PROJECT_NAME}-artemis" - image: quay.io/artemiscloud/activemq-artemis-broker - environment: - AMQ_EXTRA_ARGS: "--user admin --password admin" + image: apache/activemq-artemis depends_on: - app networks: - internal + - stonehenge-network profiles: - queue chromium: diff --git a/composer.lock b/composer.lock index b86e0309..21e94056 100644 --- a/composer.lock +++ b/composer.lock @@ -2360,16 +2360,16 @@ }, { "name": "drupal/core", - "version": "10.3.9", + "version": "10.3.10", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "42a6516491b4793158542a2326dc6ad1fe2aa5bd" + "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/42a6516491b4793158542a2326dc6ad1fe2aa5bd", - "reference": "42a6516491b4793158542a2326dc6ad1fe2aa5bd", + "url": "https://api.github.com/repos/drupal/core/zipball/3ebb71e9c4ef0c13f683353547551fca49f9a144", + "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144", "shasum": "" }, "require": { @@ -2518,13 +2518,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.3.9" + "source": "https://github.com/drupal/core/tree/10.3.10" }, - "time": "2024-11-20T17:59:45+00:00" + "time": "2024-11-22T12:51:33+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.3.9", + "version": "10.3.10", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -2568,7 +2568,7 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.9" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.10" }, "time": "2024-08-22T14:31:34+00:00" }, @@ -4255,16 +4255,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.9", + "version": "6.8.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "01dac91a676828e19a6ace8b6e53a9e2a4c26b7a" + "reference": "2427bb6c2988c157285e685308e16f0c66e8d5e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/01dac91a676828e19a6ace8b6e53a9e2a4c26b7a", - "reference": "01dac91a676828e19a6ace8b6e53a9e2a4c26b7a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/2427bb6c2988c157285e685308e16f0c66e8d5e1", + "reference": "2427bb6c2988c157285e685308e16f0c66e8d5e1", "shasum": "" }, "require": { @@ -4283,10 +4283,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.9", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.10", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-11-20T13:11:33+00:00" + "time": "2024-11-22T12:52:59+00:00" }, { "name": "drupal/hdbt_admin", @@ -4384,16 +4384,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.7.15", + "version": "2.7.17", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "bfada1ee33120497e8dde6dbde201320f41e2dfc" + "reference": "d5d46f30b9ec1ccac5b5bac130097454232e35a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/bfada1ee33120497e8dde6dbde201320f41e2dfc", - "reference": "bfada1ee33120497e8dde6dbde201320f41e2dfc", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/d5d46f30b9ec1ccac5b5bac130097454232e35a8", + "reference": "d5d46f30b9ec1ccac5b5bac130097454232e35a8", "shasum": "" }, "require": { @@ -4415,7 +4415,9 @@ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "dg/bypass-finals": "^1.0", "donatj/mock-webserver": "dev-master", - "drupal/coder": "^8.3" + "drupal/coder": "^8.3", + "drupal/elasticsearch_connector": "^8.0@alpha", + "drupal/search_api": "^1.0" }, "type": "drupal-module", "license": [ @@ -4423,10 +4425,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.15", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.17", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-11-08T08:31:53+00:00" + "time": "2024-11-22T08:27:20+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4480,17 +4482,20 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "53ad81c4249c6dd38deea3f6014ad0b1be47f2db" + "reference": "3de6f884ac7de9a43fe242f371dcf9416cac47b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/53ad81c4249c6dd38deea3f6014ad0b1be47f2db", - "reference": "53ad81c4249c6dd38deea3f6014ad0b1be47f2db", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/3de6f884ac7de9a43fe242f371dcf9416cac47b2", + "reference": "3de6f884ac7de9a43fe242f371dcf9416cac47b2", "shasum": "" }, "require": { "drupal/helfi_api_base": "*", - "drush/drush": "^11 || ^12 || ^13" + "drush/drush": "^12 || ^13" + }, + "conflict": { + "drush/drush": "< 12.5" }, "require-dev": { "composer/installers": "^2", @@ -4557,7 +4562,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-10-23T10:28:01+00:00" + "time": "2024-11-26T06:52:09+00:00" }, { "name": "drupal/helfi_navigation", @@ -4595,16 +4600,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.8.0", + "version": "4.8.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "d93cdc55e761665a2bb68503f466ab376a745c10" + "reference": "6c57a1041a22c37008822ea642ce63c763081369" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d93cdc55e761665a2bb68503f466ab376a745c10", - "reference": "d93cdc55e761665a2bb68503f466ab376a745c10", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/6c57a1041a22c37008822ea642ce63c763081369", + "reference": "6c57a1041a22c37008822ea642ce63c763081369", "shasum": "" }, "require": { @@ -4673,7 +4678,7 @@ "ruflin/elastica": "^8.0" }, "conflict": { - "drupal/core": "<10.3", + "drupal/core": "<10.3.10", "drupal/core-composer-scaffold": "<10.3", "drupal/ctools": "<3.11 || ^4.0.1", "drupal/default_content": ">2.0.0-alpha2", @@ -4701,8 +4706,7 @@ "[#UHF-9388] Process configuration translation files for custom modules (https://www.drupal.org/i/2845437)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fd68277191b8f8ec290e53b5fbbae699b2260384/patches/drupal-2845437-process-custom-module-translation-config-10.3.x.patch", "[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch", "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch", - "[#UHF-10716] Ensure consistent ordering when calculating library asset order (https://www.drupal.org/i/3467860)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/955e2fc9493c6574ab070187b8a5a8634da7daab/patches/drupal-3467860-optimized-js-assets-mismatch.patch", - "[#UHF-10967] Performance Degraded after update to twig 3.14.2 (https://www.drupal.org/project/drupal/issues/3487031)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/90b44ce5a778d05bbe89f7eaca6412b7bd34efa0/patches/10177.patch" + "[#UHF-10716] Ensure consistent ordering when calculating library asset order (https://www.drupal.org/i/3467860)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/955e2fc9493c6574ab070187b8a5a8634da7daab/patches/drupal-3467860-optimized-js-assets-mismatch.patch" }, "drupal/default_content": { "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" @@ -4731,10 +4735,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.0", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.1", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-11-20T11:35:52+00:00" + "time": "2024-11-25T13:05:33+00:00" }, { "name": "drupal/helfi_proxy", @@ -7348,20 +7352,20 @@ }, { "name": "drupal/search_api", - "version": "1.35.0", + "version": "1.36.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.35" + "reference": "8.x-1.36" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.35.zip", - "reference": "8.x-1.35", - "shasum": "d119726e870f793c6470d2a4fa9286662c5eb45d" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.36.zip", + "reference": "8.x-1.36", + "shasum": "1464f21cb924746a0df7f4cb080abaf00804e9a7" }, "require": { - "drupal/core": "^10.1 || ^11" + "drupal/core": "^10.2 || ^11" }, "conflict": { "drupal/search_api_solr": "2.* || 3.0 || 3.1" @@ -7379,17 +7383,12 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.35", - "datestamp": "1718551025", + "version": "8.x-1.36", + "datestamp": "1732448767", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" } - }, - "drush": { - "services": { - "drush.services.yml": "^9 || ^10 || ^11" - } } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -7474,36 +7473,37 @@ }, { "name": "drupal/simple_sitemap", - "version": "4.2.1", + "version": "4.2.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/simple_sitemap.git", - "reference": "4.2.1" + "reference": "4.2.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.2.1.zip", - "reference": "4.2.1", - "shasum": "d96b481571ca2fecdb305e87d2557f9338116864" + "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.2.2.zip", + "reference": "4.2.2", + "shasum": "1f9c9197d37450fb347a4fa3f10191f5f4b5ef13" }, "require": { "drupal/core": "^10.2 || ^11", "ext-xmlwriter": "*" }, + "conflict": { + "drush/drush": "<12.5.1" + }, + "require-dev": { + "drupal/paragraphs": "^1.18" + }, "type": "drupal-module", "extra": { "drupal": { - "version": "4.2.1", - "datestamp": "1723802052", + "version": "4.2.2", + "datestamp": "1732485885", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" } - }, - "drush": { - "services": { - "drush.services.yml": ">=9" - } } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -9245,16 +9245,16 @@ }, { "name": "firebase/php-jwt", - "version": "v6.10.1", + "version": "v6.10.2", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "500501c2ce893c824c801da135d02661199f60c5" + "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/500501c2ce893c824c801da135d02661199f60c5", - "reference": "500501c2ce893c824c801da135d02661199f60c5", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/30c19ed0f3264cb660ea496895cfb6ef7ee3653b", + "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b", "shasum": "" }, "require": { @@ -9302,9 +9302,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.10.1" + "source": "https://github.com/firebase/php-jwt/tree/v6.10.2" }, - "time": "2024-05-18T18:05:11+00:00" + "time": "2024-11-24T11:22:49+00:00" }, { "name": "galbar/jsonpath", @@ -9359,16 +9359,16 @@ }, { "name": "grasmash/expander", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/grasmash/expander.git", - "reference": "bb1c1a2430957945cf08c5a62f5d72a6aa6a2c82" + "reference": "eea11b9afb0c32483b18b9009f4ca07b770e39f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/grasmash/expander/zipball/bb1c1a2430957945cf08c5a62f5d72a6aa6a2c82", - "reference": "bb1c1a2430957945cf08c5a62f5d72a6aa6a2c82", + "url": "https://api.github.com/repos/grasmash/expander/zipball/eea11b9afb0c32483b18b9009f4ca07b770e39f4", + "reference": "eea11b9afb0c32483b18b9009f4ca07b770e39f4", "shasum": "" }, "require": { @@ -9405,9 +9405,9 @@ "description": "Expands internal property references in PHP arrays file.", "support": { "issues": "https://github.com/grasmash/expander/issues", - "source": "https://github.com/grasmash/expander/tree/3.0.0" + "source": "https://github.com/grasmash/expander/tree/3.0.1" }, - "time": "2022-05-10T13:14:49+00:00" + "time": "2024-11-25T23:28:05+00:00" }, { "name": "grasmash/yaml-cli", @@ -11219,16 +11219,16 @@ }, { "name": "pear/pear-core-minimal", - "version": "v1.10.15", + "version": "v1.10.16", "source": { "type": "git", "url": "https://github.com/pear/pear-core-minimal.git", - "reference": "ce0adade8b97561656ace07cdaac4751c271ea8c" + "reference": "c0f51b45f50683bf5bbf558036854ebc9b54d033" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/ce0adade8b97561656ace07cdaac4751c271ea8c", - "reference": "ce0adade8b97561656ace07cdaac4751c271ea8c", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/c0f51b45f50683bf5bbf558036854ebc9b54d033", + "reference": "c0f51b45f50683bf5bbf558036854ebc9b54d033", "shasum": "" }, "require": { @@ -11264,7 +11264,7 @@ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR", "source": "https://github.com/pear/pear-core-minimal" }, - "time": "2024-03-16T18:41:45+00:00" + "time": "2024-11-24T22:27:58+00:00" }, { "name": "pear/pear_exception", diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml index 02737965..cff76fd1 100644 --- a/conf/cmi/core.entity_form_display.node.landing_page.default.yml +++ b/conf/cmi/core.entity_form_display.node.landing_page.default.yml @@ -128,9 +128,9 @@ content: third_party_settings: { } simple_sitemap: weight: 10 + region: content settings: { } third_party_settings: { } - region: content status: type: boolean_checkbox weight: 12 diff --git a/conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image.yml b/conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image.yml index b7c0a450..cef092dc 100644 --- a/conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image.yml +++ b/conf/cmi/language/sv/field.field.paragraph.image_gallery_item.field_gallery_image.yml @@ -1 +1 @@ -label: Bild +label: 'Bild (stöds på andra språk)' diff --git a/conf/cmi/search_api.index.news.yml b/conf/cmi/search_api.index.news.yml index c2242d3a..9d78a1f2 100644 --- a/conf/cmi/search_api.index.news.yml +++ b/conf/cmi/search_api.index.news.yml @@ -3,23 +3,22 @@ langcode: en status: true dependencies: config: - - field.storage.node.field_main_image_caption - field.storage.media.field_media_image - - field.storage.node.field_main_image - field.storage.media.field_photographer + - field.storage.node.field_main_image + - field.storage.node.field_main_image_caption - field.storage.node.field_news_groups - - field.storage.node.field_news_neighbourhoods - field.storage.node.field_news_item_tags + - field.storage.node.field_news_neighbourhoods - field.storage.node.field_short_title - search_api.server.news module: - - node - - media - - taxonomy - - publication_date - - search_api - helfi_etusivu - helfi_react_search + - media + - node + - publication_date + - taxonomy id: news name: news description: '' diff --git a/conf/cmi/search_api.index.news_terms.yml b/conf/cmi/search_api.index.news_terms.yml index 7ef5a643..c3c57d9b 100644 --- a/conf/cmi/search_api.index.news_terms.yml +++ b/conf/cmi/search_api.index.news_terms.yml @@ -5,10 +5,9 @@ dependencies: config: - search_api.server.news module: - - taxonomy - - search_api - helfi_etusivu - helfi_react_search + - taxonomy id: news_terms name: news-terms description: '' diff --git a/docker/openshift/crons/menu-queue.sh b/docker/openshift/crons/menu-queue.sh new file mode 100644 index 00000000..c4cd99b0 --- /dev/null +++ b/docker/openshift/crons/menu-queue.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +source /init.sh + +if [ -z "$AMQ_BROKERS" ]; then + exit 0 +fi + +if ! is_drupal_module_enabled "helfi_navigation"; then + exit 0 +fi + +while true +do + # Restart process every 12 hours. + drush stomp:worker helfi_navigation_menu_queue --lease-time 43200 +done diff --git a/docker/openshift/crons/revision-queue.sh b/docker/openshift/crons/revision-queue.sh new file mode 100644 index 00000000..130ba3fe --- /dev/null +++ b/docker/openshift/crons/revision-queue.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ -z "$AMQ_BROKERS" ]; then + exit 0 +fi + +while true +do + # Restart process every 12 hours. + drush stomp:worker helfi_api_base_revision --lease-time 43200 +done diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 2f8d1e8e..b80276cd 100644 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -260,24 +260,18 @@ function drupal_get_env(string|array $variables) : mixed { $config['helfi_proxy.settings']['session_suffix'] = $session_suffix; } -if ($robots_header_enabled = getenv('DRUPAL_X_ROBOTS_TAG_HEADER')) { - $config['helfi_proxy.settings']['robots_header_enabled'] = (bool) $robots_header_enabled; -} - -$artemis_destination = drupal_get_env([ - 'ARTEMIS_DESTINATION', +$amq_destination = drupal_get_env([ 'PROJECT_NAME', ]); +$amq_brokers = getenv('AMQ_BROKERS'); -$artemis_brokers = getenv('ARTEMIS_BROKERS'); - -if ($artemis_brokers && $artemis_destination) { +if ($amq_brokers && $amq_destination) { $settings['stomp']['default'] = [ - 'clientId' => getenv('ARTEMIS_CLIENT_ID') ?: 'artemis', - 'login' => getenv('ARTEMIS_LOGIN') ?: NULL, - 'passcode' => getenv('ARTEMIS_PASSCODE') ?: NULL, - 'destination' => sprintf('/queue/%s', $artemis_destination), - 'brokers' => $artemis_brokers, + 'clientId' => getenv('AMQ_CLIENT_ID') ?: 'client_ ' . $amq_destination, + 'login' => getenv('AMQ_USER') ?: NULL, + 'passcode' => getenv('AMQ_PASSWORD') ?: NULL, + 'destination' => sprintf('/queue/%s', $amq_destination), + 'brokers' => $amq_brokers, 'timeout' => ['read' => 12000], 'heartbeat' => [ 'send' => 20000, @@ -289,7 +283,17 @@ function drupal_get_env(string|array $variables) : mixed { ], ], ]; - $settings['queue_default'] = 'queue.stomp.default'; + + $queues = [ + 'helfi_navigation_menu_queue', + 'helfi_api_base_revision', + ]; + foreach ($queues as $queue) { + $settings['queue_service_' . $queue] = 'queue.stomp.default'; + } + // You must configure project specific queues manually in 'all.settings.php' + // file. + // @see https://github.com/City-of-Helsinki/drupal-helfi-platform/blob/main/documentation/queue.md } $config['filelog.settings']['rotation']['schedule'] = 'never'; From 803dc6a5db71b825b721f9811602de920c74d4ba Mon Sep 17 00:00:00 2001 From: tuutti Date: Tue, 26 Nov 2024 09:35:30 +0200 Subject: [PATCH 31/59] UHF-9452: Updated required env variables --- public/sites/default/all.settings.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php index 93248dbf..58d5625c 100644 --- a/public/sites/default/all.settings.php +++ b/public/sites/default/all.settings.php @@ -67,6 +67,9 @@ 'ELASTIC_USER', 'ELASTIC_PASSWORD', 'SENTRY_DSN_REACT', + 'AMQ_BROKERS', + 'AMQ_USER', + 'AMQ_PASSWORD', ]; foreach ($additionalEnvVars as $var) { $preflight_checks['environmentVariables'][] = $var; From 659c91d09c270a050ed8827edd2bf94ac7c4df98 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:28:40 +0000 Subject: [PATCH 32/59] Update configuration --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 21e94056..cd5ed3d9 100644 --- a/composer.lock +++ b/composer.lock @@ -4600,16 +4600,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.8.1", + "version": "4.8.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "6c57a1041a22c37008822ea642ce63c763081369" + "reference": "a09268b0bcb9d9ba572d2dc95dc291c944982e97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/6c57a1041a22c37008822ea642ce63c763081369", - "reference": "6c57a1041a22c37008822ea642ce63c763081369", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a09268b0bcb9d9ba572d2dc95dc291c944982e97", + "reference": "a09268b0bcb9d9ba572d2dc95dc291c944982e97", "shasum": "" }, "require": { @@ -4735,10 +4735,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.1", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.2", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-11-25T13:05:33+00:00" + "time": "2024-11-26T11:15:11+00:00" }, { "name": "drupal/helfi_proxy", From 59db03f98f596dbe6843a79787793db8e01f0590 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 26 Nov 2024 12:39:10 +0000 Subject: [PATCH 33/59] Update configuration --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index cd5ed3d9..9dd71563 100644 --- a/composer.lock +++ b/composer.lock @@ -4600,16 +4600,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.8.2", + "version": "4.8.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "a09268b0bcb9d9ba572d2dc95dc291c944982e97" + "reference": "e6cde28156dbb1bb890b41e8a5c84d61f9102242" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a09268b0bcb9d9ba572d2dc95dc291c944982e97", - "reference": "a09268b0bcb9d9ba572d2dc95dc291c944982e97", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/e6cde28156dbb1bb890b41e8a5c84d61f9102242", + "reference": "e6cde28156dbb1bb890b41e8a5c84d61f9102242", "shasum": "" }, "require": { @@ -4735,10 +4735,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.2", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.3", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-11-26T11:15:11+00:00" + "time": "2024-11-26T12:32:51+00:00" }, { "name": "drupal/helfi_proxy", From 1ce969696ec786abd49415d6add4dc60be75710e Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Tue, 26 Nov 2024 15:44:19 +0200 Subject: [PATCH 34/59] UHF-10771: Fix phpunit tests --- .../tests/src/Kernel/SearchApi/Processor/UuidLangcodeTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/modules/custom/helfi_etusivu/tests/src/Kernel/SearchApi/Processor/UuidLangcodeTest.php b/public/modules/custom/helfi_etusivu/tests/src/Kernel/SearchApi/Processor/UuidLangcodeTest.php index 47ec22bf..cf3ac49a 100644 --- a/public/modules/custom/helfi_etusivu/tests/src/Kernel/SearchApi/Processor/UuidLangcodeTest.php +++ b/public/modules/custom/helfi_etusivu/tests/src/Kernel/SearchApi/Processor/UuidLangcodeTest.php @@ -24,6 +24,8 @@ class UuidLangcodeTest extends ProcessorTestBase { */ protected static $modules = [ 'helfi_etusivu', + 'helfi_api_base', + 'helfi_react_search', ]; /** From b6061cf6f52c7a738f4c80ffdb663c4748d26179 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Wed, 27 Nov 2024 14:29:07 +0200 Subject: [PATCH 35/59] UHF-10771: Require authenticated role for routes while feature is not finished --- .../modules/custom/helfi_etusivu/helfi_etusivu.routing.yml | 6 +++--- .../modules/custom/helfi_etusivu/helfi_etusivu.services.yml | 1 - .../src/Controller/HelsinkiNearYouResultsController.php | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml b/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml index f45600e2..aea5c225 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.routing.yml @@ -4,7 +4,7 @@ helfi_etusivu.helsinki_near_you: _controller: '\Drupal\helfi_etusivu\Controller\HelsinkiNearYouController::content' _title: 'Helsinki near you' requirements: - _permission: 'access content' + _role: 'authenticated' helfi_etusivu.helsinki_near_you_results: path: '/helsinki-near-you/results' @@ -12,11 +12,11 @@ helfi_etusivu.helsinki_near_you_results: _controller: '\Drupal\helfi_etusivu\Controller\HelsinkiNearYouResultsController::content' _title: 'Services, events and news near your address' requirements: - _permission: 'access content' + _role: 'authenticated' helfi_etusivu.helsinki_near_you_autocomplete: path: '/helsinki-near-you/results/autocomplete' defaults: _controller: '\Drupal\helfi_etusivu\Controller\HelsinkiNearYouResultsController::addressSuggestions' requirements: - _permission: 'access content' + _role: 'authenticated' diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml b/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml index 0c81b815..7a9040ac 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.services.yml @@ -10,4 +10,3 @@ services: tags: - { name: helfi_platform_config.og_image_builder } Drupal\helfi_etusivu\Servicemap: ~ - Drupal\helfi_etusivu\Controller\HelsinkiNearYouResultsController: ~ diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php index c4dfa4ab..cd816026 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php @@ -46,7 +46,7 @@ public function content(Request $request) : array|RedirectResponse { $return_url = Url::fromRoute('helfi_etusivu.helsinki_near_you'); if (!$address) { - $this->messenger->addMessage($this->t('Please enter an address', [], ['context' => 'Helsinki near you']), 'error'); + $this->messenger()->addMessage($this->t('Please enter an address', [], ['context' => 'Helsinki near you']), 'error'); return $this->redirect('helfi_etusivu.helsinki_near_you'); } @@ -57,7 +57,7 @@ public function content(Request $request) : array|RedirectResponse { ); if (!$addressData) { - $this->messenger->addMessage($this->t('Address not found', [], ['context' => 'Helsinki near you']), 'error'); + $this->messenger()->addMessage($this->t('Address not found', [], ['context' => 'Helsinki near you']), 'error'); return $this->redirect('helfi_etusivu.helsinki_near_you'); } From ed2ed9447f108df7df84de2e76bc6c003688e181 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Wed, 27 Nov 2024 16:54:22 +0200 Subject: [PATCH 36/59] UHF-10771: Add language param to servicemap request --- .../Controller/HelsinkiNearYouResultsController.php | 10 ++++++++-- public/modules/custom/helfi_etusivu/src/Servicemap.php | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php index cd816026..27c34f4b 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php @@ -46,7 +46,7 @@ public function content(Request $request) : array|RedirectResponse { $return_url = Url::fromRoute('helfi_etusivu.helsinki_near_you'); if (!$address) { - $this->messenger()->addMessage($this->t('Please enter an address', [], ['context' => 'Helsinki near you']), 'error'); + $this->messenger()->addError($this->t('Please enter an address', [], ['context' => 'Helsinki near you'])); return $this->redirect('helfi_etusivu.helsinki_near_you'); } @@ -57,7 +57,13 @@ public function content(Request $request) : array|RedirectResponse { ); if (!$addressData) { - $this->messenger()->addMessage($this->t('Address not found', [], ['context' => 'Helsinki near you']), 'error'); + $this->messenger()->addError( + $this->t( + 'The address you input yielded no results. You may want to try a different address.', + [], + ['context' => 'Helsinki near you'] + ) + ); return $this->redirect('helfi_etusivu.helsinki_near_you'); } diff --git a/public/modules/custom/helfi_etusivu/src/Servicemap.php b/public/modules/custom/helfi_etusivu/src/Servicemap.php index 6e151f39..7ffa7a1d 100644 --- a/public/modules/custom/helfi_etusivu/src/Servicemap.php +++ b/public/modules/custom/helfi_etusivu/src/Servicemap.php @@ -63,6 +63,7 @@ public function query(string $address, int $page_size = 1) : array { 'page_size' => $page_size, 'q' => $address, 'type' => 'address', + 'language' => $this->languageManager->getCurrentLanguage()->getId(), ], ]); } From 638e0af4d3889f2c65eb3a45aba93c10cf67dd1f Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Wed, 27 Nov 2024 16:54:38 +0200 Subject: [PATCH 37/59] UHF-10771: Add missing translation --- public/modules/custom/helfi_etusivu/translations/fi.po | 4 ++++ public/modules/custom/helfi_etusivu/translations/sv.po | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/public/modules/custom/helfi_etusivu/translations/fi.po b/public/modules/custom/helfi_etusivu/translations/fi.po index f14365a5..dba18200 100644 --- a/public/modules/custom/helfi_etusivu/translations/fi.po +++ b/public/modules/custom/helfi_etusivu/translations/fi.po @@ -80,3 +80,7 @@ msgstr "Palvelut, tapahtumat ja uutiset osoitteesi lähellä" msgctxt "Helsinki near you" msgid "Eg. Vaasankatu 5" msgstr "Esimerkiksi Vaasankatu 5" + +msgctxt "Helsinki near you" +msgid "The address you input yielded no results. You may want to try a different address." +msgstr "Antamallasi osoitteella ei löytynyt tuloksia. Voit kokeilla muuttaa hakuehtojasi." diff --git a/public/modules/custom/helfi_etusivu/translations/sv.po b/public/modules/custom/helfi_etusivu/translations/sv.po index 480151b0..bce89e38 100644 --- a/public/modules/custom/helfi_etusivu/translations/sv.po +++ b/public/modules/custom/helfi_etusivu/translations/sv.po @@ -69,3 +69,7 @@ msgstr "Tjänster, evenemang och nyheter nära din adress" msgctxt "Helsinki near you" msgid "Eg. Vaasankatu 5" msgstr "Till exempel Vasagatan 5" + +msgctxt "Helsinki near you" +msgid "The address you input yielded no results. You may want to try a different address." +msgstr "Adressen du angav gav inga resultat. Du kanske vill prova en annan adress." From e72ad22f50886c2fb21e2fa0b380d926cf64a555 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Thu, 28 Nov 2024 09:08:15 +0000 Subject: [PATCH 38/59] Update configuration --- composer.lock | 216 +++++++++++++++++++++++++------------------------- 1 file changed, 108 insertions(+), 108 deletions(-) diff --git a/composer.lock b/composer.lock index 9dd71563..c1d1fa0c 100644 --- a/composer.lock +++ b/composer.lock @@ -2453,29 +2453,29 @@ "extra": { "drupal-scaffold": { "file-mapping": { - "[project-root]/.editorconfig": "assets/scaffold/files/editorconfig", - "[project-root]/.gitattributes": "assets/scaffold/files/gitattributes", - "[web-root]/.csslintrc": "assets/scaffold/files/csslintrc", - "[web-root]/.eslintignore": "assets/scaffold/files/eslintignore", - "[web-root]/.eslintrc.json": "assets/scaffold/files/eslintrc.json", - "[web-root]/.ht.router.php": "assets/scaffold/files/ht.router.php", "[web-root]/.htaccess": "assets/scaffold/files/htaccess", - "[web-root]/example.gitignore": "assets/scaffold/files/example.gitignore", - "[web-root]/index.php": "assets/scaffold/files/index.php", - "[web-root]/INSTALL.txt": "assets/scaffold/files/drupal.INSTALL.txt", "[web-root]/README.md": "assets/scaffold/files/drupal.README.md", + "[web-root]/index.php": "assets/scaffold/files/index.php", + "[web-root]/.csslintrc": "assets/scaffold/files/csslintrc", "[web-root]/robots.txt": "assets/scaffold/files/robots.txt", "[web-root]/update.php": "assets/scaffold/files/update.php", "[web-root]/web.config": "assets/scaffold/files/web.config", + "[web-root]/INSTALL.txt": "assets/scaffold/files/drupal.INSTALL.txt", + "[web-root]/.eslintignore": "assets/scaffold/files/eslintignore", + "[web-root]/.eslintrc.json": "assets/scaffold/files/eslintrc.json", + "[web-root]/.ht.router.php": "assets/scaffold/files/ht.router.php", "[web-root]/sites/README.txt": "assets/scaffold/files/sites.README.txt", + "[project-root]/.editorconfig": "assets/scaffold/files/editorconfig", + "[web-root]/example.gitignore": "assets/scaffold/files/example.gitignore", + "[web-root]/themes/README.txt": "assets/scaffold/files/themes.README.txt", + "[project-root]/.gitattributes": "assets/scaffold/files/gitattributes", + "[web-root]/modules/README.txt": "assets/scaffold/files/modules.README.txt", + "[web-root]/profiles/README.txt": "assets/scaffold/files/profiles.README.txt", + "[web-root]/sites/example.sites.php": "assets/scaffold/files/example.sites.php", "[web-root]/sites/development.services.yml": "assets/scaffold/files/development.services.yml", "[web-root]/sites/example.settings.local.php": "assets/scaffold/files/example.settings.local.php", - "[web-root]/sites/example.sites.php": "assets/scaffold/files/example.sites.php", "[web-root]/sites/default/default.services.yml": "assets/scaffold/files/default.services.yml", - "[web-root]/sites/default/default.settings.php": "assets/scaffold/files/default.settings.php", - "[web-root]/modules/README.txt": "assets/scaffold/files/modules.README.txt", - "[web-root]/profiles/README.txt": "assets/scaffold/files/profiles.README.txt", - "[web-root]/themes/README.txt": "assets/scaffold/files/themes.README.txt" + "[web-root]/sites/default/default.settings.php": "assets/scaffold/files/default.settings.php" } } }, @@ -2988,17 +2988,17 @@ }, { "name": "drupal/easy_breadcrumb", - "version": "2.0.8", + "version": "2.0.9", "source": { "type": "git", "url": "https://git.drupalcode.org/project/easy_breadcrumb.git", - "reference": "2.0.8" + "reference": "2.0.9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/easy_breadcrumb-2.0.8.zip", - "reference": "2.0.8", - "shasum": "49bfd9b8b0ec664963d05e360449876745cf2868" + "url": "https://ftp.drupal.org/files/projects/easy_breadcrumb-2.0.9.zip", + "reference": "2.0.9", + "shasum": "9e7c33e2ec0637d37d509776795a476f2f2d9bb8" }, "require": { "drupal/core": "^9.2 || ^10 || ^11" @@ -3006,8 +3006,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.8", - "datestamp": "1723545040", + "version": "2.0.9", + "datestamp": "1732752214", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3522,17 +3522,17 @@ }, { "name": "drupal/entity_usage", - "version": "2.0.0-beta14", + "version": "2.0.0-beta15", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_usage.git", - "reference": "8.x-2.0-beta14" + "reference": "8.x-2.0-beta15" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta14.zip", - "reference": "8.x-2.0-beta14", - "shasum": "68124ea440273a8f4e40bc7d07421c8a230c287b" + "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta15.zip", + "reference": "8.x-2.0-beta15", + "shasum": "80ad5d27e2a499fae60d303d8cc7daededc6d8a6" }, "require": { "drupal/core": "^10.2 || ^11" @@ -3545,15 +3545,15 @@ "drupal/entity_browser_block": "~1.0", "drupal/entity_embed": "~1.0", "drupal/entity_reference_revisions": "~1.0", - "drupal/inline_entity_form": "^1.0@RC", + "drupal/inline_entity_form": "^1.0@RC || ^3.0@RC", "drupal/paragraphs": "~1.0", "drupal/webform": "^6.0.0-alpha4" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta14", - "datestamp": "1724498300", + "version": "8.x-2.0-beta15", + "datestamp": "1732783084", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -4255,16 +4255,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.10", + "version": "6.8.12", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "2427bb6c2988c157285e685308e16f0c66e8d5e1" + "reference": "eb3b0e24a7846928ce01c2faa8da5d00cc73a6ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/2427bb6c2988c157285e685308e16f0c66e8d5e1", - "reference": "2427bb6c2988c157285e685308e16f0c66e8d5e1", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/eb3b0e24a7846928ce01c2faa8da5d00cc73a6ca", + "reference": "eb3b0e24a7846928ce01c2faa8da5d00cc73a6ca", "shasum": "" }, "require": { @@ -4283,10 +4283,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.10", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.12", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-11-22T12:52:59+00:00" + "time": "2024-11-28T09:01:49+00:00" }, { "name": "drupal/hdbt_admin", @@ -4600,16 +4600,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.8.3", + "version": "4.8.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "e6cde28156dbb1bb890b41e8a5c84d61f9102242" + "reference": "e8e2bc806764286a7ab8e37fb574a6513a3a4e70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/e6cde28156dbb1bb890b41e8a5c84d61f9102242", - "reference": "e6cde28156dbb1bb890b41e8a5c84d61f9102242", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/e8e2bc806764286a7ab8e37fb574a6513a3a4e70", + "reference": "e8e2bc806764286a7ab8e37fb574a6513a3a4e70", "shasum": "" }, "require": { @@ -4735,10 +4735,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.3", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.5", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-11-26T12:32:51+00:00" + "time": "2024-11-28T08:49:44+00:00" }, { "name": "drupal/helfi_proxy", @@ -7352,17 +7352,17 @@ }, { "name": "drupal/search_api", - "version": "1.36.0", + "version": "1.37.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.36" + "reference": "8.x-1.37" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.36.zip", - "reference": "8.x-1.36", - "shasum": "1464f21cb924746a0df7f4cb080abaf00804e9a7" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.37.zip", + "reference": "8.x-1.37", + "shasum": "76d9b5850d7fce9df8fc6cf8c49450ab541f455d" }, "require": { "drupal/core": "^10.2 || ^11" @@ -7383,8 +7383,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.36", - "datestamp": "1732448767", + "version": "8.x-1.37", + "datestamp": "1732727356", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -12647,16 +12647,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v6.4.15", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "70ab1f65a4516ef741e519ea938e6aa465e6aa36" + "reference": "7a379d8871f6a36f01559c14e11141cc02eb8dc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/70ab1f65a4516ef741e519ea938e6aa465e6aa36", - "reference": "70ab1f65a4516ef741e519ea938e6aa465e6aa36", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/7a379d8871f6a36f01559c14e11141cc02eb8dc8", + "reference": "7a379d8871f6a36f01559c14e11141cc02eb8dc8", "shasum": "" }, "require": { @@ -12708,7 +12708,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.15" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.16" }, "funding": [ { @@ -12724,20 +12724,20 @@ "type": "tidelift" } ], - "time": "2024-11-09T06:56:25+00:00" + "time": "2024-11-25T14:52:46+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", "shasum": "" }, "require": { @@ -12775,7 +12775,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1" }, "funding": [ { @@ -12791,7 +12791,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/error-handler", @@ -12950,16 +12950,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50" + "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50", - "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f", + "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f", "shasum": "" }, "require": { @@ -13006,7 +13006,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1" }, "funding": [ { @@ -13022,7 +13022,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/filesystem", @@ -13156,16 +13156,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.15", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6" + "reference": "431771b7a6f662f1575b3cfc8fd7617aa9864d57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6", - "reference": "9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/431771b7a6f662f1575b3cfc8fd7617aa9864d57", + "reference": "431771b7a6f662f1575b3cfc8fd7617aa9864d57", "shasum": "" }, "require": { @@ -13213,7 +13213,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.15" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.16" }, "funding": [ { @@ -13229,20 +13229,20 @@ "type": "tidelift" } ], - "time": "2024-11-08T16:09:24+00:00" + "time": "2024-11-13T18:58:10+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.15", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "b002a5b3947653c5aee3adac2a024ea615fd3ff5" + "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b002a5b3947653c5aee3adac2a024ea615fd3ff5", - "reference": "b002a5b3947653c5aee3adac2a024ea615fd3ff5", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8838b5b21d807923b893ccbfc2cbeda0f1bc00f0", + "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0", "shasum": "" }, "require": { @@ -13327,7 +13327,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.15" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.16" }, "funding": [ { @@ -13343,7 +13343,7 @@ "type": "tidelift" } ], - "time": "2024-11-13T13:57:37+00:00" + "time": "2024-11-27T12:49:36+00:00" }, { "name": "symfony/mailer", @@ -13512,16 +13512,16 @@ }, { "name": "symfony/options-resolver", - "version": "v7.1.6", + "version": "v7.1.9", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85" + "reference": "0f4099f5306a92487d13b2a4589068c36a93c447" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/85e95eeede2d41cd146146e98c9c81d9214cae85", - "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0f4099f5306a92487d13b2a4589068c36a93c447", + "reference": "0f4099f5306a92487d13b2a4589068c36a93c447", "shasum": "" }, "require": { @@ -13559,7 +13559,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v7.1.6" + "source": "https://github.com/symfony/options-resolver/tree/v7.1.9" }, "funding": [ { @@ -13575,7 +13575,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-11-20T11:08:58+00:00" }, { "name": "symfony/polyfill-ctype", @@ -14580,16 +14580,16 @@ }, { "name": "symfony/routing", - "version": "v6.4.13", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278" + "reference": "91e02e606b4b705c2f4fb42f7e7708b7923a3220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/640a74250d13f9c30d5ca045b6aaaabcc8215278", - "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278", + "url": "https://api.github.com/repos/symfony/routing/zipball/91e02e606b4b705c2f4fb42f7e7708b7923a3220", + "reference": "91e02e606b4b705c2f4fb42f7e7708b7923a3220", "shasum": "" }, "require": { @@ -14643,7 +14643,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.13" + "source": "https://github.com/symfony/routing/tree/v6.4.16" }, "funding": [ { @@ -14659,7 +14659,7 @@ "type": "tidelift" } ], - "time": "2024-10-01T08:30:56+00:00" + "time": "2024-11-13T15:31:34+00:00" }, { "name": "symfony/serializer", @@ -14761,16 +14761,16 @@ }, { "name": "symfony/service-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" + "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", - "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0", + "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0", "shasum": "" }, "require": { @@ -14824,7 +14824,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.5.1" }, "funding": [ { @@ -14840,7 +14840,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/string", @@ -14930,16 +14930,16 @@ }, { "name": "symfony/translation-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a" + "reference": "4667ff3bd513750603a09c8dedbea942487fb07c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", - "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c", + "reference": "4667ff3bd513750603a09c8dedbea942487fb07c", "shasum": "" }, "require": { @@ -14988,7 +14988,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1" }, "funding": [ { @@ -15004,20 +15004,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/validator", - "version": "v6.4.15", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "7541055cdaf54ff95f0735bf703d313374e8b20b" + "reference": "9b0d1988b56511706bc91d96ead39acd77aaf34d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/7541055cdaf54ff95f0735bf703d313374e8b20b", - "reference": "7541055cdaf54ff95f0735bf703d313374e8b20b", + "url": "https://api.github.com/repos/symfony/validator/zipball/9b0d1988b56511706bc91d96ead39acd77aaf34d", + "reference": "9b0d1988b56511706bc91d96ead39acd77aaf34d", "shasum": "" }, "require": { @@ -15085,7 +15085,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.4.15" + "source": "https://github.com/symfony/validator/tree/v6.4.16" }, "funding": [ { @@ -15101,7 +15101,7 @@ "type": "tidelift" } ], - "time": "2024-11-08T15:28:48+00:00" + "time": "2024-11-27T09:48:51+00:00" }, { "name": "symfony/var-dumper", From b0b957f567b65e271c4730552f74e4e67df954c5 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:49:02 +0000 Subject: [PATCH 39/59] Update configuration --- composer.lock | 107 +++++++++--------- ...tem.paragraphs_library_item.paragraphs.yml | 2 +- ...ty_form_display.node.news_item.default.yml | 8 -- conf/cmi/social_media.settings.yml | 2 +- 4 files changed, 56 insertions(+), 63 deletions(-) diff --git a/composer.lock b/composer.lock index c1d1fa0c..2e82d33f 100644 --- a/composer.lock +++ b/composer.lock @@ -3716,7 +3716,7 @@ "homepage": "https://www.drupal.org/user/423148" }, { - "name": "Hanno", + "name": "hanno", "homepage": "https://www.drupal.org/user/18826" }, { @@ -4384,16 +4384,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.7.17", + "version": "2.7.19", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "d5d46f30b9ec1ccac5b5bac130097454232e35a8" + "reference": "096a75dd49d1ae4db5959980337de4b77d10cce5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/d5d46f30b9ec1ccac5b5bac130097454232e35a8", - "reference": "d5d46f30b9ec1ccac5b5bac130097454232e35a8", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/096a75dd49d1ae4db5959980337de4b77d10cce5", + "reference": "096a75dd49d1ae4db5959980337de4b77d10cce5", "shasum": "" }, "require": { @@ -4425,10 +4425,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.17", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.19", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-11-22T08:27:20+00:00" + "time": "2024-11-29T09:44:21+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4600,16 +4600,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.8.5", + "version": "4.8.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "e8e2bc806764286a7ab8e37fb574a6513a3a4e70" + "reference": "6d08f98fbb9980d73ddb8efa5f2d14ceb17f7f44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/e8e2bc806764286a7ab8e37fb574a6513a3a4e70", - "reference": "e8e2bc806764286a7ab8e37fb574a6513a3a4e70", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/6d08f98fbb9980d73ddb8efa5f2d14ceb17f7f44", + "reference": "6d08f98fbb9980d73ddb8efa5f2d14ceb17f7f44", "shasum": "" }, "require": { @@ -4735,10 +4735,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.5", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.6", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-11-28T08:49:44+00:00" + "time": "2024-11-29T10:12:26+00:00" }, { "name": "drupal/helfi_proxy", @@ -4787,16 +4787,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.3.9", + "version": "2.3.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "6cca3df5dc891c98ae40e8259856a343d9abd8ca" + "reference": "d98687373b1cb4647ad576403e470f049c7a4d3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/6cca3df5dc891c98ae40e8259856a343d9abd8ca", - "reference": "6cca3df5dc891c98ae40e8259856a343d9abd8ca", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/d98687373b1cb4647ad576403e470f049c7a4d3c", + "reference": "d98687373b1cb4647ad576403e470f049c7a4d3c", "shasum": "" }, "require": { @@ -4822,10 +4822,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.9", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.10", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2024-11-07T13:09:51+00:00" + "time": "2024-11-29T09:43:38+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -12139,16 +12139,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.4", + "version": "v0.12.5", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "2fd717afa05341b4f8152547f142cd2f130f6818" + "reference": "36a03ff27986682c22985e56aabaf840dd173cb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818", - "reference": "2fd717afa05341b4f8152547f142cd2f130f6818", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/36a03ff27986682c22985e56aabaf840dd173cb5", + "reference": "36a03ff27986682c22985e56aabaf840dd173cb5", "shasum": "" }, "require": { @@ -12175,12 +12175,12 @@ ], "type": "library", "extra": { - "branch-alias": { - "dev-main": "0.12.x-dev" - }, "bamarni-bin": { "bin-links": false, "forward-command": false + }, + "branch-alias": { + "dev-main": "0.12.x-dev" } }, "autoload": { @@ -12212,9 +12212,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.4" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.5" }, - "time": "2024-06-10T01:18:23+00:00" + "time": "2024-11-29T06:14:30+00:00" }, { "name": "ralouphie/getallheaders", @@ -12262,23 +12262,23 @@ }, { "name": "ruflin/elastica", - "version": "8.0.0", + "version": "8.1.0", "source": { "type": "git", "url": "https://github.com/ruflin/Elastica.git", - "reference": "2fc446e37847e84cd9f9be8e75fd2b322007ea43" + "reference": "5e5f9b220e34fdcc1a55b9153323e2548f9a51f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ruflin/Elastica/zipball/2fc446e37847e84cd9f9be8e75fd2b322007ea43", - "reference": "2fc446e37847e84cd9f9be8e75fd2b322007ea43", + "url": "https://api.github.com/repos/ruflin/Elastica/zipball/5e5f9b220e34fdcc1a55b9153323e2548f9a51f1", + "reference": "5e5f9b220e34fdcc1a55b9153323e2548f9a51f1", "shasum": "" }, "require": { "elastic/transport": "^8.8", "elasticsearch/elasticsearch": "^8.4.1", "ext-json": "*", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", "psr/log": "^1.0 || ^2.0 || ^3.0" }, "conflict": { @@ -12319,9 +12319,9 @@ ], "support": { "issues": "https://github.com/ruflin/Elastica/issues", - "source": "https://github.com/ruflin/Elastica/tree/8.0.0" + "source": "https://github.com/ruflin/Elastica/tree/8.1.0" }, - "time": "2024-05-29T11:45:23+00:00" + "time": "2024-11-29T07:37:01+00:00" }, { "name": "sebastian/diff", @@ -13512,16 +13512,16 @@ }, { "name": "symfony/options-resolver", - "version": "v7.1.9", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "0f4099f5306a92487d13b2a4589068c36a93c447" + "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0f4099f5306a92487d13b2a4589068c36a93c447", - "reference": "0f4099f5306a92487d13b2a4589068c36a93c447", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/7da8fbac9dcfef75ffc212235d76b2754ce0cf50", + "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50", "shasum": "" }, "require": { @@ -13559,7 +13559,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v7.1.9" + "source": "https://github.com/symfony/options-resolver/tree/v7.2.0" }, "funding": [ { @@ -13575,7 +13575,7 @@ "type": "tidelift" } ], - "time": "2024-11-20T11:08:58+00:00" + "time": "2024-11-20T11:17:29+00:00" }, { "name": "symfony/polyfill-ctype", @@ -15190,16 +15190,16 @@ }, { "name": "symfony/var-exporter", - "version": "v7.1.6", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "90173ef89c40e7c8c616653241048705f84130ef" + "reference": "1a6a89f95a46af0f142874c9d650a6358d13070d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/90173ef89c40e7c8c616653241048705f84130ef", - "reference": "90173ef89c40e7c8c616653241048705f84130ef", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/1a6a89f95a46af0f142874c9d650a6358d13070d", + "reference": "1a6a89f95a46af0f142874c9d650a6358d13070d", "shasum": "" }, "require": { @@ -15246,7 +15246,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v7.1.6" + "source": "https://github.com/symfony/var-exporter/tree/v7.2.0" }, "funding": [ { @@ -15262,7 +15262,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-10-18T07:58:17+00:00" }, { "name": "symfony/yaml", @@ -15437,16 +15437,16 @@ }, { "name": "twig/twig", - "version": "v3.15.0", + "version": "v3.16.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "2d5b3964cc21d0188633d7ddce732dc8e874db02" + "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/2d5b3964cc21d0188633d7ddce732dc8e874db02", - "reference": "2d5b3964cc21d0188633d7ddce732dc8e874db02", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/475ad2dc97d65d8631393e721e7e44fb544f0561", + "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561", "shasum": "" }, "require": { @@ -15457,6 +15457,7 @@ "symfony/polyfill-php81": "^1.29" }, "require-dev": { + "phpstan/phpstan": "^2.0", "psr/container": "^1.0|^2.0", "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" }, @@ -15500,7 +15501,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.15.0" + "source": "https://github.com/twigphp/Twig/tree/v3.16.0" }, "funding": [ { @@ -15512,7 +15513,7 @@ "type": "tidelift" } ], - "time": "2024-11-17T15:59:19+00:00" + "time": "2024-11-29T08:27:05+00:00" }, { "name": "twistor/flysystem-stream-wrapper", diff --git a/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml b/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml index 9239b312..0d0f0e35 100644 --- a/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml +++ b/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml @@ -43,12 +43,12 @@ settings: contact_card_listing: contact_card_listing content_cards: content_cards image: image + image_gallery: image_gallery liftup_with_image: liftup_with_image list_of_links: list_of_links map: map sidebar_text: sidebar_text text: text - image_gallery: image_gallery negate: 0 target_bundles_drag_drop: accordion: diff --git a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml index 2a0d8abe..ddec2770 100644 --- a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml @@ -6,14 +6,6 @@ third_party_settings: label: Linkit group_main_image: label: Pääkuva - group_updating_news: - label: 'Päivittyvä uutinen' - format_settings: - description: 'Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.
Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan.' - group_automatically_recommended: - label: 'Automaattisesti suositellut sisällöt' - format_settings: - description: 'Suositellut sisällöt voivat olla uutisia tai artikkeleita. Suositukset perustuvat automaattisesti valittuihin uutisluokkiin. Uutisluokat valitaan sivun sisällön perusteella, kun sivu tallennetaan.' content: field_content: settings: diff --git a/conf/cmi/social_media.settings.yml b/conf/cmi/social_media.settings.yml index 085af9f2..486ebb3b 100644 --- a/conf/cmi/social_media.settings.yml +++ b/conf/cmi/social_media.settings.yml @@ -5,7 +5,7 @@ social_media: facebook_share: enable: 1 text: 'Share in Facebook' - api_url: 'http://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]' + api_url: 'https://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]' api_event: href default_img: 0 weight: 1 From 4531a11eb2e493244a1424969f81c7c43e63b233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 2 Dec 2024 09:29:12 +0200 Subject: [PATCH 40/59] Reverted translations. --- .../core.entity_form_display.node.news_item.default.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml index ddec2770..2a0d8abe 100644 --- a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml @@ -6,6 +6,14 @@ third_party_settings: label: Linkit group_main_image: label: Pääkuva + group_updating_news: + label: 'Päivittyvä uutinen' + format_settings: + description: 'Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.
Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan.' + group_automatically_recommended: + label: 'Automaattisesti suositellut sisällöt' + format_settings: + description: 'Suositellut sisällöt voivat olla uutisia tai artikkeleita. Suositukset perustuvat automaattisesti valittuihin uutisluokkiin. Uutisluokat valitaan sivun sisällön perusteella, kun sivu tallennetaan.' content: field_content: settings: From a6cea8570b705be0d049248bb7b4108a0f61991f Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Mon, 2 Dec 2024 12:15:58 +0200 Subject: [PATCH 41/59] UHF-10549: Rename config --- conf/cmi/search_api.index.news.yml | 4 ++-- conf/cmi/search_api.index.news_terms.yml | 4 ++-- ..._api.server.news.yml => search_api.server.default.yml} | 2 +- public/sites/default/all.settings.php | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) rename conf/cmi/{search_api.server.news.yml => search_api.server.default.yml} (96%) diff --git a/conf/cmi/search_api.index.news.yml b/conf/cmi/search_api.index.news.yml index 9d78a1f2..e1b59b34 100644 --- a/conf/cmi/search_api.index.news.yml +++ b/conf/cmi/search_api.index.news.yml @@ -11,7 +11,7 @@ dependencies: - field.storage.node.field_news_item_tags - field.storage.node.field_news_neighbourhoods - field.storage.node.field_short_title - - search_api.server.news + - search_api.server.default module: - helfi_etusivu - helfi_react_search @@ -280,4 +280,4 @@ options: cron_limit: 50 index_directly: true track_changes_in_references: true -server: news +server: default diff --git a/conf/cmi/search_api.index.news_terms.yml b/conf/cmi/search_api.index.news_terms.yml index c3c57d9b..7998b444 100644 --- a/conf/cmi/search_api.index.news_terms.yml +++ b/conf/cmi/search_api.index.news_terms.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: config: - - search_api.server.news + - search_api.server.default module: - helfi_etusivu - helfi_react_search @@ -113,4 +113,4 @@ options: cron_limit: 50 index_directly: true track_changes_in_references: true -server: news +server: default diff --git a/conf/cmi/search_api.server.news.yml b/conf/cmi/search_api.server.default.yml similarity index 96% rename from conf/cmi/search_api.server.news.yml rename to conf/cmi/search_api.server.default.yml index cc406d76..6ca0d589 100644 --- a/conf/cmi/search_api.server.news.yml +++ b/conf/cmi/search_api.server.default.yml @@ -4,7 +4,7 @@ status: true dependencies: module: - elasticsearch_connector -id: news +id: default name: news description: '' backend: elasticsearch diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php index 58d5625c..ee9129cd 100644 --- a/public/sites/default/all.settings.php +++ b/public/sites/default/all.settings.php @@ -7,12 +7,12 @@ // Elasticsearch settings. if (getenv('ELASTICSEARCH_URL')) { - $config['search_api.server.news']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL'); + $config['search_api.server.default']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL'); if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) { - $config['search_api.server.news']['backend_config']['connector'] = 'basicauth'; - $config['search_api.server.news']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER'); - $config['search_api.server.news']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD'); + $config['search_api.server.default']['backend_config']['connector'] = 'basicauth'; + $config['search_api.server.default']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER'); + $config['search_api.server.default']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD'); } } From a84dd2f2c0b2e9c8dccf79cf893e058cf5dcfd82 Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Mon, 2 Dec 2024 12:17:00 +0200 Subject: [PATCH 42/59] UHF-10549: Accept self-signed certificates for elasticsearch --- public/sites/default/all.settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php index ee9129cd..a3639c91 100644 --- a/public/sites/default/all.settings.php +++ b/public/sites/default/all.settings.php @@ -10,7 +10,7 @@ $config['search_api.server.default']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL'); if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) { - $config['search_api.server.default']['backend_config']['connector'] = 'basicauth'; + $config['search_api.server.default']['backend_config']['connector'] = 'helfi_connector'; $config['search_api.server.default']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER'); $config['search_api.server.default']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD'); } From eb3c649c13178ba114b06c46103927550998e54f Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Mon, 2 Dec 2024 12:24:30 +0200 Subject: [PATCH 43/59] UHF-10549: Move elasticsearch settings to settings.php --- public/sites/default/all.settings.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php index a3639c91..ec3ff0f8 100644 --- a/public/sites/default/all.settings.php +++ b/public/sites/default/all.settings.php @@ -5,17 +5,6 @@ * Contains site specific overrides. */ -// Elasticsearch settings. -if (getenv('ELASTICSEARCH_URL')) { - $config['search_api.server.default']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL'); - - if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) { - $config['search_api.server.default']['backend_config']['connector'] = 'helfi_connector'; - $config['search_api.server.default']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER'); - $config['search_api.server.default']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD'); - } -} - // Elastic proxy URL. $config['elastic_proxy.settings']['elastic_proxy_url'] = getenv('ELASTIC_PROXY_URL'); From 7d51d22c074fbcc27b59139852ff7445953e0131 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Tue, 3 Dec 2024 07:50:53 +0200 Subject: [PATCH 44/59] UHF-10771: AC fixes --- .../custom/helfi_etusivu/helfi_etusivu.module | 2 +- .../HelsinkiNearYouResultsController.php | 4 ++++ .../helfi_etusivu/src/Form/NearYouForm.php | 17 ++++++++++++++++- .../custom/helfi_etusivu/translations/fi.po | 4 ++++ .../custom/helfi_etusivu/translations/sv.po | 4 ++++ .../hdbt_subtheme/dist/css/styles.min.css | 2 +- .../custom/hdbt_subtheme/package-lock.json | 12 ++++++------ .../06_components/pages/_helsinki-near-you.scss | 17 ++++++++++++++--- 8 files changed, 50 insertions(+), 12 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index 4a7114e1..6eac7339 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -246,7 +246,7 @@ function helfi_etusivu_preprocess_html(&$variables): void { // Set the theme color to engel on Helsinki near you landing page. if ($route === 'helfi_etusivu.helsinki_near_you') { - $variables['theme_color'] = 'engel'; + $variables['theme_color'] = 'suomenlinna'; } } diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php index 27c34f4b..692c10b8 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php @@ -5,6 +5,7 @@ namespace Drupal\helfi_etusivu\Controller; use Drupal\Component\Utility\Xss; +use Drupal\Core\Cache\Cache; use Drupal\Core\Controller\ControllerBase; use Drupal\Core\Url; use Drupal\helfi_etusivu\Servicemap; @@ -80,6 +81,9 @@ public function content(Request $request) : array|RedirectResponse { ], '#back_link_label' => $this->t('Edit address', [], ['context' => 'Helsinki near you']), '#back_link_url' => $return_url, + '#cache' => [ + 'contexts' => ['url.query_args:q'], + ], '#coordinates' => $addressData ? $addressData['coordinates'] : NULL, '#theme' => 'helsinki_near_you_results_page', '#title' => $this->t( diff --git a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php index a560766c..dac70016 100644 --- a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php +++ b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php @@ -25,6 +25,14 @@ public function getFormId() { public function buildForm(array $form, FormStateInterface $form_state) { $form['#attributes']['class'][] = 'helfi-etusivu-near-you-form'; + $form['description'] = [ + '#markup' => + '
' . + $this->t('Find services, events, and news near you. Start by searching with your address.') . + '
', + '#type' => 'markup', + ]; + $form['q'] = [ '#autocomplete_route_name' => 'helfi_etusivu.helsinki_near_you_autocomplete', '#placeholder' => $this->t('Eg. Vaasankatu 5', [], ['context' => 'Helsinki near you']), @@ -35,8 +43,15 @@ public function buildForm(array $form, FormStateInterface $form_state) { $form['actions']['#type'] = 'actions'; $form['actions']['submit'] = [ + '#attributes' => [ + 'class' => [ + 'hds-button', + 'hds-button--primary', + 'helfi-search__submit-button', + ], + ], '#type' => 'submit', - '#value' => $this->t('Search'), + '#value' => $this->t('Search', [], ['context' => 'Helsinki near you']), ]; return $form; diff --git a/public/modules/custom/helfi_etusivu/translations/fi.po b/public/modules/custom/helfi_etusivu/translations/fi.po index dba18200..99291971 100644 --- a/public/modules/custom/helfi_etusivu/translations/fi.po +++ b/public/modules/custom/helfi_etusivu/translations/fi.po @@ -84,3 +84,7 @@ msgstr "Esimerkiksi Vaasankatu 5" msgctxt "Helsinki near you" msgid "The address you input yielded no results. You may want to try a different address." msgstr "Antamallasi osoitteella ei löytynyt tuloksia. Voit kokeilla muuttaa hakuehtojasi." + +msgctxt "Helsinki near you" +msgid "Search" +msgstr "Hae" diff --git a/public/modules/custom/helfi_etusivu/translations/sv.po b/public/modules/custom/helfi_etusivu/translations/sv.po index bce89e38..40f82ddc 100644 --- a/public/modules/custom/helfi_etusivu/translations/sv.po +++ b/public/modules/custom/helfi_etusivu/translations/sv.po @@ -73,3 +73,7 @@ msgstr "Till exempel Vasagatan 5" msgctxt "Helsinki near you" msgid "The address you input yielded no results. You may want to try a different address." msgstr "Adressen du angav gav inga resultat. Du kanske vill prova en annan adress." + +msgctxt "Helsinki near you" +msgid "Search" +msgstr "Söka" diff --git a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css index d0844749..6d9346ee 100644 --- a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css +++ b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css @@ -1 +1 @@ -.table-of-contents--news-update{padding-left:16px;padding-right:16px;--item-title-lineheight: 1.875rem}@media(min-width: 768px){.table-of-contents--news-update{padding-left:32px;padding-right:32px}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__container{border-left:none}[dir="rtl"] .table-of-contents--news-update .table-of-contents__container{border-right:none}.table-of-contents--news-update .table-of-contents__title+.table-of-contents__content{padding-top:16px}.table-of-contents--news-update .table-of-contents__item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:flex;flex-direction:column;padding-top:16px;padding-bottom:16px;padding-left:16px;padding-right:16px;position:relative}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__item{flex-direction:row}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::before,[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::after{left:8px}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::before,.table-of-contents--news-update .table-of-contents__item::after{content:"";display:block;position:absolute}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::after{background-color:#000;height:calc(100% + 32px + 8px);top:-16px;transform:translateX(calc(var(--lang-direction) * -50%));width:2px;z-index:0}.table-of-contents--news-update .table-of-contents__item:first-of-type::after{height:100%;top:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:last-of-type::after{height:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:only-child::after{display:none}.table-of-contents--news-update .table-of-contents__item::before{background-color:#fff;border:3px solid #000;border-radius:50%;height:16px;top:calc(16px + var(--item-title-lineheight)*.5);transform:translate(calc(var(--lang-direction) * -50%), -50%);width:16px;z-index:1}.table-of-contents--news-update time{padding-left:16px}@media(min-width: 768px){.table-of-contents--news-update time{flex:none;width:110px}}[dir="rtl"] .table-of-contents--news-update time{padding-left:0;padding-right:16px}.table-of-contents--news-update .table-of-contents__link{margin-left:16px}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__link{margin-left:32px}}[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-left:0;margin-right:16px}@media(min-width: 768px){[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-right:32px}}.block--main-news{padding-left:16px;padding-right:16px;max-width:1296px;margin-top:32px;margin:auto;width:100%}@media(min-width: 768px){.block--main-news{padding-left:32px;padding-right:32px}}@media(min-width: 768px){.block--main-news{max-width:1328px}}@media(min-width: 992px){.block--main-news{margin-top:64px}}.block--main-news h2{margin-bottom:48px;margin-top:0}.component--news-of-interest{margin-top:32px;background-color:#f2f2f2;margin-left:16px;margin-right:16px;padding:32px 16px 32px}@media(min-width: 992px){.component--news-of-interest{margin-top:64px}}@media(min-width: 768px){.component--news-of-interest{padding:48px 32px 48px}}.component--news-of-interest .card{padding:24px}.component--news-of-interest .empty-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.component--graphics{max-width:100%}@media(min-width: 992px){.graphics{align-items:center;display:flex;justify-content:space-between}}@media(min-width: 992px){.graphics__text-container{min-height:300px}}.graphics__title{margin-top:0}.graphics__illustration-container{margin-top:64px}@media(min-width: 992px){.graphics__illustration-container{margin-top:0}}.graphics__illustration{max-width:100%}.page-title+article>.components--helsinki-near-you-results:first-child{margin-top:16px}.helfi-etusivu-near-you-form .form-item-q{margin-bottom:24px}.helfi-etusivu-near-you-form .form-item-q .form-autocomplete{background-position:98% center}.ui-menu.ui-front .ui-menu-item-wrapper{color:#000;display:inline-block;padding:16px;width:100%}.ui-menu.ui-front .ui-menu-item-wrapper.ui-state-active{background-color:#f0f0ff;border:1px solid #0000bf}.component--current{background-color:var(--hdbt-color-palette--secondary);color:var(--hdbt-color-palette-text--secondary)}.current__content{display:flex;flex-direction:column;margin-left:auto;margin-right:auto;max-width:1264px}@media(min-width: 768px){.current__content{flex-direction:row}}.current__content__list{margin-bottom:0;margin-top:0}.current__content__list-item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-bottom:2px;margin-top:0;padding-top:7px;padding-bottom:7px;vertical-align:top}.current__links-container{padding-bottom:16px;padding-top:16px}@media(min-width: 576px){.current__links-container{padding-bottom:24px;padding-top:24px}}@media(min-width: 768px){.current__links-container{padding-right:16px}}@media(min-width: 992px){.current__links-container{padding-bottom:48px;padding-top:48px}}@media(min-width: 992px){.current__links-container{padding-bottom:64px;padding-top:64px}}.current{display:flex;flex-direction:column}@media(min-width: 768px){.current__illustration-container{margin-left:auto;margin-top:-32px}}@media(min-width: 992px){.current__illustration-container{margin-top:-48px}}@media(min-width: 1248px){.current__illustration-container{margin-top:-64px}}.current__seasonal-illustration{aspect-ratio:1;display:block;width:258px}@media(min-width: 992px){.current__seasonal-illustration{width:378px}}@media(min-width: 1248px){.current__seasonal-illustration{width:486px}}.component--latest-news--cards{background-color:#f2f2f2}.component--latest-news .latest-news__link-wrapper{margin-top:32px}@media(min-width: 768px){.component--latest-news .latest-news__link-wrapper{margin-top:64px}}[dir="ltr"] .component--top-news .news-listing{padding-left:0}[dir="rtl"] .component--top-news .news-listing{padding-right:0}.component--top-news .news-listing__item{position:relative}.component--top-news--news .component__container{background-color:#e8f3fc;padding:24px 24px 32px}@media(min-width: 768px){.component--top-news--news .component__container{padding:32px 32px 48px}}.component--top-news--news .component__title+.component__content{margin-top:0}@media(min-width: 768px){.component--top-news--news .component__title+.component__content{grid-template-columns:repeat(2, 1fr);margin-top:32px}}.component--top-news--news .news-listing--medium-teasers{display:grid;margin-bottom:0;margin-top:24px}@media(min-width: 768px){.component--top-news--news .news-listing--medium-teasers{grid-column-gap:24px;grid-row-gap:32px;grid-template-columns:repeat(2, 1fr);margin-top:48px}}.component--top-news--news .news-listing__medium-teaser{padding:0}[dir=rtl] .component--top-news--news .news-listing__medium-teaser{padding:0}.component--top-news--news .news-listing__medium-teaser::before{display:none}.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.component--top-news--news .news-listing__medium-teaser .news-listing__datetime{margin-top:8px}.component--news-update{border-bottom:1px solid #ccc;padding-bottom:32px}@media(min-width: 768px){.component--news-update{padding-bottom:48px}}.component--news-update time{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);display:inline-block;margin-top:16px}.component--news-update .component__content{margin-top:32px}@media(min-width: 768px){.component--news-update .component__content{margin-top:48px}}*~.component--news-update,.component--news-update~.component--news-update{margin-top:32px}@media(min-width: 768px){*~.component--news-update,.component--news-update~.component--news-update{margin-top:48px}} +.table-of-contents--news-update{padding-left:16px;padding-right:16px;--item-title-lineheight: 1.875rem}@media(min-width: 768px){.table-of-contents--news-update{padding-left:32px;padding-right:32px}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__container{border-left:none}[dir="rtl"] .table-of-contents--news-update .table-of-contents__container{border-right:none}.table-of-contents--news-update .table-of-contents__title+.table-of-contents__content{padding-top:16px}.table-of-contents--news-update .table-of-contents__item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:flex;flex-direction:column;padding-top:16px;padding-bottom:16px;padding-left:16px;padding-right:16px;position:relative}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__item{flex-direction:row}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::before,[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::after{left:8px}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::before,.table-of-contents--news-update .table-of-contents__item::after{content:"";display:block;position:absolute}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::after{background-color:#000;height:calc(100% + 32px + 8px);top:-16px;transform:translateX(calc(var(--lang-direction) * -50%));width:2px;z-index:0}.table-of-contents--news-update .table-of-contents__item:first-of-type::after{height:100%;top:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:last-of-type::after{height:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:only-child::after{display:none}.table-of-contents--news-update .table-of-contents__item::before{background-color:#fff;border:3px solid #000;border-radius:50%;height:16px;top:calc(16px + var(--item-title-lineheight)*.5);transform:translate(calc(var(--lang-direction) * -50%), -50%);width:16px;z-index:1}.table-of-contents--news-update time{padding-left:16px}@media(min-width: 768px){.table-of-contents--news-update time{flex:none;width:110px}}[dir="rtl"] .table-of-contents--news-update time{padding-left:0;padding-right:16px}.table-of-contents--news-update .table-of-contents__link{margin-left:16px}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__link{margin-left:32px}}[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-left:0;margin-right:16px}@media(min-width: 768px){[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-right:32px}}.block--main-news{padding-left:16px;padding-right:16px;max-width:1296px;margin-top:32px;margin:auto;width:100%}@media(min-width: 768px){.block--main-news{padding-left:32px;padding-right:32px}}@media(min-width: 768px){.block--main-news{max-width:1328px}}@media(min-width: 992px){.block--main-news{margin-top:64px}}.block--main-news h2{margin-bottom:48px;margin-top:0}.component--news-of-interest{margin-top:32px;background-color:#f2f2f2;margin-left:16px;margin-right:16px;padding:32px 16px 32px}@media(min-width: 992px){.component--news-of-interest{margin-top:64px}}@media(min-width: 768px){.component--news-of-interest{padding:48px 32px 48px}}.component--news-of-interest .card{padding:24px}.component--news-of-interest .empty-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.component--graphics{max-width:100%}@media(min-width: 992px){.graphics{align-items:center;display:flex;justify-content:space-between}}.graphics__text-container{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}@media(min-width: 992px){.graphics__text-container{min-height:300px}}.graphics__title{margin-top:0}.graphics__illustration-container{margin-top:64px}@media(min-width: 992px){.graphics__illustration-container{margin-top:0}}.graphics__illustration{max-width:100%}.page-title+article>.components--helsinki-near-you-results:first-child{margin-top:16px}.helfi-etusivu-near-you-form__description{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);margin-bottom:32px;margin-top:16px}@media(min-width: 992px){.helfi-etusivu-near-you-form .helfi-search__submit-button{margin-top:8px}}.helfi-etusivu-near-you-form .form-item-q .form-autocomplete,.helfi-etusivu-near-you-form .form-item-q .form-autocomplete.ui-autocomplete-loading{background-position:98% center}.ui-menu.ui-front .ui-menu-item-wrapper{color:#000;display:inline-block;padding:16px;width:100%}.ui-menu.ui-front .ui-menu-item-wrapper.ui-state-active{background-color:#f0f0ff;border:1px solid #0000bf}.component--current{background-color:var(--hdbt-color-palette--secondary);color:var(--hdbt-color-palette-text--secondary)}.current__content{display:flex;flex-direction:column;margin-left:auto;margin-right:auto;max-width:1264px}@media(min-width: 768px){.current__content{flex-direction:row}}.current__content__list{margin-bottom:0;margin-top:0}.current__content__list-item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-bottom:2px;margin-top:0;padding-top:7px;padding-bottom:7px;vertical-align:top}.current__links-container{padding-bottom:16px;padding-top:16px}@media(min-width: 576px){.current__links-container{padding-bottom:24px;padding-top:24px}}@media(min-width: 768px){.current__links-container{padding-right:16px}}@media(min-width: 992px){.current__links-container{padding-bottom:48px;padding-top:48px}}@media(min-width: 992px){.current__links-container{padding-bottom:64px;padding-top:64px}}.current{display:flex;flex-direction:column}@media(min-width: 768px){.current__illustration-container{margin-left:auto;margin-top:-32px}}@media(min-width: 992px){.current__illustration-container{margin-top:-48px}}@media(min-width: 1248px){.current__illustration-container{margin-top:-64px}}.current__seasonal-illustration{aspect-ratio:1;display:block;width:258px}@media(min-width: 992px){.current__seasonal-illustration{width:378px}}@media(min-width: 1248px){.current__seasonal-illustration{width:486px}}.component--latest-news--cards{background-color:#f2f2f2}.component--latest-news .latest-news__link-wrapper{margin-top:32px}@media(min-width: 768px){.component--latest-news .latest-news__link-wrapper{margin-top:64px}}[dir="ltr"] .component--top-news .news-listing{padding-left:0}[dir="rtl"] .component--top-news .news-listing{padding-right:0}.component--top-news .news-listing__item{position:relative}.component--top-news--news .component__container{background-color:#e8f3fc;padding:24px 24px 32px}@media(min-width: 768px){.component--top-news--news .component__container{padding:32px 32px 48px}}.component--top-news--news .component__title+.component__content{margin-top:0}@media(min-width: 768px){.component--top-news--news .component__title+.component__content{grid-template-columns:repeat(2, 1fr);margin-top:32px}}.component--top-news--news .news-listing--medium-teasers{display:grid;margin-bottom:0;margin-top:24px}@media(min-width: 768px){.component--top-news--news .news-listing--medium-teasers{grid-column-gap:24px;grid-row-gap:32px;grid-template-columns:repeat(2, 1fr);margin-top:48px}}.component--top-news--news .news-listing__medium-teaser{padding:0}[dir=rtl] .component--top-news--news .news-listing__medium-teaser{padding:0}.component--top-news--news .news-listing__medium-teaser::before{display:none}.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.component--top-news--news .news-listing__medium-teaser .news-listing__datetime{margin-top:8px}.component--news-update{border-bottom:1px solid #ccc;padding-bottom:32px}@media(min-width: 768px){.component--news-update{padding-bottom:48px}}.component--news-update time{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);display:inline-block;margin-top:16px}.component--news-update .component__content{margin-top:32px}@media(min-width: 768px){.component--news-update .component__content{margin-top:48px}}*~.component--news-update,.component--news-update~.component--news-update{margin-top:32px}@media(min-width: 768px){*~.component--news-update,.component--news-update~.component--news-update{margin-top:48px}} diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index 1e5100c0..6b725b2e 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -3325,9 +3325,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001684", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz", - "integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==", + "version": "1.0.30001685", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001685.tgz", + "integrity": "sha512-e/kJN1EMyHQzgcMEEgoo+YTCO1NGCmIYHk5Qk8jT6AazWemS5QFKJ5ShCJlH3GZrNIdZofcNCEwZqbMjjKzmnA==", "funding": [ { "type": "opencollective", @@ -13159,9 +13159,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001684", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz", - "integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==" + "version": "1.0.30001685", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001685.tgz", + "integrity": "sha512-e/kJN1EMyHQzgcMEEgoo+YTCO1NGCmIYHk5Qk8jT6AazWemS5QFKJ5ShCJlH3GZrNIdZofcNCEwZqbMjjKzmnA==" }, "chalk": { "version": "2.4.2", diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss index 03f893fa..bbe830ce 100644 --- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss +++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss @@ -11,6 +11,8 @@ } .graphics__text-container { + @include font(body); + @include breakpoint($breakpoint-l) { min-height: 300px; // This height is from design to align the text nicely with the illustration. } @@ -36,12 +38,21 @@ margin-top: $spacing; } -.helfi-etusivu-near-you-form .form-item-q { - margin-bottom: $spacing-and-half; +.helfi-etusivu-near-you-form__description { + @include font(body); + margin-bottom: $spacing-double; + margin-top: $spacing; +} + +.helfi-etusivu-near-you-form .helfi-search__submit-button { + @include breakpoint($breakpoint-l) { + margin-top: $spacing-half; + } } // Tweak Drupal throbber position, needs specific selector -.helfi-etusivu-near-you-form .form-item-q .form-autocomplete { +.helfi-etusivu-near-you-form .form-item-q .form-autocomplete, +.helfi-etusivu-near-you-form .form-item-q .form-autocomplete.ui-autocomplete-loading { background-position: 98% center; } From 9e95086d8cac248e7428aff28843a38d2ad16a26 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Tue, 3 Dec 2024 07:55:54 +0200 Subject: [PATCH 45/59] UHF-10771: Fix phpcs --- .../src/Controller/HelsinkiNearYouResultsController.php | 1 - .../modules/custom/helfi_etusivu/src/Form/NearYouForm.php | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php index 692c10b8..a4798a99 100644 --- a/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php +++ b/public/modules/custom/helfi_etusivu/src/Controller/HelsinkiNearYouResultsController.php @@ -5,7 +5,6 @@ namespace Drupal\helfi_etusivu\Controller; use Drupal\Component\Utility\Xss; -use Drupal\Core\Cache\Cache; use Drupal\Core\Controller\ControllerBase; use Drupal\Core\Url; use Drupal\helfi_etusivu\Servicemap; diff --git a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php index dac70016..b6298868 100644 --- a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php +++ b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php @@ -27,9 +27,9 @@ public function buildForm(array $form, FormStateInterface $form_state) { $form['description'] = [ '#markup' => - '
' . - $this->t('Find services, events, and news near you. Start by searching with your address.') . - '
', + '
' . + $this->t('Find services, events, and news near you. Start by searching with your address.') . + '
', '#type' => 'markup', ]; From ed317ea5ae742d066cae38e1f1bf8a260461eb40 Mon Sep 17 00:00:00 2001 From: tuutti Date: Tue, 3 Dec 2024 08:30:28 +0200 Subject: [PATCH 46/59] UHF-9452: Disable AMQ until prod setup is done --- public/sites/default/all.settings.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php index 58d5625c..3a9b44e5 100644 --- a/public/sites/default/all.settings.php +++ b/public/sites/default/all.settings.php @@ -67,9 +67,9 @@ 'ELASTIC_USER', 'ELASTIC_PASSWORD', 'SENTRY_DSN_REACT', - 'AMQ_BROKERS', - 'AMQ_USER', - 'AMQ_PASSWORD', + // 'AMQ_BROKERS', + // 'AMQ_USER', + // 'AMQ_PASSWORD', ]; foreach ($additionalEnvVars as $var) { $preflight_checks['environmentVariables'][] = $var; From 409e76aa77341168a2f66d1503de54b668dacbe9 Mon Sep 17 00:00:00 2001 From: khalima <1712902+khalima@users.noreply.github.com> Date: Tue, 3 Dec 2024 07:00:43 +0000 Subject: [PATCH 47/59] Update configuration --- .platform/schema | 2 +- composer.json | 1 + composer.lock | 123 ++++++++++++------ ...ty_form_display.node.news_item.default.yml | 8 -- .../cmi/language/fi/social_media.settings.yml | 2 +- .../cmi/language/sv/social_media.settings.yml | 2 +- public/sites/default/settings.php | 32 +++-- 7 files changed, 112 insertions(+), 58 deletions(-) diff --git a/.platform/schema b/.platform/schema index 9a037142..3cacc0b9 100644 --- a/.platform/schema +++ b/.platform/schema @@ -1 +1 @@ -10 \ No newline at end of file +12 \ No newline at end of file diff --git a/composer.json b/composer.json index 0b666103..42a3b76d 100644 --- a/composer.json +++ b/composer.json @@ -38,6 +38,7 @@ }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "dg/bypass-finals": "^1.5", "dmore/chrome-mink-driver": "^2.8", "drupal/coder": "^8.3", "drupal/core-dev": "^10.0", diff --git a/composer.lock b/composer.lock index 2e82d33f..ebd4e30e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "418f745bde621515c623957f4976bc56", + "content-hash": "ad99cd734146612824218365d4836809", "packages": [ { "name": "asm89/stack-cors", @@ -3522,17 +3522,17 @@ }, { "name": "drupal/entity_usage", - "version": "2.0.0-beta15", + "version": "2.0.0-beta16", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_usage.git", - "reference": "8.x-2.0-beta15" + "reference": "8.x-2.0-beta16" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta15.zip", - "reference": "8.x-2.0-beta15", - "shasum": "80ad5d27e2a499fae60d303d8cc7daededc6d8a6" + "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta16.zip", + "reference": "8.x-2.0-beta16", + "shasum": "af6533149a0926d2d539f279e7e08073f8f08c55" }, "require": { "drupal/core": "^10.2 || ^11" @@ -3552,8 +3552,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta15", - "datestamp": "1732783084", + "version": "8.x-2.0-beta16", + "datestamp": "1733149424", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -4255,16 +4255,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.12", + "version": "6.8.13", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "eb3b0e24a7846928ce01c2faa8da5d00cc73a6ca" + "reference": "297f267856f3566109e80e1e2bd2377117b53110" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/eb3b0e24a7846928ce01c2faa8da5d00cc73a6ca", - "reference": "eb3b0e24a7846928ce01c2faa8da5d00cc73a6ca", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/297f267856f3566109e80e1e2bd2377117b53110", + "reference": "297f267856f3566109e80e1e2bd2377117b53110", "shasum": "" }, "require": { @@ -4283,10 +4283,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.12", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.13", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-11-28T09:01:49+00:00" + "time": "2024-12-02T19:33:15+00:00" }, { "name": "drupal/hdbt_admin", @@ -4482,12 +4482,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "3de6f884ac7de9a43fe242f371dcf9416cac47b2" + "reference": "2abe26c3735150f630dd1203c3e60a77173d90fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/3de6f884ac7de9a43fe242f371dcf9416cac47b2", - "reference": "3de6f884ac7de9a43fe242f371dcf9416cac47b2", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/2abe26c3735150f630dd1203c3e60a77173d90fd", + "reference": "2abe26c3735150f630dd1203c3e60a77173d90fd", "shasum": "" }, "require": { @@ -4562,7 +4562,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-11-26T06:52:09+00:00" + "time": "2024-12-03T06:30:07+00:00" }, { "name": "drupal/helfi_navigation", @@ -4600,16 +4600,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.8.6", + "version": "4.8.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "6d08f98fbb9980d73ddb8efa5f2d14ceb17f7f44" + "reference": "49736905ff7807964dd61f1aa12e87b86678d905" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/6d08f98fbb9980d73ddb8efa5f2d14ceb17f7f44", - "reference": "6d08f98fbb9980d73ddb8efa5f2d14ceb17f7f44", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/49736905ff7807964dd61f1aa12e87b86678d905", + "reference": "49736905ff7807964dd61f1aa12e87b86678d905", "shasum": "" }, "require": { @@ -4735,10 +4735,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.6", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.7", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-11-29T10:12:26+00:00" + "time": "2024-12-02T13:38:47+00:00" }, { "name": "drupal/helfi_proxy", @@ -14077,12 +14077,12 @@ }, "type": "metapackage", "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + }, "branch-alias": { "dev-main": "1.20-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" } }, "notification-url": "https://packagist.org/downloads/", @@ -16615,6 +16615,59 @@ }, "time": "2022-02-04T12:51:07+00:00" }, + { + "name": "dg/bypass-finals", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/dg/bypass-finals.git", + "reference": "86b00f0d900c7e15d3341e687e0df89e8c2d4632" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dg/bypass-finals/zipball/86b00f0d900c7e15d3341e687e0df89e8c2d4632", + "reference": "86b00f0d900c7e15d3341e687e0df89e8c2d4632", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "nette/tester": "^2.3", + "phpstan/phpstan": "^0.12" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause", + "GPL-2.0-only", + "GPL-3.0-only" + ], + "authors": [ + { + "name": "David Grudl", + "homepage": "https://davidgrudl.com" + } + ], + "description": "Removes final keyword from source code on-the-fly and allows mocking of final methods and classes", + "keywords": [ + "finals", + "mocking", + "phpunit", + "testing", + "unit" + ], + "support": { + "issues": "https://github.com/dg/bypass-finals/issues", + "source": "https://github.com/dg/bypass-finals/tree/v1.8.0" + }, + "time": "2024-07-02T22:24:43+00:00" + }, { "name": "dmore/chrome-mink-driver", "version": "2.9.2", @@ -18108,16 +18161,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.58", + "version": "1.12.12", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "a23518379ec4defd9e47cbf81019526861623ec2" + "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2", - "reference": "a23518379ec4defd9e47cbf81019526861623ec2", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0", + "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0", "shasum": "" }, "require": { @@ -18160,13 +18213,9 @@ { "url": "https://github.com/phpstan", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", - "type": "tidelift" } ], - "time": "2024-02-12T20:02:57+00:00" + "time": "2024-11-28T22:13:23+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", diff --git a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml index 2a0d8abe..ddec2770 100644 --- a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml @@ -6,14 +6,6 @@ third_party_settings: label: Linkit group_main_image: label: Pääkuva - group_updating_news: - label: 'Päivittyvä uutinen' - format_settings: - description: 'Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.
Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan.' - group_automatically_recommended: - label: 'Automaattisesti suositellut sisällöt' - format_settings: - description: 'Suositellut sisällöt voivat olla uutisia tai artikkeleita. Suositukset perustuvat automaattisesti valittuihin uutisluokkiin. Uutisluokat valitaan sivun sisällön perusteella, kun sivu tallennetaan.' content: field_content: settings: diff --git a/conf/cmi/language/fi/social_media.settings.yml b/conf/cmi/language/fi/social_media.settings.yml index 973f8ba0..94e60de6 100644 --- a/conf/cmi/language/fi/social_media.settings.yml +++ b/conf/cmi/language/fi/social_media.settings.yml @@ -1,7 +1,7 @@ social_media: facebook_share: text: 'Jaa Facebook-palvelussa' - api_url: 'http://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]' + api_url: 'https://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]' attributes: "target|_blank\r\nclass|facebook-share" linkedin: text: 'Jaa LinkedIn-palvelussa' diff --git a/conf/cmi/language/sv/social_media.settings.yml b/conf/cmi/language/sv/social_media.settings.yml index 79ff812c..027c6e2c 100644 --- a/conf/cmi/language/sv/social_media.settings.yml +++ b/conf/cmi/language/sv/social_media.settings.yml @@ -1,7 +1,7 @@ social_media: facebook_share: text: 'Dela på Facebook' - api_url: 'http://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]' + api_url: 'https://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]' attributes: "target|_blank\r\nclass|facebook-share" linkedin: text: 'Dela på Linkedin' diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index b80276cd..b68b80aa 100644 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -289,7 +289,7 @@ function drupal_get_env(string|array $variables) : mixed { 'helfi_api_base_revision', ]; foreach ($queues as $queue) { - $settings['queue_service_' . $queue] = 'queue.stomp.default'; + // $settings['queue_service_' . $queue] = 'queue.stomp.default'; } // You must configure project specific queues manually in 'all.settings.php' // file. @@ -359,6 +359,27 @@ function drupal_get_env(string|array $variables) : mixed { 'additionalFiles' => [], ]; +// Elasticsearch server config. +if (getenv('ELASTICSEARCH_URL')) { + $config['search_api.server.default']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL'); + + if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) { + $config['search_api.server.default']['backend_config']['connector'] = 'helfi_connector'; + $config['search_api.server.default']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER'); + $config['search_api.server.default']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD'); + } +} + + +// Supported values: https://github.com/Seldaek/monolog/blob/main/doc/01-usage.md#log-levels. +$default_log_level = getenv('APP_ENV') === 'production' ? 'info' : 'debug'; +$settings['helfi_api_base.log_level'] = getenv('LOG_LEVEL') ?: $default_log_level; + +// Turn sentry JS error tracking on if SENTRY_DSN_PUBLIC is defined. +if (getenv('SENTRY_DSN_PUBLIC')) { + $config['raven.settings']['javascript_error_handler'] = TRUE; +} + // Environment specific overrides. if (file_exists(__DIR__ . '/all.settings.php')) { // phpcs:ignore @@ -389,15 +410,6 @@ function drupal_get_env(string|array $variables) : mixed { } } -// Supported values: https://github.com/Seldaek/monolog/blob/main/doc/01-usage.md#log-levels. -$default_log_level = getenv('APP_ENV') === 'production' ? 'info' : 'debug'; -$settings['helfi_api_base.log_level'] = getenv('LOG_LEVEL') ?: $default_log_level; - -// Turn sentry JS error tracking on if SENTRY_DSN_PUBLIC is defined. -if (getenv('SENTRY_DSN_PUBLIC')) { - $config['raven.settings']['javascript_error_handler'] = TRUE; -} - /** * Deployment identifier. * From f5bd9b2db2b220aeac67d7fff564f87bd2a84ee7 Mon Sep 17 00:00:00 2001 From: Anna Lonka Date: Tue, 3 Dec 2024 09:03:04 +0200 Subject: [PATCH 48/59] Reverted news_item language changes --- .../core.entity_form_display.node.news_item.default.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml index ddec2770..2a0d8abe 100644 --- a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml @@ -6,6 +6,14 @@ third_party_settings: label: Linkit group_main_image: label: Pääkuva + group_updating_news: + label: 'Päivittyvä uutinen' + format_settings: + description: 'Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.
Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan.' + group_automatically_recommended: + label: 'Automaattisesti suositellut sisällöt' + format_settings: + description: 'Suositellut sisällöt voivat olla uutisia tai artikkeleita. Suositukset perustuvat automaattisesti valittuihin uutisluokkiin. Uutisluokat valitaan sivun sisällön perusteella, kun sivu tallennetaan.' content: field_content: settings: From 1e8483b1c503579425b7fcf5826cadc0cedb1b44 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Tue, 3 Dec 2024 09:32:43 +0200 Subject: [PATCH 49/59] UHF-10771: Add missing translations, fix mistakes --- public/modules/custom/helfi_etusivu/helfi_etusivu.module | 2 +- public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php | 2 +- public/modules/custom/helfi_etusivu/translations/fi.po | 4 ++++ public/modules/custom/helfi_etusivu/translations/sv.po | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index 6eac7339..b0273a5b 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -244,7 +244,7 @@ function helfi_etusivu_helfi_hero_design_alter(array &$designs, FieldStorageDefi function helfi_etusivu_preprocess_html(&$variables): void { $route = \Drupal::routeMatch()->getRouteName(); - // Set the theme color to engel on Helsinki near you landing page. + // Set the theme color to suomenlinna on Helsinki near you landing page. if ($route === 'helfi_etusivu.helsinki_near_you') { $variables['theme_color'] = 'suomenlinna'; } diff --git a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php index b6298868..0f84b054 100644 --- a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php +++ b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php @@ -28,7 +28,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $form['description'] = [ '#markup' => '
' . - $this->t('Find services, events, and news near you. Start by searching with your address.') . + $this->t('Find services, events, and news near you. Start by searching with your address.', [], ['context' => 'Helsinki near you']) . '
', '#type' => 'markup', ]; diff --git a/public/modules/custom/helfi_etusivu/translations/fi.po b/public/modules/custom/helfi_etusivu/translations/fi.po index 99291971..1e226aa4 100644 --- a/public/modules/custom/helfi_etusivu/translations/fi.po +++ b/public/modules/custom/helfi_etusivu/translations/fi.po @@ -55,6 +55,10 @@ msgctxt "Helsinki near you" msgid "First make a search with your address" msgstr "Tee aluksi haku osoitteellasi" +msgctxt "Helsinki near you" +msgid "Find services, events, and news near you. Start by searching with your address." +msgstr "Löydä palvelut, tapahtumat ja uutiset läheltäsi. Aloita kirjoittamalla osoitteesi." + msgctxt "Helsinki near you" msgid "Fill in your address to the search bar above and find services, events and news near you." msgstr "Täytä osoitteesi yllä olevaan hakuun ja löydä palveluita, tapahtumia ja uutisia läheltäsi." diff --git a/public/modules/custom/helfi_etusivu/translations/sv.po b/public/modules/custom/helfi_etusivu/translations/sv.po index 40f82ddc..c8a5441e 100644 --- a/public/modules/custom/helfi_etusivu/translations/sv.po +++ b/public/modules/custom/helfi_etusivu/translations/sv.po @@ -44,6 +44,10 @@ msgctxt "Helsinki near you" msgid "First make a search with your address" msgstr "Först gör en sökning med din adress" +msgctxt "Helsinki near you" +msgid "Find services, events, and news near you. Start by searching with your address." +msgstr "Hitta tjänster, evenemang och nyheter nära dig. Börja med att söka med din adress." + msgctxt "Helsinki near you" msgid "Fill in your address to the search bar above and find services, events and news near you." msgstr "Fyll i din adress i sökfältet ovan och hitta tjänster, evenemang och nyheter nära dig." From 18d23af1fbe4039108a9d884ae551d4ce893a821 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Tue, 3 Dec 2024 09:44:01 +0200 Subject: [PATCH 50/59] UHF-10771: Move spacing to top margin rather than bottom --- public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php | 3 +++ public/themes/custom/hdbt_subtheme/dist/css/styles.min.css | 2 +- .../src/scss/06_components/pages/_helsinki-near-you.scss | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php index 0f84b054..d7c1031b 100644 --- a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php +++ b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php @@ -39,6 +39,9 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#required' => TRUE, '#title' => $this->t('Address'), '#type' => 'textfield', + '#wrapper_attributes' => [ + 'class' => ['helfi-etusivu-near-you-form__address-input'] + ], ]; $form['actions']['#type'] = 'actions'; diff --git a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css index 6d9346ee..43707e4e 100644 --- a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css +++ b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css @@ -1 +1 @@ -.table-of-contents--news-update{padding-left:16px;padding-right:16px;--item-title-lineheight: 1.875rem}@media(min-width: 768px){.table-of-contents--news-update{padding-left:32px;padding-right:32px}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__container{border-left:none}[dir="rtl"] .table-of-contents--news-update .table-of-contents__container{border-right:none}.table-of-contents--news-update .table-of-contents__title+.table-of-contents__content{padding-top:16px}.table-of-contents--news-update .table-of-contents__item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:flex;flex-direction:column;padding-top:16px;padding-bottom:16px;padding-left:16px;padding-right:16px;position:relative}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__item{flex-direction:row}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::before,[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::after{left:8px}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::before,.table-of-contents--news-update .table-of-contents__item::after{content:"";display:block;position:absolute}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::after{background-color:#000;height:calc(100% + 32px + 8px);top:-16px;transform:translateX(calc(var(--lang-direction) * -50%));width:2px;z-index:0}.table-of-contents--news-update .table-of-contents__item:first-of-type::after{height:100%;top:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:last-of-type::after{height:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:only-child::after{display:none}.table-of-contents--news-update .table-of-contents__item::before{background-color:#fff;border:3px solid #000;border-radius:50%;height:16px;top:calc(16px + var(--item-title-lineheight)*.5);transform:translate(calc(var(--lang-direction) * -50%), -50%);width:16px;z-index:1}.table-of-contents--news-update time{padding-left:16px}@media(min-width: 768px){.table-of-contents--news-update time{flex:none;width:110px}}[dir="rtl"] .table-of-contents--news-update time{padding-left:0;padding-right:16px}.table-of-contents--news-update .table-of-contents__link{margin-left:16px}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__link{margin-left:32px}}[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-left:0;margin-right:16px}@media(min-width: 768px){[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-right:32px}}.block--main-news{padding-left:16px;padding-right:16px;max-width:1296px;margin-top:32px;margin:auto;width:100%}@media(min-width: 768px){.block--main-news{padding-left:32px;padding-right:32px}}@media(min-width: 768px){.block--main-news{max-width:1328px}}@media(min-width: 992px){.block--main-news{margin-top:64px}}.block--main-news h2{margin-bottom:48px;margin-top:0}.component--news-of-interest{margin-top:32px;background-color:#f2f2f2;margin-left:16px;margin-right:16px;padding:32px 16px 32px}@media(min-width: 992px){.component--news-of-interest{margin-top:64px}}@media(min-width: 768px){.component--news-of-interest{padding:48px 32px 48px}}.component--news-of-interest .card{padding:24px}.component--news-of-interest .empty-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.component--graphics{max-width:100%}@media(min-width: 992px){.graphics{align-items:center;display:flex;justify-content:space-between}}.graphics__text-container{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}@media(min-width: 992px){.graphics__text-container{min-height:300px}}.graphics__title{margin-top:0}.graphics__illustration-container{margin-top:64px}@media(min-width: 992px){.graphics__illustration-container{margin-top:0}}.graphics__illustration{max-width:100%}.page-title+article>.components--helsinki-near-you-results:first-child{margin-top:16px}.helfi-etusivu-near-you-form__description{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);margin-bottom:32px;margin-top:16px}@media(min-width: 992px){.helfi-etusivu-near-you-form .helfi-search__submit-button{margin-top:8px}}.helfi-etusivu-near-you-form .form-item-q .form-autocomplete,.helfi-etusivu-near-you-form .form-item-q .form-autocomplete.ui-autocomplete-loading{background-position:98% center}.ui-menu.ui-front .ui-menu-item-wrapper{color:#000;display:inline-block;padding:16px;width:100%}.ui-menu.ui-front .ui-menu-item-wrapper.ui-state-active{background-color:#f0f0ff;border:1px solid #0000bf}.component--current{background-color:var(--hdbt-color-palette--secondary);color:var(--hdbt-color-palette-text--secondary)}.current__content{display:flex;flex-direction:column;margin-left:auto;margin-right:auto;max-width:1264px}@media(min-width: 768px){.current__content{flex-direction:row}}.current__content__list{margin-bottom:0;margin-top:0}.current__content__list-item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-bottom:2px;margin-top:0;padding-top:7px;padding-bottom:7px;vertical-align:top}.current__links-container{padding-bottom:16px;padding-top:16px}@media(min-width: 576px){.current__links-container{padding-bottom:24px;padding-top:24px}}@media(min-width: 768px){.current__links-container{padding-right:16px}}@media(min-width: 992px){.current__links-container{padding-bottom:48px;padding-top:48px}}@media(min-width: 992px){.current__links-container{padding-bottom:64px;padding-top:64px}}.current{display:flex;flex-direction:column}@media(min-width: 768px){.current__illustration-container{margin-left:auto;margin-top:-32px}}@media(min-width: 992px){.current__illustration-container{margin-top:-48px}}@media(min-width: 1248px){.current__illustration-container{margin-top:-64px}}.current__seasonal-illustration{aspect-ratio:1;display:block;width:258px}@media(min-width: 992px){.current__seasonal-illustration{width:378px}}@media(min-width: 1248px){.current__seasonal-illustration{width:486px}}.component--latest-news--cards{background-color:#f2f2f2}.component--latest-news .latest-news__link-wrapper{margin-top:32px}@media(min-width: 768px){.component--latest-news .latest-news__link-wrapper{margin-top:64px}}[dir="ltr"] .component--top-news .news-listing{padding-left:0}[dir="rtl"] .component--top-news .news-listing{padding-right:0}.component--top-news .news-listing__item{position:relative}.component--top-news--news .component__container{background-color:#e8f3fc;padding:24px 24px 32px}@media(min-width: 768px){.component--top-news--news .component__container{padding:32px 32px 48px}}.component--top-news--news .component__title+.component__content{margin-top:0}@media(min-width: 768px){.component--top-news--news .component__title+.component__content{grid-template-columns:repeat(2, 1fr);margin-top:32px}}.component--top-news--news .news-listing--medium-teasers{display:grid;margin-bottom:0;margin-top:24px}@media(min-width: 768px){.component--top-news--news .news-listing--medium-teasers{grid-column-gap:24px;grid-row-gap:32px;grid-template-columns:repeat(2, 1fr);margin-top:48px}}.component--top-news--news .news-listing__medium-teaser{padding:0}[dir=rtl] .component--top-news--news .news-listing__medium-teaser{padding:0}.component--top-news--news .news-listing__medium-teaser::before{display:none}.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.component--top-news--news .news-listing__medium-teaser .news-listing__datetime{margin-top:8px}.component--news-update{border-bottom:1px solid #ccc;padding-bottom:32px}@media(min-width: 768px){.component--news-update{padding-bottom:48px}}.component--news-update time{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);display:inline-block;margin-top:16px}.component--news-update .component__content{margin-top:32px}@media(min-width: 768px){.component--news-update .component__content{margin-top:48px}}*~.component--news-update,.component--news-update~.component--news-update{margin-top:32px}@media(min-width: 768px){*~.component--news-update,.component--news-update~.component--news-update{margin-top:48px}} +.table-of-contents--news-update{padding-left:16px;padding-right:16px;--item-title-lineheight: 1.875rem}@media(min-width: 768px){.table-of-contents--news-update{padding-left:32px;padding-right:32px}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__container{border-left:none}[dir="rtl"] .table-of-contents--news-update .table-of-contents__container{border-right:none}.table-of-contents--news-update .table-of-contents__title+.table-of-contents__content{padding-top:16px}.table-of-contents--news-update .table-of-contents__item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:flex;flex-direction:column;padding-top:16px;padding-bottom:16px;padding-left:16px;padding-right:16px;position:relative}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__item{flex-direction:row}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::before,[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::after{left:8px}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::before,.table-of-contents--news-update .table-of-contents__item::after{content:"";display:block;position:absolute}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::after{background-color:#000;height:calc(100% + 32px + 8px);top:-16px;transform:translateX(calc(var(--lang-direction) * -50%));width:2px;z-index:0}.table-of-contents--news-update .table-of-contents__item:first-of-type::after{height:100%;top:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:last-of-type::after{height:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:only-child::after{display:none}.table-of-contents--news-update .table-of-contents__item::before{background-color:#fff;border:3px solid #000;border-radius:50%;height:16px;top:calc(16px + var(--item-title-lineheight)*.5);transform:translate(calc(var(--lang-direction) * -50%), -50%);width:16px;z-index:1}.table-of-contents--news-update time{padding-left:16px}@media(min-width: 768px){.table-of-contents--news-update time{flex:none;width:110px}}[dir="rtl"] .table-of-contents--news-update time{padding-left:0;padding-right:16px}.table-of-contents--news-update .table-of-contents__link{margin-left:16px}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__link{margin-left:32px}}[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-left:0;margin-right:16px}@media(min-width: 768px){[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-right:32px}}.block--main-news{padding-left:16px;padding-right:16px;max-width:1296px;margin-top:32px;margin:auto;width:100%}@media(min-width: 768px){.block--main-news{padding-left:32px;padding-right:32px}}@media(min-width: 768px){.block--main-news{max-width:1328px}}@media(min-width: 992px){.block--main-news{margin-top:64px}}.block--main-news h2{margin-bottom:48px;margin-top:0}.component--news-of-interest{margin-top:32px;background-color:#f2f2f2;margin-left:16px;margin-right:16px;padding:32px 16px 32px}@media(min-width: 992px){.component--news-of-interest{margin-top:64px}}@media(min-width: 768px){.component--news-of-interest{padding:48px 32px 48px}}.component--news-of-interest .card{padding:24px}.component--news-of-interest .empty-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.component--graphics{max-width:100%}@media(min-width: 992px){.graphics{align-items:center;display:flex;justify-content:space-between}}.graphics__text-container{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}@media(min-width: 992px){.graphics__text-container{min-height:300px}}.graphics__title{margin-top:0}.graphics__illustration-container{margin-top:64px}@media(min-width: 992px){.graphics__illustration-container{margin-top:0}}.graphics__illustration{max-width:100%}.page-title+article>.components--helsinki-near-you-results:first-child{margin-top:16px}.helfi-etusivu-near-you-form__description{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);margin-top:16px}.helfi-etusivu-near-you-form__address-input{margin-top:32px}@media(min-width: 992px){.helfi-etusivu-near-you-form .helfi-search__submit-button{margin-top:8px}}.helfi-etusivu-near-you-form .form-item-q .form-autocomplete,.helfi-etusivu-near-you-form .form-item-q .form-autocomplete.ui-autocomplete-loading{background-position:98% center}.ui-menu.ui-front .ui-menu-item-wrapper{color:#000;display:inline-block;padding:16px;width:100%}.ui-menu.ui-front .ui-menu-item-wrapper.ui-state-active{background-color:#f0f0ff;border:1px solid #0000bf}.component--current{background-color:var(--hdbt-color-palette--secondary);color:var(--hdbt-color-palette-text--secondary)}.current__content{display:flex;flex-direction:column;margin-left:auto;margin-right:auto;max-width:1264px}@media(min-width: 768px){.current__content{flex-direction:row}}.current__content__list{margin-bottom:0;margin-top:0}.current__content__list-item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-bottom:2px;margin-top:0;padding-top:7px;padding-bottom:7px;vertical-align:top}.current__links-container{padding-bottom:16px;padding-top:16px}@media(min-width: 576px){.current__links-container{padding-bottom:24px;padding-top:24px}}@media(min-width: 768px){.current__links-container{padding-right:16px}}@media(min-width: 992px){.current__links-container{padding-bottom:48px;padding-top:48px}}@media(min-width: 992px){.current__links-container{padding-bottom:64px;padding-top:64px}}.current{display:flex;flex-direction:column}@media(min-width: 768px){.current__illustration-container{margin-left:auto;margin-top:-32px}}@media(min-width: 992px){.current__illustration-container{margin-top:-48px}}@media(min-width: 1248px){.current__illustration-container{margin-top:-64px}}.current__seasonal-illustration{aspect-ratio:1;display:block;width:258px}@media(min-width: 992px){.current__seasonal-illustration{width:378px}}@media(min-width: 1248px){.current__seasonal-illustration{width:486px}}.component--latest-news--cards{background-color:#f2f2f2}.component--latest-news .latest-news__link-wrapper{margin-top:32px}@media(min-width: 768px){.component--latest-news .latest-news__link-wrapper{margin-top:64px}}[dir="ltr"] .component--top-news .news-listing{padding-left:0}[dir="rtl"] .component--top-news .news-listing{padding-right:0}.component--top-news .news-listing__item{position:relative}.component--top-news--news .component__container{background-color:#e8f3fc;padding:24px 24px 32px}@media(min-width: 768px){.component--top-news--news .component__container{padding:32px 32px 48px}}.component--top-news--news .component__title+.component__content{margin-top:0}@media(min-width: 768px){.component--top-news--news .component__title+.component__content{grid-template-columns:repeat(2, 1fr);margin-top:32px}}.component--top-news--news .news-listing--medium-teasers{display:grid;margin-bottom:0;margin-top:24px}@media(min-width: 768px){.component--top-news--news .news-listing--medium-teasers{grid-column-gap:24px;grid-row-gap:32px;grid-template-columns:repeat(2, 1fr);margin-top:48px}}.component--top-news--news .news-listing__medium-teaser{padding:0}[dir=rtl] .component--top-news--news .news-listing__medium-teaser{padding:0}.component--top-news--news .news-listing__medium-teaser::before{display:none}.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.component--top-news--news .news-listing__medium-teaser .news-listing__datetime{margin-top:8px}.component--news-update{border-bottom:1px solid #ccc;padding-bottom:32px}@media(min-width: 768px){.component--news-update{padding-bottom:48px}}.component--news-update time{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);display:inline-block;margin-top:16px}.component--news-update .component__content{margin-top:32px}@media(min-width: 768px){.component--news-update .component__content{margin-top:48px}}*~.component--news-update,.component--news-update~.component--news-update{margin-top:32px}@media(min-width: 768px){*~.component--news-update,.component--news-update~.component--news-update{margin-top:48px}} diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss index bbe830ce..485b46b1 100644 --- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss +++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss @@ -40,10 +40,13 @@ .helfi-etusivu-near-you-form__description { @include font(body); - margin-bottom: $spacing-double; margin-top: $spacing; } +.helfi-etusivu-near-you-form__address-input { + margin-top: $spacing-double; +} + .helfi-etusivu-near-you-form .helfi-search__submit-button { @include breakpoint($breakpoint-l) { margin-top: $spacing-half; From 9f95c583821e0bb96d28d85f19f42c656f7ecf5b Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Tue, 3 Dec 2024 09:46:05 +0200 Subject: [PATCH 51/59] UHF-10771: Fix phpcs --- public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php index d7c1031b..571f72c4 100644 --- a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php +++ b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php @@ -40,7 +40,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#title' => $this->t('Address'), '#type' => 'textfield', '#wrapper_attributes' => [ - 'class' => ['helfi-etusivu-near-you-form__address-input'] + 'class' => ['helfi-etusivu-near-you-form__address-input'], ], ]; From 2a58e8c02d59823415611dd9682a8d4da1b90ae3 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 3 Dec 2024 08:52:19 +0000 Subject: [PATCH 52/59] Update configuration --- composer.lock | 12 ++++++------ ...re.entity_form_display.node.news_item.default.yml | 8 -------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/composer.lock b/composer.lock index ebd4e30e..886a77dd 100644 --- a/composer.lock +++ b/composer.lock @@ -4600,16 +4600,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.8.7", + "version": "4.8.9", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "49736905ff7807964dd61f1aa12e87b86678d905" + "reference": "d36c184befaae3efd8d95e69d1d2dd5df93e6056" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/49736905ff7807964dd61f1aa12e87b86678d905", - "reference": "49736905ff7807964dd61f1aa12e87b86678d905", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d36c184befaae3efd8d95e69d1d2dd5df93e6056", + "reference": "d36c184befaae3efd8d95e69d1d2dd5df93e6056", "shasum": "" }, "require": { @@ -4735,10 +4735,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.7", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.9", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-12-02T13:38:47+00:00" + "time": "2024-12-03T08:46:03+00:00" }, { "name": "drupal/helfi_proxy", diff --git a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml index 2a0d8abe..ddec2770 100644 --- a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml @@ -6,14 +6,6 @@ third_party_settings: label: Linkit group_main_image: label: Pääkuva - group_updating_news: - label: 'Päivittyvä uutinen' - format_settings: - description: 'Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.
Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan.' - group_automatically_recommended: - label: 'Automaattisesti suositellut sisällöt' - format_settings: - description: 'Suositellut sisällöt voivat olla uutisia tai artikkeleita. Suositukset perustuvat automaattisesti valittuihin uutisluokkiin. Uutisluokat valitaan sivun sisällön perusteella, kun sivu tallennetaan.' content: field_content: settings: From 78b93841c74ec2011675f3944c5c1cf83b79625a Mon Sep 17 00:00:00 2001 From: Anna Lonka Date: Tue, 3 Dec 2024 11:05:04 +0200 Subject: [PATCH 53/59] Reverted news_item language changes --- .../core.entity_form_display.node.news_item.default.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml index ddec2770..2a0d8abe 100644 --- a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml @@ -6,6 +6,14 @@ third_party_settings: label: Linkit group_main_image: label: Pääkuva + group_updating_news: + label: 'Päivittyvä uutinen' + format_settings: + description: 'Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.
Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan.' + group_automatically_recommended: + label: 'Automaattisesti suositellut sisällöt' + format_settings: + description: 'Suositellut sisällöt voivat olla uutisia tai artikkeleita. Suositukset perustuvat automaattisesti valittuihin uutisluokkiin. Uutisluokat valitaan sivun sisällön perusteella, kun sivu tallennetaan.' content: field_content: settings: From 15a7b8971fc91588d385010c49b599870f4c229b Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Tue, 3 Dec 2024 11:20:39 +0200 Subject: [PATCH 54/59] UHF-10771: Strip unused styles + form element --- .../modules/custom/helfi_etusivu/src/Form/NearYouForm.php | 8 -------- .../themes/custom/hdbt_subtheme/dist/css/styles.min.css | 2 +- .../src/scss/06_components/pages/_helsinki-near-you.scss | 5 ----- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php index 571f72c4..51563e41 100644 --- a/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php +++ b/public/modules/custom/helfi_etusivu/src/Form/NearYouForm.php @@ -25,14 +25,6 @@ public function getFormId() { public function buildForm(array $form, FormStateInterface $form_state) { $form['#attributes']['class'][] = 'helfi-etusivu-near-you-form'; - $form['description'] = [ - '#markup' => - '
' . - $this->t('Find services, events, and news near you. Start by searching with your address.', [], ['context' => 'Helsinki near you']) . - '
', - '#type' => 'markup', - ]; - $form['q'] = [ '#autocomplete_route_name' => 'helfi_etusivu.helsinki_near_you_autocomplete', '#placeholder' => $this->t('Eg. Vaasankatu 5', [], ['context' => 'Helsinki near you']), diff --git a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css index 43707e4e..293e5ad4 100644 --- a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css +++ b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css @@ -1 +1 @@ -.table-of-contents--news-update{padding-left:16px;padding-right:16px;--item-title-lineheight: 1.875rem}@media(min-width: 768px){.table-of-contents--news-update{padding-left:32px;padding-right:32px}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__container{border-left:none}[dir="rtl"] .table-of-contents--news-update .table-of-contents__container{border-right:none}.table-of-contents--news-update .table-of-contents__title+.table-of-contents__content{padding-top:16px}.table-of-contents--news-update .table-of-contents__item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:flex;flex-direction:column;padding-top:16px;padding-bottom:16px;padding-left:16px;padding-right:16px;position:relative}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__item{flex-direction:row}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::before,[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::after{left:8px}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::before,.table-of-contents--news-update .table-of-contents__item::after{content:"";display:block;position:absolute}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::after{background-color:#000;height:calc(100% + 32px + 8px);top:-16px;transform:translateX(calc(var(--lang-direction) * -50%));width:2px;z-index:0}.table-of-contents--news-update .table-of-contents__item:first-of-type::after{height:100%;top:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:last-of-type::after{height:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:only-child::after{display:none}.table-of-contents--news-update .table-of-contents__item::before{background-color:#fff;border:3px solid #000;border-radius:50%;height:16px;top:calc(16px + var(--item-title-lineheight)*.5);transform:translate(calc(var(--lang-direction) * -50%), -50%);width:16px;z-index:1}.table-of-contents--news-update time{padding-left:16px}@media(min-width: 768px){.table-of-contents--news-update time{flex:none;width:110px}}[dir="rtl"] .table-of-contents--news-update time{padding-left:0;padding-right:16px}.table-of-contents--news-update .table-of-contents__link{margin-left:16px}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__link{margin-left:32px}}[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-left:0;margin-right:16px}@media(min-width: 768px){[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-right:32px}}.block--main-news{padding-left:16px;padding-right:16px;max-width:1296px;margin-top:32px;margin:auto;width:100%}@media(min-width: 768px){.block--main-news{padding-left:32px;padding-right:32px}}@media(min-width: 768px){.block--main-news{max-width:1328px}}@media(min-width: 992px){.block--main-news{margin-top:64px}}.block--main-news h2{margin-bottom:48px;margin-top:0}.component--news-of-interest{margin-top:32px;background-color:#f2f2f2;margin-left:16px;margin-right:16px;padding:32px 16px 32px}@media(min-width: 992px){.component--news-of-interest{margin-top:64px}}@media(min-width: 768px){.component--news-of-interest{padding:48px 32px 48px}}.component--news-of-interest .card{padding:24px}.component--news-of-interest .empty-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.component--graphics{max-width:100%}@media(min-width: 992px){.graphics{align-items:center;display:flex;justify-content:space-between}}.graphics__text-container{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}@media(min-width: 992px){.graphics__text-container{min-height:300px}}.graphics__title{margin-top:0}.graphics__illustration-container{margin-top:64px}@media(min-width: 992px){.graphics__illustration-container{margin-top:0}}.graphics__illustration{max-width:100%}.page-title+article>.components--helsinki-near-you-results:first-child{margin-top:16px}.helfi-etusivu-near-you-form__description{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);margin-top:16px}.helfi-etusivu-near-you-form__address-input{margin-top:32px}@media(min-width: 992px){.helfi-etusivu-near-you-form .helfi-search__submit-button{margin-top:8px}}.helfi-etusivu-near-you-form .form-item-q .form-autocomplete,.helfi-etusivu-near-you-form .form-item-q .form-autocomplete.ui-autocomplete-loading{background-position:98% center}.ui-menu.ui-front .ui-menu-item-wrapper{color:#000;display:inline-block;padding:16px;width:100%}.ui-menu.ui-front .ui-menu-item-wrapper.ui-state-active{background-color:#f0f0ff;border:1px solid #0000bf}.component--current{background-color:var(--hdbt-color-palette--secondary);color:var(--hdbt-color-palette-text--secondary)}.current__content{display:flex;flex-direction:column;margin-left:auto;margin-right:auto;max-width:1264px}@media(min-width: 768px){.current__content{flex-direction:row}}.current__content__list{margin-bottom:0;margin-top:0}.current__content__list-item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-bottom:2px;margin-top:0;padding-top:7px;padding-bottom:7px;vertical-align:top}.current__links-container{padding-bottom:16px;padding-top:16px}@media(min-width: 576px){.current__links-container{padding-bottom:24px;padding-top:24px}}@media(min-width: 768px){.current__links-container{padding-right:16px}}@media(min-width: 992px){.current__links-container{padding-bottom:48px;padding-top:48px}}@media(min-width: 992px){.current__links-container{padding-bottom:64px;padding-top:64px}}.current{display:flex;flex-direction:column}@media(min-width: 768px){.current__illustration-container{margin-left:auto;margin-top:-32px}}@media(min-width: 992px){.current__illustration-container{margin-top:-48px}}@media(min-width: 1248px){.current__illustration-container{margin-top:-64px}}.current__seasonal-illustration{aspect-ratio:1;display:block;width:258px}@media(min-width: 992px){.current__seasonal-illustration{width:378px}}@media(min-width: 1248px){.current__seasonal-illustration{width:486px}}.component--latest-news--cards{background-color:#f2f2f2}.component--latest-news .latest-news__link-wrapper{margin-top:32px}@media(min-width: 768px){.component--latest-news .latest-news__link-wrapper{margin-top:64px}}[dir="ltr"] .component--top-news .news-listing{padding-left:0}[dir="rtl"] .component--top-news .news-listing{padding-right:0}.component--top-news .news-listing__item{position:relative}.component--top-news--news .component__container{background-color:#e8f3fc;padding:24px 24px 32px}@media(min-width: 768px){.component--top-news--news .component__container{padding:32px 32px 48px}}.component--top-news--news .component__title+.component__content{margin-top:0}@media(min-width: 768px){.component--top-news--news .component__title+.component__content{grid-template-columns:repeat(2, 1fr);margin-top:32px}}.component--top-news--news .news-listing--medium-teasers{display:grid;margin-bottom:0;margin-top:24px}@media(min-width: 768px){.component--top-news--news .news-listing--medium-teasers{grid-column-gap:24px;grid-row-gap:32px;grid-template-columns:repeat(2, 1fr);margin-top:48px}}.component--top-news--news .news-listing__medium-teaser{padding:0}[dir=rtl] .component--top-news--news .news-listing__medium-teaser{padding:0}.component--top-news--news .news-listing__medium-teaser::before{display:none}.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.component--top-news--news .news-listing__medium-teaser .news-listing__datetime{margin-top:8px}.component--news-update{border-bottom:1px solid #ccc;padding-bottom:32px}@media(min-width: 768px){.component--news-update{padding-bottom:48px}}.component--news-update time{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);display:inline-block;margin-top:16px}.component--news-update .component__content{margin-top:32px}@media(min-width: 768px){.component--news-update .component__content{margin-top:48px}}*~.component--news-update,.component--news-update~.component--news-update{margin-top:32px}@media(min-width: 768px){*~.component--news-update,.component--news-update~.component--news-update{margin-top:48px}} +.table-of-contents--news-update{padding-left:16px;padding-right:16px;--item-title-lineheight: 1.875rem}@media(min-width: 768px){.table-of-contents--news-update{padding-left:32px;padding-right:32px}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__container{border-left:none}[dir="rtl"] .table-of-contents--news-update .table-of-contents__container{border-right:none}.table-of-contents--news-update .table-of-contents__title+.table-of-contents__content{padding-top:16px}.table-of-contents--news-update .table-of-contents__item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:flex;flex-direction:column;padding-top:16px;padding-bottom:16px;padding-left:16px;padding-right:16px;position:relative}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__item{flex-direction:row}}[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::before,[dir="ltr"] .table-of-contents--news-update .table-of-contents__item::after{left:8px}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::before,.table-of-contents--news-update .table-of-contents__item::after{content:"";display:block;position:absolute}[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::before,[dir="rtl"] .table-of-contents--news-update .table-of-contents__item::after{right:8px}.table-of-contents--news-update .table-of-contents__item::after{background-color:#000;height:calc(100% + 32px + 8px);top:-16px;transform:translateX(calc(var(--lang-direction) * -50%));width:2px;z-index:0}.table-of-contents--news-update .table-of-contents__item:first-of-type::after{height:100%;top:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:last-of-type::after{height:calc(16px + var(--item-title-lineheight)*.5)}.table-of-contents--news-update .table-of-contents__item:only-child::after{display:none}.table-of-contents--news-update .table-of-contents__item::before{background-color:#fff;border:3px solid #000;border-radius:50%;height:16px;top:calc(16px + var(--item-title-lineheight)*.5);transform:translate(calc(var(--lang-direction) * -50%), -50%);width:16px;z-index:1}.table-of-contents--news-update time{padding-left:16px}@media(min-width: 768px){.table-of-contents--news-update time{flex:none;width:110px}}[dir="rtl"] .table-of-contents--news-update time{padding-left:0;padding-right:16px}.table-of-contents--news-update .table-of-contents__link{margin-left:16px}@media(min-width: 768px){.table-of-contents--news-update .table-of-contents__link{margin-left:32px}}[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-left:0;margin-right:16px}@media(min-width: 768px){[dir="rtl"] .table-of-contents--news-update .table-of-contents__link{margin-right:32px}}.block--main-news{padding-left:16px;padding-right:16px;max-width:1296px;margin-top:32px;margin:auto;width:100%}@media(min-width: 768px){.block--main-news{padding-left:32px;padding-right:32px}}@media(min-width: 768px){.block--main-news{max-width:1328px}}@media(min-width: 992px){.block--main-news{margin-top:64px}}.block--main-news h2{margin-bottom:48px;margin-top:0}.component--news-of-interest{margin-top:32px;background-color:#f2f2f2;margin-left:16px;margin-right:16px;padding:32px 16px 32px}@media(min-width: 992px){.component--news-of-interest{margin-top:64px}}@media(min-width: 768px){.component--news-of-interest{padding:48px 32px 48px}}.component--news-of-interest .card{padding:24px}.component--news-of-interest .empty-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.component--graphics{max-width:100%}@media(min-width: 992px){.graphics{align-items:center;display:flex;justify-content:space-between}}.graphics__text-container{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}@media(min-width: 992px){.graphics__text-container{min-height:300px}}.graphics__title{margin-top:0}.graphics__illustration-container{margin-top:64px}@media(min-width: 992px){.graphics__illustration-container{margin-top:0}}.graphics__illustration{max-width:100%}.page-title+article>.components--helsinki-near-you-results:first-child{margin-top:16px}.helfi-etusivu-near-you-form__address-input{margin-top:32px}@media(min-width: 992px){.helfi-etusivu-near-you-form .helfi-search__submit-button{margin-top:8px}}.helfi-etusivu-near-you-form .form-item-q .form-autocomplete,.helfi-etusivu-near-you-form .form-item-q .form-autocomplete.ui-autocomplete-loading{background-position:98% center}.ui-menu.ui-front .ui-menu-item-wrapper{color:#000;display:inline-block;padding:16px;width:100%}.ui-menu.ui-front .ui-menu-item-wrapper.ui-state-active{background-color:#f0f0ff;border:1px solid #0000bf}.component--current{background-color:var(--hdbt-color-palette--secondary);color:var(--hdbt-color-palette-text--secondary)}.current__content{display:flex;flex-direction:column;margin-left:auto;margin-right:auto;max-width:1264px}@media(min-width: 768px){.current__content{flex-direction:row}}.current__content__list{margin-bottom:0;margin-top:0}.current__content__list-item{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-bottom:2px;margin-top:0;padding-top:7px;padding-bottom:7px;vertical-align:top}.current__links-container{padding-bottom:16px;padding-top:16px}@media(min-width: 576px){.current__links-container{padding-bottom:24px;padding-top:24px}}@media(min-width: 768px){.current__links-container{padding-right:16px}}@media(min-width: 992px){.current__links-container{padding-bottom:48px;padding-top:48px}}@media(min-width: 992px){.current__links-container{padding-bottom:64px;padding-top:64px}}.current{display:flex;flex-direction:column}@media(min-width: 768px){.current__illustration-container{margin-left:auto;margin-top:-32px}}@media(min-width: 992px){.current__illustration-container{margin-top:-48px}}@media(min-width: 1248px){.current__illustration-container{margin-top:-64px}}.current__seasonal-illustration{aspect-ratio:1;display:block;width:258px}@media(min-width: 992px){.current__seasonal-illustration{width:378px}}@media(min-width: 1248px){.current__seasonal-illustration{width:486px}}.component--latest-news--cards{background-color:#f2f2f2}.component--latest-news .latest-news__link-wrapper{margin-top:32px}@media(min-width: 768px){.component--latest-news .latest-news__link-wrapper{margin-top:64px}}[dir="ltr"] .component--top-news .news-listing{padding-left:0}[dir="rtl"] .component--top-news .news-listing{padding-right:0}.component--top-news .news-listing__item{position:relative}.component--top-news--news .component__container{background-color:#e8f3fc;padding:24px 24px 32px}@media(min-width: 768px){.component--top-news--news .component__container{padding:32px 32px 48px}}.component--top-news--news .component__title+.component__content{margin-top:0}@media(min-width: 768px){.component--top-news--news .component__title+.component__content{grid-template-columns:repeat(2, 1fr);margin-top:32px}}.component--top-news--news .news-listing--medium-teasers{display:grid;margin-bottom:0;margin-top:24px}@media(min-width: 768px){.component--top-news--news .news-listing--medium-teasers{grid-column-gap:24px;grid-row-gap:32px;grid-template-columns:repeat(2, 1fr);margin-top:48px}}.component--top-news--news .news-listing__medium-teaser{padding:0}[dir=rtl] .component--top-news--news .news-listing__medium-teaser{padding:0}.component--top-news--news .news-listing__medium-teaser::before{display:none}.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.component--top-news--news .news-listing__medium-teaser .news-listing__title{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.component--top-news--news .news-listing__medium-teaser .news-listing__datetime{margin-top:8px}.component--news-update{border-bottom:1px solid #ccc;padding-bottom:32px}@media(min-width: 768px){.component--news-update{padding-bottom:48px}}.component--news-update time{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);display:inline-block;margin-top:16px}.component--news-update .component__content{margin-top:32px}@media(min-width: 768px){.component--news-update .component__content{margin-top:48px}}*~.component--news-update,.component--news-update~.component--news-update{margin-top:32px}@media(min-width: 768px){*~.component--news-update,.component--news-update~.component--news-update{margin-top:48px}} diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss index 485b46b1..ca7562b9 100644 --- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss +++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/pages/_helsinki-near-you.scss @@ -38,11 +38,6 @@ margin-top: $spacing; } -.helfi-etusivu-near-you-form__description { - @include font(body); - margin-top: $spacing; -} - .helfi-etusivu-near-you-form__address-input { margin-top: $spacing-double; } From 6cfe13c7a2020f66fda347ce87402be0082176a6 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Tue, 3 Dec 2024 11:24:20 +0200 Subject: [PATCH 55/59] UHF-10771: Remove duplicate translations --- public/modules/custom/helfi_etusivu/translations/fi.po | 4 ---- public/modules/custom/helfi_etusivu/translations/sv.po | 4 ---- 2 files changed, 8 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/translations/fi.po b/public/modules/custom/helfi_etusivu/translations/fi.po index 1e226aa4..99291971 100644 --- a/public/modules/custom/helfi_etusivu/translations/fi.po +++ b/public/modules/custom/helfi_etusivu/translations/fi.po @@ -55,10 +55,6 @@ msgctxt "Helsinki near you" msgid "First make a search with your address" msgstr "Tee aluksi haku osoitteellasi" -msgctxt "Helsinki near you" -msgid "Find services, events, and news near you. Start by searching with your address." -msgstr "Löydä palvelut, tapahtumat ja uutiset läheltäsi. Aloita kirjoittamalla osoitteesi." - msgctxt "Helsinki near you" msgid "Fill in your address to the search bar above and find services, events and news near you." msgstr "Täytä osoitteesi yllä olevaan hakuun ja löydä palveluita, tapahtumia ja uutisia läheltäsi." diff --git a/public/modules/custom/helfi_etusivu/translations/sv.po b/public/modules/custom/helfi_etusivu/translations/sv.po index c8a5441e..40f82ddc 100644 --- a/public/modules/custom/helfi_etusivu/translations/sv.po +++ b/public/modules/custom/helfi_etusivu/translations/sv.po @@ -44,10 +44,6 @@ msgctxt "Helsinki near you" msgid "First make a search with your address" msgstr "Först gör en sökning med din adress" -msgctxt "Helsinki near you" -msgid "Find services, events, and news near you. Start by searching with your address." -msgstr "Hitta tjänster, evenemang och nyheter nära dig. Börja med att söka med din adress." - msgctxt "Helsinki near you" msgid "Fill in your address to the search bar above and find services, events and news near you." msgstr "Fyll i din adress i sökfältet ovan och hitta tjänster, evenemang och nyheter nära dig." From 9a988676f1ca4cf8b9598e381a01adfff443b34f Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 3 Dec 2024 10:16:54 +0000 Subject: [PATCH 56/59] Update configuration --- composer.lock | 12 ++++++------ ...re.entity_form_display.node.news_item.default.yml | 8 -------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/composer.lock b/composer.lock index 886a77dd..bda0220e 100644 --- a/composer.lock +++ b/composer.lock @@ -4255,16 +4255,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.13", + "version": "6.8.14", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "297f267856f3566109e80e1e2bd2377117b53110" + "reference": "59a87e90968edb6138555d4ff89fdccdd432150b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/297f267856f3566109e80e1e2bd2377117b53110", - "reference": "297f267856f3566109e80e1e2bd2377117b53110", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/59a87e90968edb6138555d4ff89fdccdd432150b", + "reference": "59a87e90968edb6138555d4ff89fdccdd432150b", "shasum": "" }, "require": { @@ -4283,10 +4283,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.13", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.14", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-12-02T19:33:15+00:00" + "time": "2024-12-03T10:11:32+00:00" }, { "name": "drupal/hdbt_admin", diff --git a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml index 2a0d8abe..ddec2770 100644 --- a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml @@ -6,14 +6,6 @@ third_party_settings: label: Linkit group_main_image: label: Pääkuva - group_updating_news: - label: 'Päivittyvä uutinen' - format_settings: - description: 'Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.
Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan.' - group_automatically_recommended: - label: 'Automaattisesti suositellut sisällöt' - format_settings: - description: 'Suositellut sisällöt voivat olla uutisia tai artikkeleita. Suositukset perustuvat automaattisesti valittuihin uutisluokkiin. Uutisluokat valitaan sivun sisällön perusteella, kun sivu tallennetaan.' content: field_content: settings: From ba56e847b1768798f39728fc4097738a89e324aa Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Tue, 3 Dec 2024 14:17:15 +0200 Subject: [PATCH 57/59] Revert conf changes --- .../core.entity_form_display.node.news_item.default.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml index ddec2770..2a0d8abe 100644 --- a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml @@ -6,6 +6,14 @@ third_party_settings: label: Linkit group_main_image: label: Pääkuva + group_updating_news: + label: 'Päivittyvä uutinen' + format_settings: + description: 'Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.
Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan.' + group_automatically_recommended: + label: 'Automaattisesti suositellut sisällöt' + format_settings: + description: 'Suositellut sisällöt voivat olla uutisia tai artikkeleita. Suositukset perustuvat automaattisesti valittuihin uutisluokkiin. Uutisluokat valitaan sivun sisällön perusteella, kun sivu tallennetaan.' content: field_content: settings: From c92fe8517033e028256a92233dede00be6e8fe84 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Wed, 4 Dec 2024 06:20:10 +0000 Subject: [PATCH 58/59] Update configuration --- composer.lock | 24 +++++++++---------- ...ty_form_display.node.news_item.default.yml | 8 ------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/composer.lock b/composer.lock index bda0220e..fddf2336 100644 --- a/composer.lock +++ b/composer.lock @@ -4255,16 +4255,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.14", + "version": "6.8.16", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "59a87e90968edb6138555d4ff89fdccdd432150b" + "reference": "7078104991314db54aa0301b508dba947f2e4a87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/59a87e90968edb6138555d4ff89fdccdd432150b", - "reference": "59a87e90968edb6138555d4ff89fdccdd432150b", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/7078104991314db54aa0301b508dba947f2e4a87", + "reference": "7078104991314db54aa0301b508dba947f2e4a87", "shasum": "" }, "require": { @@ -4283,10 +4283,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.14", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.16", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-12-03T10:11:32+00:00" + "time": "2024-12-04T05:47:34+00:00" }, { "name": "drupal/hdbt_admin", @@ -4600,16 +4600,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.8.9", + "version": "4.8.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "d36c184befaae3efd8d95e69d1d2dd5df93e6056" + "reference": "2e1c2a4d090084042954e56b0a61e3077d1daf4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d36c184befaae3efd8d95e69d1d2dd5df93e6056", - "reference": "d36c184befaae3efd8d95e69d1d2dd5df93e6056", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/2e1c2a4d090084042954e56b0a61e3077d1daf4f", + "reference": "2e1c2a4d090084042954e56b0a61e3077d1daf4f", "shasum": "" }, "require": { @@ -4735,10 +4735,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.9", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.10", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-12-03T08:46:03+00:00" + "time": "2024-12-04T06:14:43+00:00" }, { "name": "drupal/helfi_proxy", diff --git a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml index 2a0d8abe..ddec2770 100644 --- a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml @@ -6,14 +6,6 @@ third_party_settings: label: Linkit group_main_image: label: Pääkuva - group_updating_news: - label: 'Päivittyvä uutinen' - format_settings: - description: 'Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.
Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan.' - group_automatically_recommended: - label: 'Automaattisesti suositellut sisällöt' - format_settings: - description: 'Suositellut sisällöt voivat olla uutisia tai artikkeleita. Suositukset perustuvat automaattisesti valittuihin uutisluokkiin. Uutisluokat valitaan sivun sisällön perusteella, kun sivu tallennetaan.' content: field_content: settings: From 978a1a6c0ea3da06361b84cb78181d7a59a71e1c Mon Sep 17 00:00:00 2001 From: annadruid <161724181+annadruid@users.noreply.github.com> Date: Wed, 4 Dec 2024 08:39:28 +0200 Subject: [PATCH 59/59] Reverted news item translations --- .../core.entity_form_display.node.news_item.default.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml index ddec2770..2a0d8abe 100644 --- a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml @@ -6,6 +6,14 @@ third_party_settings: label: Linkit group_main_image: label: Pääkuva + group_updating_news: + label: 'Päivittyvä uutinen' + format_settings: + description: 'Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.
Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan.' + group_automatically_recommended: + label: 'Automaattisesti suositellut sisällöt' + format_settings: + description: 'Suositellut sisällöt voivat olla uutisia tai artikkeleita. Suositukset perustuvat automaattisesti valittuihin uutisluokkiin. Uutisluokat valitaan sivun sisällön perusteella, kun sivu tallennetaan.' content: field_content: settings: