From edb56d295fece8020ce8f8dd86213d760a1b18e5 Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Mon, 18 Dec 2023 10:28:50 +0100 Subject: [PATCH] HRIN-767: Added GIS map token --- CHANGELOG.md | 3 +- composer.json | 1 + composer.lock | 93 ++++++++++++++++-- config/sync/core.extension.yml | 1 + .../editor.editor.hearing_description.yml | 59 ++++++++++++ ...d.field.node.hearing.field_description.yml | 6 +- .../filter.format.hearing_description.yml | 45 +++++++++ config/sync/user.role.authenticated.yml | 2 + .../assets/css/gis-minimap.css | 11 +++ .../hoeringsportal_hearing.libraries.yml | 8 ++ .../hoeringsportal_hearing.module | 21 +++- .../hoeringsportal_hearing.services.yml | 2 + .../src/TokenHelper.php | 96 +++++++++++++++++++ 13 files changed, 337 insertions(+), 11 deletions(-) create mode 100644 config/sync/editor.editor.hearing_description.yml create mode 100644 config/sync/filter.format.hearing_description.yml create mode 100644 web/modules/custom/hoeringsportal_hearing/assets/css/gis-minimap.css create mode 100644 web/modules/custom/hoeringsportal_hearing/src/TokenHelper.php diff --git a/CHANGELOG.md b/CHANGELOG.md index d13a66b9e..6a27d9c34 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,10 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +* [PR-376](https://github.com/itk-dev/hoeringsportal/pull/376) + Added GIS map token * [PR-374](https://github.com/itk-dev/hoeringsportal/pull/374) Fix hidden mobile filters - * [PR-367](https://github.com/itk-dev/hoeringsportal/pull/367) Added and used Editor Advanced link diff --git a/composer.json b/composer.json index 1e78d7fcc..68e4bbfea 100755 --- a/composer.json +++ b/composer.json @@ -144,6 +144,7 @@ "drupal/quick_node_clone": "^1.12", "drupal/redirect": "^1.6", "drupal/search_autocomplete": "^3.0", + "drupal/token_filter": "^2.1", "drupal/toolbar_visibility": "^2.1", "drupal/twig_tweak": "^3.2", "drupal/view_custom_table": "^2.0", diff --git a/composer.lock b/composer.lock index 8e49cc053..b36426692 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e8af805a89710ee8dcff49ed024c727b", + "content-hash": "56df1281b9775c8eaa3212258d0eab9a", "packages": [ { "name": "asm89/stack-cors", @@ -3695,10 +3695,6 @@ "name": "oknate", "homepage": "https://www.drupal.org/user/471638" }, - { - "name": "podarok", - "homepage": "https://www.drupal.org/user/116002" - }, { "name": "ram4nd", "homepage": "https://www.drupal.org/user/601534" @@ -4730,6 +4726,75 @@ "source": "https://git.drupalcode.org/project/token" } }, + { + "name": "drupal/token_filter", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/token_filter.git", + "reference": "2.1.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/token_filter-2.1.0.zip", + "reference": "2.1.0", + "shasum": "34d72db7151738395afd25391195b36afb140bf1" + }, + "require": { + "drupal/core": "^9.4 || ^10", + "drupal/token": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.1.0", + "datestamp": "1698126115", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "ademarco", + "homepage": "https://www.drupal.org/user/186696" + }, + { + "name": "asciikewl", + "homepage": "https://www.drupal.org/user/147292" + }, + { + "name": "darvanen", + "homepage": "https://www.drupal.org/user/1068770" + }, + { + "name": "Dave Reid", + "homepage": "https://www.drupal.org/user/53892" + }, + { + "name": "Deciphered", + "homepage": "https://www.drupal.org/user/103796" + }, + { + "name": "pescetti", + "homepage": "https://www.drupal.org/user/436244" + }, + { + "name": "pvhee", + "homepage": "https://www.drupal.org/user/108811" + } + ], + "description": "This is a very simple module to make global token values available as an input filter.", + "homepage": "https://www.drupal.org/project/token_filter", + "support": { + "source": "https://git.drupalcode.org/project/token_filter" + } + }, { "name": "drupal/toolbar_visibility", "version": "2.1.0", @@ -16919,12 +16984,12 @@ "version": "3.7.2", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", "shasum": "" }, @@ -16969,6 +17034,20 @@ "source": "https://github.com/squizlabs/PHP_CodeSniffer", "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], "time": "2023-02-22T23:07:41+00:00" }, { diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index ca0a65e8d..4fca0472d 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -98,6 +98,7 @@ module: telephone: 0 text: 0 token: 0 + token_filter: 0 toolbar: 0 toolbar_visibility: 0 twig_tweak: 0 diff --git a/config/sync/editor.editor.hearing_description.yml b/config/sync/editor.editor.hearing_description.yml new file mode 100644 index 000000000..f76b25e0d --- /dev/null +++ b/config/sync/editor.editor.hearing_description.yml @@ -0,0 +1,59 @@ +uuid: d4a16c11-faf2-4617-bd62-c28ad4eb5f31 +langcode: da +status: true +dependencies: + config: + - filter.format.hearing_description + module: + - ckeditor5 +format: hearing_description +editor: ckeditor5 +settings: + toolbar: + items: + - bold + - italic + - '|' + - link + - '|' + - bulletedList + - numberedList + - '|' + - blockQuote + - '|' + - sourceEditing + - '|' + - heading + - tokenBrowser + plugins: + ckeditor5_heading: + enabled_headings: + - heading2 + - heading3 + - heading4 + ckeditor5_list: + reversed: false + startIndex: true + ckeditor5_sourceEditing: + allowed_tags: + - '' + - '' + - '
' + - '