From a6cea8570b705be0d049248bb7b4108a0f61991f Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Mon, 2 Dec 2024 12:15:58 +0200 Subject: [PATCH 01/19] 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 02/19] 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 03/19] 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 04/19] 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 05/19] 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 06/19] 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 07/19] 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 08/19] 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 09/19] 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 10/19] 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 11/19] 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 12/19] 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 13/19] 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 14/19] 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 15/19] 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 16/19] 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 17/19] 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 18/19] 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 19/19] 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: