diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f4a302d7..f7eb84b9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -51,8 +51,8 @@ jobs:
- name: Run PHPCS
run: |
- vendor/bin/phpcs public/modules/custom/ --ignore="*.js,*.css" --extensions=php,module,install --standard=Drupal,DrupalPractice
- vendor/bin/phpcs public/themes/custom/ --ignore="*.js,*.css" --extensions=php,theme --standard=Drupal,DrupalPractice
+ vendor/bin/phpcs public/modules/custom/
+ vendor/bin/phpcs public/themes/custom/
- name: Run phpstan
run: vendor/bin/phpstan analyze
diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml
index 1a7d61f7..d36258dd 100644
--- a/.github/workflows/update-config.yml
+++ b/.github/workflows/update-config.yml
@@ -24,6 +24,12 @@ jobs:
steps:
- uses: actions/checkout@v4
+ - name: Check if required secrets are set
+ env:
+ AUTOMATIC_UPDATE_TOKEN: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }}
+ if: env.AUTOMATIC_UPDATE_TOKEN == ''
+ run: exit 1
+
- name: Download latest dump
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -77,6 +83,7 @@ jobs:
uses: peter-evans/create-pull-request@v6
with:
commit-message: Update configuration
+ token: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }}
title: Automatic update
labels: auto-update
body: |
diff --git a/README.md b/README.md
index 055ca1f6..3b0289f0 100644
--- a/README.md
+++ b/README.md
@@ -255,6 +255,12 @@ KASKO has some additional fields on TPR units.
Field categories is used to save the TPR unit categorization that is done based on the `ontologyword_ids`. Read more
about it in the [TPR unit categorization section](#tpr-unit-categorization).
+### Announcements for user with role "comprehensive school editor"
+
+Comprehensive school editor (peruskoulun sisällöntuottaja) can create, edit, translate and delete their own announcements.
+They can also see all unpublished announcements.
+An form alter has been created for announcement node. It prevents comprehensive school editor from creating a site wide announcement.
+
#### [DEPRECATED] High school front page (field_hs_front_page)
Reference field where the upper secondary school (high school) front page used to be added. Appears to be unused and
diff --git a/composer.lock b/composer.lock
index a503d658..86e4c576 100644
--- a/composer.lock
+++ b/composer.lock
@@ -902,16 +902,16 @@
},
{
"name": "consolidation/output-formatters",
- "version": "4.5.0",
+ "version": "4.6.0",
"source": {
"type": "git",
"url": "https://github.com/consolidation/output-formatters.git",
- "reference": "7a611b01eb48eb19cd54672339fc08c0985bf540"
+ "reference": "5fd5656718d7068a02d046f418a7ba873d5abbfe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/7a611b01eb48eb19cd54672339fc08c0985bf540",
- "reference": "7a611b01eb48eb19cd54672339fc08c0985bf540",
+ "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/5fd5656718d7068a02d046f418a7ba873d5abbfe",
+ "reference": "5fd5656718d7068a02d046f418a7ba873d5abbfe",
"shasum": ""
},
"require": {
@@ -950,9 +950,9 @@
"description": "Format text by applying transformations provided by plug-in formatters.",
"support": {
"issues": "https://github.com/consolidation/output-formatters/issues",
- "source": "https://github.com/consolidation/output-formatters/tree/4.5.0"
+ "source": "https://github.com/consolidation/output-formatters/tree/4.6.0"
},
- "time": "2024-04-02T15:18:52+00:00"
+ "time": "2024-10-18T14:02:48+00:00"
},
{
"name": "consolidation/robo",
@@ -4308,16 +4308,16 @@
},
{
"name": "drupal/hdbt",
- "version": "6.7.8",
+ "version": "6.7.18",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "9ad05cc9c80d0dc536132ae07625ae4375c51d3d"
+ "reference": "643a333baebd357037bcacb7810d4a14dde39e4d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/9ad05cc9c80d0dc536132ae07625ae4375c51d3d",
- "reference": "9ad05cc9c80d0dc536132ae07625ae4375c51d3d",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/643a333baebd357037bcacb7810d4a14dde39e4d",
+ "reference": "643a333baebd357037bcacb7810d4a14dde39e4d",
"shasum": ""
},
"require": {
@@ -4336,23 +4336,23 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.8",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.18",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2024-10-07T12:37:51+00:00"
+ "time": "2024-10-22T12:59:01+00:00"
},
{
"name": "drupal/hdbt_admin",
- "version": "3.2.3",
+ "version": "3.2.5",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git",
- "reference": "2d5454a08e66621f0e7ef5116066c1eb450cea33"
+ "reference": "f3284d00c7cb52126c727b744ccac5108195544c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/2d5454a08e66621f0e7ef5116066c1eb450cea33",
- "reference": "2d5454a08e66621f0e7ef5116066c1eb450cea33",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/f3284d00c7cb52126c727b744ccac5108195544c",
+ "reference": "f3284d00c7cb52126c727b744ccac5108195544c",
"shasum": ""
},
"require": {
@@ -4373,10 +4373,10 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.3",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.5",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues"
},
- "time": "2024-10-02T11:54:42+00:00"
+ "time": "2024-10-11T08:52:57+00:00"
},
{
"name": "drupal/health_check",
@@ -4430,16 +4430,16 @@
},
{
"name": "drupal/helfi_api_base",
- "version": "2.7.8",
+ "version": "2.7.10",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git",
- "reference": "7a37870d06234179c50f9f5c5d190d49af7c2e62"
+ "reference": "2327b07739cbead0d2e7d3482c074d717b786ba6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/7a37870d06234179c50f9f5c5d190d49af7c2e62",
- "reference": "7a37870d06234179c50f9f5c5d190d49af7c2e62",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/2327b07739cbead0d2e7d3482c074d717b786ba6",
+ "reference": "2327b07739cbead0d2e7d3482c074d717b786ba6",
"shasum": ""
},
"require": {
@@ -4469,23 +4469,23 @@
],
"description": "Helfi - API Base",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.8",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.10",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
},
- "time": "2024-10-03T06:20:46+00:00"
+ "time": "2024-10-18T12:57:18+00:00"
},
{
"name": "drupal/helfi_azure_fs",
- "version": "2.0.5",
+ "version": "2.0.7",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git",
- "reference": "955f8b742147cab0cf82370b6cc93a6901624261"
+ "reference": "f35b0a703e2da09374c4ca137dd6519274db552a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/955f8b742147cab0cf82370b6cc93a6901624261",
- "reference": "955f8b742147cab0cf82370b6cc93a6901624261",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/f35b0a703e2da09374c4ca137dd6519274db552a",
+ "reference": "f35b0a703e2da09374c4ca137dd6519274db552a",
"shasum": ""
},
"require": {
@@ -4507,6 +4507,9 @@
},
"twistor/flysystem-stream-wrapper": {
"PHP 8.2 support (https://www.drupal.org/project/flysystem/issues/3387094)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-azure-fs/ddb222622b92d1c2b7db975a84167a00579a1ad0/patches/3387094-add-context-property-to-stream-wrapper.patch"
+ },
+ "drupal/flysystem": {
+ "UHF-10544 D10.3 support (https://drupal.org/i/3457193)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-azure-fs/82f0dc93d14357011d12d219f5d1641da7ae6960/patches/3457193.patch"
}
}
},
@@ -4515,10 +4518,10 @@
],
"description": "Helfi - Azure FS",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.5",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.7",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues"
},
- "time": "2024-10-03T06:32:56+00:00"
+ "time": "2024-10-11T07:42:06+00:00"
},
{
"name": "drupal/helfi_drupal_tools",
@@ -4641,16 +4644,16 @@
},
{
"name": "drupal/helfi_platform_config",
- "version": "4.6.11",
+ "version": "4.6.19",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "46f83e38d3e63714779f3b040e040c9b4be406bb"
+ "reference": "c17835fd4b1629ab55852a857320d6bd102b963d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/46f83e38d3e63714779f3b040e040c9b4be406bb",
- "reference": "46f83e38d3e63714779f3b040e040c9b4be406bb",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c17835fd4b1629ab55852a857320d6bd102b963d",
+ "reference": "c17835fd4b1629ab55852a857320d6bd102b963d",
"shasum": ""
},
"require": {
@@ -4671,7 +4674,7 @@
"drupal/elasticsearch_connector": "^7.0@alpha",
"drupal/entity_browser": "^2.5",
"drupal/entity_usage": "^2.0@beta",
- "drupal/eu_cookie_compliance": "^1.24",
+ "drupal/eu_cookie_compliance": "1.24",
"drupal/external_entities": "^2.0@beta",
"drupal/field_group": "^3.1",
"drupal/focal_point": "^2.0",
@@ -4769,10 +4772,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.11",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.19",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2024-10-08T06:10:45+00:00"
+ "time": "2024-10-22T08:56:56+00:00"
},
{
"name": "drupal/helfi_proxy",
@@ -5489,17 +5492,17 @@
},
{
"name": "drupal/linkit",
- "version": "6.1.4",
+ "version": "6.1.6",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/linkit.git",
- "reference": "6.1.4"
+ "reference": "6.1.6"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/linkit-6.1.4.zip",
- "reference": "6.1.4",
- "shasum": "f5544a39d691af5efd1532bd5403862a7153f60b"
+ "url": "https://ftp.drupal.org/files/projects/linkit-6.1.6.zip",
+ "reference": "6.1.6",
+ "shasum": "113d8e569cfb92f8d7feb0a2f7713953c0715e92"
},
"require": {
"drupal/core": "^10.1"
@@ -5511,8 +5514,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "6.1.4",
- "datestamp": "1715203830",
+ "version": "6.1.6",
+ "datestamp": "1729189029",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -7383,30 +7386,30 @@
},
{
"name": "drupal/tfa",
- "version": "1.8.0",
+ "version": "1.9.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/tfa.git",
- "reference": "8.x-1.8"
+ "reference": "8.x-1.9"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/tfa-8.x-1.8.zip",
- "reference": "8.x-1.8",
- "shasum": "fda56a048fc15d2d24601981785d3974cd29acd9"
+ "url": "https://ftp.drupal.org/files/projects/tfa-8.x-1.9.zip",
+ "reference": "8.x-1.9",
+ "shasum": "1d42020673e8c29259dd9b6b2a7c1f974e66a415"
},
"require": {
"chillerlan/php-qrcode": "^1.0.9 || ^2.0 || ^3.2 || ^4.0",
"christian-riesen/otp": "^2.1",
- "drupal/core": "^8 || ^9 || ^10",
+ "drupal/core": "^8 || ^9 || ^10 || ^11",
"drupal/encrypt": "~3.0",
"php": ">=7.0"
},
"require-dev": {
"drupal/encrypt": "*",
"drupal/key": "*",
- "drupal/services": "^4 || ^5",
- "drush/drush": "^10 || ^11 || ^12",
+ "drupal/services": "*",
+ "drush/drush": "^10 || ^11 || ^12 || ^13",
"mglaman/phpstan-drupal": "^1.1",
"phpstan/extension-installer": "^1.2",
"phpstan/phpstan": "^1.9",
@@ -7416,8 +7419,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.8",
- "datestamp": "1727892298",
+ "version": "8.x-1.9",
+ "datestamp": "1729138391",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -7886,42 +7889,39 @@
},
{
"name": "drupal/views_bulk_operations",
- "version": "4.2.7",
+ "version": "4.3.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/views_bulk_operations.git",
- "reference": "4.2.7"
+ "reference": "4.3.0"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.2.7.zip",
- "reference": "4.2.7",
- "shasum": "25c9fa531ac49664a361fdd2202eec0a6e53bc61"
+ "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.3.0.zip",
+ "reference": "4.3.0",
+ "shasum": "887e784e3e41b05d6f8915c223d42f4273ada604"
},
"require": {
- "drupal/core": "^9.4 || ^10 || ^11",
- "php": ">=7.4.0"
+ "drupal/core": "^10.3 || ^11"
+ },
+ "conflict": {
+ "drush/drush": "<12.5.1"
},
"require-dev": {
- "drush/drush": "^12"
+ "drush/drush": "^12 || ^13"
},
"suggest": {
- "drush/drush": "^11 || ^12"
+ "drush/drush": "^12 || ^13"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "4.2.7",
- "datestamp": "1717665214",
+ "version": "4.3.0",
+ "datestamp": "1729513620",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
- },
- "drush": {
- "services": {
- "drush.services.yml": "^10 || ^11"
- }
}
},
"notification-url": "https://packages.drupal.org/8/downloads",
@@ -9013,16 +9013,16 @@
},
{
"name": "guzzlehttp/promises",
- "version": "2.0.3",
+ "version": "2.0.4",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"
+ "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
- "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
+ "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
"shasum": ""
},
"require": {
@@ -9076,7 +9076,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/2.0.3"
+ "source": "https://github.com/guzzle/promises/tree/2.0.4"
},
"funding": [
{
@@ -9092,7 +9092,7 @@
"type": "tidelift"
}
],
- "time": "2024-07-18T10:29:17+00:00"
+ "time": "2024-10-17T10:06:22+00:00"
},
{
"name": "guzzlehttp/psr7",
@@ -10131,16 +10131,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.0",
+ "version": "v5.3.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a"
+ "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a",
- "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
"shasum": ""
},
"require": {
@@ -10183,9 +10183,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
},
- "time": "2024-09-29T13:56:26+00:00"
+ "time": "2024-10-08T18:51:32+00:00"
},
{
"name": "nodespark/des-connector",
@@ -17569,16 +17569,16 @@
},
{
"name": "phpstan/phpdoc-parser",
- "version": "1.32.0",
+ "version": "1.33.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
- "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4"
+ "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ca22b154efdd9e3c68c56f5d94670920a1c19a4",
- "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140",
+ "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140",
"shasum": ""
},
"require": {
@@ -17610,9 +17610,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
- "source": "https://github.com/phpstan/phpdoc-parser/tree/1.32.0"
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0"
},
- "time": "2024-09-26T07:23:32+00:00"
+ "time": "2024-10-13T11:25:22+00:00"
},
{
"name": "phpstan/phpstan",
@@ -20099,7 +20099,7 @@
},
"prefer-stable": true,
"prefer-lowest": false,
- "platform": [],
- "platform-dev": [],
+ "platform": {},
+ "platform-dev": {},
"plugin-api-version": "2.6.0"
}
diff --git a/conf/cmi/core.base_field_override.node.landing_page.promote.yml b/conf/cmi/core.base_field_override.node.landing_page.promote.yml
index bbf59e37..dabd05e3 100644
--- a/conf/cmi/core.base_field_override.node.landing_page.promote.yml
+++ b/conf/cmi/core.base_field_override.node.landing_page.promote.yml
@@ -5,7 +5,7 @@ dependencies:
config:
- node.type.landing_page
_core:
- default_config_hash: KZ4pDrGhkRiIo7Ee-E4HGZp7YPXKS_FLR0nLeUQ3P2U
+ default_config_hash: 0RFWx8vtIwLeQrOoawTp8idfhPTj_7aPejhw4Pp3xqc
id: node.landing_page.promote
field_name: promote
entity_type: node
diff --git a/conf/cmi/core.base_field_override.node.landing_page.status.yml b/conf/cmi/core.base_field_override.node.landing_page.status.yml
index 06168e8d..0933ff21 100644
--- a/conf/cmi/core.base_field_override.node.landing_page.status.yml
+++ b/conf/cmi/core.base_field_override.node.landing_page.status.yml
@@ -5,7 +5,7 @@ dependencies:
config:
- node.type.landing_page
_core:
- default_config_hash: ewmZbuO4KgD36Ka7QA-8tJ9jktJH-jQbTNMrkHfuQRc
+ default_config_hash: LhhVx2le9fx915rM-xf5RApryzfsAY8X_odQehIJq9U
id: node.landing_page.status
field_name: status
entity_type: node
diff --git a/conf/cmi/core.base_field_override.node.page.promote.yml b/conf/cmi/core.base_field_override.node.page.promote.yml
index 708093db..d1064d79 100644
--- a/conf/cmi/core.base_field_override.node.page.promote.yml
+++ b/conf/cmi/core.base_field_override.node.page.promote.yml
@@ -5,7 +5,7 @@ dependencies:
config:
- node.type.page
_core:
- default_config_hash: vdYkuvvyzCU3dFiOu7LULd-uZyENb_byNYidQVIZtXk
+ default_config_hash: Awr4_4hZMOAsXNK5ZxL4I1U5BCzGywFswcc9pteegIk
id: node.page.promote
field_name: promote
entity_type: node
diff --git a/conf/cmi/core.base_field_override.node.page.status.yml b/conf/cmi/core.base_field_override.node.page.status.yml
index a9f826b6..2d14c17c 100644
--- a/conf/cmi/core.base_field_override.node.page.status.yml
+++ b/conf/cmi/core.base_field_override.node.page.status.yml
@@ -5,7 +5,7 @@ dependencies:
config:
- node.type.page
_core:
- default_config_hash: 0m4p2SiQag8S_hCuiUZt-3xis3qrOuBXCwKH51hF5lo
+ default_config_hash: sq-TgFSE-Ft53bktUufBtJVHiqZboy0IFAc5JH0iLJ4
id: node.page.status
field_name: status
entity_type: node
diff --git a/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml b/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml
index df34fa6e..04b1bf7e 100644
--- a/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml
+++ b/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml
@@ -8,7 +8,6 @@ dependencies:
- paragraphs.paragraphs_type.columns
- paragraphs.paragraphs_type.contact_card_listing
- paragraphs.paragraphs_type.content_cards
- - paragraphs.paragraphs_type.content_liftup
- paragraphs.paragraphs_type.image
- paragraphs.paragraphs_type.liftup_with_image
- paragraphs.paragraphs_type.list_of_links
@@ -45,7 +44,6 @@ settings:
columns: columns
contact_card_listing: contact_card_listing
content_cards: content_cards
- content_liftup: content_liftup
image: image
liftup_with_image: liftup_with_image
list_of_links: list_of_links
@@ -72,9 +70,6 @@ settings:
content_cards:
weight: 0
enabled: true
- content_liftup:
- weight: 0
- enabled: true
image:
weight: 0
enabled: true
diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml
index 8252dbdc..3b4d4926 100644
--- a/conf/cmi/core.entity_form_display.node.landing_page.default.yml
+++ b/conf/cmi/core.entity_form_display.node.landing_page.default.yml
@@ -18,7 +18,7 @@ dependencies:
- publication_date
- scheduler
_core:
- default_config_hash: hhHaoVWPiqGGQ2qDbN-7sawAmvK_BCGWA2vwgIevwq4
+ default_config_hash: nz2kuZQ53sXaRjzi5GT0LPTskHJFGOgRZuY2XwpDYls
id: node.landing_page.default
targetEntityType: node
bundle: landing_page
diff --git a/conf/cmi/core.entity_form_display.node.page.default.yml b/conf/cmi/core.entity_form_display.node.page.default.yml
index d16e4558..eddaa118 100644
--- a/conf/cmi/core.entity_form_display.node.page.default.yml
+++ b/conf/cmi/core.entity_form_display.node.page.default.yml
@@ -21,7 +21,7 @@ dependencies:
- publication_date
- scheduler
_core:
- default_config_hash: IrTthHmbnCZxuMpndzRlr9-t2RT3szU18RcM_bpnrz0
+ default_config_hash: 1c66UJvkqgUlwTKKPGactcR0FjaLLXJZq9ZHP_M24ao
id: node.page.default
targetEntityType: node
bundle: page
diff --git a/conf/cmi/core.entity_form_display.paragraph.content_liftup.default.yml b/conf/cmi/core.entity_form_display.paragraph.content_liftup.default.yml
deleted file mode 100644
index 3a36e6e1..00000000
--- a/conf/cmi/core.entity_form_display.paragraph.content_liftup.default.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 640b1d52-88bd-4dc5-94d6-87493b5415c8
-langcode: en
-status: true
-dependencies:
- config:
- - field.field.paragraph.content_liftup.field_content_liftup_unit
- - paragraphs.paragraphs_type.content_liftup
-_core:
- default_config_hash: xULweJ9JMlJZPMLEKe6rT2QooMGsSyiqRMh9VCv95fM
-id: paragraph.content_liftup.default
-targetEntityType: paragraph
-bundle: content_liftup
-mode: default
-content:
- field_content_liftup_unit:
- type: entity_reference_autocomplete
- weight: 1
- region: content
- settings:
- match_operator: CONTAINS
- match_limit: 10
- size: 60
- placeholder: ''
- third_party_settings: { }
-hidden:
- created: true
- status: true
diff --git a/conf/cmi/core.entity_form_display.paragraph.curated_event_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.curated_event_list.default.yml
new file mode 100644
index 00000000..2514fff1
--- /dev/null
+++ b/conf/cmi/core.entity_form_display.paragraph.curated_event_list.default.yml
@@ -0,0 +1,38 @@
+uuid: b5c5ed81-d651-4db2-8d72-a67e7b66390e
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.field.paragraph.curated_event_list.field_all_events_link
+ - field.field.paragraph.curated_event_list.field_events
+ - paragraphs.paragraphs_type.curated_event_list
+ module:
+ - link
+_core:
+ default_config_hash: xbLWsjGFnK8aSW5O_r3mVF5bAlCp8J6wP5mGihlXLfU
+id: paragraph.curated_event_list.default
+targetEntityType: paragraph
+bundle: curated_event_list
+mode: default
+content:
+ field_all_events_link:
+ type: link_default
+ weight: 1
+ region: content
+ settings:
+ placeholder_url: ''
+ placeholder_title: ''
+ third_party_settings: { }
+ field_events:
+ type: entity_reference_autocomplete
+ weight: 0
+ region: content
+ settings:
+ match_operator: CONTAINS
+ match_limit: 5
+ size: 60
+ placeholder: ''
+ third_party_settings: { }
+hidden:
+ created: true
+ status: true
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
index 9cb31229..1b37a2f8 100644
--- a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
+++ b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -133,6 +133,16 @@ content:
allowed_formats:
hide_help: '1'
hide_guidelines: '1'
+ field_categories:
+ type: readonly_field_widget
+ weight: 39
+ region: content
+ settings:
+ label: above
+ formatter_type: null
+ formatter_settings: { }
+ show_description: false
+ third_party_settings: { }
field_content:
type: paragraphs
weight: 31
@@ -152,6 +162,16 @@ content:
collapse_edit_all: collapse_edit_all
duplicate: duplicate
third_party_settings: { }
+ field_hs_front_page:
+ type: entity_reference_autocomplete
+ weight: 31
+ region: content
+ settings:
+ match_operator: CONTAINS
+ match_limit: 10
+ size: 60
+ placeholder: ''
+ third_party_settings: { }
field_lower_content:
type: paragraphs
weight: 33
@@ -179,6 +199,16 @@ content:
sidebar: false
use_details: true
third_party_settings: { }
+ field_ontologyword_details:
+ type: readonly_field_widget
+ weight: 40
+ region: content
+ settings:
+ label: above
+ formatter_type: null
+ formatter_settings: { }
+ show_description: false
+ third_party_settings: { }
field_phone_label:
type: string_textfield
weight: 11
@@ -194,6 +224,16 @@ content:
settings:
display_label: true
third_party_settings: { }
+ field_study_field:
+ type: select2_entity_reference
+ weight: 31
+ region: content
+ settings:
+ width: 100%
+ autocomplete: false
+ match_operator: CONTAINS
+ match_limit: 10
+ third_party_settings: { }
field_unit_type:
type: entity_reference_autocomplete
weight: 34
@@ -204,6 +244,13 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
+ hide_description:
+ type: boolean_checkbox
+ weight: 18
+ region: content
+ settings:
+ display_label: true
+ third_party_settings: { }
hide_sidebar_navigation:
type: boolean_checkbox
weight: 35
@@ -391,6 +438,16 @@ content:
formatter_settings: { }
show_description: false
third_party_settings: { }
+ subgroup:
+ type: readonly_field_widget
+ weight: 40
+ region: content
+ settings:
+ label: above
+ formatter_type: null
+ formatter_settings: { }
+ show_description: false
+ third_party_settings: { }
toc_enabled:
type: boolean_checkbox
weight: 3
@@ -439,63 +496,6 @@ content:
formatter_settings: { }
show_description: false
third_party_settings: { }
- field_categories:
- type: readonly_field_widget
- weight: 39
- region: content
- settings:
- label: above
- formatter_type: null
- formatter_settings: { }
- show_description: false
- third_party_settings: { }
- field_hs_front_page:
- type: entity_reference_autocomplete
- weight: 31
- region: content
- settings:
- match_operator: CONTAINS
- match_limit: 10
- size: 60
- placeholder: ''
- third_party_settings: { }
- field_ontologyword_details:
- type: readonly_field_widget
- weight: 40
- region: content
- settings:
- label: above
- formatter_type: null
- formatter_settings: { }
- show_description: false
- third_party_settings: { }
- field_study_field:
- type: select2_entity_reference
- weight: 31
- region: content
- settings:
- width: 100%
- autocomplete: false
- match_operator: CONTAINS
- match_limit: 10
- third_party_settings: { }
- hide_description:
- type: boolean_checkbox
- weight: 18
- region: content
- settings:
- display_label: true
- third_party_settings: { }
- subgroup:
- type: readonly_field_widget
- weight: 40
- region: content
- settings:
- label: above
- formatter_type: null
- formatter_settings: { }
- show_description: false
- third_party_settings: { }
hidden:
created: true
field_districts: true
diff --git a/conf/cmi/core.entity_view_display.linkedevents_event.linkedevents_event.default.yml b/conf/cmi/core.entity_view_display.linkedevents_event.linkedevents_event.default.yml
new file mode 100644
index 00000000..78ab301e
--- /dev/null
+++ b/conf/cmi/core.entity_view_display.linkedevents_event.linkedevents_event.default.yml
@@ -0,0 +1,75 @@
+uuid: 22363443-8bc6-4b97-980f-6bfb225edb1b
+langcode: en
+status: true
+dependencies:
+ config:
+ - responsive_image.styles.card_teaser
+ module:
+ - datetime
+ - external_entities
+ - imagecache_external
+ - linkit
+_core:
+ default_config_hash: HLUzZHxqtb77OIc2B344fWXiNo5fO78woa0r4KmRGcA
+id: linkedevents_event.linkedevents_event.default
+targetEntityType: linkedevents_event
+bundle: linkedevents_event
+mode: default
+content:
+ end_time:
+ type: datetime_default
+ label: hidden
+ settings:
+ timezone_override: ''
+ format_type: medium
+ third_party_settings: { }
+ weight: 3
+ region: content
+ external_link:
+ type: linkit
+ label: hidden
+ settings:
+ trim_length: 80
+ url_only: false
+ url_plain: false
+ rel: ''
+ target: ''
+ linkit_profile: default
+ third_party_settings: { }
+ weight: 4
+ region: content
+ langcode:
+ type: string_default
+ label: hidden
+ settings: { }
+ third_party_settings: { }
+ weight: 5
+ region: content
+ main_image:
+ type: imagecache_external_responsive_image
+ label: hidden
+ settings:
+ imagecache_external_link: ''
+ imagecache_external_responsive_style: card_teaser
+ third_party_settings: { }
+ weight: 1
+ region: content
+ start_time:
+ type: datetime_default
+ label: hidden
+ settings:
+ timezone_override: ''
+ format_type: medium
+ third_party_settings: { }
+ weight: 2
+ region: content
+ title:
+ type: string
+ label: hidden
+ settings:
+ link_to_entity: false
+ third_party_settings: { }
+ weight: 0
+ region: content
+hidden:
+ search_api_excerpt: true
diff --git a/conf/cmi/core.entity_view_display.node.landing_page.default.yml b/conf/cmi/core.entity_view_display.node.landing_page.default.yml
index 8c63334f..1b842ac2 100644
--- a/conf/cmi/core.entity_view_display.node.landing_page.default.yml
+++ b/conf/cmi/core.entity_view_display.node.landing_page.default.yml
@@ -14,7 +14,7 @@ dependencies:
- metatag
- user
_core:
- default_config_hash: k0yB8d9jdIQ1SPK3C2TVyKEfwT05muqbE9tTkdV9fdQ
+ default_config_hash: '-3nrGpFj2UjEtxeOaUkHAayjdX0IK1zP1joIg9Da5lg'
id: node.landing_page.default
targetEntityType: node
bundle: landing_page
diff --git a/conf/cmi/core.entity_view_display.node.landing_page.teaser.yml b/conf/cmi/core.entity_view_display.node.landing_page.teaser.yml
index 30875edc..95b4fe02 100644
--- a/conf/cmi/core.entity_view_display.node.landing_page.teaser.yml
+++ b/conf/cmi/core.entity_view_display.node.landing_page.teaser.yml
@@ -13,7 +13,7 @@ dependencies:
module:
- user
_core:
- default_config_hash: '-w2hz1ajYKPav1NspjgUWRkxu9iE-8eHNZ1Ix1LKx_M'
+ default_config_hash: r_BQI2tPEU16do-YUzrDByQnVy_8d8bJr91mdehPlwE
id: node.landing_page.teaser
targetEntityType: node
bundle: landing_page
diff --git a/conf/cmi/core.entity_view_display.node.page.default.yml b/conf/cmi/core.entity_view_display.node.page.default.yml
index 95dd9e18..952f63ba 100644
--- a/conf/cmi/core.entity_view_display.node.page.default.yml
+++ b/conf/cmi/core.entity_view_display.node.page.default.yml
@@ -18,7 +18,7 @@ dependencies:
- metatag
- user
_core:
- default_config_hash: piTzY36HSFy5WyKCdZ6BvAOj3JzxAy5Jt6J1KyU4h64
+ default_config_hash: F-u8s9R9tXTY7ZzyOpQcQ6abxM8QlR2Asv_-C3fo3Mc
id: node.page.default
targetEntityType: node
bundle: page
diff --git a/conf/cmi/core.entity_view_display.node.page.teaser.yml b/conf/cmi/core.entity_view_display.node.page.teaser.yml
index 165cedd9..daa36ea3 100644
--- a/conf/cmi/core.entity_view_display.node.page.teaser.yml
+++ b/conf/cmi/core.entity_view_display.node.page.teaser.yml
@@ -16,7 +16,7 @@ dependencies:
module:
- user
_core:
- default_config_hash: cNX3bx6qnz2khBmsfeNeR-4bUFPswL2Eb0w6tRAUzvc
+ default_config_hash: IHO2JHvcAGkOIDr7TbzmCXV80ajFCCbKs05r35GcfVc
id: node.page.teaser
targetEntityType: node
bundle: page
diff --git a/conf/cmi/core.entity_view_display.paragraph.content_liftup.default.yml b/conf/cmi/core.entity_view_display.paragraph.content_liftup.default.yml
deleted file mode 100644
index 7626eed7..00000000
--- a/conf/cmi/core.entity_view_display.paragraph.content_liftup.default.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 0bb553ce-087f-4d5b-aeb5-263e88439cdb
-langcode: en
-status: true
-dependencies:
- config:
- - field.field.paragraph.content_liftup.field_content_liftup_unit
- - paragraphs.paragraphs_type.content_liftup
-_core:
- default_config_hash: dPsp5m4FRvYce8_hXZJSdT2m-WOFaFpX1hOQw-mrgGE
-id: paragraph.content_liftup.default
-targetEntityType: paragraph
-bundle: content_liftup
-mode: default
-content:
- field_content_liftup_unit:
- type: entity_reference_entity_view
- label: hidden
- settings:
- view_mode: wide_teaser
- link: false
- third_party_settings: { }
- weight: 2
- region: content
-hidden:
- search_api_excerpt: true
diff --git a/conf/cmi/core.entity_view_display.paragraph.curated_event_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.curated_event_list.default.yml
new file mode 100644
index 00000000..966ffdd4
--- /dev/null
+++ b/conf/cmi/core.entity_view_display.paragraph.curated_event_list.default.yml
@@ -0,0 +1,40 @@
+uuid: 313ec60d-d84a-4e82-9ae3-ee3221c0e631
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.field.paragraph.curated_event_list.field_all_events_link
+ - field.field.paragraph.curated_event_list.field_events
+ - paragraphs.paragraphs_type.curated_event_list
+ module:
+ - link
+_core:
+ default_config_hash: kSyBcsfddKV9vQJsToglwPaZvKFQSf3GDFPLqkzIfTQ
+id: paragraph.curated_event_list.default
+targetEntityType: paragraph
+bundle: curated_event_list
+mode: default
+content:
+ field_all_events_link:
+ type: link
+ label: hidden
+ settings:
+ trim_length: 80
+ url_only: false
+ url_plain: false
+ rel: ''
+ target: ''
+ third_party_settings: { }
+ weight: 1
+ region: content
+ field_events:
+ type: entity_reference_entity_view
+ label: hidden
+ settings:
+ view_mode: default
+ link: false
+ third_party_settings: { }
+ weight: 0
+ region: content
+hidden:
+ search_api_excerpt: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
index ed526f65..54be6119 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
@@ -143,6 +143,13 @@ content:
third_party_settings: { }
weight: 17
region: content
+ field_ontologyword_details:
+ type: tpr_ontologyword_details_formatter
+ label: hidden
+ settings: { }
+ third_party_settings: { }
+ weight: 28
+ region: content
field_phone_label:
type: string
label: hidden
@@ -280,6 +287,13 @@ content:
third_party_settings: { }
weight: 16
region: content
+ subgroup:
+ type: tpr_connection
+ label: hidden
+ settings: { }
+ third_party_settings: { }
+ weight: 32
+ region: content
toc_enabled:
type: boolean
label: hidden
@@ -316,20 +330,6 @@ content:
third_party_settings: { }
weight: 12
region: content
- field_ontologyword_details:
- type: tpr_ontologyword_details_formatter
- label: hidden
- settings: { }
- third_party_settings: { }
- weight: 28
- region: content
- subgroup:
- type: tpr_connection
- label: hidden
- settings: { }
- third_party_settings: { }
- weight: 32
- region: content
hidden:
created: true
field_categories: true
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
index d33414a7..a3c94981 100644
--- a/conf/cmi/core.extension.yml
+++ b/conf/cmi/core.extension.yml
@@ -72,7 +72,7 @@ module:
helfi_paragraphs_columns: 0
helfi_paragraphs_contact_card_listing: 0
helfi_paragraphs_content_cards: 0
- helfi_paragraphs_content_liftup: 0
+ helfi_paragraphs_curated_event_list: 0
helfi_paragraphs_hearings: 0
helfi_paragraphs_hero: 0
helfi_paragraphs_image: 0
diff --git a/conf/cmi/easy_breadcrumb.settings.yml b/conf/cmi/easy_breadcrumb.settings.yml
index 2e5abdc3..335d89be 100644
--- a/conf/cmi/easy_breadcrumb.settings.yml
+++ b/conf/cmi/easy_breadcrumb.settings.yml
@@ -30,7 +30,7 @@ capitalizator_forced_words_first_letter: false
follow_redirects: false
limit_segment_display: false
segment_display_limit: null
+segment_display_minimum: 1
truncator_mode: false
truncator_length: 100
truncator_dots: true
-segment_display_minimum: 1
diff --git a/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml b/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml
new file mode 100644
index 00000000..819ef5ee
--- /dev/null
+++ b/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml
@@ -0,0 +1,38 @@
+uuid: 66fe8cbc-203c-40aa-ac7b-6e0e89470312
+langcode: en
+status: true
+dependencies: { }
+_core:
+ default_config_hash: Ll_0kw3O6gGsRvmdTi7l4K2pwhUrL0yQT4uPcttspmA
+id: linkedevents_event
+label: 'LinkedEvents: Event'
+label_plural: 'LinkedEvents: Events'
+description: 'Event entities from https://api.hel.fi/linkedevents.'
+read_only: true
+generate_aliases: false
+field_mapper_id: jsonpath
+field_mapper_config:
+ field_mappings:
+ id:
+ value: $.id
+ uuid:
+ value: $.id
+ title:
+ value: $.title
+ main_image:
+ uri: '$.images[0].url'
+ title: '$.images[0].alt_text'
+ start_time:
+ value: $.start_time
+ end_time:
+ value: $.end_time
+ external_link:
+ uri: $.external_link
+ title: $.clean_title
+storage_client_id: linkedevents_events
+storage_client_config: null
+persistent_cache_max_age: 0
+annotation_entity_type_id: null
+annotation_bundle_id: null
+annotation_field_name: null
+inherits_annotation_fields: false
diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml
index 371c9be9..d21e1891 100644
--- a/conf/cmi/field.field.node.landing_page.field_content.yml
+++ b/conf/cmi/field.field.node.landing_page.field_content.yml
@@ -10,7 +10,7 @@ dependencies:
- paragraphs.paragraphs_type.chart
- paragraphs.paragraphs_type.columns
- paragraphs.paragraphs_type.content_cards
- - paragraphs.paragraphs_type.content_liftup
+ - paragraphs.paragraphs_type.curated_event_list
- paragraphs.paragraphs_type.daycare_search
- paragraphs.paragraphs_type.event_list
- paragraphs.paragraphs_type.from_library
@@ -36,7 +36,7 @@ dependencies:
module:
- entity_reference_revisions
_core:
- default_config_hash: zEXoDFJnyArUOiL2ZrtDuq4YDWKyn6ung9JndPk_Ntg
+ default_config_hash: hTXPpiRGSAr_S4UXdMrZbYum_JkD4y-qlfTvBS_M-X4
id: node.landing_page.field_content
field_name: field_content
entity_type: node
@@ -74,11 +74,11 @@ settings:
event_list: event_list
news_list: news_list
hearings: hearings
- content_liftup: content_liftup
service_list: service_list
service_list_search: service_list_search
unit_search: unit_search
unit_contact_card: unit_contact_card
+ curated_event_list: curated_event_list
negate: 0
target_bundles_drag_drop:
after_school_activity_search:
@@ -96,8 +96,8 @@ settings:
content_cards:
weight: 1
enabled: true
- content_liftup:
- weight: 11
+ curated_event_list:
+ weight: 15
enabled: true
daycare_search:
weight: 23
diff --git a/conf/cmi/field.field.node.landing_page.field_has_hero.yml b/conf/cmi/field.field.node.landing_page.field_has_hero.yml
index 6196351e..e45f123d 100644
--- a/conf/cmi/field.field.node.landing_page.field_has_hero.yml
+++ b/conf/cmi/field.field.node.landing_page.field_has_hero.yml
@@ -6,7 +6,7 @@ dependencies:
- field.storage.node.field_has_hero
- node.type.landing_page
_core:
- default_config_hash: 9YN8dmUhU-XhgxPRCb4x-ghOzqatFuntD6iIFhL9G3k
+ default_config_hash: D-QxXFQAE5RYftqDw7rRXhAGQ8Zi6KVyhqr7wDO9K4g
id: node.landing_page.field_has_hero
field_name: field_has_hero
entity_type: node
diff --git a/conf/cmi/field.field.node.landing_page.field_hero.yml b/conf/cmi/field.field.node.landing_page.field_hero.yml
index eb5ca687..04459715 100644
--- a/conf/cmi/field.field.node.landing_page.field_hero.yml
+++ b/conf/cmi/field.field.node.landing_page.field_hero.yml
@@ -9,7 +9,7 @@ dependencies:
module:
- entity_reference_revisions
_core:
- default_config_hash: wqQr5ULFXtP_T3sIZky7GLndZznJR6XMIzyIO-0lmiY
+ default_config_hash: KaTQhVTD7zi12oPJmsx4YCvrqYI4VKs6UzsUSHZMW_0
id: node.landing_page.field_hero
field_name: field_hero
entity_type: node
diff --git a/conf/cmi/field.field.node.landing_page.field_liftup_image.yml b/conf/cmi/field.field.node.landing_page.field_liftup_image.yml
index b5878417..49b02d14 100644
--- a/conf/cmi/field.field.node.landing_page.field_liftup_image.yml
+++ b/conf/cmi/field.field.node.landing_page.field_liftup_image.yml
@@ -7,7 +7,7 @@ dependencies:
- media.type.image
- node.type.landing_page
_core:
- default_config_hash: tjssmYxe5qbWn7P7--dg9YMnck83F4dImAQiwIz4eJs
+ default_config_hash: LmNZ-_b0A7CEHJsvBCOu0Bm5rL8wYMrWwy5BA_9LutI
id: node.landing_page.field_liftup_image
field_name: field_liftup_image
entity_type: node
diff --git a/conf/cmi/field.field.node.landing_page.field_metatags.yml b/conf/cmi/field.field.node.landing_page.field_metatags.yml
index 529eba4e..065899be 100644
--- a/conf/cmi/field.field.node.landing_page.field_metatags.yml
+++ b/conf/cmi/field.field.node.landing_page.field_metatags.yml
@@ -8,7 +8,7 @@ dependencies:
module:
- metatag
_core:
- default_config_hash: i5JpOyh9B9vJHXsqh-XHmZBoSaWMT3XTnBGCFLtDntw
+ default_config_hash: hekcnEJjTt7ESst-zfAY8MrteMhOFYz540rJOo4l0LI
id: node.landing_page.field_metatags
field_name: field_metatags
entity_type: node
diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml
index 958f9a67..004358dc 100644
--- a/conf/cmi/field.field.node.page.field_content.yml
+++ b/conf/cmi/field.field.node.page.field_content.yml
@@ -12,7 +12,6 @@ dependencies:
- paragraphs.paragraphs_type.columns
- paragraphs.paragraphs_type.contact_card_listing
- paragraphs.paragraphs_type.content_cards
- - paragraphs.paragraphs_type.content_liftup
- paragraphs.paragraphs_type.event_list
- paragraphs.paragraphs_type.from_library
- paragraphs.paragraphs_type.group_news
@@ -31,7 +30,7 @@ dependencies:
module:
- entity_reference_revisions
_core:
- default_config_hash: G8uqVofIIeSPJSEW4FPnQrwefO2xMZGnwlbcHrbpZ48
+ default_config_hash: 6ObVx71DtZm2Bwbo4phVPA-nauJ8lld2GdbvT9iFIcw
id: node.page.field_content
field_name: field_content
entity_type: node
@@ -65,7 +64,6 @@ settings:
event_list: event_list
contact_card_listing: contact_card_listing
news_list: news_list
- content_liftup: content_liftup
service_list_search: service_list_search
unit_search: unit_search
unit_contact_card: unit_contact_card
@@ -92,9 +90,6 @@ settings:
content_cards:
weight: 5
enabled: true
- content_liftup:
- weight: 12
- enabled: true
event_list:
weight: 13
enabled: true
diff --git a/conf/cmi/field.field.node.page.field_has_hero.yml b/conf/cmi/field.field.node.page.field_has_hero.yml
index 95f243e4..060a8fbb 100644
--- a/conf/cmi/field.field.node.page.field_has_hero.yml
+++ b/conf/cmi/field.field.node.page.field_has_hero.yml
@@ -6,7 +6,7 @@ dependencies:
- field.storage.node.field_has_hero
- node.type.page
_core:
- default_config_hash: ZaUX6z_hdafBR97yocI3uxs6NHlntDM1GTvyOzaqLec
+ default_config_hash: OQINdpOOSCX5l_5PfJelmtFDiHVESETGrWj7_LoTmk0
id: node.page.field_has_hero
field_name: field_has_hero
entity_type: node
diff --git a/conf/cmi/field.field.node.page.field_hero.yml b/conf/cmi/field.field.node.page.field_hero.yml
index c7e9d23e..c595b851 100644
--- a/conf/cmi/field.field.node.page.field_hero.yml
+++ b/conf/cmi/field.field.node.page.field_hero.yml
@@ -9,7 +9,7 @@ dependencies:
module:
- entity_reference_revisions
_core:
- default_config_hash: _JO0VBpDGRU-ye4MgCyh72SJmF6G9ndACtwAfuQJZI8
+ default_config_hash: ABVg78DS3Nw5IjpLToJyHIKKneImCCeV37bGTSYQCPw
id: node.page.field_hero
field_name: field_hero
entity_type: node
diff --git a/conf/cmi/field.field.node.page.field_lead_in.yml b/conf/cmi/field.field.node.page.field_lead_in.yml
index 0c00682c..5dcf2ccf 100644
--- a/conf/cmi/field.field.node.page.field_lead_in.yml
+++ b/conf/cmi/field.field.node.page.field_lead_in.yml
@@ -6,7 +6,7 @@ dependencies:
- field.storage.node.field_lead_in
- node.type.page
_core:
- default_config_hash: tPwfvL9sS2_dI0nhmfCMypX6JXVe5rARuztaSQ5h6Z8
+ default_config_hash: WJ-GI4hxHLj-LOOeftyY2oUueL_Vf7aCagTbT3RTlkU
id: node.page.field_lead_in
field_name: field_lead_in
entity_type: node
diff --git a/conf/cmi/field.field.node.page.field_liftup_image.yml b/conf/cmi/field.field.node.page.field_liftup_image.yml
index 6c72eeec..5a288fd7 100644
--- a/conf/cmi/field.field.node.page.field_liftup_image.yml
+++ b/conf/cmi/field.field.node.page.field_liftup_image.yml
@@ -7,7 +7,7 @@ dependencies:
- media.type.image
- node.type.page
_core:
- default_config_hash: HnNX7GzhZeJlJrJoD5s1zgpCSG-TT5PEgL9tSbc97Qg
+ default_config_hash: YVZuPe0HyzTmFUyhL571saa_4HZD7-iDMePASIRhqcs
id: node.page.field_liftup_image
field_name: field_liftup_image
entity_type: node
diff --git a/conf/cmi/field.field.node.page.field_lower_content.yml b/conf/cmi/field.field.node.page.field_lower_content.yml
index 88915779..a885d932 100644
--- a/conf/cmi/field.field.node.page.field_lower_content.yml
+++ b/conf/cmi/field.field.node.page.field_lower_content.yml
@@ -13,7 +13,6 @@ dependencies:
- paragraphs.paragraphs_type.columns
- paragraphs.paragraphs_type.contact_card_listing
- paragraphs.paragraphs_type.content_cards
- - paragraphs.paragraphs_type.content_liftup
- paragraphs.paragraphs_type.daycare_search
- paragraphs.paragraphs_type.event_list
- paragraphs.paragraphs_type.from_library
@@ -34,7 +33,7 @@ dependencies:
module:
- entity_reference_revisions
_core:
- default_config_hash: AejXN443GE3b159k_6fsqDyZ_BHs68SU9wBMY24Ueog
+ default_config_hash: v3n3ZeAjQ22N3kPPeDCIlFFcOuTiJ9F1CB0Gf4HQ6ZI
id: node.page.field_lower_content
field_name: field_lower_content
entity_type: node
@@ -71,7 +70,6 @@ settings:
event_list: event_list
contact_card_listing: contact_card_listing
news_list: news_list
- content_liftup: content_liftup
service_list_search: service_list_search
unit_search: unit_search
unit_contact_card: unit_contact_card
@@ -101,9 +99,6 @@ settings:
content_cards:
weight: 1
enabled: true
- content_liftup:
- weight: 12
- enabled: true
daycare_search:
weight: 23
enabled: true
diff --git a/conf/cmi/field.field.node.page.field_metatags.yml b/conf/cmi/field.field.node.page.field_metatags.yml
index be4cf956..36c28fcc 100644
--- a/conf/cmi/field.field.node.page.field_metatags.yml
+++ b/conf/cmi/field.field.node.page.field_metatags.yml
@@ -8,7 +8,7 @@ dependencies:
module:
- metatag
_core:
- default_config_hash: 66fePtAJZ1t0RO2WvkpN-gBiDaq55M4LM1FFDEQ6rvY
+ default_config_hash: umfCmBUM3Qvbgnbf2Mms9ptk9QqXkx-P2bw7BHUvc8g
id: node.page.field_metatags
field_name: field_metatags
entity_type: node
diff --git a/conf/cmi/field.field.node.page.field_sidebar_content.yml b/conf/cmi/field.field.node.page.field_sidebar_content.yml
index 6ff29355..f4ff3edb 100644
--- a/conf/cmi/field.field.node.page.field_sidebar_content.yml
+++ b/conf/cmi/field.field.node.page.field_sidebar_content.yml
@@ -10,7 +10,7 @@ dependencies:
module:
- entity_reference_revisions
_core:
- default_config_hash: 056k2o_OzWbDmv_9zA5BNb30RqLImUGCYN6nnYWjqoQ
+ default_config_hash: SQUCcarKdIUnT8p_fKf_Dca17YujYpyfd8H1m91BTK0
id: node.page.field_sidebar_content
field_name: field_sidebar_content
entity_type: node
diff --git a/conf/cmi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml b/conf/cmi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml
deleted file mode 100644
index 6f96ab31..00000000
--- a/conf/cmi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: ef752f4e-78a6-431d-8216-9623b7588bb1
-langcode: en
-status: true
-dependencies:
- config:
- - field.storage.paragraph.field_content_liftup_unit
- - paragraphs.paragraphs_type.content_liftup
-_core:
- default_config_hash: PDfXJdsEFnyW-qrv229_Y5bkaK0ztYhLPJc6JutjBfs
-id: paragraph.content_liftup.field_content_liftup_unit
-field_name: field_content_liftup_unit
-entity_type: paragraph
-bundle: content_liftup
-label: Unit
-description: 'Add here the content that you want to appear as cards to the block. Works only with TPR Unit in alpha version'
-required: true
-translatable: false
-default_value: { }
-default_value_callback: ''
-settings:
- handler: views
- handler_settings:
- view:
- view_name: er_tpr_unit
- display_name: entity_reference
- arguments: { }
-field_type: entity_reference
diff --git a/conf/cmi/field.field.paragraph.curated_event_list.field_all_events_link.yml b/conf/cmi/field.field.paragraph.curated_event_list.field_all_events_link.yml
new file mode 100644
index 00000000..78d0b935
--- /dev/null
+++ b/conf/cmi/field.field.paragraph.curated_event_list.field_all_events_link.yml
@@ -0,0 +1,30 @@
+uuid: b144b934-3c5a-4c5b-ae89-b477bfb8367d
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.storage.paragraph.field_all_events_link
+ - paragraphs.paragraphs_type.curated_event_list
+ module:
+ - link
+_core:
+ default_config_hash: FfVydFQYnAcPJkSaTbBQoyzqe8k11WrSJ5tSxAt8b1k
+id: paragraph.curated_event_list.field_all_events_link
+field_name: field_all_events_link
+entity_type: paragraph
+bundle: curated_event_list
+label: 'All events link'
+description: "Add a link to the tapahtumat.hel.fi website. You may also filter the events in the event calendar as desired and copy the page's URL.\r\n
\r\nAlso provide a text for the link, eg. View all events."
+required: false
+translatable: false
+default_value:
+ -
+ attributes: { }
+ uri: 'https://tapahtumat.hel.fi'
+ title: 'View all events'
+ options: { }
+default_value_callback: ''
+settings:
+ title: 2
+ link_type: 16
+field_type: link
diff --git a/conf/cmi/field.field.paragraph.curated_event_list.field_events.yml b/conf/cmi/field.field.paragraph.curated_event_list.field_events.yml
new file mode 100644
index 00000000..896f3cde
--- /dev/null
+++ b/conf/cmi/field.field.paragraph.curated_event_list.field_events.yml
@@ -0,0 +1,28 @@
+uuid: 41acbd4d-63ba-4cb7-919c-d6435553d4a9
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.storage.paragraph.field_events
+ - paragraphs.paragraphs_type.curated_event_list
+_core:
+ default_config_hash: XaOHQv-1E_t55GwYhhyvtA03_7mWbdEbmXA3YhGrHiA
+id: paragraph.curated_event_list.field_events
+field_name: field_events
+entity_type: paragraph
+bundle: curated_event_list
+label: Events
+description: "Pick events to display in the list. You may either search event by their name or enter their ID. \r\n
\r\nYou can find the ID of an event on tapahtumat.hel.fi site from the URL of the page. For example, in the url https://tapahtumat.hel.fi/fi/events/helsinki:agiy4m4ida the helsinki:agiy4m4ida part is the ID of the event.\r\n
\r\nThe page will display the top three events. You can arrange the events by dragging. Expired events will be automatically removed from the page."
+required: false
+translatable: false
+default_value: { }
+default_value_callback: ''
+settings:
+ handler: 'default:linkedevents_event'
+ handler_settings:
+ target_bundles: null
+ sort:
+ field: _none
+ direction: ASC
+ auto_create: false
+field_type: entity_reference
diff --git a/conf/cmi/field.storage.paragraph.field_all_events_link.yml b/conf/cmi/field.storage.paragraph.field_all_events_link.yml
new file mode 100644
index 00000000..046d3b06
--- /dev/null
+++ b/conf/cmi/field.storage.paragraph.field_all_events_link.yml
@@ -0,0 +1,21 @@
+uuid: 1dd4d7e6-e3be-490e-9309-e9380e0c33b4
+langcode: en
+status: true
+dependencies:
+ module:
+ - link
+ - paragraphs
+_core:
+ default_config_hash: 7QiTeiuYd-9Za2xvC3WVShDfIhAcgIpMYzIV4PX2NLQ
+id: paragraph.field_all_events_link
+field_name: field_all_events_link
+entity_type: paragraph
+type: link
+settings: { }
+module: link
+locked: false
+cardinality: 1
+translatable: true
+indexes: { }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/conf/cmi/field.storage.paragraph.field_content_liftup_unit.yml b/conf/cmi/field.storage.paragraph.field_content_liftup_unit.yml
deleted file mode 100644
index ec15db6b..00000000
--- a/conf/cmi/field.storage.paragraph.field_content_liftup_unit.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 33db56a9-04f3-45ca-9ab3-8b68bb2f6071
-langcode: en
-status: true
-dependencies:
- module:
- - helfi_tpr
- - paragraphs
-_core:
- default_config_hash: qDXN7Cf4Za-x_Udo3DzY4P9LhxH6YTQW0D0YhB66BnQ
-id: paragraph.field_content_liftup_unit
-field_name: field_content_liftup_unit
-entity_type: paragraph
-type: entity_reference
-settings:
- target_type: tpr_unit
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: { }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/conf/cmi/field.storage.paragraph.field_events.yml b/conf/cmi/field.storage.paragraph.field_events.yml
new file mode 100644
index 00000000..aff4e3ba
--- /dev/null
+++ b/conf/cmi/field.storage.paragraph.field_events.yml
@@ -0,0 +1,22 @@
+uuid: a381685c-627a-4ba4-8be3-5bb2d2a705bd
+langcode: en
+status: true
+dependencies:
+ module:
+ - external_entities
+ - paragraphs
+_core:
+ default_config_hash: 5xBhIfvn2RSNE7qg7Ep4BljIMo7j78jrEekdHV_eCgo
+id: paragraph.field_events
+field_name: field_events
+entity_type: paragraph
+type: entity_reference
+settings:
+ target_type: linkedevents_event
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: { }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/conf/cmi/language.content_settings.node.landing_page.yml b/conf/cmi/language.content_settings.node.landing_page.yml
index 3acdf816..e8a64832 100644
--- a/conf/cmi/language.content_settings.node.landing_page.yml
+++ b/conf/cmi/language.content_settings.node.landing_page.yml
@@ -10,7 +10,7 @@ third_party_settings:
content_translation:
enabled: true
_core:
- default_config_hash: UrEWFwFHhJNNrHsT2CbI-8FK7KIgmDq0xV6ahjaavBM
+ default_config_hash: Jkn_hpGZxUb8bwd-7N-7pq9YU3Ttt4tLVGrEAPhxrRg
id: node.landing_page
target_entity_type_id: node
target_bundle: landing_page
diff --git a/conf/cmi/language.content_settings.node.page.yml b/conf/cmi/language.content_settings.node.page.yml
index 166e7854..7004a317 100644
--- a/conf/cmi/language.content_settings.node.page.yml
+++ b/conf/cmi/language.content_settings.node.page.yml
@@ -10,7 +10,7 @@ third_party_settings:
content_translation:
enabled: true
_core:
- default_config_hash: gmtmgLpPQOcKE9BA_eKfrCXtoWVO63kmcfythbJiz5Q
+ default_config_hash: NuKCYRhchzV5oFaVmTQHc64apY1USi-6PazrucpcR34
id: node.page
target_entity_type_id: node
target_bundle: page
diff --git a/conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml b/conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml
deleted file mode 100644
index 32a00dda..00000000
--- a/conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-label: Toimipiste
-description: |-
- Lisää tähän sen sisällön otsikko jonka haluat nostaa sivulle.
- Voit toistaiseksi valita vain toimipisteitä.
\ No newline at end of file
diff --git a/conf/cmi/language/fi/field.field.paragraph.curated_event_list.field_all_events_link.yml b/conf/cmi/language/fi/field.field.paragraph.curated_event_list.field_all_events_link.yml
new file mode 100644
index 00000000..baa26279
--- /dev/null
+++ b/conf/cmi/language/fi/field.field.paragraph.curated_event_list.field_all_events_link.yml
@@ -0,0 +1,5 @@
+label: 'Kaikki tapahtumat -linkki'
+description: "Lisää likki tapahtumat.hel.fi -sivulle. Voit halutessasi tehdä tapahtumakalenterissa haluamasi tapahtumien rajauksen ja kopioida sivun URL-osoitteen.\r\nLisää myös teksti linkille, esimerkiksi. Katso kaikki tapahtumat"
+default_value:
+ -
+ title: 'Katso kaikki tapahtumat'
diff --git a/conf/cmi/language/fi/field.field.paragraph.curated_event_list.field_events.yml b/conf/cmi/language/fi/field.field.paragraph.curated_event_list.field_events.yml
new file mode 100644
index 00000000..65cac6a6
--- /dev/null
+++ b/conf/cmi/language/fi/field.field.paragraph.curated_event_list.field_events.yml
@@ -0,0 +1,2 @@
+label: Tapahtumat
+description: "Valitse tapahtumat, jotka näytetään listassa. Voit hakea tapahtumaa sen nimellä tai tapahtuman ID:llä.\r\n
\r\nLöydät tapahtuman ID:n tapahtumat.hel.fi-sivun osoitteesta: esimerkiksi osoitteessa https://tapahtumat.hel.fi/fi/events/helsinki:agiy4m4ida kohta helsinki:agiy4m4ida on tapahtuman ID.\r\n
\r\nSivulla näytetään kolme ylintä tapahtumaa. Voit järjestää tapahtumia raahaamalla. Vanhentuneet tapahtumat poistuvat sivulta automaattisesti."
diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml
deleted file mode 100644
index 3cf63a6b..00000000
--- a/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml
+++ /dev/null
@@ -1 +0,0 @@
-label: Toimipistekortti
diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.curated_event_list.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.curated_event_list.yml
new file mode 100644
index 00000000..7d8f759d
--- /dev/null
+++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.curated_event_list.yml
@@ -0,0 +1,2 @@
+label: 'Kuratoitu tapahtumalista'
+description: 'Manuaalisesti ylläpidettävä tapahtumalista tapahtumille Linked Events -rajapinnasta.'
diff --git a/conf/cmi/language/fi/social_media.settings.yml b/conf/cmi/language/fi/social_media.settings.yml
index ead72050..973f8ba0 100644
--- a/conf/cmi/language/fi/social_media.settings.yml
+++ b/conf/cmi/language/fi/social_media.settings.yml
@@ -12,7 +12,7 @@ social_media:
api_url: 'https://twitter.com/intent/tweet?url=[current-page:url]&status=[current-page:title]+[current-page:url]'
attributes: "target|_blank\r\nclass|twitter"
email:
- text: Sähköposti
+ text: 'Lähetä sivu sähköpostitse'
facebook_msg:
attributes: "target|_blank\r\nclass|facebook-msg\r\nrel|noopener noreferrer"
pinterest:
diff --git a/conf/cmi/language/sv/social_media.settings.yml b/conf/cmi/language/sv/social_media.settings.yml
index f3c07820..79ff812c 100644
--- a/conf/cmi/language/sv/social_media.settings.yml
+++ b/conf/cmi/language/sv/social_media.settings.yml
@@ -12,7 +12,7 @@ social_media:
api_url: 'https://twitter.com/intent/tweet?url=[current-page:url]&status=[current-page:title]+[current-page:url]'
attributes: "target|_blank\r\nclass|twitter"
email:
- text: E-post
+ text: 'Skicka via e-post'
facebook_msg:
attributes: "target|_blank\r\nclass|facebook-msg\r\nrel|noopener noreferrer"
pinterest:
diff --git a/conf/cmi/menu_link_attributes.config.yml b/conf/cmi/menu_link_attributes.config.yml
index d2fe542f..3bebeb20 100644
--- a/conf/cmi/menu_link_attributes.config.yml
+++ b/conf/cmi/menu_link_attributes.config.yml
@@ -4,10 +4,10 @@ attributes:
icon:
label: ''
class:
- label: 'Link class(es)'
- description: 'CSS class for the link (<a href>). Separate multiple classes by space.'
+ label: ''
+ description: ''
target:
- label: 'Link target'
+ label: ''
description: ''
options:
_blank: 'New window (_blank)'
diff --git a/conf/cmi/metatag.metatag_defaults.global.yml b/conf/cmi/metatag.metatag_defaults.global.yml
index c0a4da83..bc388f92 100644
--- a/conf/cmi/metatag.metatag_defaults.global.yml
+++ b/conf/cmi/metatag.metatag_defaults.global.yml
@@ -14,3 +14,4 @@ tags:
og_image: '[site:shareable-image]'
twitter_cards_image: '[site:shareable-image]'
og_site_name: '[site:page-title-suffix]'
+ twitter_cards_page_url: '[current-page:url]'
diff --git a/conf/cmi/metatag.metatag_defaults.node__landing_page.yml b/conf/cmi/metatag.metatag_defaults.node__landing_page.yml
index 431f7335..9a3a134f 100644
--- a/conf/cmi/metatag.metatag_defaults.node__landing_page.yml
+++ b/conf/cmi/metatag.metatag_defaults.node__landing_page.yml
@@ -3,7 +3,7 @@ langcode: en
status: true
dependencies: { }
_core:
- default_config_hash: KFDRmGwu9d-ua_6WM0B6f7Qz85hnDdZ0VulBDnvmg5Q
+ default_config_hash: IxbBxQpwTHAosiqZXzMlXTSiLA2-mZs2g4lZ48xwpkA
id: node__landing_page
label: 'Content: Landing page'
tags:
diff --git a/conf/cmi/metatag.metatag_defaults.node__page.yml b/conf/cmi/metatag.metatag_defaults.node__page.yml
index 5e852b21..9aa0e1c7 100644
--- a/conf/cmi/metatag.metatag_defaults.node__page.yml
+++ b/conf/cmi/metatag.metatag_defaults.node__page.yml
@@ -3,7 +3,7 @@ langcode: en
status: true
dependencies: { }
_core:
- default_config_hash: Mqgf6_xfg7HLsBnW3BSP9e9EuHWJXsEMbt240DMt_5E
+ default_config_hash: FCzY3DYgTVYC6q7fgjEKTt3jTHOgRUhj1XmD2SE9O5I
id: node__page
label: 'Content: Page'
tags: { }
diff --git a/conf/cmi/node.type.landing_page.yml b/conf/cmi/node.type.landing_page.yml
index 1a75dc2d..742615e8 100644
--- a/conf/cmi/node.type.landing_page.yml
+++ b/conf/cmi/node.type.landing_page.yml
@@ -25,7 +25,7 @@ third_party_settings:
unpublish_required: false
unpublish_revision: false
_core:
- default_config_hash: PfTlYxtl_LoeL3LJeT4Qwnzu5MZq6Rc7R5o3NLTInHU
+ default_config_hash: R1Ihw3WH8wwYHlx0C6VCEMhTDZHQ6NbZl56Dz0zMOAo
name: 'Landing page'
type: landing_page
description: 'Content type for the front page of a section or theme. A landing page consists of highlight areas, content listings and links.'
diff --git a/conf/cmi/node.type.page.yml b/conf/cmi/node.type.page.yml
index 5e5eb1dc..e9455f98 100644
--- a/conf/cmi/node.type.page.yml
+++ b/conf/cmi/node.type.page.yml
@@ -24,7 +24,7 @@ third_party_settings:
unpublish_required: false
unpublish_revision: false
_core:
- default_config_hash: A1XVcWETFW22MWUdDTxkOE331kBoYUWPQILECfHoBfk
+ default_config_hash: TxNxs_Yq3TzOPE9lwS4hArqiWBve9F-de3Lm12Hbm9U
name: 'Standard page'
type: page
description: 'Content type for standard web content.'
diff --git a/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml b/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml
deleted file mode 100644
index 3d7f8be8..00000000
--- a/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 7f69f314-b136-45d1-869c-5f6fe41cf783
-langcode: en
-status: true
-dependencies: { }
-_core:
- default_config_hash: ONSzgYJ_Jc8pZ002ZLaFDdkbCXm0lKyjjWMpiEYA3v8
-id: content_liftup
-label: 'Content liftup'
-icon_uuid: null
-icon_default: null
-description: 'With content liftup you can reference to a single content inside this site. The information about the content is automatically fetched through the reference.'
-behavior_plugins: { }
diff --git a/conf/cmi/paragraphs.paragraphs_type.curated_event_list.yml b/conf/cmi/paragraphs.paragraphs_type.curated_event_list.yml
new file mode 100644
index 00000000..b729b022
--- /dev/null
+++ b/conf/cmi/paragraphs.paragraphs_type.curated_event_list.yml
@@ -0,0 +1,12 @@
+uuid: 5b0c689e-1733-47ff-ba7c-63923e4f2116
+langcode: en
+status: true
+dependencies: { }
+_core:
+ default_config_hash: OdlftsJm7cyT434X7pj43aSTgKo7t5f7eYxG3ShBimY
+id: curated_event_list
+label: 'Curated event list'
+icon_uuid: null
+icon_default: null
+description: 'Event list with curated event picks loaded from Linked Events API.'
+behavior_plugins: { }
diff --git a/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml b/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml
index 7778c27b..4b74eeaa 100644
--- a/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml
+++ b/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml
@@ -5,7 +5,7 @@ dependencies:
module:
- node
_core:
- default_config_hash: JC4p2qHXUeY-wiNBTGDl6RCdOEYxfeMrvQe7tVcJHZY
+ default_config_hash: OkUmSgW0vSciD4ZUN-lXM_UuXElx5msmlPZToa-3yss
id: landing_page_content_pattern
label: 'Landing page content pattern'
type: 'canonical_entities:node'
diff --git a/conf/cmi/pathauto.pattern.page_content_pattern.yml b/conf/cmi/pathauto.pattern.page_content_pattern.yml
index 69eeefb7..0a1549bd 100644
--- a/conf/cmi/pathauto.pattern.page_content_pattern.yml
+++ b/conf/cmi/pathauto.pattern.page_content_pattern.yml
@@ -5,7 +5,7 @@ dependencies:
module:
- node
_core:
- default_config_hash: YrMS_tpZzY4kqrmIPkRckaFUN3aKZEyHpgADFLI6rBg
+ default_config_hash: FbJxc16K3DO9eOHODpQQ-oQAmC98JJc0Lw__17AP-fY
id: page_content_pattern
label: 'Page content pattern'
type: 'canonical_entities:node'
diff --git a/conf/cmi/raven.settings.yml b/conf/cmi/raven.settings.yml
index 81ad5377..51a8298a 100644
--- a/conf/cmi/raven.settings.yml
+++ b/conf/cmi/raven.settings.yml
@@ -29,7 +29,7 @@ rate_limit: 0
send_request_body: false
request_tracing: true
traces_sample_rate: 0.2
-browser_traces_sample_rate: null
+browser_traces_sample_rate: 0.2
database_tracing: true
twig_tracing: true
auto_session_tracking: false
diff --git a/conf/cmi/responsive_image.styles.unit_contact_card.yml b/conf/cmi/responsive_image.styles.unit_contact_card.yml
index 3893c27f..3b41081f 100644
--- a/conf/cmi/responsive_image.styles.unit_contact_card.yml
+++ b/conf/cmi/responsive_image.styles.unit_contact_card.yml
@@ -3,72 +3,72 @@ langcode: en
status: true
dependencies:
config:
- - image.style.1.5_1120w_746h_LQ
- - image.style.1.5_1200w_800h_LQ
- - image.style.1.5_1298w_866h_LQ
- - image.style.1.5_1470w_980h_LQ
- - image.style.1.5_1854w_1236h_LQ
- - image.style.1.5_560w_373h
- - image.style.1.5_600w_400h
- - image.style.1.5_649w_433h
- - image.style.1.5_735w_490h
- - image.style.1.5_927w_618h
+ - image.style.1.5_1022w_682h_LQ
+ - image.style.1.5_217w_145h
+ - image.style.1.5_264w_176h
+ - image.style.1.5_341w_227h
+ - image.style.1.5_378w_252h
+ - image.style.1.5_434w_290h_LQ
+ - image.style.1.5_511w_341h
+ - image.style.1.5_528w_352h_LQ
+ - image.style.1.5_682w_454h_LQ
+ - image.style.1.5_756w_504h_LQ
module:
- helfi_image_styles
_core:
- default_config_hash: j4r0g0EtcwDoFwxEuB3RGVktSuN6LWThnZBfw2SpG6g
+ default_config_hash: VnnwBYRxRNKSPg5iTbuRmMLcv0ZtU6Tjd4crcbDTeCs
id: unit_contact_card
label: 'Unit Contact Card'
image_style_mappings:
-
image_mapping_type: image_style
- image_mapping: 1.5_649w_433h
+ image_mapping: 1.5_378w_252h
breakpoint_id: helfi_image_styles.xl
multiplier: 1x
-
image_mapping_type: image_style
- image_mapping: 1.5_1298w_866h_LQ
+ image_mapping: 1.5_756w_504h_LQ
breakpoint_id: helfi_image_styles.xl
multiplier: 2x
-
image_mapping_type: image_style
- image_mapping: 1.5_600w_400h
+ image_mapping: 1.5_341w_227h
breakpoint_id: helfi_image_styles.l
multiplier: 1x
-
image_mapping_type: image_style
- image_mapping: 1.5_1200w_800h_LQ
+ image_mapping: 1.5_682w_454h_LQ
breakpoint_id: helfi_image_styles.l
multiplier: 2x
-
image_mapping_type: image_style
- image_mapping: 1.5_927w_618h
+ image_mapping: 1.5_264w_176h
breakpoint_id: helfi_image_styles.m
multiplier: 1x
-
image_mapping_type: image_style
- image_mapping: 1.5_1854w_1236h_LQ
+ image_mapping: 1.5_528w_352h_LQ
breakpoint_id: helfi_image_styles.m
multiplier: 2x
-
image_mapping_type: image_style
- image_mapping: 1.5_735w_490h
+ image_mapping: 1.5_217w_145h
breakpoint_id: helfi_image_styles.s
multiplier: 1x
-
image_mapping_type: image_style
- image_mapping: 1.5_1470w_980h_LQ
+ image_mapping: 1.5_434w_290h_LQ
breakpoint_id: helfi_image_styles.s
multiplier: 2x
-
image_mapping_type: image_style
- image_mapping: 1.5_560w_373h
+ image_mapping: 1.5_511w_341h
breakpoint_id: helfi_image_styles.xs
multiplier: 1x
-
image_mapping_type: image_style
- image_mapping: 1.5_1120w_746h_LQ
+ image_mapping: 1.5_1022w_682h_LQ
breakpoint_id: helfi_image_styles.xs
multiplier: 2x
breakpoint_group: helfi_image_styles
-fallback_image_style: 1.5_735w_490h
+fallback_image_style: 1.5_378w_252h
diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml
index 92c29069..e49a2251 100644
--- a/conf/cmi/user.role.anonymous.yml
+++ b/conf/cmi/user.role.anonymous.yml
@@ -10,6 +10,7 @@ dependencies:
- helfi_api_base
- helfi_tpr
- media
+ - raven
- rest
- system
_core:
@@ -23,6 +24,7 @@ permissions:
- 'display eu cookie compliance popup'
- 'restful get helfi_global_mobile_menu'
- 'restful get helfi_global_mobile_menu'
+ - 'send javascript errors to sentry'
- 'view helfi_announcements external entity'
- 'view helfi_news external entity'
- 'view helfi_news_groups external entity'
diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml
index 66c7a24e..87cd1d15 100644
--- a/conf/cmi/user.role.authenticated.yml
+++ b/conf/cmi/user.role.authenticated.yml
@@ -12,6 +12,7 @@ dependencies:
- helfi_tpr
- media
- paragraphs
+ - raven
- rest
- system
- tfa
@@ -29,6 +30,7 @@ permissions:
- 'disable own tfa'
- 'display eu cookie compliance popup'
- 'restful get helfi_global_mobile_menu'
+ - 'send javascript errors to sentry'
- 'setup own tfa'
- 'view helfi_announcements external entity'
- 'view helfi_news external entity'
diff --git a/conf/cmi/user.role.comprehensive_school_editor.yml b/conf/cmi/user.role.comprehensive_school_editor.yml
index 6fed90d0..7d1662d8 100644
--- a/conf/cmi/user.role.comprehensive_school_editor.yml
+++ b/conf/cmi/user.role.comprehensive_school_editor.yml
@@ -10,6 +10,7 @@ dependencies:
- media.type.helfi_chart
- media.type.image
- media.type.remote_video
+ - node.type.announcement
module:
- content_translation
- editoria11y
@@ -20,9 +21,11 @@ dependencies:
- helfi_tpr
- media
- node
+ - publication_date
- scheduler
- system
- tfa
+ - view_unpublished
id: comprehensive_school_editor
label: 'Comprehensive school editor'
weight: -5
@@ -38,6 +41,7 @@ permissions:
- 'admin comprehensive school units'
- 'cancel account'
- 'change own username'
+ - 'create announcement content'
- 'create file media'
- 'create hel_map media'
- 'create helfi_chart media'
@@ -45,6 +49,7 @@ permissions:
- 'create media'
- 'create remote_video media'
- 'delete media'
+ - 'delete own announcement content'
- 'delete own file media'
- 'delete own files'
- 'delete own hel_map media'
@@ -52,13 +57,16 @@ permissions:
- 'delete own image media'
- 'delete own remote_video media'
- 'disable own tfa'
+ - 'edit own announcement content'
- 'edit own file media'
- 'edit own hel_map media'
- 'edit own helfi_chart media'
- 'edit own image media'
- 'edit own remote_video media'
- 'mark as hidden in editoria11y'
+ - 'revert announcement revisions'
- 'schedule publishing of nodes'
+ - 'set announcement published on date'
- 'setup own tfa'
- 'translate editable entities'
- 'update any tpr_unit'
@@ -66,6 +74,8 @@ permissions:
- 'use text format full_html'
- 'use text format minimal'
- 'view all media revisions'
+ - 'view announcement revisions'
+ - 'view any unpublished announcement content'
- 'view editoria11y checker'
- 'view own unpublished content'
- 'view own unpublished media'
diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml
index 4e54a190..5bdfdb2a 100644
--- a/conf/cmi/views.view.er_tpr_unit.yml
+++ b/conf/cmi/views.view.er_tpr_unit.yml
@@ -91,6 +91,7 @@ display:
type: mini
options:
offset: 0
+ pagination_heading_level: h4
items_per_page: 10
total_pages: null
id: 0
@@ -105,7 +106,6 @@ display:
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
- pagination_heading_level: h4
exposed_form:
type: basic
options:
diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml
index 65c6d42a..aacb060e 100644
--- a/conf/cmi/views.view.locked_services.yml
+++ b/conf/cmi/views.view.locked_services.yml
@@ -381,6 +381,7 @@ display:
type: full
options:
offset: 0
+ pagination_heading_level: h4
items_per_page: 50
total_pages: null
id: 0
@@ -398,7 +399,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
- pagination_heading_level: h4
exposed_form:
type: basic
options:
diff --git a/conf/cmi/views.view.locked_units.yml b/conf/cmi/views.view.locked_units.yml
index ca6f6924..962da4e4 100644
--- a/conf/cmi/views.view.locked_units.yml
+++ b/conf/cmi/views.view.locked_units.yml
@@ -381,6 +381,7 @@ display:
type: full
options:
offset: 0
+ pagination_heading_level: h4
items_per_page: 50
total_pages: null
id: 0
@@ -398,7 +399,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
- pagination_heading_level: h4
exposed_form:
type: basic
options:
diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
index 106e85a6..ad00a470 100644
--- a/conf/cmi/views.view.service_list.yml
+++ b/conf/cmi/views.view.service_list.yml
@@ -109,6 +109,7 @@ display:
type: full
options:
offset: 0
+ pagination_heading_level: h4
items_per_page: 4
total_pages: null
id: 0
@@ -126,7 +127,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
- pagination_heading_level: h4
exposed_form:
type: basic
options:
@@ -646,6 +646,7 @@ display:
type: full
options:
offset: 0
+ pagination_heading_level: h4
items_per_page: 5
total_pages: null
id: 0
@@ -663,7 +664,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
- pagination_heading_level: h4
exposed_form:
type: basic
options:
diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml
index 3684c3d6..1acf4be6 100644
--- a/conf/cmi/views.view.service_units.yml
+++ b/conf/cmi/views.view.service_units.yml
@@ -93,6 +93,7 @@ display:
type: full
options:
offset: 0
+ pagination_heading_level: h4
items_per_page: 8
total_pages: null
id: 0
@@ -110,7 +111,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
- pagination_heading_level: h4
exposed_form:
type: basic
options:
diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml
index e5367958..949623f5 100644
--- a/conf/cmi/views.view.unit_search.yml
+++ b/conf/cmi/views.view.unit_search.yml
@@ -286,6 +286,7 @@ display:
type: full
options:
offset: 0
+ pagination_heading_level: h4
items_per_page: 15
total_pages: null
id: 0
@@ -303,7 +304,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
- pagination_heading_level: h4
exposed_form:
type: basic
options:
diff --git a/docker/openshift/crons/base.sh b/docker/openshift/crons/base.sh
deleted file mode 100644
index 986608b8..00000000
--- a/docker/openshift/crons/base.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-source /init.sh
-
-echo "Starting cron: $(date)"
-
-# You can add any additional cron "daemons" here:
-#
-# exec "/crons/some-command.sh" &
-#
-# Example cron (docker/openshift/crons/some-command.sh):
-# @code
-# #!/bin/bash
-# while true
-# do
-# drush some-command
-# sleep 600
-# done
-# @endcode
-
-exec "/crons/migrate-tpr.sh" &
-exec "/crons/migrate-tpr-kasko.sh" &
-exec "/crons/purge-queue.sh" &
-exec "/crons/update-translations.sh" &
-# Uncomment this to enable content scheduler
-exec "/crons/content-scheduler.sh" &
-exec "/crons/pubsub.sh" &
-exec "/crons/linked-events.sh" &
-
-while true
-do
- echo "Running cron: $(date)\n"
- drush cron
- # Sleep for 10 minutes.
- sleep 600
-done
diff --git a/docker/openshift/crons/pubsub.sh b/docker/openshift/crons/pubsub.sh
index be359b9f..7589ed46 100644
--- a/docker/openshift/crons/pubsub.sh
+++ b/docker/openshift/crons/pubsub.sh
@@ -1,5 +1,10 @@
#!/bin/bash
+if [ -z "$DRUPAL_PUBSUB_VAULT" ]; then
+ echo "PubSub is not configured, exiting."
+ exit 0
+fi
+
echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')"
while true
diff --git a/public/modules/custom/helfi_group/helfi_group.tokens.inc b/public/modules/custom/helfi_group/helfi_group.tokens.inc
index 7a095e60..4afd799e 100644
--- a/public/modules/custom/helfi_group/helfi_group.tokens.inc
+++ b/public/modules/custom/helfi_group/helfi_group.tokens.inc
@@ -5,6 +5,8 @@
* Builds extra placeholder replacement tokens for groups.
*/
+declare(strict_types=1);
+
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\Render\BubbleableMetadata;
use Drupal\helfi_group\GroupUtility;
diff --git a/public/modules/custom/helfi_kasko_content/helfi_kasko_content.module b/public/modules/custom/helfi_kasko_content/helfi_kasko_content.module
index 1ef65e78..2bad648b 100644
--- a/public/modules/custom/helfi_kasko_content/helfi_kasko_content.module
+++ b/public/modules/custom/helfi_kasko_content/helfi_kasko_content.module
@@ -5,6 +5,8 @@
* Contains alterations for content.
*/
+declare(strict_types=1);
+
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Entity\ContentEntityInterface;
use Drupal\Core\Entity\EntityInterface;
@@ -13,6 +15,7 @@ use Drupal\Core\Session\AccountInterface;
use Drupal\helfi_kasko_content\UnitCategoryUtility;
use Drupal\helfi_platform_config\DTO\ParagraphTypeCollection;
use Drupal\paragraphs\ParagraphInterface;
+use Drupal\user\Entity\Role;
/**
* Implements hook_ENTITY_TYPE_access().
@@ -336,3 +339,64 @@ function helfi_kasko_content_views_data_alter(array &$data) {
],
];
}
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function helfi_kasko_content_form_node_announcement_form_alter(&$form): void {
+ _helfi_kasko_content_announcement_exception($form);
+}
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function helfi_kasko_content_form_node_announcement_edit_form_alter(&$form): void {
+ _helfi_kasko_content_announcement_exception($form);
+}
+
+/**
+ * UHF-10763 Alter announcement form for comprehensive school editor.
+ *
+ * Comprehensive school editor must be able to create announcements
+ * for unit pages. Prevent site wide announcements and allow only adding
+ * unit pages.
+ *
+ * @param array $form
+ * The form.
+ */
+function _helfi_kasko_content_announcement_exception(array &$form): void {
+ /** @var \Drupal\user\Entity\User $account */
+ $account = \Drupal::currentUser()->getAccount();
+ $user_roles = $account->getRoles(TRUE);
+ if (!in_array('comprehensive_school_editor', $user_roles)) {
+ return;
+ }
+
+ $roles_with_permission = array_filter(
+ Role::loadMultiple(),
+ fn($role) => $role->hasPermission('create announcement content')
+ );
+ $other_user_roles = array_intersect(array_keys($roles_with_permission), $user_roles);
+
+ // User might have other roles than comprehensive school editor.
+ // in that case, we don't want to alter anything.
+ if (
+ $account->hasRole('comprehensive_school_editor') &&
+ count($other_user_roles) >= 2
+ ) {
+ return;
+ }
+
+ // Set unit pages selection required (Toimipistesivu).
+ $form['field_announcement_unit_pages']['widget']['#required'] = TRUE;
+ $info = t('Add the school you want to create the announcement for. This field is required.');
+ $form['field_announcement_unit_pages']['widget']['#description'] = $info;
+
+ // Prevent creating a site wide announcement.
+ $form['field_announcement_all_pages']['widget']['value']['#default_value'] = FALSE;
+ $form['field_announcement_all_pages']['#access'] = FALSE;
+
+ // Prevent adding service pages (Palvelusivu) or content page (Sisältösivu).
+ $form['field_announcement_service_pages']['#access'] = FALSE;
+ $form['field_announcement_content_pages']['#access'] = FALSE;
+}
diff --git a/public/modules/custom/helfi_kasko_content/translations/fi.po b/public/modules/custom/helfi_kasko_content/translations/fi.po
index e4e4fed2..f38155b8 100644
--- a/public/modules/custom/helfi_kasko_content/translations/fi.po
+++ b/public/modules/custom/helfi_kasko_content/translations/fi.po
@@ -181,3 +181,7 @@ msgstr "B2-kieli"
msgctxt "TPR Ontologyword details schools"
msgid "Language offering"
msgstr "Kielitarjonta"
+
+msgctxt "Announcement exception info"
+msgid "Add the school you want to create the announcement for. This field is required."
+msgstr "Syötä koulu, jonka sivulla poikkeusilmoitus näytetään. Tämä kenttä on pakollinen."
diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
index 9813b60a..2f8d1e8e 100755
--- a/public/sites/default/settings.php
+++ b/public/sites/default/settings.php
@@ -385,6 +385,15 @@ 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.
*
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 1c4f2bfb..de0e42bf 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 @@
-.unit.unit--high-school-card,.unit.unit--vocational-school-card{margin-top:24px}@media(min-width: 576px){.unit.unit--high-school-card,.unit.unit--vocational-school-card{padding-left:24px;width:50%}}@media(min-width: 992px){.unit.unit--high-school-card,.unit.unit--vocational-school-card{width:33.3333%}}.unit.unit--high-school-card:first-child,.unit.unit--vocational-school-card:first-child{margin-top:0}@media(min-width: 576px){.unit.unit--high-school-card:nth-child(-n+2),.unit.unit--vocational-school-card:nth-child(-n+2){margin-top:0}}@media(min-width: 992px){.unit.unit--high-school-card:nth-child(-n+3),.unit.unit--vocational-school-card:nth-child(-n+3){margin-top:0}}.unit.unit--high-school-card .unit__link,.unit.unit--vocational-school-card .unit__link{background-color:#fff;height:100%;display:block;text-decoration:none}.unit.unit--high-school-card .unit__link:hover .unit__title,.unit.unit--vocational-school-card .unit__link:hover .unit__title{text-decoration:underline}.unit.unit--high-school-card .unit__link:hover .unit__arrow,.unit.unit--vocational-school-card .unit__link:hover .unit__arrow{padding-left:16px}.unit.unit--high-school-card .unit__title,.unit.unit--vocational-school-card .unit__title{margin-top:0}.unit.unit--high-school-card .unit__image,.unit.unit--vocational-school-card .unit__image{margin-left:0;margin-right:0}.unit.unit--high-school-card .unit__text,.unit.unit--vocational-school-card .unit__text{padding:24px}.unit.unit--high-school-card .unit__title,.unit.unit--vocational-school-card .unit__title{font-size:1.5rem;line-height:1.75rem;font-weight:500;margin-bottom:0}.unit.unit--high-school-card .unit__info-row,.unit.unit--vocational-school-card .unit__info-row{margin-top:8px}.unit.unit--high-school-card .unit__info-row p,.unit.unit--vocational-school-card .unit__info-row p{margin:0}.unit.unit--high-school-card .unit__info-row .address,.unit.unit--vocational-school-card .unit__info-row .address{display:inline;margin-top:0}.unit.unit--high-school-card .unit__info-row .address .address-line1::after,.unit.unit--high-school-card .unit__info-row .address .address-line2::after,.unit.unit--vocational-school-card .unit__info-row .address .address-line1::after,.unit.unit--vocational-school-card .unit__info-row .address .address-line2::after{content:","}.unit.unit--high-school-card .unit__short-desc,.unit.unit--vocational-school-card .unit__short-desc{font-size:1.125rem;line-height:1.75rem;margin-top:16px}.unit.unit--high-school-card .unit__arrow,.unit.unit--vocational-school-card .unit__arrow{display:block;line-height:0;margin-top:16px;margin-left:-4px;padding-left:0;transition:all .3s;width:48px}@media(min-width: 576px){.unit.unit--high-school-card .unit__arrow,.unit.unit--vocational-school-card .unit__arrow{margin-left:-7px}}.unit.unit--high-school-card .unit__arrow .hel-icon,.unit.unit--vocational-school-card .unit__arrow .hel-icon{--icon-size: 32px}@media(min-width: 576px){.unit.unit--high-school-card .unit__arrow .hel-icon,.unit.unit--vocational-school-card .unit__arrow .hel-icon{--icon-size: 48px}}@media(min-width: 768px){.unit-search--high-school .views--unit-search .views-exposed-form,.unit-search--vocational-school .views--unit-search .views-exposed-form{align-items:flex-end;grid-column-gap:24px;-moz-column-gap:24px;column-gap:24px;display:grid;grid-template-columns:1fr 1fr;grid-row-gap:32px;row-gap:32px}}.unit-search--high-school .views--unit-search .views-exposed-form .form-item,.unit-search--vocational-school .views--unit-search .views-exposed-form .form-item{margin-bottom:32px}@media(min-width: 768px){.unit-search--high-school .views--unit-search .views-exposed-form .form-item,.unit-search--vocational-school .views--unit-search .views-exposed-form .form-item{margin-bottom:0;width:100%}}.unit-search--high-school .views--unit-search .views-exposed-form .form-actions,.unit-search--vocational-school .views--unit-search .views-exposed-form .form-actions{grid-area:submit;width:100%}.unit-search--high-school .views--unit-search .views-exposed-form .form-submit,.unit-search--vocational-school .views--unit-search .views-exposed-form .form-submit{max-width:280px;min-width:44px;width:100%}.unit-search--high-school .views--unit-search .views-exposed-form label,.unit-search--vocational-school .views--unit-search .views-exposed-form label{display:block;font-weight:500;margin-bottom:4px}@media(min-width: 768px){.unit-search--high-school .views--unit-search .views-exposed-form{grid-template-areas:"filter filter" "filter filter" "submit .";grid-template-rows:auto auto auto}}@media(min-width: 768px){.unit-search--vocational-school .views--unit-search .views-exposed-form{grid-template-areas:"filter ." "submit .";grid-template-rows:auto auto}}@media(min-width: 768px){.unit-search--daycare-search .bef-exposed-form,.unit-search--playground-search .bef-exposed-form,.unit-search--after-school-activity-search .bef-exposed-form{position:relative}}.unit-search--daycare-search .bef-exposed-form>.form-item,.unit-search--playground-search .bef-exposed-form>.form-item,.unit-search--after-school-activity-search .bef-exposed-form>.form-item{margin-bottom:0;margin-top:24px}@media(min-width: 768px){.unit-search--daycare-search .bef-exposed-form>.form-item,.unit-search--playground-search .bef-exposed-form>.form-item,.unit-search--after-school-activity-search .bef-exposed-form>.form-item{width:auto}}.unit-search--daycare-search .bef-exposed-form>.form-item:first-child,.unit-search--playground-search .bef-exposed-form>.form-item:first-child,.unit-search--after-school-activity-search .bef-exposed-form>.form-item:first-child{margin-top:0}.unit-search--daycare-search .fieldgroup,.unit-search--playground-search .fieldgroup,.unit-search--after-school-activity-search .fieldgroup{margin-bottom:0;margin-left:0;margin-right:0}.unit-search--daycare-search .bef-checkboxes,.unit-search--playground-search .bef-checkboxes,.unit-search--after-school-activity-search .bef-checkboxes{display:flex;flex-wrap:wrap;justify-content:flex-start}@media(min-width: 768px){.unit-search--daycare-search .bef-checkboxes,.unit-search--playground-search .bef-checkboxes,.unit-search--after-school-activity-search .bef-checkboxes{margin-bottom:16px}}.unit-search--daycare-search .bef-checkboxes .form-item,.unit-search--playground-search .bef-checkboxes .form-item,.unit-search--after-school-activity-search .bef-checkboxes .form-item{margin-bottom:0;margin-right:24px;margin-top:16px;width:auto}.unit-search--daycare-search .form-actions,.unit-search--playground-search .form-actions,.unit-search--after-school-activity-search .form-actions{margin-top:16px;width:100%}.unit-search--daycare-search .form-actions .form-submit,.unit-search--playground-search .form-actions .form-submit,.unit-search--after-school-activity-search .form-actions .form-submit{display:inline-flex;margin-top:16px;max-width:280px;min-width:44px;width:100%}.has-navigation .component--unit-search{margin-left:-32px;margin-right:-32px;padding-left:32px;padding-right:32px}@media(min-width: 992px){.has-navigation .component--unit-search{margin-left:0;margin-right:0}}@media(min-width: 992px){.has-sidebar .components--upper .unit-search--high-school .views--unit-search .views-exposed-form{margin-left:0}}@media(min-width: 1248px){.has-sidebar .components--upper .unit-search--high-school .views--unit-search .views-exposed-form{margin-left:-24px}}@media(min-width: 992px){.has-sidebar .components--upper .unit-search--high-school .views--unit-search .views-exposed-form .form-item,.has-sidebar .components--upper .unit-search--high-school .views--unit-search .views-exposed-form .form-actions{margin-bottom:32px;padding-left:0;width:100%}}@media(min-width: 1248px){.has-sidebar .components--upper .unit-search--high-school .views--unit-search .views-exposed-form .form-item,.has-sidebar .components--upper .unit-search--high-school .views--unit-search .views-exposed-form .form-actions{margin-bottom:0;padding-left:24px;width:25%}}.comprehensive-school__instruction-language::after{content:", "}.comprehensive-school__instruction-language:last-child::after{content:""}.hero-wrapper.has-first-gray-bg-block--desktop{background-color:#f7f7f8;margin-bottom:-64px;padding-bottom:48px}@media(min-width: 992px){.hero-wrapper.has-first-gray-bg-block--desktop{background-color:rgba(0,0,0,0);margin-bottom:0;padding-bottom:0}}.group-news__links{display:flex;justify-content:flex-start}@media(min-width: 768px){.group-news__links{justify-content:flex-end}}.news-archive--group-news{max-width:860px}.news-archive--group-news .news-listing__item{border-bottom:1px solid #f2f2f2}.unit__ontologyword-details h5{margin-bottom:16px}.unit__ontologyword-details__schoolyear{-webkit-hyphens:auto;hyphens:auto;word-wrap:break-word;--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:block;margin-top:16px;padding-top:16px}@media(min-width: 992px){.unit__ontologyword-details__schoolyear{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.unit__ontologyword-details__detail-group{--line-height: 1.2222222222;font-size:1.125rem;font-weight:500;line-height:var(--line-height);margin-bottom:8px;margin-top:24px}@media(min-width: 992px){.unit__ontologyword-details__detail-group{--line-height: 1.5;font-size:1.25rem;font-weight:500}}.unit__ontologyword-details-row{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);margin-bottom:16px}.unit__ontologyword-details-row .unit__ontologyword-details-row__label{--line-height: 1.5;font-size:1rem;font-weight:700;line-height:var(--line-height);align-items:flex-start;display:flex}@media(min-width: 992px){.unit__ontologyword-details-row .unit__ontologyword-details-row__label{--line-height: 1.5555555556;font-size:1.125rem;font-weight:700}}
+.unit.unit--high-school-card,.unit.unit--vocational-school-card{margin-top:24px}@media(min-width: 576px){.unit.unit--high-school-card,.unit.unit--vocational-school-card{padding-left:24px;width:50%}}@media(min-width: 992px){.unit.unit--high-school-card,.unit.unit--vocational-school-card{width:33.3333%}}.unit.unit--high-school-card:first-child,.unit.unit--vocational-school-card:first-child{margin-top:0}@media(min-width: 576px){.unit.unit--high-school-card:nth-child(-n+2),.unit.unit--vocational-school-card:nth-child(-n+2){margin-top:0}}@media(min-width: 992px){.unit.unit--high-school-card:nth-child(-n+3),.unit.unit--vocational-school-card:nth-child(-n+3){margin-top:0}}.unit.unit--high-school-card .unit__link,.unit.unit--vocational-school-card .unit__link{background-color:#fff;height:100%;display:block;text-decoration:none}.unit.unit--high-school-card .unit__link:hover .unit__title,.unit.unit--vocational-school-card .unit__link:hover .unit__title{text-decoration:underline}.unit.unit--high-school-card .unit__link:hover .unit__arrow,.unit.unit--vocational-school-card .unit__link:hover .unit__arrow{padding-left:16px}.unit.unit--high-school-card .unit__title,.unit.unit--vocational-school-card .unit__title{margin-top:0}.unit.unit--high-school-card .unit__image,.unit.unit--vocational-school-card .unit__image{margin-left:0;margin-right:0}.unit.unit--high-school-card .unit__text,.unit.unit--vocational-school-card .unit__text{padding:24px}.unit.unit--high-school-card .unit__title,.unit.unit--vocational-school-card .unit__title{font-size:1.5rem;line-height:1.75rem;font-weight:500;margin-bottom:0}.unit.unit--high-school-card .unit__info-row,.unit.unit--vocational-school-card .unit__info-row{margin-top:8px}.unit.unit--high-school-card .unit__info-row p,.unit.unit--vocational-school-card .unit__info-row p{margin:0}.unit.unit--high-school-card .unit__info-row .address,.unit.unit--vocational-school-card .unit__info-row .address{display:inline;margin-top:0}.unit.unit--high-school-card .unit__info-row .address .address-line1::after,.unit.unit--high-school-card .unit__info-row .address .address-line2::after,.unit.unit--vocational-school-card .unit__info-row .address .address-line1::after,.unit.unit--vocational-school-card .unit__info-row .address .address-line2::after{content:","}.unit.unit--high-school-card .unit__short-desc,.unit.unit--vocational-school-card .unit__short-desc{font-size:1.125rem;line-height:1.75rem;margin-top:16px}.unit.unit--high-school-card .unit__arrow,.unit.unit--vocational-school-card .unit__arrow{display:block;line-height:0;margin-top:16px;margin-left:-4px;padding-left:0;transition:all .3s;width:48px}@media(min-width: 576px){.unit.unit--high-school-card .unit__arrow,.unit.unit--vocational-school-card .unit__arrow{margin-left:-7px}}.unit.unit--high-school-card .unit__arrow .hel-icon,.unit.unit--vocational-school-card .unit__arrow .hel-icon{--icon-size: 32px}@media(min-width: 576px){.unit.unit--high-school-card .unit__arrow .hel-icon,.unit.unit--vocational-school-card .unit__arrow .hel-icon{--icon-size: 48px}}@media(min-width: 768px){.unit-search--high-school .views--unit-search .views-exposed-form,.unit-search--vocational-school .views--unit-search .views-exposed-form{align-items:flex-end;grid-column-gap:24px;-moz-column-gap:24px;column-gap:24px;display:grid;grid-template-columns:1fr 1fr;grid-row-gap:32px;row-gap:32px}}.unit-search--high-school .views--unit-search .views-exposed-form .form-item,.unit-search--vocational-school .views--unit-search .views-exposed-form .form-item{margin-bottom:32px}@media(min-width: 768px){.unit-search--high-school .views--unit-search .views-exposed-form .form-item,.unit-search--vocational-school .views--unit-search .views-exposed-form .form-item{margin-bottom:0;width:100%}}.unit-search--high-school .views--unit-search .views-exposed-form .form-actions,.unit-search--vocational-school .views--unit-search .views-exposed-form .form-actions{grid-area:submit;width:100%}.unit-search--high-school .views--unit-search .views-exposed-form .form-submit,.unit-search--vocational-school .views--unit-search .views-exposed-form .form-submit{max-width:280px;min-width:44px;width:100%}.unit-search--high-school .views--unit-search .views-exposed-form label,.unit-search--vocational-school .views--unit-search .views-exposed-form label{display:block;font-weight:500;margin-bottom:4px}@media(min-width: 768px){.unit-search--high-school .views--unit-search .views-exposed-form{grid-template-areas:"filter filter" "filter filter" "submit .";grid-template-rows:auto auto auto}}@media(min-width: 768px){.unit-search--vocational-school .views--unit-search .views-exposed-form{grid-template-areas:"filter ." "submit .";grid-template-rows:auto auto}}@media(min-width: 768px){.unit-search--daycare-search .bef-exposed-form,.unit-search--playground-search .bef-exposed-form,.unit-search--after-school-activity-search .bef-exposed-form{align-items:flex-start;gap:24px;position:relative}}.unit-search--daycare-search .bef-exposed-form>.form-item,.unit-search--playground-search .bef-exposed-form>.form-item,.unit-search--after-school-activity-search .bef-exposed-form>.form-item{margin-bottom:0;margin-top:24px}@media(min-width: 768px){.unit-search--daycare-search .bef-exposed-form>.form-item,.unit-search--playground-search .bef-exposed-form>.form-item,.unit-search--after-school-activity-search .bef-exposed-form>.form-item{margin-top:0;width:auto}}.unit-search--daycare-search .bef-exposed-form>.form-item:first-child,.unit-search--playground-search .bef-exposed-form>.form-item:first-child,.unit-search--after-school-activity-search .bef-exposed-form>.form-item:first-child{margin-top:0;width:100%}.unit-search--daycare-search .fieldgroup,.unit-search--playground-search .fieldgroup,.unit-search--after-school-activity-search .fieldgroup{margin-bottom:0;margin-left:0;margin-right:0}.unit-search--daycare-search .fieldgroup .fieldset-legend,.unit-search--playground-search .fieldgroup .fieldset-legend,.unit-search--after-school-activity-search .fieldgroup .fieldset-legend{color:var(--label-color-default);display:block;font-size:var(--fontsize-body-m);font-weight:500;margin-bottom:var(--spacing-3-xs)}.unit-search--daycare-search .bef-checkboxes,.unit-search--playground-search .bef-checkboxes,.unit-search--after-school-activity-search .bef-checkboxes{display:flex;flex-direction:column;flex-wrap:wrap;justify-content:flex-start}@media(min-width: 768px){.unit-search--daycare-search .bef-checkboxes,.unit-search--playground-search .bef-checkboxes,.unit-search--after-school-activity-search .bef-checkboxes{flex-direction:row;margin-bottom:16px}}.unit-search--daycare-search .bef-checkboxes .form-item,.unit-search--playground-search .bef-checkboxes .form-item,.unit-search--after-school-activity-search .bef-checkboxes .form-item{margin-bottom:0;margin-right:24px;margin-top:16px;width:auto}.unit-search--daycare-search .form-actions,.unit-search--playground-search .form-actions,.unit-search--after-school-activity-search .form-actions{margin-top:16px;width:100%}.unit-search--daycare-search .form-actions .form-submit,.unit-search--playground-search .form-actions .form-submit,.unit-search--after-school-activity-search .form-actions .form-submit{display:inline-flex;margin-top:16px;max-width:280px;min-width:44px;width:100%}.has-navigation .component--unit-search{margin-left:-32px;margin-right:-32px;padding-left:32px;padding-right:32px}@media(min-width: 992px){.has-navigation .component--unit-search{margin-left:0;margin-right:0}}@media(min-width: 992px){.has-sidebar .components--upper .unit-search--high-school .views--unit-search .views-exposed-form{margin-left:0}}@media(min-width: 1248px){.has-sidebar .components--upper .unit-search--high-school .views--unit-search .views-exposed-form{margin-left:-24px}}@media(min-width: 992px){.has-sidebar .components--upper .unit-search--high-school .views--unit-search .views-exposed-form .form-item,.has-sidebar .components--upper .unit-search--high-school .views--unit-search .views-exposed-form .form-actions{margin-bottom:32px;padding-left:0;width:100%}}@media(min-width: 1248px){.has-sidebar .components--upper .unit-search--high-school .views--unit-search .views-exposed-form .form-item,.has-sidebar .components--upper .unit-search--high-school .views--unit-search .views-exposed-form .form-actions{margin-bottom:0;padding-left:24px;width:25%}}.comprehensive-school__instruction-language::after{content:", "}.comprehensive-school__instruction-language:last-child::after{content:""}.hero-wrapper.has-first-gray-bg-block--desktop{background-color:#f7f7f8;margin-bottom:-64px;padding-bottom:48px}@media(min-width: 992px){.hero-wrapper.has-first-gray-bg-block--desktop{background-color:rgba(0,0,0,0);margin-bottom:0;padding-bottom:0}}.group-news__links{display:flex;justify-content:flex-start}@media(min-width: 768px){.group-news__links{justify-content:flex-end}}.news-archive--group-news{max-width:860px}.news-archive--group-news .news-listing__item{border-bottom:1px solid #f2f2f2}.unit__ontologyword-details h5{margin-bottom:16px}.unit__ontologyword-details__schoolyear{-webkit-hyphens:auto;hyphens:auto;word-wrap:break-word;--line-height: 1.3;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:block;margin-top:16px;padding-top:16px}@media(min-width: 992px){.unit__ontologyword-details__schoolyear{--line-height: 1.1666666667;font-size:1.5rem;font-weight:500}}.unit__ontologyword-details__detail-group{--line-height: 1.2222222222;font-size:1.125rem;font-weight:500;line-height:var(--line-height);margin-bottom:8px;margin-top:24px}@media(min-width: 992px){.unit__ontologyword-details__detail-group{--line-height: 1.5;font-size:1.25rem;font-weight:500}}.unit__ontologyword-details-row{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);margin-bottom:16px}.unit__ontologyword-details-row .unit__ontologyword-details-row__label{--line-height: 1.5;font-size:1rem;font-weight:700;line-height:var(--line-height);align-items:flex-start;display:flex}@media(min-width: 992px){.unit__ontologyword-details-row .unit__ontologyword-details-row__label{--line-height: 1.5555555556;font-size:1.125rem;font-weight:700}}
diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json
index 9b212491..ddb1a4af 100644
--- a/public/themes/custom/hdbt_subtheme/package-lock.json
+++ b/public/themes/custom/hdbt_subtheme/package-lock.json
@@ -3346,9 +3346,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001659",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001659.tgz",
- "integrity": "sha512-Qxxyfv3RdHAfJcXelgf0hU4DFUVXBGTjqrBUZLUh8AtlGnsDo+CnncYtTd95+ZKfnANUOzxyIQCuU/UeBZBYoA==",
+ "version": "1.0.30001669",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
+ "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==",
"funding": [
{
"type": "opencollective",
@@ -13194,9 +13194,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001659",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001659.tgz",
- "integrity": "sha512-Qxxyfv3RdHAfJcXelgf0hU4DFUVXBGTjqrBUZLUh8AtlGnsDo+CnncYtTd95+ZKfnANUOzxyIQCuU/UeBZBYoA=="
+ "version": "1.0.30001669",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
+ "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w=="
},
"chalk": {
"version": "2.4.2",
diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_unit-search-variants.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_unit-search-variants.scss
index 948af565..eef67435 100644
--- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_unit-search-variants.scss
+++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_unit-search-variants.scss
@@ -60,6 +60,8 @@
// Daycare and playground search filters
.bef-exposed-form {
@include breakpoint($breakpoint-m) {
+ align-items: flex-start;
+ gap: $spacing-and-half;
position: relative;
}
@@ -68,12 +70,14 @@
margin-top: $spacing-and-half;
@include breakpoint($breakpoint-m) {
+ margin-top: 0;
width: auto;
}
// Sort by distance to an address
&:first-child {
margin-top: 0;
+ width: 100%;
}
}
}
@@ -83,15 +87,26 @@
margin-bottom: 0;
margin-left: 0;
margin-right: 0;
+
+ // Emulate hds-text-input__label styles since the legend is used here in a similar way.
+ .fieldset-legend {
+ color: var(--label-color-default);
+ display: block;
+ font-size: var(--fontsize-body-m);
+ font-weight: 500;
+ margin-bottom: var(--spacing-3-xs);
+ }
}
.bef-checkboxes {
display: flex;
+ flex-direction: column;
flex-wrap: wrap;
justify-content: flex-start;
// Compensate the checkboxes height so that it matches the select height.
@include breakpoint($breakpoint-m) {
+ flex-direction: row;
margin-bottom: $spacing;
}
diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk
index 02cca319..483d64f7 100644
--- a/tools/make/project/install.mk
+++ b/tools/make/project/install.mk
@@ -1,9 +1,9 @@
ifeq ($(DRUPAL_CONF_EXISTS),yes)
- DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-helfi-locale-import drush-uli
+ DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-helfi-locale-import drush-unblock drush-uli
else
- DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-uli
+ DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-unblock drush-uli
endif
-DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-helfi-locale-import drush-uli
+DRUPAL_POST_INSTALL_TARGETS := drush-deploy drush-locale-update drush-helfi-locale-import drush-unblock
OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token')
@@ -46,3 +46,8 @@ drush-helfi-locale-import: ## Update translations from helfi platform config.
$(call step,Import helfi platform config translations...)
$(call drush,helfi:locale-import helfi_platform_config)
$(call drush,cr)
+
+PHONY += drush-unblock
+drush-unblock: ## Get login link
+ $(call step,Unblocking helfi-admin...\n)
+ $(call drush,user:unblock --uid=1)