From 890577e4010e5d16f2cd942c62937d7e47b55a4a Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Sun, 1 Aug 2021 12:21:34 +0300 Subject: [PATCH 1/9] Updated SCSS compiler to v1.6 --- CHANGELOG.md | 6 + composer.lock | 206 +++++++++--------- vendor/composer/InstalledVersions.php | 16 +- vendor/composer/installed.json | 26 +-- vendor/composer/installed.php | 16 +- .../laminas-zendframework-bridge/CHANGELOG.md | 26 ++- .../laminas-zendframework-bridge/README.md | 6 + .../src/Autoloader.php | 6 - .../src/ConfigPostProcessor.php | 14 +- .../src/Module.php | 6 - .../src/Replacements.php | 6 - .../src/RewriteRules.php | 6 - .../src/autoload.php | 6 - vendor/scssphp/scssphp/composer.json | 8 +- vendor/scssphp/scssphp/src/Compiler.php | 15 ++ vendor/scssphp/scssphp/src/Parser.php | 6 +- vendor/scssphp/scssphp/src/Version.php | 2 +- 17 files changed, 197 insertions(+), 180 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c9e75b3..4df71d06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.10.19 +## mm/dd/2021 + +1. [](#new) + * Updated SCSS compiler to v1.6 + # v1.10.18 ## 07/19/2021 diff --git a/composer.lock b/composer.lock index a046854e..9d4e3e9d 100644 --- a/composer.lock +++ b/composer.lock @@ -66,16 +66,16 @@ }, { "name": "laminas/laminas-zendframework-bridge", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-zendframework-bridge.git", - "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32" + "reference": "13af2502d9bb6f7d33be2de4b51fb68c6cdb476e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6cccbddfcfc742eb02158d6137ca5687d92cee32", - "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32", + "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/13af2502d9bb6f7d33be2de4b51fb68c6cdb476e", + "reference": "13af2502d9bb6f7d33be2de4b51fb68c6cdb476e", "shasum": "" }, "require": { @@ -124,7 +124,7 @@ "type": "community_bridge" } ], - "time": "2021-02-25T21:54:58+00:00" + "time": "2021-06-24T12:49:22+00:00" }, { "name": "p3k/picofeed", @@ -188,16 +188,16 @@ }, { "name": "scssphp/scssphp", - "version": "v1.5.2", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/scssphp/scssphp.git", - "reference": "6fe16f169f55f5e793474fb210aac0a4481619e5" + "reference": "b83594e2323c5d6e80785df3f91b9d1d32aad530" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/6fe16f169f55f5e793474fb210aac0a4481619e5", - "reference": "6fe16f169f55f5e793474fb210aac0a4481619e5", + "url": "https://api.github.com/repos/scssphp/scssphp/zipball/b83594e2323c5d6e80785df3f91b9d1d32aad530", + "reference": "b83594e2323c5d6e80785df3f91b9d1d32aad530", "shasum": "" }, "require": { @@ -255,9 +255,9 @@ ], "support": { "issues": "https://github.com/scssphp/scssphp/issues", - "source": "https://github.com/scssphp/scssphp/tree/v1.5.2" + "source": "https://github.com/scssphp/scssphp/tree/v1.6.0" }, - "time": "2021-05-18T00:05:58+00:00" + "time": "2021-07-02T16:28:10+00:00" } ], "packages-dev": [ @@ -1355,16 +1355,16 @@ }, { "name": "phpunit/php-file-iterator", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357" + "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4b49fb70f067272b659ef0174ff9ca40fdaa6357", - "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/28af674ff175d0768a5a978e6de83f697d4a7f05", + "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05", "shasum": "" }, "require": { @@ -1403,7 +1403,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.3" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.4" }, "funding": [ { @@ -1411,7 +1411,7 @@ "type": "github" } ], - "time": "2020-11-30T08:25:21+00:00" + "time": "2021-07-19T06:46:01+00:00" }, { "name": "phpunit/php-text-template", @@ -1519,16 +1519,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "3.1.2", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "472b687829041c24b25f475e14c2f38a09edf1c2" + "reference": "9c1da83261628cb24b6a6df371b6e312b3954768" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/472b687829041c24b25f475e14c2f38a09edf1c2", - "reference": "472b687829041c24b25f475e14c2f38a09edf1c2", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9c1da83261628cb24b6a6df371b6e312b3954768", + "reference": "9c1da83261628cb24b6a6df371b6e312b3954768", "shasum": "" }, "require": { @@ -1566,7 +1566,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", - "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.2" + "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.3" }, "funding": [ { @@ -1575,7 +1575,7 @@ } ], "abandoned": true, - "time": "2020-11-30T08:38:46+00:00" + "time": "2021-07-26T12:15:06+00:00" }, { "name": "phpunit/phpunit", @@ -2425,6 +2425,7 @@ "type": "github" } ], + "abandoned": true, "time": "2020-11-30T07:30:19+00:00" }, { @@ -2476,21 +2477,22 @@ }, { "name": "symfony/browser-kit", - "version": "v4.4.25", + "version": "v4.4.27", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "729b1f0eca3ef18ea4e1a29b166145aff75d8fa1" + "reference": "9629d1524d8ced5a4ec3e94abdbd638b4ec8319b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/729b1f0eca3ef18ea4e1a29b166145aff75d8fa1", - "reference": "729b1f0eca3ef18ea4e1a29b166145aff75d8fa1", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/9629d1524d8ced5a4ec3e94abdbd638b4ec8319b", + "reference": "9629d1524d8ced5a4ec3e94abdbd638b4ec8319b", "shasum": "" }, "require": { "php": ">=7.1.3", - "symfony/dom-crawler": "^3.4|^4.0|^5.0" + "symfony/dom-crawler": "^3.4|^4.0|^5.0", + "symfony/polyfill-php80": "^1.16" }, "require-dev": { "symfony/css-selector": "^3.4|^4.0|^5.0", @@ -2527,7 +2529,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v4.4.25" + "source": "https://github.com/symfony/browser-kit/tree/v4.4.27" }, "funding": [ { @@ -2543,40 +2545,41 @@ "type": "tidelift" } ], - "time": "2021-05-26T17:39:37+00:00" + "time": "2021-07-21T12:19:41+00:00" }, { "name": "symfony/console", - "version": "v4.4.25", + "version": "v4.4.29", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a62acecdf5b50e314a4f305cd01b5282126f3095" + "reference": "8baf0bbcfddfde7d7225ae8e04705cfd1081cd7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a62acecdf5b50e314a4f305cd01b5282126f3095", - "reference": "a62acecdf5b50e314a4f305cd01b5282126f3095", + "url": "https://api.github.com/repos/symfony/console/zipball/8baf0bbcfddfde7d7225ae8e04705cfd1081cd7b", + "reference": "8baf0bbcfddfde7d7225ae8e04705cfd1081cd7b", "shasum": "" }, "require": { "php": ">=7.1.3", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.8", - "symfony/polyfill-php80": "^1.15", + "symfony/polyfill-php80": "^1.16", "symfony/service-contracts": "^1.1|^2" }, "conflict": { + "psr/log": ">=3", "symfony/dependency-injection": "<3.4", "symfony/event-dispatcher": "<4.3|>=5", "symfony/lock": "<4.4", "symfony/process": "<3.3" }, "provide": { - "psr/log-implementation": "1.0" + "psr/log-implementation": "1.0|2.0" }, "require-dev": { - "psr/log": "~1.0", + "psr/log": "^1|^2", "symfony/config": "^3.4|^4.0|^5.0", "symfony/dependency-injection": "^3.4|^4.0|^5.0", "symfony/event-dispatcher": "^4.3", @@ -2616,7 +2619,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.25" + "source": "https://github.com/symfony/console/tree/v4.4.29" }, "funding": [ { @@ -2632,24 +2635,25 @@ "type": "tidelift" } ], - "time": "2021-05-26T11:20:16+00:00" + "time": "2021-07-27T19:04:53+00:00" }, { "name": "symfony/css-selector", - "version": "v4.4.25", + "version": "v4.4.27", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "c1e29de6dc893b130b45d20d8051efbb040560a9" + "reference": "5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/c1e29de6dc893b130b45d20d8051efbb040560a9", - "reference": "c1e29de6dc893b130b45d20d8051efbb040560a9", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6", + "reference": "5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.1.3", + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -2681,7 +2685,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v4.4.25" + "source": "https://github.com/symfony/css-selector/tree/v4.4.27" }, "funding": [ { @@ -2697,26 +2701,27 @@ "type": "tidelift" } ], - "time": "2021-05-26T17:39:37+00:00" + "time": "2021-07-21T12:19:41+00:00" }, { "name": "symfony/dom-crawler", - "version": "v4.4.25", + "version": "v4.4.27", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "41d15bb6d6b95d2be763c514bb2494215d9c5eef" + "reference": "86aa075c9e0b13ac7db8d73d1f9d8b656143881a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/41d15bb6d6b95d2be763c514bb2494215d9c5eef", - "reference": "41d15bb6d6b95d2be763c514bb2494215d9c5eef", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/86aa075c9e0b13ac7db8d73d1f9d8b656143881a", + "reference": "86aa075c9e0b13ac7db8d73d1f9d8b656143881a", "shasum": "" }, "require": { "php": ">=7.1.3", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.0" + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "^1.16" }, "conflict": { "masterminds/html5": "<2.6" @@ -2754,7 +2759,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v4.4.25" + "source": "https://github.com/symfony/dom-crawler/tree/v4.4.27" }, "funding": [ { @@ -2770,25 +2775,26 @@ "type": "tidelift" } ], - "time": "2021-05-26T11:20:16+00:00" + "time": "2021-07-23T15:41:52+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.25", + "version": "v4.4.27", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "047773e7016e4fd45102cedf4bd2558ae0d0c32f" + "reference": "958a128b184fcf0ba45ec90c0e88554c9327c2e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/047773e7016e4fd45102cedf4bd2558ae0d0c32f", - "reference": "047773e7016e4fd45102cedf4bd2558ae0d0c32f", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/958a128b184fcf0ba45ec90c0e88554c9327c2e9", + "reference": "958a128b184fcf0ba45ec90c0e88554c9327c2e9", "shasum": "" }, "require": { "php": ">=7.1.3", - "symfony/event-dispatcher-contracts": "^1.1" + "symfony/event-dispatcher-contracts": "^1.1", + "symfony/polyfill-php80": "^1.16" }, "conflict": { "symfony/dependency-injection": "<3.4" @@ -2798,7 +2804,7 @@ "symfony/event-dispatcher-implementation": "1.1" }, "require-dev": { - "psr/log": "~1.0", + "psr/log": "^1|^2|^3", "symfony/config": "^3.4|^4.0|^5.0", "symfony/dependency-injection": "^3.4|^4.0|^5.0", "symfony/error-handler": "~3.4|~4.4", @@ -2837,7 +2843,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.25" + "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.27" }, "funding": [ { @@ -2853,7 +2859,7 @@ "type": "tidelift" } ], - "time": "2021-05-26T17:39:37+00:00" + "time": "2021-07-23T15:41:52+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -2936,20 +2942,21 @@ }, { "name": "symfony/finder", - "version": "v4.4.25", + "version": "v4.4.27", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ed33314396d968a8936c95f5bd1b88bd3b3e94a3" + "reference": "42414d7ac96fc2880a783b872185789dea0d4262" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ed33314396d968a8936c95f5bd1b88bd3b3e94a3", - "reference": "ed33314396d968a8936c95f5bd1b88bd3b3e94a3", + "url": "https://api.github.com/repos/symfony/finder/zipball/42414d7ac96fc2880a783b872185789dea0d4262", + "reference": "42414d7ac96fc2880a783b872185789dea0d4262", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.1.3", + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -2977,7 +2984,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v4.4.25" + "source": "https://github.com/symfony/finder/tree/v4.4.27" }, "funding": [ { @@ -2993,7 +3000,7 @@ "type": "tidelift" } ], - "time": "2021-05-26T11:20:16+00:00" + "time": "2021-07-23T15:41:52+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3247,16 +3254,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.0", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1" + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", + "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", "shasum": "" }, "require": { @@ -3307,7 +3314,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" }, "funding": [ { @@ -3323,20 +3330,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2021-05-27T12:26:48+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.23.0", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0" + "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0", - "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", + "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", "shasum": "" }, "require": { @@ -3390,7 +3397,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" }, "funding": [ { @@ -3406,24 +3413,25 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-07-28T13:41:28+00:00" }, { "name": "symfony/process", - "version": "v4.4.25", + "version": "v4.4.27", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "cd61e6dd273975c6625316de9d141ebd197f93c9" + "reference": "0b7dc5599ac4aa6d7b936c8f7d10abae64f6cf7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/cd61e6dd273975c6625316de9d141ebd197f93c9", - "reference": "cd61e6dd273975c6625316de9d141ebd197f93c9", + "url": "https://api.github.com/repos/symfony/process/zipball/0b7dc5599ac4aa6d7b936c8f7d10abae64f6cf7f", + "reference": "0b7dc5599ac4aa6d7b936c8f7d10abae64f6cf7f", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.1.3", + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -3451,7 +3459,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v4.4.25" + "source": "https://github.com/symfony/process/tree/v4.4.27" }, "funding": [ { @@ -3467,7 +3475,7 @@ "type": "tidelift" } ], - "time": "2021-05-26T11:20:16+00:00" + "time": "2021-07-23T15:41:52+00:00" }, { "name": "symfony/service-contracts", @@ -3550,16 +3558,16 @@ }, { "name": "symfony/yaml", - "version": "v4.4.25", + "version": "v4.4.29", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc" + "reference": "3abcc4db06d4e776825eaa3ed8ad924d5bc7432a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc", - "reference": "81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3abcc4db06d4e776825eaa3ed8ad924d5bc7432a", + "reference": "3abcc4db06d4e776825eaa3ed8ad924d5bc7432a", "shasum": "" }, "require": { @@ -3601,7 +3609,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v4.4.25" + "source": "https://github.com/symfony/yaml/tree/v4.4.29" }, "funding": [ { @@ -3617,20 +3625,20 @@ "type": "tidelift" } ], - "time": "2021-05-26T17:39:37+00:00" + "time": "2021-07-27T16:19:30+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "75a63c33a8577608444246075ea0af0d052e452a" + "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a", - "reference": "75a63c33a8577608444246075ea0af0d052e452a", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", + "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", "shasum": "" }, "require": { @@ -3659,7 +3667,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/master" + "source": "https://github.com/theseer/tokenizer/tree/1.2.1" }, "funding": [ { @@ -3667,7 +3675,7 @@ "type": "github" } ], - "time": "2020-07-12T23:59:07+00:00" + "time": "2021-07-28T10:34:58+00:00" }, { "name": "webmozart/assert", diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index 047b6ce9..73722434 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -29,7 +29,7 @@ private static $installed = array ( 'aliases' => array ( ), - 'reference' => '0b66fc80312bf6a9553af43e825d731a627a90ed', + 'reference' => '315e35fa69d28436e276274382262866360c64e9', 'name' => 'getgrav/grav-plugin-admin', ), 'versions' => @@ -41,7 +41,7 @@ private static $installed = array ( 'aliases' => array ( ), - 'reference' => '0b66fc80312bf6a9553af43e825d731a627a90ed', + 'reference' => '315e35fa69d28436e276274382262866360c64e9', ), 'laminas/laminas-xml' => array ( @@ -54,12 +54,12 @@ private static $installed = array ( ), 'laminas/laminas-zendframework-bridge' => array ( - 'pretty_version' => '1.2.0', - 'version' => '1.2.0.0', + 'pretty_version' => '1.3.0', + 'version' => '1.3.0.0', 'aliases' => array ( ), - 'reference' => '6cccbddfcfc742eb02158d6137ca5687d92cee32', + 'reference' => '13af2502d9bb6f7d33be2de4b51fb68c6cdb476e', ), 'miniflux/picofeed' => array ( @@ -79,12 +79,12 @@ private static $installed = array ( ), 'scssphp/scssphp' => array ( - 'pretty_version' => 'v1.5.2', - 'version' => '1.5.2.0', + 'pretty_version' => 'v1.6.0', + 'version' => '1.6.0.0', 'aliases' => array ( ), - 'reference' => '6fe16f169f55f5e793474fb210aac0a4481619e5', + 'reference' => 'b83594e2323c5d6e80785df3f91b9d1d32aad530', ), 'symfony/polyfill-php72' => array ( diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 19869b38..192445ea 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -63,17 +63,17 @@ }, { "name": "laminas/laminas-zendframework-bridge", - "version": "1.2.0", - "version_normalized": "1.2.0.0", + "version": "1.3.0", + "version_normalized": "1.3.0.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-zendframework-bridge.git", - "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32" + "reference": "13af2502d9bb6f7d33be2de4b51fb68c6cdb476e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6cccbddfcfc742eb02158d6137ca5687d92cee32", - "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32", + "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/13af2502d9bb6f7d33be2de4b51fb68c6cdb476e", + "reference": "13af2502d9bb6f7d33be2de4b51fb68c6cdb476e", "shasum": "" }, "require": { @@ -85,7 +85,7 @@ "squizlabs/php_codesniffer": "^3.5", "vimeo/psalm": "^4.6" }, - "time": "2021-02-25T21:54:58+00:00", + "time": "2021-06-24T12:49:22+00:00", "type": "library", "extra": { "laminas": { @@ -191,17 +191,17 @@ }, { "name": "scssphp/scssphp", - "version": "v1.5.2", - "version_normalized": "1.5.2.0", + "version": "v1.6.0", + "version_normalized": "1.6.0.0", "source": { "type": "git", "url": "https://github.com/scssphp/scssphp.git", - "reference": "6fe16f169f55f5e793474fb210aac0a4481619e5" + "reference": "b83594e2323c5d6e80785df3f91b9d1d32aad530" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/6fe16f169f55f5e793474fb210aac0a4481619e5", - "reference": "6fe16f169f55f5e793474fb210aac0a4481619e5", + "url": "https://api.github.com/repos/scssphp/scssphp/zipball/b83594e2323c5d6e80785df3f91b9d1d32aad530", + "reference": "b83594e2323c5d6e80785df3f91b9d1d32aad530", "shasum": "" }, "require": { @@ -223,7 +223,7 @@ "ext-iconv": "Can be used as fallback when ext-mbstring is not available", "ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv" }, - "time": "2021-05-18T00:05:58+00:00", + "time": "2021-07-02T16:28:10+00:00", "bin": [ "bin/pscss" ], @@ -261,7 +261,7 @@ ], "support": { "issues": "https://github.com/scssphp/scssphp/issues", - "source": "https://github.com/scssphp/scssphp/tree/v1.5.2" + "source": "https://github.com/scssphp/scssphp/tree/v1.6.0" }, "install-path": "../scssphp/scssphp" } diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index ac886b5e..0300f07c 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -6,7 +6,7 @@ 'aliases' => array ( ), - 'reference' => '0b66fc80312bf6a9553af43e825d731a627a90ed', + 'reference' => '315e35fa69d28436e276274382262866360c64e9', 'name' => 'getgrav/grav-plugin-admin', ), 'versions' => @@ -18,7 +18,7 @@ 'aliases' => array ( ), - 'reference' => '0b66fc80312bf6a9553af43e825d731a627a90ed', + 'reference' => '315e35fa69d28436e276274382262866360c64e9', ), 'laminas/laminas-xml' => array ( @@ -31,12 +31,12 @@ ), 'laminas/laminas-zendframework-bridge' => array ( - 'pretty_version' => '1.2.0', - 'version' => '1.2.0.0', + 'pretty_version' => '1.3.0', + 'version' => '1.3.0.0', 'aliases' => array ( ), - 'reference' => '6cccbddfcfc742eb02158d6137ca5687d92cee32', + 'reference' => '13af2502d9bb6f7d33be2de4b51fb68c6cdb476e', ), 'miniflux/picofeed' => array ( @@ -56,12 +56,12 @@ ), 'scssphp/scssphp' => array ( - 'pretty_version' => 'v1.5.2', - 'version' => '1.5.2.0', + 'pretty_version' => 'v1.6.0', + 'version' => '1.6.0.0', 'aliases' => array ( ), - 'reference' => '6fe16f169f55f5e793474fb210aac0a4481619e5', + 'reference' => 'b83594e2323c5d6e80785df3f91b9d1d32aad530', ), 'symfony/polyfill-php72' => array ( diff --git a/vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md b/vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md index 626f7c2c..646828a6 100644 --- a/vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md +++ b/vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md @@ -2,6 +2,28 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. +## 1.2.1 - TBD + +### Added + +- Nothing. + +### Changed + +- Nothing. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- Nothing. + ## 1.2.0 - 2021-02-25 @@ -115,7 +137,7 @@ Feature release (minor) ### Fixed -- [#63](https://github.com/laminas/laminas-zendframework-bridge/pull/63) fixes handling of dependency configuration to ensure each of delegators, initializers, and abstract factories are properly handled during configuraiton post processing. The new approach should allow delegators to work post-migration to Laminas or Mezzio. +- [#63](https://github.com/laminas/laminas-zendframework-bridge/pull/63) fixes handling of dependency configuration to ensure each of delegators, initializers, and abstract factories are properly handled during configuration post processing. The new approach should allow delegators to work post-migration to Laminas or Mezzio. - [#61](https://github.com/laminas/laminas-zendframework-bridge/pull/61) ensures configuration for delegator factories gets rewritten; the functionality broke in version 1.0.1. @@ -709,4 +731,4 @@ Feature release (minor) ### Fixed -- Nothing. +- Nothing. \ No newline at end of file diff --git a/vendor/laminas/laminas-zendframework-bridge/README.md b/vendor/laminas/laminas-zendframework-bridge/README.md index f8e068e6..a8d8526f 100644 --- a/vendor/laminas/laminas-zendframework-bridge/README.md +++ b/vendor/laminas/laminas-zendframework-bridge/README.md @@ -10,6 +10,12 @@ Project. This package should be installed only if you are also using the composer plugin that installs Laminas packages to replace ZF/Apigility/Expressive packages. +This tool supports: + +* Zend Framework MVC projects, all v2 and v3 releases +* Apigility projects, all stable versions +* Expressive versions, all stable versions + ## Installation Run the following to install this library: diff --git a/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php b/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php index 6048766a..261bb888 100644 --- a/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php +++ b/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php @@ -1,11 +1,5 @@ replacementRuleMatch($value, $keys); diff --git a/vendor/laminas/laminas-zendframework-bridge/src/Module.php b/vendor/laminas/laminas-zendframework-bridge/src/Module.php index d10cb43d..9bb12980 100644 --- a/vendor/laminas/laminas-zendframework-bridge/src/Module.php +++ b/vendor/laminas/laminas-zendframework-bridge/src/Module.php @@ -1,11 +1,5 @@ multiplySelectors($this->env, $child['selfParent']); } + if (\count($result) > 1) { + $replacement = implode(', ', $result); + $fname = $this->getPrettyPath($this->sourceNames[$this->sourceIndex]); + $line = $this->sourceLine; + + $message = <<logger->warn($message); + } + $this->pushExtends($result, $selectors, $child); } } diff --git a/vendor/scssphp/scssphp/src/Parser.php b/vendor/scssphp/scssphp/src/Parser.php index bb5d6b30..ab54885e 100644 --- a/vendor/scssphp/scssphp/src/Parser.php +++ b/vendor/scssphp/scssphp/src/Parser.php @@ -2415,10 +2415,8 @@ class Parser break; } - // peek and see if rhs belongs to next operator - if ($this->peek($operators, $next) && static::$precedence[$next[1]] > static::$precedence[$op]) { - $rhs = $this->expHelper($rhs, static::$precedence[$next[1]]); - } + // consume higher-precedence operators on the right-hand side + $rhs = $this->expHelper($rhs, static::$precedence[$op] + 1); $lhs = [Type::T_EXPRESSION, $op, $lhs, $rhs, $this->inParens, $whiteBefore, $whiteAfter]; diff --git a/vendor/scssphp/scssphp/src/Version.php b/vendor/scssphp/scssphp/src/Version.php index e8bf3bee..b103b4bf 100644 --- a/vendor/scssphp/scssphp/src/Version.php +++ b/vendor/scssphp/scssphp/src/Version.php @@ -19,5 +19,5 @@ namespace ScssPhp\ScssPhp; */ class Version { - const VERSION = '1.5.2'; + const VERSION = '1.6.0'; } From 366512cd6bf6c08236267bbbbb5ad2022636d4a1 Mon Sep 17 00:00:00 2001 From: Djamil Legato Date: Mon, 2 Aug 2021 12:21:53 -0700 Subject: [PATCH 2/9] Removed leftover alert --- themes/grav/app/utils/cookies.js | 1 - 1 file changed, 1 deletion(-) diff --git a/themes/grav/app/utils/cookies.js b/themes/grav/app/utils/cookies.js index 237c7592..40184ddc 100644 --- a/themes/grav/app/utils/cookies.js +++ b/themes/grav/app/utils/cookies.js @@ -13,7 +13,6 @@ const factory = function(window) { } const Cookies = (key, value, options) => { - alert('a'); return arguments.length === 1 ? Cookies.get(key) : Cookies.set(key, value, options); From 7317e755e5646400f92dddc5017da1b1bdc2c822 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Mon, 9 Aug 2021 21:12:57 +0300 Subject: [PATCH 3/9] Fixed missing values in `fieldset` form field --- CHANGELOG.md | 2 ++ .../grav/templates/forms/fields/fieldset/fieldset.html.twig | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4df71d06..dca37921 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ 1. [](#new) * Updated SCSS compiler to v1.6 +1. [](#bugfix) + * Fixed missing values in `fieldset` form field # v1.10.18 ## 07/19/2021 diff --git a/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig b/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig index 6bc4762d..14ce670e 100644 --- a/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig +++ b/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig @@ -60,11 +60,11 @@ {% for childName, child in field.fields %} {%- if childName == 'value' -%} {% set childKey = '' %} - {% set childValue = val %} + {% set childValue = value %} {% set childName = field.name -%} {%- elseif childName starts with '.' -%} {% set childKey = childName|trim('.') %} - {% set childValue = val|nested(childName) %} + {% set childValue = value|nested(childName) %} {% set childName = field.name ~ childName %} {% else %} {% set childKey = childName %} From 43da7c909d17f8a8402b761f815c408802311ca7 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 12 Aug 2021 14:13:19 +0300 Subject: [PATCH 4/9] Updated forms and nested fields to use new form logic --- CHANGELOG.md | 5 +- blueprints.yaml | 4 +- themes/grav/templates/forgot.html.twig | 13 +- .../fields/colorscheme/colorscheme.html.twig | 7 +- .../forms/fields/column/column.html.twig | 14 +- .../forms/fields/columns/columns.html.twig | 8 +- .../forms/fields/fieldset/fieldset.html.twig | 52 ++---- .../forms/fields/list/list.html.twig | 165 +++++++----------- .../forms/fields/section/section.html.twig | 18 +- .../forms/fields/taxonomy/taxonomy.html.twig | 2 +- .../partials/blueprints-copy.html.twig | 12 +- .../partials/blueprints-new-folder.html.twig | 12 +- .../partials/blueprints-new.html.twig | 12 +- .../partials/blueprints-raw.html.twig | 12 +- .../templates/partials/blueprints.html.twig | 12 +- .../templates/partials/login-form.html.twig | 13 +- .../templates/partials/login-twofa.html.twig | 14 +- .../templates/partials/page-move.html.twig | 12 +- themes/grav/templates/register.html.twig | 13 +- themes/grav/templates/reset.html.twig | 13 +- 20 files changed, 151 insertions(+), 262 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dca37921..0b69fcb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,11 @@ ## mm/dd/2021 1. [](#new) + * Require **Grav 1.7.19** and **Form 5.1.0** * Updated SCSS compiler to v1.6 -1. [](#bugfix) +2. [](#improved) + * Updated forms and nested fields to use new form logic +3. [](#bugfix) * Fixed missing values in `fieldset` form field # v1.10.18 diff --git a/blueprints.yaml b/blueprints.yaml index 42d3fbd5..b4e65c01 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -15,8 +15,8 @@ docs: https://github.com/getgrav/grav-plugin-admin/blob/develop/README.md license: MIT dependencies: - - { name: grav, version: '>=1.7.10' } - - { name: form, version: '>=4.1.0' } + - { name: grav, version: '>=1.7.19' } + - { name: form, version: '>=5.1.0' } - { name: login, version: '>=3.3.5' } - { name: email, version: '>=3.0.9' } - { name: flex-objects, version: '>=1.0.0' } diff --git a/themes/grav/templates/forgot.html.twig b/themes/grav/templates/forgot.html.twig index e7d9ef0c..08a3645a 100644 --- a/themes/grav/templates/forgot.html.twig +++ b/themes/grav/templates/forgot.html.twig @@ -1,15 +1,10 @@ {% embed 'partials/login.html.twig' with {title:'Grav Forgot Password'} %} {% block form %} - {% for field_name,field in form.fields %} - {% if field.type %} - {% set field = field|merge({ name: field.name ?? field_name }) %} - {% set value = form.value(field.name) %} -
- {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} -
- {% endif %} - {% endfor %} + {% embed 'forms/default/fields.html.twig' with {name: null, fields: form.fields} %} + {% block inner_markup_field_open %}
{% endblock %} + {% block inner_markup_field_close %}
{% endblock %} + {% endembed %}
diff --git a/themes/grav/templates/forms/fields/colorscheme/colorscheme.html.twig b/themes/grav/templates/forms/fields/colorscheme/colorscheme.html.twig index dc1a549e..e0276ae2 100644 --- a/themes/grav/templates/forms/fields/colorscheme/colorscheme.html.twig +++ b/themes/grav/templates/forms/fields/colorscheme/colorscheme.html.twig @@ -5,12 +5,7 @@ {% block input %}
- {% for field in field.fields %} - {% if field.type %} - {% set value = data.value(field.name) %} - {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} - {% endif %} - {% endfor %} + {% include 'forms/default/fields.html.twig' with {name: field.name, fields: field.fields} %}
{% endblock %} diff --git a/themes/grav/templates/forms/fields/column/column.html.twig b/themes/grav/templates/forms/fields/column/column.html.twig index b332fdd1..6c5d4264 100644 --- a/themes/grav/templates/forms/fields/column/column.html.twig +++ b/themes/grav/templates/forms/fields/column/column.html.twig @@ -1,14 +1,8 @@ {% extends "forms/field.html.twig" %} {% block field %} -{% if field.fields %} -
- {% for child in field.fields %} - {% if child.type and not child.validate.ignore %} - {% set value = child.name ? (form.value(child.name) ?? data.value(child.name)) : data.toArray %} - {% include ["forms/fields/#{child.type}/#{child.type}.html.twig", 'forms/fields/text/text.html.twig'] with {field: child} %} - {% endif %} - {% endfor %} -
-{% endif %} + {% embed 'forms/default/fields.html.twig' with {name: field.name, fields: field.fields} %} + {% block outer_markup_field_open %}
{% endblock %} + {% block outer_markup_field_close %}
{% endblock %} + {% endembed %} {% endblock %} diff --git a/themes/grav/templates/forms/fields/columns/columns.html.twig b/themes/grav/templates/forms/fields/columns/columns.html.twig index ab994d05..1a8fc00b 100644 --- a/themes/grav/templates/forms/fields/columns/columns.html.twig +++ b/themes/grav/templates/forms/fields/columns/columns.html.twig @@ -2,11 +2,7 @@ {% block field %}
-{% if field.fields %} {% set cols = field.fields|length %} - {% for child in field.fields %} - {% include ["forms/fields/#{child.type}/#{child.type}.html.twig", 'forms/fields/column/column.html.twig'] with {field: child, cols: cols} %} - {% endfor %} -{% endif %} + {% include 'forms/default/fields.html.twig' with {name: field.name, fields: field.fields, fallback_field: 'column', cols: cols} %}
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig b/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig index 14ce670e..a0498cb3 100644 --- a/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig +++ b/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig @@ -57,44 +57,28 @@ {% endif %} {% if field.fields %} - {% for childName, child in field.fields %} - {%- if childName == 'value' -%} - {% set childKey = '' %} - {% set childValue = value %} - {% set childName = field.name -%} - {%- elseif childName starts with '.' -%} - {% set childKey = childName|trim('.') %} - {% set childValue = value|nested(childName) %} - {% set childName = field.name ~ childName %} - {% else %} - {% set childKey = childName %} - {% set childValue = data.value(childName) %} - {% set childName = childName|replace({'*': key}) %} - {% endif %} - {% set child = child|merge({ name: childName }) %} + {% for child_name, child in field.fields %} + {% set child = prepare_form_field(child, child_name, field.name, key) %} + {% if child %} + {% set default_layout = 'text' %} + {% if child.type == 'key' or child.key == true %} + {# Special handling for the key field #} + {% set default_layout = 'key' %} + {% set child_value = key %} + {% elseif child.name == 'value' %} + {# Special handling for the value field #} + {% set child = child|merge({ name: field.name }) %} + {% set child_value = value %} + {% else %} + {% set child_value = form ? form.value(child.name) : data.value(child.name) %} + {% endif %} - {% if child.type == 'key' %} - {% - include 'forms/fields/key/key.html.twig' - with { field: child, value: key } - %} - {% elseif child.key == true %} - {% include [ - "forms/fields/#{child.type}/#{child.type}.html.twig", - 'forms/fields/key/key.html.twig' - ] with { field: child, value: key } - %} - {% elseif child.type %} - {% - include [ - "forms/fields/#{child.type}/#{child.type}.html.twig", - 'forms/fields/text/text.html.twig' - ] with { field: child, value: childValue } - %} + {% set field_templates = include_form_field(child.type, field_layout, default_layout) %} + {% include field_templates with { field: child, value: child_value } %} {% endif %} {% endfor %} {% endif %} - {% endblock %} + {% endblock %} {% endblock %} diff --git a/themes/grav/templates/forms/fields/list/list.html.twig b/themes/grav/templates/forms/fields/list/list.html.twig index adb95fec..840517fe 100644 --- a/themes/grav/templates/forms/fields/list/list.html.twig +++ b/themes/grav/templates/forms/fields/list/list.html.twig @@ -69,65 +69,50 @@ {% if field.fields %} {% set collapsible = field.fields|length > 1 and (field.collapsible is not defined or field.collapsible) %} {% for key, val in value %} - {% set itemName = name ? name ~ '.' ~ key : key %} -
  • - {% for childName, child in field.fields %} - {% set child = child|merge({ '_list_index': itemName }) %} - {%- if childName == 'value' -%} - {% set childKey = '' %} - {% set childValue = val %} - {% set childName = itemName -%} - {%- elseif childName starts with '.' -%} - {% set childKey = childName|trim('.') %} - {% set childValue = val|nested(childName) %} - {% set childName = itemName ~ childName %} - {% else %} - {% set childKey = childName %} - {% set childValue = data.value(childName) %} - {% set childName = childName|replace({'*': key}) %} - {% endif %} - {% set child = child|merge({ name: childName }) %} + {%- for child_name, child in field.fields -%} + {% set child = prepare_form_field(child, child_name, item_name) %} + {% if child %} + {% set child = child|merge({ '_list_index': item_name }) %} + {% set default_layout = 'text' %} + {% if child.type == 'key' or (child.key == true and child.type != 'list') %} + {# Special handling for the key field #} + {% set default_layout = 'key' %} + {% set child_value = key %} + {% elseif child.name == 'value' %} + {# Special handling for the value field #} + {% set child = child|merge({ name: item_name }) %} + {% set child_value = value %} + {% else %} + {% set child_value = form ? form.value(child.name) : data.value(child.name) %} + {% endif %} - {% if child.type == 'key' %} - {% - include 'forms/fields/key/key.html.twig' - with { field: child, value: key } - %} - {% elseif child.key == true and child.type != 'list' %} - {% include [ - "forms/fields/#{child.type}/#{child.type}.html.twig", - 'forms/fields/key/key.html.twig' - ] with { field: child, value: key } - %} - {% elseif child.type %} - {% set originalValue = childValue %} - {% set templateData = { field: child, value: childValue } %} + {% set field_templates = include_form_field(child.type, field_layout, default_layout) %} + {% set template_data = { field: child, value: child_value } %} + {% if default_layout != 'key' %} + {% set originalValue = child_value %} + {% if child.type == 'fieldset' %} + {% set template_data = template_data|merge({val: child_value}) %} + {% endif %} + {% endif %} - {% if child.type == 'fieldset' %} - {% set templateData = templateData|merge({val: childValue}) %} + {%- include field_templates with template_data -%} {% endif %} - - {% - include [ - "forms/fields/#{child.type}/#{child.type}.html.twig", - 'forms/fields/text/text.html.twig' - ] with templateData - %} - {% endif %} - {% endfor %} -
    - {% if collapsible %} - -
    - {% endif %} - -
    -
    • - {% endfor %} + {% endfor %} +
    + {% if collapsible %} + +
    + {% endif %} + +
    + + {% endfor %} {% endif %} {% if fieldControls in ['bottom', 'both'] %} @@ -149,58 +134,42 @@ {% endif %} - {%- set itemName = name ? name ~ '.*' : '*' -%} -
    + {% set template %} + {%- set item_name = name ? name ~ '.*' : '*' -%} +
  • {% if field.sort is not same as(false) %} -
    +
    {% endif %} {%- if field.fields -%} - {%- for childName, child in field.fields -%} - {%- if childName == 'value' -%} - {%- set childKey = '' -%} - {%- set childName = itemName -%} - {%- elseif childName starts with '.' -%} - {%- set childKey = childName|trim('.') -%} - {%- set childName = itemName ~ childName -%} - {%- else %} - {%- set childKey = childName -%} - {%- set childName = childName|replace({'*': key}) -%} - {%- endif %} - {%- set child = child|merge({ name: childName }) -%} + {%- for child_name, child in field.fields -%} + {% set child = prepare_form_field(child, child_name, item_name) %} + {% if child %} + {% set child = child|merge({ '_list_index': item_name }) %} + {% set default_layout = 'text' %} + {% if child.type == 'key' or child.key == true %} + {# Special handling for the key field #} + {% set default_layout = 'key' %} + {% elseif child.name == 'value' %} + {# Special handling for the value field #} + {% set child = child|merge({ name: item_name }) %} + {% endif %} - {%- if child.type == 'key' -%} - {%- - include 'forms/fields/key/key.html.twig' - with { field: child, value: null } - -%} - {%- elseif child.key == true -%} - {%- - include [ - "forms/fields/#{child.type}/#{child.type}.html.twig", - 'forms/fields/key/key.html.twig' - ] with { field: child, value: null } - -%} - {%- elseif child.type -%} - {%- - include [ - "forms/fields/#{child.type}/#{child.type}.html.twig", - 'forms/fields/text/text.html.twig' - ] with { field: child, value: null } - -%} - {%- endif -%} - {%- endfor %} -
    - {% if collapsible %} - -
    - {% endif %} - -
    + {% set field_templates = include_form_field(child.type, field_layout, default_layout) %} + {% include field_templates with { field: child, value: null } %} + {% endif %} + {%- endfor %} +
    + {% if collapsible %} + +
    + {% endif %} + +
    {%- endif -%}
    • - {%- endfilter -%}">
    - + {% endset %} +
    diff --git a/themes/grav/templates/forms/fields/section/section.html.twig b/themes/grav/templates/forms/fields/section/section.html.twig index fd6faf85..485ad184 100644 --- a/themes/grav/templates/forms/fields/section/section.html.twig +++ b/themes/grav/templates/forms/fields/section/section.html.twig @@ -11,16 +11,14 @@

    {% if grav.twig.twig.filters['tu'] is defined %}{{ field.text|tu|markdown|raw }}{% else %}{{ field.text|t|markdown|raw }}{% endif %}

    {% endif %} - {% if field.fields %} -
    - {% for field in field.fields %} - {% if field.type %} - {% set value = field.name ? (form.value(field.name) ?? data.value(field.name)) : data.toArray %} - {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} - {% endif %} - {% endfor %} -
    - {% endif %} + {% embed 'forms/default/fields.html.twig' with {name: field.name, fields: field.fields} %} + {% block outer_markup_field_open %} +
    + {% endblock %} + {% block outer_markup_field_close %} +
    + {% endblock %} + {% endembed %} {% endif %} {% endblock %} diff --git a/themes/grav/templates/forms/fields/taxonomy/taxonomy.html.twig b/themes/grav/templates/forms/fields/taxonomy/taxonomy.html.twig index 5e611f64..64d5434d 100644 --- a/themes/grav/templates/forms/fields/taxonomy/taxonomy.html.twig +++ b/themes/grav/templates/forms/fields/taxonomy/taxonomy.html.twig @@ -33,6 +33,6 @@ } } %} - {% include ['forms/fields/select/select.html.twig'] %} + {% include 'forms/fields/select/select.html.twig' %} {% endfor %} {% endblock %} diff --git a/themes/grav/templates/partials/blueprints-copy.html.twig b/themes/grav/templates/partials/blueprints-copy.html.twig index c8e02607..c85a8b01 100644 --- a/themes/grav/templates/partials/blueprints-copy.html.twig +++ b/themes/grav/templates/partials/blueprints-copy.html.twig @@ -2,14 +2,10 @@ {% set scope = scope ?: 'data.' %}
    - {% for field in blueprints.fields %} - {% if field.type %} - {% set value = field.name ? (data.value(field.name) ?? form.value(field.name)) : data.toArray %} -
    - {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} -
    - {% endif %} - {% endfor %} + {% embed 'forms/default/fields.html.twig' with {name: null, fields: blueprints.fields} %} + {% block inner_markup_field_open %}
    {% endblock %} + {% block inner_markup_field_close %}
    {% endblock %} + {% endembed %}
    diff --git a/themes/grav/templates/partials/blueprints-new-folder.html.twig b/themes/grav/templates/partials/blueprints-new-folder.html.twig index c22124bb..fb5ace86 100644 --- a/themes/grav/templates/partials/blueprints-new-folder.html.twig +++ b/themes/grav/templates/partials/blueprints-new-folder.html.twig @@ -2,14 +2,10 @@ {% set scope = scope ?: 'data.' %} - {% for field in blueprints.fields %} - {% if field.type %} - {% set value = field.name ? (form.value(field.name) ?? data.value(field.name)) : data.toArray %} -
    - {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} -
    - {% endif %} - {% endfor %} + {% embed 'forms/default/fields.html.twig' with {name: null, fields: blueprints.fields} %} + {% block inner_markup_field_open %}
    {% endblock %} + {% block inner_markup_field_close %}
    {% endblock %} + {% endembed %}
    diff --git a/themes/grav/templates/partials/blueprints-new.html.twig b/themes/grav/templates/partials/blueprints-new.html.twig index cb10f2e1..b3b0f71b 100644 --- a/themes/grav/templates/partials/blueprints-new.html.twig +++ b/themes/grav/templates/partials/blueprints-new.html.twig @@ -2,14 +2,10 @@ {% set scope = scope ?: 'data.' %} - {% for field in blueprints.fields %} - {% if field.type %} - {% set value = field.name ? (form.value(field.name) ?? data.value(field.name)) : data.toArray %} -
    - {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} -
    - {% endif %} - {% endfor %} + {% embed 'forms/default/fields.html.twig' with {name: null, fields: blueprints.fields} %} + {% block inner_markup_field_open %}
    {% endblock %} + {% block inner_markup_field_close %}
    {% endblock %} + {% endembed %}
    diff --git a/themes/grav/templates/partials/blueprints-raw.html.twig b/themes/grav/templates/partials/blueprints-raw.html.twig index 68573a00..c7fe133d 100644 --- a/themes/grav/templates/partials/blueprints-raw.html.twig +++ b/themes/grav/templates/partials/blueprints-raw.html.twig @@ -6,14 +6,10 @@ {% endif %} - {% for field in blueprints.fields %} - {% if field.type %} - {% set value = field.name ? (form.value(field.name) ?? data.value(field.name)) : data.toArray %} -
    - {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} -
    - {% endif %} - {% endfor %} + {% embed 'forms/default/fields.html.twig' with {name: null, fields: blueprints.fields} %} + {% block inner_markup_field_open %}
    {% endblock %} + {% block inner_markup_field_close %}
    {% endblock %} + {% endembed %} {% if form %} {% include "forms/fields/formname/formname.html.twig" %} diff --git a/themes/grav/templates/partials/blueprints.html.twig b/themes/grav/templates/partials/blueprints.html.twig index ecf00373..77728e6a 100644 --- a/themes/grav/templates/partials/blueprints.html.twig +++ b/themes/grav/templates/partials/blueprints.html.twig @@ -8,14 +8,10 @@ {% endif %} - {% for field in blueprints.fields %} - {% if field.type %} - {% set value = field.name ? (form.value(field.name) ?? data.value(field.name)) : data.toArray %} -
    - {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} -
    - {% endif %} - {% endfor %} + {% embed 'forms/default/fields.html.twig' with {name: null, fields: blueprints.fields} %} + {% block inner_markup_field_open %}
    {% endblock %} + {% block inner_markup_field_close %}
    {% endblock %} + {% endembed %} {% if data.extra %} {% for name, value in data.extra %} diff --git a/themes/grav/templates/partials/login-form.html.twig b/themes/grav/templates/partials/login-form.html.twig index 99234030..5623cafd 100755 --- a/themes/grav/templates/partials/login-form.html.twig +++ b/themes/grav/templates/partials/login-form.html.twig @@ -10,15 +10,10 @@ {% endblock %} {% block form %} - {% for field_name,field in form.fields %} - {% if field.type %} - {% set field = field|merge({ name: field.name ?? field_name }) %} - {% set value = form.value(field.name) %} -
    - {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} -
    - {% endif %} - {% endfor %} + {% embed 'forms/default/fields.html.twig' with {name: null, fields: form.fields} %} + {% block inner_markup_field_open %}
    {% endblock %} + {% block inner_markup_field_close %}
    {% endblock %} + {% endembed %}
    {{ 'PLUGIN_ADMIN.LOGIN_BTN_FORGOT'|tu }} diff --git a/themes/grav/templates/partials/login-twofa.html.twig b/themes/grav/templates/partials/login-twofa.html.twig index 7cb7892f..06fbcafc 100644 --- a/themes/grav/templates/partials/login-twofa.html.twig +++ b/themes/grav/templates/partials/login-twofa.html.twig @@ -4,16 +4,10 @@ {% endblock %} {% block form %} - - {% for field_name, field in form.fields %} - {% if field.type %} - {% set field = field|merge({ name: field.name ?? field_name }) %} - {% set value = form.value(field.name) %} -
    - {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} -
    - {% endif %} - {% endfor %} + {% embed 'forms/default/fields.html.twig' with {name: null, fields: form.fields} %} + {% block inner_markup_field_open %}
    {% endblock %} + {% block inner_markup_field_close %}
    {% endblock %} + {% endembed %}
    diff --git a/themes/grav/templates/partials/page-move.html.twig b/themes/grav/templates/partials/page-move.html.twig index 4f3a56d7..da559a0e 100644 --- a/themes/grav/templates/partials/page-move.html.twig +++ b/themes/grav/templates/partials/page-move.html.twig @@ -6,14 +6,10 @@
    Loading...
    - {% for field in blueprints.fields %} - {% if field.type %} - {% set value = field.name ? (form.value(field.name) ?? data.value(field.name)) : data.toArray %} -
    - {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} -
    - {% endif %} - {% endfor %} + {% embed 'forms/default/fields.html.twig' with {name: null, fields: blueprints.fields} %} + {% block inner_markup_field_open %}
    {% endblock %} + {% block inner_markup_field_close %}
    {% endblock %} + {% endembed %} {{ nonce_field('admin-form', 'admin-nonce')|raw }} diff --git a/themes/grav/templates/register.html.twig b/themes/grav/templates/register.html.twig index aadf765b..172e6ae2 100644 --- a/themes/grav/templates/register.html.twig +++ b/themes/grav/templates/register.html.twig @@ -7,15 +7,10 @@ {% endblock %} {% block form %} - {% for field_name,field in form.fields %} - {% if field.type %} - {% set field = field|merge({ name: field.name ?? field_name }) %} - {% set value = form.value(field.name) %} -
    - {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} -
    - {% endif %} - {% endfor %} + {% embed 'forms/default/fields.html.twig' with {name: null, fields: form.fields} %} + {% block inner_markup_field_open %}
    {% endblock %} + {% block inner_markup_field_close %}
    {% endblock %} + {% endembed %}
    diff --git a/themes/grav/templates/reset.html.twig b/themes/grav/templates/reset.html.twig index c5f28ecd..77d14cc7 100644 --- a/themes/grav/templates/reset.html.twig +++ b/themes/grav/templates/reset.html.twig @@ -1,15 +1,10 @@ {% embed 'partials/login.html.twig' with {title:'Grav Reset Password'} %} {% block form %} - {% for field_name,field in form.fields %} - {% if field.type %} - {% set field = field|merge({ name: field.name ?? field_name }) %} - {% set value = form.value(field.name) %} -
    - {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} -
    - {% endif %} - {% endfor %} + {% embed 'forms/default/fields.html.twig' with {name: null, fields: form.fields} %} + {% block inner_markup_field_open %}
    {% endblock %} + {% block inner_markup_field_close %}
    {% endblock %} + {% endembed %}
    From 2546cd35e039762df19ae7fd6063b5fb4ff85005 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Wed, 18 Aug 2021 13:41:04 +0300 Subject: [PATCH 5/9] Make sure that login data is an array in taskLogin() --- classes/plugin/Controllers/Login/LoginController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/plugin/Controllers/Login/LoginController.php b/classes/plugin/Controllers/Login/LoginController.php index 4baf402b..1e3c81f0 100644 --- a/classes/plugin/Controllers/Login/LoginController.php +++ b/classes/plugin/Controllers/Login/LoginController.php @@ -140,7 +140,7 @@ class LoginController extends AdminController } $post = $this->getPost(); - $credentials = $post['data'] ?? []; + $credentials = (array)($post['data'] ?? []); $login = $this->getLogin(); $config = $this->getConfig(); From e9d36b97a85b9cf8baf4fdc78ad5980592351baf Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Wed, 18 Aug 2021 14:12:03 +0300 Subject: [PATCH 6/9] Stop using `|tu` filter, Grav already has the same logic in `|t` for admin --- CHANGELOG.md | 2 + themes/grav/templates/config.html.twig | 14 +-- themes/grav/templates/dashboard.html.twig | 20 ++-- themes/grav/templates/denied.html.twig | 4 +- themes/grav/templates/email/base.html.twig | 2 +- themes/grav/templates/error.html.twig | 2 +- themes/grav/templates/forgot.html.twig | 2 +- themes/grav/templates/forms/field.html.twig | 26 ++--- .../fields/acl_picker/acl_picker.html.twig | 13 ++- .../forms/fields/array/array.html.twig | 18 ++-- .../backupshistory/backupshistory.html.twig | 10 +- .../fields/colorpicker/colorpicker.html.twig | 10 +- .../colorscheme.color.html.twig | 10 +- .../fields/dateformat/dateformat.html.twig | 2 +- .../forms/fields/editor/editor.html.twig | 18 ++-- .../forms/fields/fieldset/fieldset.html.twig | 12 +-- .../forms/fields/file/file.html.twig | 2 +- .../fields/folder-slug/folder-slug.html.twig | 2 +- .../fields/iconpicker/iconpicker.html.twig | 4 +- .../forms/fields/list/list.html.twig | 20 ++-- .../fields/multilevel/multilevel.html.twig | 8 +- .../forms/fields/order/order.html.twig | 10 +- .../fields/pagemedia/pagemedia.html.twig | 6 +- .../fields/permissions/permissions.html.twig | 10 +- .../forms/fields/section/section.html.twig | 4 +- .../selectunique/selectunique.html.twig | 10 +- .../themepreview/themepreview.html.twig | 4 +- .../forms/fields/widgets/widgets.html.twig | 4 +- .../templates/forms/fields/xss/xss.html.twig | 2 +- themes/grav/templates/installer.html.twig | 2 +- themes/grav/templates/pages.html.twig | 102 +++++++++--------- .../partials/backups-button.html.twig | 2 +- .../templates/partials/base-root.html.twig | 26 ++--- .../partials/blueprints-copy.html.twig | 2 +- .../partials/blueprints-new-folder.html.twig | 2 +- .../partials/blueprints-new.html.twig | 2 +- .../partials/dashboard-feed.html.twig | 2 +- .../partials/dashboard-maintenance.html.twig | 10 +- .../dashboard-notifications.html.twig | 2 +- .../partials/dashboard-pages.html.twig | 4 +- .../partials/dashboard-statistics.html.twig | 8 +- .../grav/templates/partials/footer.html.twig | 2 +- .../templates/partials/list-sort.html.twig | 12 +-- .../templates/partials/login-form.html.twig | 4 +- .../templates/partials/login-logout.html.twig | 4 +- themes/grav/templates/partials/logo.html.twig | 4 +- .../media-list-wrapper__sidebar.html.twig | 2 +- .../templates/partials/messages.html.twig | 4 +- .../partials/modal-add-package.html.twig | 34 +++--- .../partials/modal-changes-detected.html.twig | 10 +- .../modal-reinstall-package.html.twig | 26 ++--- .../partials/modal-remove-package.html.twig | 22 ++-- .../partials/modal-switch-theme.html.twig | 12 +-- .../partials/modal-update-packages.html.twig | 34 +++--- .../partials/nav-quick-tray.html.twig | 4 +- .../partials/nav-user-details.html.twig | 4 +- themes/grav/templates/partials/nav.html.twig | 4 +- .../templates/partials/page-legend.html.twig | 4 +- .../templates/partials/page-move.html.twig | 4 +- .../templates/partials/plugin-data.html.twig | 18 ++-- .../partials/plugins-details.html.twig | 20 ++-- .../templates/partials/plugins-list.html.twig | 14 +-- .../partials/release-toggle.html.twig | 4 +- .../partials/spinning-wheel.html.twig | 2 +- .../grav/templates/partials/theme.html.twig | 4 +- .../partials/themes-details.html.twig | 40 +++---- .../templates/partials/themes-list.html.twig | 18 ++-- .../partials/tools-backups-titlebar.html.twig | 6 +- .../partials/tools-backups.html.twig | 16 +-- .../partials/tools-direct-install.html.twig | 14 +-- .../tools-scheduler-titlebar.html.twig | 6 +- .../partials/tools-scheduler.html.twig | 12 +-- .../partials/userinfo-avatar-credit.html.twig | 2 +- themes/grav/templates/plugins.html.twig | 26 ++--- .../templates/plugins/admin-buttons.html.twig | 6 +- themes/grav/templates/preview.html.twig | 6 +- themes/grav/templates/register.html.twig | 4 +- themes/grav/templates/reset.html.twig | 2 +- themes/grav/templates/statistics.html.twig | 2 +- themes/grav/templates/themes.html.twig | 24 ++--- themes/grav/templates/tools.html.twig | 10 +- themes/grav/templates/user.html.twig | 26 ++--- 82 files changed, 441 insertions(+), 446 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b69fcb3..c0c6cfa1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ * Updated SCSS compiler to v1.6 2. [](#improved) * Updated forms and nested fields to use new form logic + * Stop using `|tu` filter, Grav already has the same logic in `|t` for admin + * Remove unneeded escapes 3. [](#bugfix) * Fixed missing values in `fieldset` form field diff --git a/themes/grav/templates/config.html.twig b/themes/grav/templates/config.html.twig index ffd1bf63..97db65d9 100644 --- a/themes/grav/templates/config.html.twig +++ b/themes/grav/templates/config.html.twig @@ -9,8 +9,8 @@ {% set isInfo = (config_slug == 'info') %} {% set tab_title_string = "PLUGIN_ADMIN." ~ config_slug|upper %} -{% set tab_title = (tab_title_string|tu == tab_title_string ? config_slug|capitalize : tab_title_string|tu) ?: 'Not Found' %} -{% set title = "PLUGIN_ADMIN.CONFIGURATION"|tu ~ ": " ~ tab_title %} +{% set tab_title = (tab_title_string|t == tab_title_string ? config_slug|capitalize : tab_title_string|t) ?: 'Not Found' %} +{% set title = "PLUGIN_ADMIN.CONFIGURATION"|t ~ ": " ~ tab_title %} {% if config_slug and not isInfo %} {% set data = admin.data('config/' ~ config_slug) %} @@ -27,17 +27,17 @@ {% block titlebar %}
    - {{ "PLUGIN_ADMIN.BACK"|tu }} + {{ "PLUGIN_ADMIN.BACK"|t }} {% if data.file.filename %} - + {% endif %}
    -

    {{ "PLUGIN_ADMIN.CONFIGURATION"|tu }} - {{ tab_title }}

    +

    {{ "PLUGIN_ADMIN.CONFIGURATION"|t }} - {{ tab_title }}

    {% endblock %} {% block content_top %} {% if authorize('admin.super') and data.file.filename %} -
    {{ "PLUGIN_ADMIN.SAVE_LOCATION"|tu }}: {{ data.file.filename|replace({(base_path):''}) }}
    +
    {{ "PLUGIN_ADMIN.SAVE_LOCATION"|t }}: {{ data.file.filename|replace({(base_path):''}) }}
    {% endif %}
    @@ -45,7 +45,7 @@ {% for configuration in configurations %} {% set configuration_string = "PLUGIN_ADMIN." ~ configuration|upper %} - {{ (configuration_string|tu == configuration_string ? configuration|capitalize : configuration_string|tu) }} + {{ (configuration_string|t == configuration_string ? configuration|capitalize : configuration_string|t) }} {% endfor %}
    diff --git a/themes/grav/templates/dashboard.html.twig b/themes/grav/templates/dashboard.html.twig index 4ebfde3f..67cd2c21 100644 --- a/themes/grav/templates/dashboard.html.twig +++ b/themes/grav/templates/dashboard.html.twig @@ -1,6 +1,6 @@ {% extends 'partials/base.html.twig' %} -{% set title = "PLUGIN_ADMIN.DASHBOARD"|tu %} +{% set title = "PLUGIN_ADMIN.DASHBOARD"|t %} {% set clear_cache_url = base_url_relative ~ '/cache.json/task' ~ config.system.param_sep ~ 'clearCache'|e('html_attr') %} @@ -8,25 +8,25 @@
    {% if authorize(['admin.maintenance', 'admin.super', 'admin.cache']) %}
    - +
    {% endif %} {% if authorize(['admin.maintenance', 'admin.super']) %} - + {% endif %}
    -

    {{ "PLUGIN_ADMIN.DASHBOARD"|tu }}

    +

    {{ "PLUGIN_ADMIN.DASHBOARD"|t }}

    {% endblock %} {% block widgets %} diff --git a/themes/grav/templates/denied.html.twig b/themes/grav/templates/denied.html.twig index 90564798..aa73c58c 100644 --- a/themes/grav/templates/denied.html.twig +++ b/themes/grav/templates/denied.html.twig @@ -5,12 +5,12 @@ {% block content %}

    - {{ "PLUGIN_ADMIN.ACCESS_DENIED"|tu }} + {{ "PLUGIN_ADMIN.ACCESS_DENIED"|t }}

    {% include 'partials/messages.html.twig' %} -

    {{ admin.user.fullname }}, {{ "PLUGIN_ADMIN.ACCOUNT_NOT_ADMIN"|tu }}. {{ "PLUGIN_ADMIN.LOGOUT"|tu }}

    +

    {{ admin.user.fullname }}, {{ "PLUGIN_ADMIN.ACCOUNT_NOT_ADMIN"|t }}. {{ "PLUGIN_ADMIN.LOGOUT"|t }}

    {% endblock %} diff --git a/themes/grav/templates/email/base.html.twig b/themes/grav/templates/email/base.html.twig index 278b2ec3..f68a7530 100644 --- a/themes/grav/templates/email/base.html.twig +++ b/themes/grav/templates/email/base.html.twig @@ -179,7 +179,7 @@
    - {{ 'PLUGIN_ADMIN.EMAIL_FOOTER'|tu|raw }} + {{ 'PLUGIN_ADMIN.EMAIL_FOOTER'|t|raw }}
    diff --git a/themes/grav/templates/error.html.twig b/themes/grav/templates/error.html.twig index fdeb4951..1446d3cf 100644 --- a/themes/grav/templates/error.html.twig +++ b/themes/grav/templates/error.html.twig @@ -1,7 +1,7 @@ {% extends 'partials/base.html.twig' %} {% block titlebar %} -

    {{ "PLUGIN_ADMIN.ERROR"|tu }}

    +

    {{ "PLUGIN_ADMIN.ERROR"|t }}

    {% endblock %} {% block content %} diff --git a/themes/grav/templates/forgot.html.twig b/themes/grav/templates/forgot.html.twig index 08a3645a..02a2c3b8 100644 --- a/themes/grav/templates/forgot.html.twig +++ b/themes/grav/templates/forgot.html.twig @@ -6,7 +6,7 @@ {% block inner_markup_field_close %}
    {% endblock %} {% endembed %}
    - +
    {% endblock %} diff --git a/themes/grav/templates/forms/field.html.twig b/themes/grav/templates/forms/field.html.twig index 9205c973..e6c16b22 100644 --- a/themes/grav/templates/forms/field.html.twig +++ b/themes/grav/templates/forms/field.html.twig @@ -46,15 +46,15 @@ {% block label %} {% if field.help %} {% if field.markdown %} - {{ field.label|tu|markdown(false)|raw }} + {{ field.label|t|markdown(false)|raw }} {% else %} - {{ field.label|tu|raw }} + {{ field.label|t|raw }} {% endif %} {% else %} {% if field.markdown %} - {{ field.label|tu|markdown(false)|raw }} + {{ field.label|t|markdown(false)|raw }} {% else %} - {{ field.label|tu|raw }} + {{ field.label|t|raw }} {% endif %} {% endif %} {{ field.validate.required in ['on', 'true', 1] ? '*' }} @@ -63,9 +63,9 @@ {% if field.sublabel %}
    {% if field.markdown %} - {{ field.sublabel|tu|markdown(false)|raw }} + {{ field.sublabel|t|markdown(false)|raw }} {% else %} - {{ field.sublabel|tu|raw }} + {{ field.sublabel|t|raw }} {% endif %}
    {% endif %} @@ -93,18 +93,18 @@ {# input attribute structures #} {% block input_attributes %} {% if field.classes is defined %}class="{{ field.classes }}" {% endif %} - {% if field.id is defined %}id="{{ field.id|e }}" {% endif %} - {% if field.style is defined %}style="{{ field.style|e }}" {% endif %} + {% if field.id is defined %}id="{{ field.id }}" {% endif %} + {% if field.style is defined %}style="{{ field.style }}" {% endif %} {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %} - {% if field.placeholder %}placeholder="{{ field.placeholder|tu }}"{% endif %} + {% if field.placeholder %}placeholder="{{ field.placeholder|t }}"{% endif %} {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %} {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %} {% if field.readonly in ['on', 'true', 1] %}readonly="readonly"{% endif %} {% if field.autocomplete is defined %}autocomplete="{{ field.autocomplete }}"{% endif %} {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %} {% if field.validate.pattern %}pattern="{{ field.validate.pattern }}"{% endif %} - {% if field.validate.message %}title="{{ field.validate.message|e|tu }}" - {% elseif field.title is defined %}title="{{ field.title|e|tu }}" {% endif %} + {% if field.validate.message %}title="{{ field.validate.message|t }}" + {% elseif field.title is defined %}title="{{ field.title|t }}" {% endif %} {% endblock %} /> {% block append %}{% endblock append %} @@ -115,9 +115,9 @@
    {% if field.markdown %} - {{ field.description|tu|markdown(false)|raw }} + {{ field.description|t|markdown(false)|raw }} {% else %} - {{ field.description|tu|raw }} + {{ field.description|t|raw }} {% endif %}
    diff --git a/themes/grav/templates/forms/fields/acl_picker/acl_picker.html.twig b/themes/grav/templates/forms/fields/acl_picker/acl_picker.html.twig index c955cc01..766d5641 100644 --- a/themes/grav/templates/forms/fields/acl_picker/acl_picker.html.twig +++ b/themes/grav/templates/forms/fields/acl_picker/acl_picker.html.twig @@ -2,7 +2,6 @@ {% block input %} {% set permissions = grav.permissions %} - {% set tu = grav.twig.twig.filters['tu'] is defined %} {% set classes = { '': 'status-unchecked', 1: 'status-checked', 0: 'status-indeterminate' } %} {% set states = { '': 0, 1: 1, 0: 2 } %} @@ -10,14 +9,14 @@ {% set groupsList = [] %} {% for action in permissions %} {% if (action.visible ?? true) %} - {% set groupsList = groupsList|merge([{ label: action.label|tu, value: action.name }]) %} + {% set groupsList = groupsList|merge([{ label: action.label|t, value: action.name }]) %} {% endif %} {% endfor %} {% set optionsList = [] %} {% for action in permissions.instances %} {% if (action.visible ?? true) %} - {% set label = (action.params.letter ? action.parent.label|tu ~ ' > ') ~ action.label|tu %} + {% set label = (action.params.letter ? action.parent.label|t ~ ' > ') ~ action.label|t %} {% set optionsList = optionsList|merge([{ text: label ~ ' (' ~ action.name ~ ')', value: action.name, optgroup: action.scope }]) %} {% endif %} {% endfor %} @@ -50,11 +49,11 @@
    - + - +
    {% elseif field.data_type == 'permissions' %} @@ -99,12 +98,12 @@ {% set rnd = random(100) %} - + {% set rnd = random(100) %} - +
    {% elseif field.data_type == 'permissions' %} diff --git a/themes/grav/templates/forms/fields/array/array.html.twig b/themes/grav/templates/forms/fields/array/array.html.twig index 7bf5c98b..0884750c 100644 --- a/themes/grav/templates/forms/fields/array/array.html.twig +++ b/themes/grav/templates/forms/fields/array/array.html.twig @@ -15,23 +15,23 @@ data-grav-array-type="key" type="text" value="{{ key }}" {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %} - placeholder="{{ field.placeholder_key|e|tu }}" /> + placeholder="{{ field.placeholder_key|t }}" /> {% endif %} {% if field.value_type == 'textarea' %} {% else %} + value={% if text == 'true' %}true{% elseif text == 'false' %}false{% else %}"{{ text|join(', ') }}"{% endif %} /> {% endif %} @@ -44,8 +44,8 @@ {% block global_attributes %} data-grav-array-name="{{ (scope ~ field.name)|fieldName }}" - data-grav-array-keyname="{{ field.placeholder_key|e|tu }}" - data-grav-array-valuename="{{ field.placeholder_value|e|tu }}" + data-grav-array-keyname="{{ field.placeholder_key|t }}" + data-grav-array-valuename="{{ field.placeholder_value|t }}" data-grav-array-textarea="{{ field.value_type == 'textarea' }}" {{ parent() }} {% endblock %} @@ -72,21 +72,21 @@ data-grav-array-type="key" type="text" {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %} - placeholder="{{ field.placeholder_key|e|tu }}" /> + placeholder="{{ field.placeholder_key|t }}" /> {% endif %} {% if field.value_type == 'textarea' %} + placeholder="{{ field.placeholder_value|t }}"> {% else %} + placeholder="{{ field.placeholder_value|t }}" /> {% endif %} diff --git a/themes/grav/templates/forms/fields/backupshistory/backupshistory.html.twig b/themes/grav/templates/forms/fields/backupshistory/backupshistory.html.twig index fc530226..ad219f60 100644 --- a/themes/grav/templates/forms/fields/backupshistory/backupshistory.html.twig +++ b/themes/grav/templates/forms/fields/backupshistory/backupshistory.html.twig @@ -3,10 +3,10 @@ # - {{ "PLUGIN_ADMIN.BACKUP_DATE"|tu }} - {{ "PLUGIN_ADMIN.NAME"|tu }} - {{ "PLUGIN_ADMIN.SIZE"|tu }} - {{ "PLUGIN_ADMIN.ACTION"|tu }} + {{ "PLUGIN_ADMIN.BACKUP_DATE"|t }} + {{ "PLUGIN_ADMIN.NAME"|t }} + {{ "PLUGIN_ADMIN.SIZE"|t }} + {{ "PLUGIN_ADMIN.ACTION"|t }} @@ -25,7 +25,7 @@ {% else %} - {{ "PLUGIN_ADMIN.BACKUPS_NOT_GENERATED"|tu }} + {{ "PLUGIN_ADMIN.BACKUPS_NOT_GENERATED"|t }} {% endfor %} diff --git a/themes/grav/templates/forms/fields/colorpicker/colorpicker.html.twig b/themes/grav/templates/forms/fields/colorpicker/colorpicker.html.twig index 7943fbe2..163d355f 100644 --- a/themes/grav/templates/forms/fields/colorpicker/colorpicker.html.twig +++ b/themes/grav/templates/forms/fields/colorpicker/colorpicker.html.twig @@ -16,8 +16,8 @@ {# input attribute structures #} {% block input_attributes %} {% if field.classes is defined %}class="{{ field.classes }}" {% endif %} - {% if field.id is defined %}id="{{ field.id|e }}" {% endif %} - {% if field.style is defined %}style="{{ field.style|e }}" {% endif %} + {% if field.id is defined %}id="{{ field.id }}" {% endif %} + {% if field.style is defined %}style="{{ field.style }}" {% endif %} {% if field.disabled %}disabled="disabled"{% endif %} {% if field.placeholder %}placeholder="{{ field.placeholder }}"{% endif %} {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %} @@ -26,12 +26,12 @@ {% if field.autocomplete in ['on', 'off'] %}autocomplete="{{ field.autocomplete }}"{% endif %} {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %} pattern="{{ field.validate.pattern|default(pattern)|raw }}" - {% if field.validate.message %}title="{{ field.validate.message|e|t }}" - {% elseif field.title is defined %}title="{{ field.title|e|t }}" {% endif %} + {% if field.validate.message %}title="{{ field.validate.message|t }}" + {% elseif field.title is defined %}title="{{ field.title|t }}" {% endif %} {% endblock %} />
    -
    +
    diff --git a/themes/grav/templates/forms/fields/colorscheme.color/colorscheme.color.html.twig b/themes/grav/templates/forms/fields/colorscheme.color/colorscheme.color.html.twig index 80042df0..67e7b2be 100644 --- a/themes/grav/templates/forms/fields/colorscheme.color/colorscheme.color.html.twig +++ b/themes/grav/templates/forms/fields/colorscheme.color/colorscheme.color.html.twig @@ -8,7 +8,7 @@ {% block input %}
    -
    {{ field.help|e|tu }}
    +
    {{ field.help|t }}
    diff --git a/themes/grav/templates/forms/fields/dateformat/dateformat.html.twig b/themes/grav/templates/forms/fields/dateformat/dateformat.html.twig index 92d7999d..87435ecd 100644 --- a/themes/grav/templates/forms/fields/dateformat/dateformat.html.twig +++ b/themes/grav/templates/forms/fields/dateformat/dateformat.html.twig @@ -17,7 +17,7 @@ {% if field.form %}form="{{ field.form }}"{% endif %} > {% for key, text in field.options %} - + {% endfor %}
    diff --git a/themes/grav/templates/forms/fields/editor/editor.html.twig b/themes/grav/templates/forms/fields/editor/editor.html.twig index 46f1b888..9816c232 100644 --- a/themes/grav/templates/forms/fields/editor/editor.html.twig +++ b/themes/grav/templates/forms/fields/editor/editor.html.twig @@ -4,7 +4,7 @@ {% set theme = whitelabel.codemirror_theme ?? 'paper.css' %} {% set fontsize = whitelabel.codemirror_fontsize ?? 'lg' %} -{% set value = value ?? field.default|tu %} +{% set value = value ?? field.default|t %} {% if not codemirrorOptions %} {% set codemirrorOptions = {'mode': 'gfm', 'theme': theme, 'ignore': ['code', 'preview'], 'font': 'mono'}|merge(field.codemirror|default({})) %} {% endif %} @@ -17,10 +17,10 @@ {% block label %} {% if field.label %} {% if field.help %} - {% set hint = 'data-hint="' ~ field.help|tu|raw ~ '"' %} + {% set hint = 'data-hint="' ~ field.help|t|raw ~ '"' %} {% endif %}
    - {{ field.label|tu|raw }} + {{ field.label|t|raw }} {{ field.validate.required in ['on', 'true', 1] ? '*' }}
    {% endif %} @@ -34,25 +34,25 @@ data-grav-editor-mode="editor" name="{{ (scope ~ field.name)|fieldName }}" {% if field.classes is defined %}class="{{ field.classes }}" {% endif %} - {% if field.id is defined %}id="{{ field.id|e }}" {% endif %} - {% if field.style is defined %}style="{{ field.style|e }}" {% endif %} + {% if field.id is defined %}id="{{ field.id }}" {% endif %} + {% if field.style is defined %}style="{{ field.style }}" {% endif %} {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %} - {% if field.placeholder %}placeholder="{{ field.placeholder|tu }}"{% endif %} + {% if field.placeholder %}placeholder="{{ field.placeholder|t }}"{% endif %} {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %} {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %} {% if field.readonly in ['on', 'true', 1] %}readonly="readonly"{% endif %} {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %} {% if 'preview' not in codemirrorOptions.ignore %}data-grav-urlpreview="{{ base_url }}/media/{{ admin.route|trim('/') }}.json"{% endif %} - >{{ input_value|e('html') }} + >{{ input_value }}
    {% if field.resizer is not defined or field.resizer not in ['off', 'false', 0] %}
    {% endif %} {% if field.description %}
    {% if field.markdown %} - {{ field.description|tu|markdown(false)|raw }} + {{ field.description|t|markdown(false)|raw }} {% else %} - {{ field.description|tu|raw }} + {{ field.description|t|raw }} {% endif %}
    diff --git a/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig b/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig index a0498cb3..e011d843 100644 --- a/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig +++ b/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig @@ -9,16 +9,16 @@

    {% if field.help %} - + {% endif %} {% block label %} {% if field.icon %} {% endif %} - {{ field.title|tu }} + {{ field.title|t }} {{ field.validate.required in ['on', 'true', 1] ? '*' }} {% if field.info %} - {{ field.info|tu }} + {{ field.info|t }} {% endif %} {% endblock %} {% if field.help %} @@ -49,11 +49,7 @@ {% block group %} {% if field.text %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.markdown ? field.text|tu|markdown : ('

    ' ~ field.text|tu ~ '

    ')|raw }} - {% else %} - {{ field.markdown ? field.text|t|markdown : ('

    ' ~ field.t ~ '

    ')|raw }} - {% endif %} + {{ field.markdown ? field.text|t|markdown : ('

    ' ~ field.t ~ '

    ')|raw }} {% endif %} {% if field.fields %} diff --git a/themes/grav/templates/forms/fields/file/file.html.twig b/themes/grav/templates/forms/fields/file/file.html.twig index fa2f384f..8e06edf4 100644 --- a/themes/grav/templates/forms/fields/file/file.html.twig +++ b/themes/grav/templates/forms/fields/file/file.html.twig @@ -113,6 +113,6 @@

    {% else %} - {{ "PLUGIN_ADMIN.CANNOT_ADD_FILES_PAGE_NOT_SAVED"|tu|raw }} + {{ "PLUGIN_ADMIN.CANNOT_ADD_FILES_PAGE_NOT_SAVED"|t|raw }} {% endif %} {% endblock %} diff --git a/themes/grav/templates/forms/fields/folder-slug/folder-slug.html.twig b/themes/grav/templates/forms/fields/folder-slug/folder-slug.html.twig index 9ce0491b..0246c06e 100644 --- a/themes/grav/templates/forms/fields/folder-slug/folder-slug.html.twig +++ b/themes/grav/templates/forms/fields/folder-slug/folder-slug.html.twig @@ -2,7 +2,7 @@ {% set field = field|merge({'wrapper_classes': 'form-input-addon-wrapper'}) %} {% block append %} -
    +
    {% endblock %} diff --git a/themes/grav/templates/forms/fields/iconpicker/iconpicker.html.twig b/themes/grav/templates/forms/fields/iconpicker/iconpicker.html.twig index f47d3681..08d3c2f2 100644 --- a/themes/grav/templates/forms/fields/iconpicker/iconpicker.html.twig +++ b/themes/grav/templates/forms/fields/iconpicker/iconpicker.html.twig @@ -22,8 +22,8 @@ {# input attribute structures #} {% block input_attributes %} {% if field.classes is defined %}class="{{ field.classes }}" {% endif %} - {% if field.id is defined %}id="{{ field.id|e }}" {% endif %} - {% if field.style is defined %}style="{{ field.style|e }}" {% endif %} + {% if field.id is defined %}id="{{ field.id }}" {% endif %} + {% if field.style is defined %}style="{{ field.style }}" {% endif %} {% if field.disabled %}disabled="disabled"{% endif %} {% if field.placeholder %}placeholder="{{ field.placeholder }}"{% endif %} {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %} diff --git a/themes/grav/templates/forms/fields/list/list.html.twig b/themes/grav/templates/forms/fields/list/list.html.twig index 840517fe..7eb424c3 100644 --- a/themes/grav/templates/forms/fields/list/list.html.twig +++ b/themes/grav/templates/forms/fields/list/list.html.twig @@ -21,9 +21,9 @@ {% endif %} {% if field.help %} - {{ field.label|tu }} + {{ field.label|t }} {% else %} - {{ field.label|tu }} + {{ field.label|t }} {% endif %} {{ field.validate.required in ['on', 'true', 1] ? '*' }} @@ -48,18 +48,18 @@
    {% if collapsible %} + {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}> {{ "PLUGIN_ADMIN.EXPAND_ALL"|t }} + {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}> {{ "PLUGIN_ADMIN.COLLAPSE_ALL"|t }} {% endif %} {% if field.sortby %} + {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}> {{ btnSortLabel|t }} '{{ field.sortby }}' {% endif %} + > {{ btnLabel|t }}
    {% endif %}
      {% if collapsible %} + {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}> {{ "PLUGIN_ADMIN.EXPAND_ALL"|t }} + {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}> {{ "PLUGIN_ADMIN.COLLAPSE_ALL"|t }} {% endif %} {% if field.sortby %} + {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}> {{ btnSortLabel|t }} '{{ field.sortby }}' {% endif %} + > {{ btnLabel|t }}
    {% endif %} diff --git a/themes/grav/templates/forms/fields/multilevel/multilevel.html.twig b/themes/grav/templates/forms/fields/multilevel/multilevel.html.twig index 92d634f6..20f527d4 100644 --- a/themes/grav/templates/forms/fields/multilevel/multilevel.html.twig +++ b/themes/grav/templates/forms/fields/multilevel/multilevel.html.twig @@ -12,8 +12,8 @@ type="text" {% if (disable_name != true) %}name="{{ name }}"{% endif %} data-attr-name="{{ name }}" - placeholder="{{ field.placeholder_value|e|tu }}" - style="{{ marginDir }}: {{ level * 50 }}px" + placeholder="{{ field.placeholder_value|t }}" + style="{{ marginDir }}: {{ level * 50 }}px" value="{{ value }}" /> @@ -86,8 +86,8 @@ {% block global_attributes %} data-grav-array-name="{{ (scope ~ field.name)|fieldName }}" - data-grav-array-keyname="{{ field.placeholder_key|e|tu }}" - data-grav-array-valuename="{{ field.placeholder_value|e|tu }}" + data-grav-array-keyname="{{ field.placeholder_key|t }}" + data-grav-array-valuename="{{ field.placeholder_value|t }}" {{ parent() }} {% endblock %} diff --git a/themes/grav/templates/forms/fields/order/order.html.twig b/themes/grav/templates/forms/fields/order/order.html.twig index 70cde9a8..42a1732c 100644 --- a/themes/grav/templates/forms/fields/order/order.html.twig +++ b/themes/grav/templates/forms/fields/order/order.html.twig @@ -19,9 +19,9 @@
    @@ -36,7 +36,7 @@ name="{{ (scope ~ field.name)|fieldName }}" value="" /> {% if not canOrder %} -
    {{ "PLUGIN_ADMIN.ORDERING_DISABLED_BECAUSE_PAGE_NO_PREFIX"|tu|raw }}
    +
    {{ "PLUGIN_ADMIN.ORDERING_DISABLED_BECAUSE_PAGE_NO_PREFIX"|t|raw }}
    {% endif %} {% if siblings|length < 200 %} @@ -48,7 +48,7 @@ {% endfor %} {% if sortable_count < siblings|length %} - +
      {% for page in siblings if not page.order %}
    • {{ page.title ?: 'NEW' }}
      • @@ -56,7 +56,7 @@
    {% endif %} {% else %} -
    {{ "PLUGIN_ADMIN.ORDERING_DISABLED_BECAUSE_TOO_MANY_SIBLINGS"|tu }}
    +
    {{ "PLUGIN_ADMIN.ORDERING_DISABLED_BECAUSE_TOO_MANY_SIBLINGS"|t }}
    {% endif %}
    diff --git a/themes/grav/templates/forms/fields/pagemedia/pagemedia.html.twig b/themes/grav/templates/forms/fields/pagemedia/pagemedia.html.twig index b93b3901..06bec69b 100644 --- a/themes/grav/templates/forms/fields/pagemedia/pagemedia.html.twig +++ b/themes/grav/templates/forms/fields/pagemedia/pagemedia.html.twig @@ -29,7 +29,7 @@
    - +
    {% if admin.session.expert == '0' or not user.authorize('admin.super') %} - + {% endif %}
    @@ -50,7 +50,7 @@
    - {{ "PLUGIN_ADMIN.CANNOT_ADD_MEDIA_FILES_PAGE_NOT_SAVED"|tu }} + {{ "PLUGIN_ADMIN.CANNOT_ADD_MEDIA_FILES_PAGE_NOT_SAVED"|t }}
    diff --git a/themes/grav/templates/forms/fields/permissions/permissions.html.twig b/themes/grav/templates/forms/fields/permissions/permissions.html.twig index fa3d50a0..c5b4a333 100644 --- a/themes/grav/templates/forms/fields/permissions/permissions.html.twig +++ b/themes/grav/templates/forms/fields/permissions/permissions.html.twig @@ -8,7 +8,7 @@ {% macro section(section, context, depth) %} {% import _self as macro %} - {% set section_label = context.tu ? (section.label ?? section.name)|tu : (section.label ?? section.name)|t %} + {% set section_label = (section.label ?? section.name)|t %} {# Sub sections can have top-level toggle.. needs to #} {% if depth > 0 %} @@ -67,12 +67,11 @@ {% import _self as macro %} {% set context = data.context %} - {% set tu = context.tu %} {% set field = context.field %}
    - {{ tu ? data.action_label|tu :data.action_label|t }} + {{ data.action_label|t }} {% if context.auth_badges %} {% set auth = context.object.authorize(data.action_name, 'test') ?? context.super %} {% if context.super and auth %} @@ -89,7 +88,7 @@ {% for key, text in context.options %} {% set parent_id = data.action_parent ? "toggle_" ~ field.name ~ "." ~ data.action_parent %} {% set id = "toggle_" ~ field.name ~ "." ~ data.action_name ~ key %} - {% set translation = (tu ? text|tu : text|t)|trim %} + {% set translation = text|t|trim %} {% if grav.twig.twig.filters['tu'] is defined %}{{ field.title|tu }}{% else %}{{ field.title|t }}{% endif %} +

    {{ field.title|t }}

    {% endif %} {% if field.text %} -

    {% if grav.twig.twig.filters['tu'] is defined %}{{ field.text|tu|markdown|raw }}{% else %}{{ field.text|t|markdown|raw }}{% endif %}

    +

    {{ field.text|t|markdown|raw }}

    {% endif %} {% embed 'forms/default/fields.html.twig' with {name: field.name, fields: field.fields} %} diff --git a/themes/grav/templates/forms/fields/selectunique/selectunique.html.twig b/themes/grav/templates/forms/fields/selectunique/selectunique.html.twig index 936f1da7..1d09b83b 100644 --- a/themes/grav/templates/forms/fields/selectunique/selectunique.html.twig +++ b/themes/grav/templates/forms/fields/selectunique/selectunique.html.twig @@ -15,8 +15,8 @@ data-select-observe {% block input_attributes %} {% if field.classes is defined %}class="{{ field.classes }}" {% endif %} - {% if field.id is defined %}id="{{ field.id|e }}" {% endif %} - {% if field.style is defined %}style="{{ field.style|e }}" {% endif %} + {% if field.id is defined %}id="{{ field.id }}" {% endif %} + {% if field.style is defined %}style="{{ field.style }}" {% endif %} {% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %} {% if field.placeholder %}placeholder="{{ field.placeholder }}"{% endif %} {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %} @@ -25,11 +25,11 @@ {% if field.autocomplete in ['on', 'off'] %}autocomplete="{{ field.autocomplete }}"{% endif %} {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %} {% if field.validate.pattern %}pattern="{{ field.validate.pattern }}"{% endif %} - {% if field.validate.message %}title="{{ field.validate.message|e|t }}" - {% elseif field.title is defined %}title="{{ field.title|e|t }}" {% endif %} + {% if field.validate.message %}title="{{ field.validate.message|t }}" + {% elseif field.title is defined %}title="{{ field.title|t }}" {% endif %} {% endblock %} > - {% if field.placeholder %}{% endif %} + {% if field.placeholder %}{% endif %} {% if value is defined %} diff --git a/themes/grav/templates/forms/fields/themepreview/themepreview.html.twig b/themes/grav/templates/forms/fields/themepreview/themepreview.html.twig index f23b1675..5b5b4f46 100644 --- a/themes/grav/templates/forms/fields/themepreview/themepreview.html.twig +++ b/themes/grav/templates/forms/fields/themepreview/themepreview.html.twig @@ -70,7 +70,7 @@
    -
    {{ "PLUGIN_ADMIN.LOAD_PRESET"|tu|e }}
    +
    {{ "PLUGIN_ADMIN.LOAD_PRESET"|t }}
    @@ -95,7 +95,7 @@
    - {{ preset.name|e }} + {{ preset.name }}
    diff --git a/themes/grav/templates/forms/fields/widgets/widgets.html.twig b/themes/grav/templates/forms/fields/widgets/widgets.html.twig index 695035fb..ab5e08db 100644 --- a/themes/grav/templates/forms/fields/widgets/widgets.html.twig +++ b/themes/grav/templates/forms/fields/widgets/widgets.html.twig @@ -34,13 +34,13 @@ {% set maxLen = 0 %} {% for value, text in options %} - {% set translation = grav.twig.twig.filters['tu'] is defined ? text|tu : text|t %} + {% set translation = text|t %} {% set maxLen = max(translation|length, maxLen) %} {% endfor %} {% for key, text in options %} {% set id = "toggle_" ~ field.name ~ "." ~ widget_id ~ '.' ~ key %} - {% set translation = (grav.twig.twig.filters['tu'] is defined ? text|tu : text|t)|trim %} + {% set translation = text|t|trim %} {{ "PLUGIN_ADMIN.XSS_ISSUE"|tu([xss_status])|raw }}
    +
    {{ "PLUGIN_ADMIN.XSS_ISSUE"|t(xss_status)|raw }}
    {% endif %} diff --git a/themes/grav/templates/installer.html.twig b/themes/grav/templates/installer.html.twig index 062d00ac..f86515c9 100644 --- a/themes/grav/templates/installer.html.twig +++ b/themes/grav/templates/installer.html.twig @@ -4,7 +4,7 @@ {% block content %}

    - {{ "PLUGIN_ADMIN.INSTALLER"|tu }} + {{ "PLUGIN_ADMIN.INSTALLER"|t }}

    {% include 'partials/messages.html.twig' %} diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig index d7bf2e2f..1911b206 100644 --- a/themes/grav/templates/pages.html.twig +++ b/themes/grav/templates/pages.html.twig @@ -26,11 +26,11 @@ {% endif %} {% for p in pcol %} - {% set description = (not p.page ? "PLUGIN_ADMIN.FOLDER"|tu ~ ' • ' : "PLUGIN_ADMIN.PAGE"|tu ~ ' • ') ~ - (p.isModule ? "PLUGIN_ADMIN.MODULE"|tu ~ ' • ' : '') ~ - (p.routable ? "PLUGIN_ADMIN.ROUTABLE"|tu ~ ' • ' : "PLUGIN_ADMIN.NON_ROUTABLE"|tu ~ ' • ') ~ - (p.visible ? "PLUGIN_ADMIN.VISIBLE"|tu ~ ' • ' : "PLUGIN_ADMIN.NON_VISIBLE"|tu ~ ' • ') ~ - (p.published ? "PLUGIN_ADMIN.PUBLISHED"|tu ~ ' • ' : "PLUGIN_ADMIN.NON_PUBLISHED"|tu ~ ' • ') %} + {% set description = (not p.page ? "PLUGIN_ADMIN.FOLDER"|t ~ ' • ' : "PLUGIN_ADMIN.PAGE"|t ~ ' • ') ~ + (p.isModule ? "PLUGIN_ADMIN.MODULE"|t ~ ' • ' : '') ~ + (p.routable ? "PLUGIN_ADMIN.ROUTABLE"|t ~ ' • ' : "PLUGIN_ADMIN.NON_ROUTABLE"|t ~ ' • ') ~ + (p.visible ? "PLUGIN_ADMIN.VISIBLE"|t ~ ' • ' : "PLUGIN_ADMIN.NON_VISIBLE"|t ~ ' • ') ~ + (p.published ? "PLUGIN_ADMIN.PUBLISHED"|t ~ ' • ' : "PLUGIN_ADMIN.NON_PUBLISHED"|t ~ ' • ') %} {% set page_url = getPageUrl(p) %} @@ -43,7 +43,7 @@
    {% set page_label = attribute(p.header, display_field)|defined(attribute(p, display_field))|defined(p.title)|default(p.slug|titleize) %} - {{ page_label|e }} + {{ page_label }} {% if p.language %} {{p.language}} @@ -58,10 +58,10 @@ {% if config.plugins.admin.frontend_preview_target != 'inline' %} {% set preview_target = config.plugins.admin.frontend_preview_target %} {% set preview_route = (base_url_relative_frontend|rtrim('/') ~ (p.home ? '' : p.route)) ?: '/' %} - {% set preview_link = p.routable ? ' ' : '' %} + {% set preview_link = p.routable ? ' ' : '' %} {% else %} {% set preview_route = admin_route('/preview' ~ (p.home ? '' : p.route)) %} - {% set preview_link = p.routable ? ' ' : '' %} + {% set preview_link = p.routable ? ' ' : '' %} {% endif %} {{ preview_link|raw }} {% if warn %} @@ -101,13 +101,13 @@ {% if context.exists %} {% set page_url = admin_route('/pages' ~ (context.header.routes.default ?: context.rawRoute)) %} {% set exists = true %} - {% set title = (context.exists ? "PLUGIN_ADMIN.EDIT"|tu : "PLUGIN_ADMIN.CREATE"|tu ) ~ " " ~ (context.header.title ?: context.title) %} + {% set title = (context.exists ? "PLUGIN_ADMIN.EDIT"|t : "PLUGIN_ADMIN.CREATE"|t ) ~ " " ~ (context.header.title ?: context.title) %} {% else %} - {% set title = "PLUGIN_ADMIN.ADD_PAGE"|tu %} + {% set title = "PLUGIN_ADMIN.ADD_PAGE"|t %} {% endif %} {% else %} {% set mode = 'list' %} - {% set title = "PLUGIN_ADMIN.PAGES"|tu %} + {% set title = "PLUGIN_ADMIN.PAGES"|t %} {% endif %} {% set modular = context.isModule ? 'modular_' : '' %} @@ -130,40 +130,40 @@ {% if config.plugins.admin.frontend_preview_target != 'inline' %} {% set preview_route = (base_url_relative_frontend|rtrim('/') ~ (context.home ? '' : context.route)) ?: '/' %} {% set preview_target = config.plugins.admin.frontend_preview_target %} - {% set preview_link = context.routable ? ' ' : '' %} + {% set preview_link = context.routable ? ' ' : '' %} {% else %} {% set preview_route = admin_route('/preview' ~ (context.home ? '' : context.route)) %} - {% set preview_link = context.routable ? ' ' : '' %} + {% set preview_link = context.routable ? ' ' : '' %} {% endif %} {% block titlebar %}
    {% if mode == 'list' %} - {{ "PLUGIN_ADMIN.BACK"|tu }} + {{ "PLUGIN_ADMIN.BACK"|t }} {% for key, add_modal in config.plugins.admin.add_modals %} {% if add_modal.show_in|defined('bar') == 'bar' %} - {{ add_modal.label|tu }} + {{ add_modal.label|t }} {% endif %} {% endfor %}
    @@ -196,7 +196,7 @@ {{ preview_link|raw }} - + {% if exists %} {% set siblings = context.parent().children() %} @@ -204,47 +204,47 @@ {% if not siblings.isFirst(context.path) %} {% set sib = siblings.nextSibling(context.path) %} {% set sib_url = admin_route('/pages' ~ (sib.header.routes.default ?: sib.rawRoute)) %} - + {% endif %} {% if not siblings.isLast(context.path) %} {% set sib = siblings.prevSibling(context.path) %} {% set sib_url = admin_route('/pages' ~ (sib.header.routes.default ?: sib.rawRoute)) %} - + {% endif %} {% if warn %} - {{ "PLUGIN_ADMIN.DELETE"|tu }} + {{ "PLUGIN_ADMIN.DELETE"|t }} {% else %} {% endif %}
    - {{ "PLUGIN_ADMIN.COPY"|tu }} - {{ "PLUGIN_ADMIN.MOVE"|tu }} + {{ "PLUGIN_ADMIN.COPY"|t }} + {{ "PLUGIN_ADMIN.MOVE"|t }} {% if config.plugins['admin-pro'].enabled %} - {{ "PLUGIN_ADMIN_PRO.REVISIONS"|tu }} + {{ "PLUGIN_ADMIN_PRO.REVISIONS"|t }} {% endif %} {% endif %}
    - + {% if exists and admin.multilang %} {% set untranslated = context.untranslatedLanguages(true) %} {% if untranslated %} @@ -255,7 +255,7 @@ {% for langCode in untranslated %} {% set langName = admin.siteLanguages[langCode] %} {% if langCode != page_lang %} -
    • +
    • {% endif %} {% endfor %} @@ -267,13 +267,13 @@ {% endif %}
    {% if mode == 'new' %} -

    {{ "PLUGIN_ADMIN.ADD_PAGE"|tu }}

    +

    {{ "PLUGIN_ADMIN.ADD_PAGE"|t }}

    {% elseif mode == 'edit' %}

    {{ context.title }}

    {% else %} -

    {{ "PLUGIN_ADMIN.MANAGE_PAGES"|tu }}

    +

    {{ "PLUGIN_ADMIN.MANAGE_PAGES"|t }}

    {% endif %} {% endblock %} @@ -290,7 +290,7 @@
    + {% if secure_delete %} - + {% else %} - {{ "PLUGIN_ADMIN.CONTINUE"|tu }} + {{ "PLUGIN_ADMIN.CONTINUE"|t }} {% endif %}
    diff --git a/themes/grav/templates/partials/backups-button.html.twig b/themes/grav/templates/partials/backups-button.html.twig index 0bfe34e6..970d8165 100644 --- a/themes/grav/templates/partials/backups-button.html.twig +++ b/themes/grav/templates/partials/backups-button.html.twig @@ -3,7 +3,7 @@ {% set backup_url = uri.addNonce(base_url_relative ~ "/backup.json/id" ~ config.system.param_sep ~ "%BACKUP_ID/task" ~ config.system.param_sep ~ "backup", 'admin-form', 'admin-nonce') %}
    {% if config.plugins.admin.show_github_msg %} -
    {{ 'PLUGIN_ADMIN.ADMIN_REPORT_ISSUE'|tu }}
    +
    {{ 'PLUGIN_ADMIN.ADMIN_REPORT_ISSUE'|t }}
    {% endif %} {% block content_bottom %}{% endblock %}
    @@ -93,48 +93,48 @@ {% block modals %}
    -

    {{ "PLUGIN_ADMIN.ERROR"|tu }}

    +

    {{ "PLUGIN_ADMIN.ERROR"|t }}

    - {{ "PLUGIN_ADMIN.CLOSE"|tu }} + {{ "PLUGIN_ADMIN.CLOSE"|t }}
    -

    {{ "PLUGIN_ADMIN.METADATA"|tu }} for

    +

    {{ "PLUGIN_ADMIN.METADATA"|t }} for

    - {{ "PLUGIN_ADMIN.CLOSE"|tu }} + {{ "PLUGIN_ADMIN.CLOSE"|t }}
    -

    {{ "PLUGIN_ADMIN.MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_TITLE"|tu }}

    +

    {{ "PLUGIN_ADMIN.MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_TITLE"|t }}

    - {{ "PLUGIN_ADMIN.MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_DESC"|tu }} + {{ "PLUGIN_ADMIN.MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_DESC"|t }}


    - - + +
    -

    {{ "PLUGIN_ADMIN.MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_TITLE"|tu }}

    +

    {{ "PLUGIN_ADMIN.MODAL_DELETE_FILE_CONFIRMATION_REQUIRED_TITLE"|t }}

    - {{ "PLUGIN_ADMIN.MODAL_UPDATE_GRAV_CONFIRMATION_REQUIRED_DESC"|tu }} + {{ "PLUGIN_ADMIN.MODAL_UPDATE_GRAV_CONFIRMATION_REQUIRED_DESC"|t }}


    - - + +
    diff --git a/themes/grav/templates/partials/blueprints-copy.html.twig b/themes/grav/templates/partials/blueprints-copy.html.twig index c85a8b01..3af694e7 100644 --- a/themes/grav/templates/partials/blueprints-copy.html.twig +++ b/themes/grav/templates/partials/blueprints-copy.html.twig @@ -10,7 +10,7 @@
    - +
    {{ nonce_field('admin-form', 'admin-nonce')|raw }} diff --git a/themes/grav/templates/partials/blueprints-new-folder.html.twig b/themes/grav/templates/partials/blueprints-new-folder.html.twig index fb5ace86..29d56b8d 100644 --- a/themes/grav/templates/partials/blueprints-new-folder.html.twig +++ b/themes/grav/templates/partials/blueprints-new-folder.html.twig @@ -9,7 +9,7 @@
    - +
    {{ nonce_field('admin-form', 'admin-nonce')|raw }} diff --git a/themes/grav/templates/partials/blueprints-new.html.twig b/themes/grav/templates/partials/blueprints-new.html.twig index b3b0f71b..033541a3 100644 --- a/themes/grav/templates/partials/blueprints-new.html.twig +++ b/themes/grav/templates/partials/blueprints-new.html.twig @@ -10,7 +10,7 @@
    - +
    {{ nonce_field('admin-form', 'admin-nonce')|raw }} diff --git a/themes/grav/templates/partials/dashboard-feed.html.twig b/themes/grav/templates/partials/dashboard-feed.html.twig index 46620889..343bdf79 100644 --- a/themes/grav/templates/partials/dashboard-feed.html.twig +++ b/themes/grav/templates/partials/dashboard-feed.html.twig @@ -1,6 +1,6 @@

    - {{ "PLUGIN_ADMIN.NEWS_FEED"|tu }} + {{ "PLUGIN_ADMIN.NEWS_FEED"|t }} diff --git a/themes/grav/templates/partials/dashboard-maintenance.html.twig b/themes/grav/templates/partials/dashboard-maintenance.html.twig index 4fa94126..d6e334da 100644 --- a/themes/grav/templates/partials/dashboard-maintenance.html.twig +++ b/themes/grav/templates/partials/dashboard-maintenance.html.twig @@ -3,26 +3,26 @@
    -

    {{ "PLUGIN_ADMIN.MAINTENANCE"|tu }}

    +

    {{ "PLUGIN_ADMIN.MAINTENANCE"|t }}

    - +

     

    - +
    - +
    - + {% include 'partials/backups-button.html.twig' %}
    diff --git a/themes/grav/templates/partials/dashboard-notifications.html.twig b/themes/grav/templates/partials/dashboard-notifications.html.twig index 092258f9..5a96cdaf 100644 --- a/themes/grav/templates/partials/dashboard-notifications.html.twig +++ b/themes/grav/templates/partials/dashboard-notifications.html.twig @@ -1,6 +1,6 @@

    - {{ "PLUGIN_ADMIN.NOTIFICATIONS"|tu }} + {{ "PLUGIN_ADMIN.NOTIFICATIONS"|t }} diff --git a/themes/grav/templates/partials/dashboard-pages.html.twig b/themes/grav/templates/partials/dashboard-pages.html.twig index 4b3b51aa..7f3b4927 100644 --- a/themes/grav/templates/partials/dashboard-pages.html.twig +++ b/themes/grav/templates/partials/dashboard-pages.html.twig @@ -1,9 +1,9 @@ {% if authorize(['admin.pages', 'admin.super']) %}
    - {{ "PLUGIN_ADMIN.MANAGE_PAGES"|tu }} + {{ "PLUGIN_ADMIN.MANAGE_PAGES"|t }}
    -

    {{ "PLUGIN_ADMIN.LATEST_PAGE_UPDATES"|tu }}

    +

    {{ "PLUGIN_ADMIN.LATEST_PAGE_UPDATES"|t }}

    {% for latest in admin.latestPages if admin.latestPages %} {% set route = latest.rawRoute %} diff --git a/themes/grav/templates/partials/dashboard-statistics.html.twig b/themes/grav/templates/partials/dashboard-statistics.html.twig index 36426a46..0ba390d7 100644 --- a/themes/grav/templates/partials/dashboard-statistics.html.twig +++ b/themes/grav/templates/partials/dashboard-statistics.html.twig @@ -1,21 +1,21 @@ {% if authorize(['admin.statistics', 'admin.super']) %}
    -

    {{ "PLUGIN_ADMIN.VIEWS_STATISTICS"|tu }}

    +

    {{ "PLUGIN_ADMIN.VIEWS_STATISTICS"|t }}

    {{ popularity.getDailyTotal }} - {{ "PLUGIN_ADMIN.TODAY"|tu }} + {{ "PLUGIN_ADMIN.TODAY"|t }} {{ popularity.getWeeklyTotal }} - {{ "PLUGIN_ADMIN.WEEK"|tu }} + {{ "PLUGIN_ADMIN.WEEK"|t }} {{ popularity.getMonthlyTotal }} - {{ "PLUGIN_ADMIN.MONTH"|tu }} + {{ "PLUGIN_ADMIN.MONTH"|t }}
    diff --git a/themes/grav/templates/partials/footer.html.twig b/themes/grav/templates/partials/footer.html.twig index e798cde6..844799fc 100644 --- a/themes/grav/templates/partials/footer.html.twig +++ b/themes/grav/templates/partials/footer.html.twig @@ -1,5 +1,5 @@ {% if custom_admin_footer %} {{ custom_admin_footer|raw }} {% else %} - Grav v{{ constant('GRAV_VERSION') }} - Admin v{{ admin_version }} - {{ "PLUGIN_ADMIN.WAS_MADE_WITH"|tu|lower }} {{ "PLUGIN_ADMIN.BY"|tu|lower }} Trilby Media. + Grav v{{ constant('GRAV_VERSION') }} - Admin v{{ admin_version }} - {{ "PLUGIN_ADMIN.WAS_MADE_WITH"|t|lower }} {{ "PLUGIN_ADMIN.BY"|t|lower }} Trilby Media. {% endif %} diff --git a/themes/grav/templates/partials/list-sort.html.twig b/themes/grav/templates/partials/list-sort.html.twig index af90b45d..9d7c8a3c 100644 --- a/themes/grav/templates/partials/list-sort.html.twig +++ b/themes/grav/templates/partials/list-sort.html.twig @@ -1,12 +1,12 @@
    diff --git a/themes/grav/templates/partials/login-form.html.twig b/themes/grav/templates/partials/login-form.html.twig index 5623cafd..7f24d1ea 100755 --- a/themes/grav/templates/partials/login-form.html.twig +++ b/themes/grav/templates/partials/login-form.html.twig @@ -16,8 +16,8 @@ {% endembed %}
    - {{ 'PLUGIN_ADMIN.LOGIN_BTN_FORGOT'|tu }} - + {{ 'PLUGIN_ADMIN.LOGIN_BTN_FORGOT'|t }} +
    {% endblock %} diff --git a/themes/grav/templates/partials/login-logout.html.twig b/themes/grav/templates/partials/login-logout.html.twig index 628039dc..082f8270 100644 --- a/themes/grav/templates/partials/login-logout.html.twig +++ b/themes/grav/templates/partials/login-logout.html.twig @@ -6,8 +6,8 @@ {% block form %}
    - {{ 'PLUGIN_ADMIN.BACK'|tu }} - + {{ 'PLUGIN_ADMIN.BACK'|t }} +
    {% endblock %} diff --git a/themes/grav/templates/partials/logo.html.twig b/themes/grav/templates/partials/logo.html.twig index 9c2d37d8..2f8c3031 100644 --- a/themes/grav/templates/partials/logo.html.twig +++ b/themes/grav/templates/partials/logo.html.twig @@ -3,7 +3,7 @@ {{ config.plugins.admin.logo_text }} - + {% else %} {% endif %} diff --git a/themes/grav/templates/partials/media-list-wrapper__sidebar.html.twig b/themes/grav/templates/partials/media-list-wrapper__sidebar.html.twig index e2e773d4..fd33ecf7 100644 --- a/themes/grav/templates/partials/media-list-wrapper__sidebar.html.twig +++ b/themes/grav/templates/partials/media-list-wrapper__sidebar.html.twig @@ -27,7 +27,7 @@ {% import _self as macro %}
    -
    {{ "PLUGIN_ADMIN.PAGES"|tu|e }}
    +
    {{ "PLUGIN_ADMIN.PAGES"|t }}
      {{ macro.loop(pages, 0, _context) }} diff --git a/themes/grav/templates/partials/messages.html.twig b/themes/grav/templates/partials/messages.html.twig index afab46f5..3d89c430 100644 --- a/themes/grav/templates/partials/messages.html.twig +++ b/themes/grav/templates/partials/messages.html.twig @@ -3,12 +3,12 @@
      {%- for message in admin_messages -%} -
      {{ message.message|raw }}
      +
      {{ message.message|raw }}
      {%- endfor -%} {%- if form_message -%}
      {{ form_message|raw }}
      {%- endif -%} {%- for message in plugin_messages -%} -
      {{ message.message|raw }}
      +
      {{ message.message|raw }}
      {%- endfor -%}
      diff --git a/themes/grav/templates/partials/modal-add-package.html.twig b/themes/grav/templates/partials/modal-add-package.html.twig index 3e2c7f86..07e97920 100644 --- a/themes/grav/templates/partials/modal-add-package.html.twig +++ b/themes/grav/templates/partials/modal-add-package.html.twig @@ -4,72 +4,72 @@ data-remodal-options="hashTracking: false">
      -

      {{ "PLUGIN_ADMIN.INSTALLING"|tu }}

      +

      {{ "PLUGIN_ADMIN.INSTALLING"|t }}

      - {{ "PLUGIN_ADMIN.LOADING"|tu }} + {{ "PLUGIN_ADMIN.LOADING"|t }}

      \ No newline at end of file +
      diff --git a/themes/grav/templates/partials/modal-changes-detected.html.twig b/themes/grav/templates/partials/modal-changes-detected.html.twig index 96de54d4..dd0c4d65 100644 --- a/themes/grav/templates/partials/modal-changes-detected.html.twig +++ b/themes/grav/templates/partials/modal-changes-detected.html.twig @@ -1,13 +1,13 @@
      -

      {{ "PLUGIN_ADMIN.MODAL_CHANGED_DETECTED_TITLE"|tu }}

      +

      {{ "PLUGIN_ADMIN.MODAL_CHANGED_DETECTED_TITLE"|t }}

      - {{ "PLUGIN_ADMIN.MODAL_CHANGED_DETECTED_DESC"|tu }} + {{ "PLUGIN_ADMIN.MODAL_CHANGED_DETECTED_DESC"|t }}


      - {{ "PLUGIN_ADMIN.CANCEL"|tu }} - {{ "PLUGIN_ADMIN.CONTINUE"|tu }} + {{ "PLUGIN_ADMIN.CANCEL"|t }} + {{ "PLUGIN_ADMIN.CONTINUE"|t }}
      -
      \ No newline at end of file +
    diff --git a/themes/grav/templates/partials/modal-reinstall-package.html.twig b/themes/grav/templates/partials/modal-reinstall-package.html.twig index b939bd27..30712fc3 100644 --- a/themes/grav/templates/partials/modal-reinstall-package.html.twig +++ b/themes/grav/templates/partials/modal-reinstall-package.html.twig @@ -3,36 +3,36 @@ data-remodal-options="hashTracking: false">
    -

    {{ "PLUGIN_ADMIN.REINSTALL_THE"|tu([("PLUGIN_ADMIN." ~ type|upper)|tu])|e }}

    +

    {{ "PLUGIN_ADMIN.REINSTALL_THE"|t(("PLUGIN_ADMIN." ~ type|upper)|t) }}

    - {{ "PLUGIN_ADMIN.CONFIRM_REINSTALL"|tu([("PLUGIN_ADMIN." ~ type|upper)|tu])|e }} + {{ "PLUGIN_ADMIN.CONFIRM_REINSTALL"|t(("PLUGIN_ADMIN." ~ type|upper)|t) }}

    - + - +
    diff --git a/themes/grav/templates/partials/modal-remove-package.html.twig b/themes/grav/templates/partials/modal-remove-package.html.twig index 8d45f6ad..7107c010 100644 --- a/themes/grav/templates/partials/modal-remove-package.html.twig +++ b/themes/grav/templates/partials/modal-remove-package.html.twig @@ -3,41 +3,41 @@ data-remodal-options="hashTracking: false">
    -

    {{ "PLUGIN_ADMIN.REMOVE_THE"|tu([("PLUGIN_ADMIN." ~ type|upper)|tu]) }}

    +

    {{ "PLUGIN_ADMIN.REMOVE_THE"|t(("PLUGIN_ADMIN." ~ type|upper)|t) }}

    - {{ "PLUGIN_ADMIN.CONFIRM_REMOVAL"|tu([("PLUGIN_ADMIN." ~ type|upper)|tu]) }} + {{ "PLUGIN_ADMIN.CONFIRM_REMOVAL"|t(("PLUGIN_ADMIN." ~ type|upper)|t) }}

    - - + +
    diff --git a/themes/grav/templates/partials/modal-switch-theme.html.twig b/themes/grav/templates/partials/modal-switch-theme.html.twig index 5a4f17b5..923deaff 100644 --- a/themes/grav/templates/partials/modal-switch-theme.html.twig +++ b/themes/grav/templates/partials/modal-switch-theme.html.twig @@ -1,16 +1,16 @@
    -

    {{ "PLUGIN_ADMIN.SWITCHING_TO"|tu }} {theme_name}

    +

    {{ "PLUGIN_ADMIN.SWITCHING_TO"|t }} {theme_name}

    - {{ "PLUGIN_ADMIN.SWITCHING_TO_DESCRIPTION"|tu }} + {{ "PLUGIN_ADMIN.SWITCHING_TO_DESCRIPTION"|t }}

    - {{ "PLUGIN_ADMIN.SWITCHING_TO_CONFIRMATION"|tu }} {theme_name}? + {{ "PLUGIN_ADMIN.SWITCHING_TO_CONFIRMATION"|t }} {theme_name}?


    - - {{ "PLUGIN_ADMIN.CONTINUE"|tu }} + + {{ "PLUGIN_ADMIN.CONTINUE"|t }}
    -
    \ No newline at end of file +
    diff --git a/themes/grav/templates/partials/modal-update-packages.html.twig b/themes/grav/templates/partials/modal-update-packages.html.twig index fc458ffb..cc285584 100644 --- a/themes/grav/templates/partials/modal-update-packages.html.twig +++ b/themes/grav/templates/partials/modal-update-packages.html.twig @@ -4,72 +4,72 @@ data-remodal-options="hashTracking: false">
    -

    {{ "PLUGIN_ADMIN.UPDATING"|tu }}

    +

    {{ "PLUGIN_ADMIN.UPDATING"|t }}

    - {{ "PLUGIN_ADMIN.LOADING"|tu }} + {{ "PLUGIN_ADMIN.LOADING"|t }}

    \ No newline at end of file +
    diff --git a/themes/grav/templates/partials/nav-quick-tray.html.twig b/themes/grav/templates/partials/nav-quick-tray.html.twig index b7af82c6..d78e3b42 100644 --- a/themes/grav/templates/partials/nav-quick-tray.html.twig +++ b/themes/grav/templates/partials/nav-quick-tray.html.twig @@ -1,14 +1,14 @@ {% set clear_cache_url = base_url_relative ~ '/cache.json/task' ~ config.system.param_sep ~ 'clearCache'|e('html_attr') %}
      {% if authorize(['admin.maintenance', 'admin.super', 'admin.cache']) %} -
    • +
      • {% endif %} {% if authorize(['admin.super']) and config.plugins.admin.whitelabel.quicktray_recompile %} -
    • +
    • diff --git a/themes/grav/templates/partials/nav-user-details.html.twig b/themes/grav/templates/partials/nav-user-details.html.twig index 1bdc574a..cfeefb73 100644 --- a/themes/grav/templates/partials/nav-user-details.html.twig +++ b/themes/grav/templates/partials/nav-user-details.html.twig @@ -14,8 +14,8 @@ {% include 'partials/nav-user-avatar.html.twig' %}
      -

      {{ user.fullname|e }} {% if user.twofa_enabled and config.plugins.admin.twofa_enabled %}2FA{% endif %}

      -
      {{ user.title|e }}
      +

      {{ user.fullname }} {% if user.twofa_enabled and config.plugins.admin.twofa_enabled %}2FA{% endif %}

      +
      {{ user.title }}
    diff --git a/themes/grav/templates/partials/nav.html.twig b/themes/grav/templates/partials/nav.html.twig index c9f02efc..bb5c785e 100644 --- a/themes/grav/templates/partials/nav.html.twig +++ b/themes/grav/templates/partials/nav.html.twig @@ -23,7 +23,7 @@
  • - {{ label|tu }} + {{ label|t }} {% set badge = item.badge ?? null %} {% if badge %} @@ -39,7 +39,7 @@ {% include 'partials/nav-pro.html.twig' ignore missing %}
  • - {{ "PLUGIN_ADMIN.LOGOUT"|tu }} + {{ "PLUGIN_ADMIN.LOGOUT"|t }}
    • diff --git a/themes/grav/templates/partials/page-legend.html.twig b/themes/grav/templates/partials/page-legend.html.twig index a6dfd2cc..04944e76 100644 --- a/themes/grav/templates/partials/page-legend.html.twig +++ b/themes/grav/templates/partials/page-legend.html.twig @@ -1,9 +1,9 @@ {% set legend = {'VISIBLE':'', 'NON_ROUTABLE':'not-routable', 'NON_VISIBLE':'not-visible', 'MODULE':'module'} %}
    - {{ 'PLUGIN_ADMIN.LEGEND'|tu }}: + {{ 'PLUGIN_ADMIN.LEGEND'|t }}:
      {% for key, class in legend %} -
    • {{ ('PLUGIN_ADMIN.'~key)|tu }}
      • +
    • {{ ('PLUGIN_ADMIN.'~key)|t }}
      • {% endfor %}
    diff --git a/themes/grav/templates/partials/page-move.html.twig b/themes/grav/templates/partials/page-move.html.twig index da559a0e..c6432550 100644 --- a/themes/grav/templates/partials/page-move.html.twig +++ b/themes/grav/templates/partials/page-move.html.twig @@ -14,7 +14,7 @@ {{ nonce_field('admin-form', 'admin-nonce')|raw }}
    - - + +
    diff --git a/themes/grav/templates/partials/plugin-data.html.twig b/themes/grav/templates/partials/plugin-data.html.twig index a5fedc5a..435b0671 100644 --- a/themes/grav/templates/partials/plugin-data.html.twig +++ b/themes/grav/templates/partials/plugin-data.html.twig @@ -1,7 +1,7 @@
    {% if plugin.author %} - + - + {% endif %} {% if plugin.demo %} - + {% endif %} {% if plugin.bugs %} - + {% endif %} {% if plugin.keywords %} - + {% endif %} {% if plugin.license %} - + {% if plugin.license|starts_with('http') %} {% else %} @@ -51,7 +51,7 @@ {% if plugin.description %} - + {% endif %} @@ -59,14 +59,14 @@ {% if plugin.readme or plugin.homepage %} {% set readme_link = plugin.readme ?: plugin.docs|default(plugin.homepage ~ '/blob/master/README.md') %} - + {% endif %} {% if admin.gpm.findPackage(plugin.slug, true).changelog %} - + {% endif %} diff --git a/themes/grav/templates/partials/plugins-details.html.twig b/themes/grav/templates/partials/plugins-details.html.twig index 532d22fc..a44ea4df 100644 --- a/themes/grav/templates/partials/plugins-details.html.twig +++ b/themes/grav/templates/partials/plugins-details.html.twig @@ -7,19 +7,19 @@

    - {{ plugin.name|e }} + {{ plugin.name }} {% if admin.isTeamGrav(plugin) %} - + {% endif %} {% if admin.isPremiumProduct(plugin) %} - {{ "PLUGIN_ADMIN.PREMIUM_PRODUCT"|tu }} + {{ "PLUGIN_ADMIN.PREMIUM_PRODUCT"|t }} {% endif %} {% if plugin.symlink %} - + {% endif %} - {{ plugin.version ? 'v' ~ plugin.version|e }} + {{ plugin.version ? 'v' ~ plugin.version }} {% if isTestingRelease %}test release{% endif %}

    @@ -36,20 +36,20 @@
    {% if not plugin.symlink %} - + {% endif %} - {{ "PLUGIN_ADMIN.REMOVE_PLUGIN"|tu }} + {{ "PLUGIN_ADMIN.REMOVE_PLUGIN"|t }}
    {% endif %} {% else %}
    - +
    - {{ "PLUGIN_ADMIN.ENABLE"|tu }} {{ plugin.name }} + {{ "PLUGIN_ADMIN.ENABLE"|t }} {{ plugin.name }}
    @@ -64,7 +64,7 @@ {% endif %} {{ plugin.premium.button|default('Purchase') }} {% else %} - {{ "PLUGIN_ADMIN.INSTALL_PLUGIN"|tu }} + {{ "PLUGIN_ADMIN.INSTALL_PLUGIN"|t }} {% endif %}
    {% endif %} diff --git a/themes/grav/templates/partials/plugins-list.html.twig b/themes/grav/templates/partials/plugins-list.html.twig index 4b4b9c95..e6059677 100644 --- a/themes/grav/templates/partials/plugins-list.html.twig +++ b/themes/grav/templates/partials/plugins-list.html.twig @@ -5,11 +5,11 @@ {% endif %} {% include 'partials/list-sort.html.twig' with { list_view: 'plugins' } %}

    - {{ installing ? "PLUGIN_ADMIN.AVAILABLE_PLUGINS"|tu : "PLUGIN_ADMIN.INSTALLED_PLUGINS"|tu }} + {{ installing ? "PLUGIN_ADMIN.AVAILABLE_PLUGINS"|t : "PLUGIN_ADMIN.INSTALLED_PLUGINS"|t }}

    - +
    @@ -24,17 +24,17 @@ {{ plugin.name }} {% if admin.isTeamGrav(plugin) %} - + {% endif %} {% if admin.isPremiumProduct(plugin) %} {% if not gumroad_loaded %} {% set gumroad_loaded = true %} {% endif %} - {{ "PLUGIN_ADMIN.PREMIUM_PRODUCT"|tu }} + {{ "PLUGIN_ADMIN.PREMIUM_PRODUCT"|t }} {% endif %} {% if plugin.symlink %} - + {% endif %} @@ -54,7 +54,7 @@ {% endif %} {{ plugin.premium.button|default('Purchase') }} {% else %} - {{ "PLUGIN_ADMIN.INSTALL"|tu }} + {{ "PLUGIN_ADMIN.INSTALL"|t }} {% endif %} {% endif %} @@ -66,7 +66,7 @@ {% else %} -     + {% endfor %}
    {{ "PLUGIN_ADMIN.AUTHOR"|tu }}:{{ "PLUGIN_ADMIN.AUTHOR"|t }}: {% if plugin.author.url %} {{ plugin.author.name }} @@ -16,31 +16,31 @@ {% endif %} {% if plugin.homepage %}
    {{ "PLUGIN_ADMIN.HOMEPAGE"|tu }}:{{ "PLUGIN_ADMIN.HOMEPAGE"|t }}: {{ plugin.homepage }}
    {{ "PLUGIN_ADMIN.DEMO"|tu }}:{{ "PLUGIN_ADMIN.DEMO"|t }}: {{ plugin.demo }}
    {{ "PLUGIN_ADMIN.BUG_TRACKER"|tu }}:{{ "PLUGIN_ADMIN.BUG_TRACKER"|t }}: {{ plugin.bugs }}
    {{ "PLUGIN_ADMIN.KEYWORDS"|tu }}:{{ "PLUGIN_ADMIN.KEYWORDS"|t }}: {{ plugin.keywords|join(', ') }}
    {{ "PLUGIN_ADMIN.LICENSE"|tu }}:{{ "PLUGIN_ADMIN.LICENSE"|t }}:{{ plugin.license }}
    {{ "PLUGIN_ADMIN.DESCRIPTION"|tu }}:{{ "PLUGIN_ADMIN.DESCRIPTION"|t }}: {{ plugin.description_html|raw }}
    {{ plugin.readme ? "PLUGIN_ADMIN.README"|tu : "PLUGIN_ADMIN.DOCS"|tu }}:{{ plugin.readme ? "PLUGIN_ADMIN.README"|t : "PLUGIN_ADMIN.DOCS"|t }}: {{ readme_link }}
    {{ "PLUGIN_ADMIN.CHANGELOG"|tu }}:{{ "PLUGIN_ADMIN.CHANGELOG"|t }}: View Changelog
    {{ "PLUGIN_ADMIN.OFFLINE_WARNING"|tu }}
    {{ "PLUGIN_ADMIN.OFFLINE_WARNING"|t }}
    diff --git a/themes/grav/templates/partials/release-toggle.html.twig b/themes/grav/templates/partials/release-toggle.html.twig index 1d956cc7..2f3c3000 100644 --- a/themes/grav/templates/partials/release-toggle.html.twig +++ b/themes/grav/templates/partials/release-toggle.html.twig @@ -2,9 +2,9 @@
    - + - +
    diff --git a/themes/grav/templates/partials/spinning-wheel.html.twig b/themes/grav/templates/partials/spinning-wheel.html.twig index 35fea2ba..d6229058 100644 --- a/themes/grav/templates/partials/spinning-wheel.html.twig +++ b/themes/grav/templates/partials/spinning-wheel.html.twig @@ -1,3 +1,3 @@ diff --git a/themes/grav/templates/partials/theme.html.twig b/themes/grav/templates/partials/theme.html.twig index b18b6c51..f298c875 100644 --- a/themes/grav/templates/partials/theme.html.twig +++ b/themes/grav/templates/partials/theme.html.twig @@ -2,8 +2,8 @@ {% set blueprints = theme.blueprints() %}

    - {{ blueprints.get('name')|e }} - {{ blueprints.get('version') ? 'v' ~ blueprints.get('version')|e }} + {{ blueprints.get('name') }} + {{ blueprints.get('version') ? 'v' ~ blueprints.get('version') }}

    {% include 'partials/messages.html.twig' %} diff --git a/themes/grav/templates/partials/themes-details.html.twig b/themes/grav/templates/partials/themes-details.html.twig index 6dd96b38..afd9d561 100644 --- a/themes/grav/templates/partials/themes-details.html.twig +++ b/themes/grav/templates/partials/themes-details.html.twig @@ -10,19 +10,19 @@

    - {{ theme.name|e }} + {{ theme.name }} {% if admin.isTeamGrav(theme) %} - + {% endif %} {% if admin.isPremiumProduct(theme) %} - {{ "PLUGIN_ADMIN.PREMIUM_PRODUCT"|tu }} + {{ "PLUGIN_ADMIN.PREMIUM_PRODUCT"|t }} {% endif %} {% if theme.symlink %} - + {% endif %} - {{ theme.version ? 'v' ~ theme.version|e }} + {{ theme.version ? 'v' ~ theme.version }} {% if isTestingRelease %}test release{% endif %}

    @@ -30,13 +30,13 @@ {% if theme.version %} - + {% endif %} {% if theme.author %} - + - + {% endif %} {% if theme.demo %} - + {% endif %} {% if theme.bugs %} - + {% endif %} {% if theme.keywords %} - + @@ -77,7 +77,7 @@ {% endif %} {% if theme.license %} - + {% if theme.license|starts_with('http') %} {% else %} @@ -87,7 +87,7 @@ {% endif %} {% if theme.description %} - + {% endif %} @@ -95,14 +95,14 @@ {% if theme.readme or theme.homepage %} {% set readme_link = theme.readme ?: theme.docs|default(theme.homepage ~ '/blob/master/README.md') %} - + {% endif %} {% if admin.gpm.findPackage(theme.slug, true).changelog %} - + {% endif %} @@ -119,11 +119,11 @@
    - +
    - {{ "PLUGIN_ADMIN.ACTIVATE"|tu }} {{ theme.name }} + {{ "PLUGIN_ADMIN.ACTIVATE"|t }} {{ theme.name }}
    @@ -133,9 +133,9 @@
    {% if not theme.symlink %} - + {% endif %} - {{ "PLUGIN_ADMIN.REMOVE_THEME"|tu }} + {{ "PLUGIN_ADMIN.REMOVE_THEME"|t }}
    {% endif %} {% else %} @@ -147,7 +147,7 @@ {% endif %} {{ theme.premium.button|default('Purchase') }} {% else %} - {{ "PLUGIN_ADMIN.INSTALL_THEME"|tu }} + {{ "PLUGIN_ADMIN.INSTALL_THEME"|t }} {% endif %} {% endif %} diff --git a/themes/grav/templates/partials/themes-list.html.twig b/themes/grav/templates/partials/themes-list.html.twig index 1a865c56..95d20b0a 100644 --- a/themes/grav/templates/partials/themes-list.html.twig +++ b/themes/grav/templates/partials/themes-list.html.twig @@ -5,11 +5,11 @@ {% endif %} {% include 'partials/list-sort.html.twig' with { list_view: 'themes' } %}

    - {{ installing ? "PLUGIN_ADMIN.AVAILABLE_THEMES"|tu : "PLUGIN_ADMIN.INSTALLED_THEMES"|tu }} + {{ installing ? "PLUGIN_ADMIN.AVAILABLE_THEMES"|t : "PLUGIN_ADMIN.INSTALLED_THEMES"|t }}

    - +
    @@ -26,17 +26,17 @@ {{ theme.name }} {% if admin.isTeamGrav(theme) %} - + {% endif %} {% if admin.isPremiumProduct(theme) %} {% if not gumroad_loaded %} {% set gumroad_loaded = true %} {% endif %} - {{ "PLUGIN_ADMIN.PREMIUM_PRODUCT"|tu }} + {{ "PLUGIN_ADMIN.PREMIUM_PRODUCT"|t }} {% endif %} {% if theme.symlink %} - + {% endif %} @@ -56,22 +56,22 @@ {% endif %} {{ theme.premium.button|default('Purchase') }} {% else %} - {{ "PLUGIN_ADMIN.INSTALL"|tu }} + {{ "PLUGIN_ADMIN.INSTALL"|t }} {% endif %} {% elseif state == 'active' %}
    - {{ "PLUGIN_ADMIN.ACTIVE_THEME"|tu }} + {{ "PLUGIN_ADMIN.ACTIVE_THEME"|t }}
    {% else %} - {{ "PLUGIN_ADMIN.ACTIVATE"|tu }} + {{ "PLUGIN_ADMIN.ACTIVATE"|t }} {% endif %} {% else %} -     + {% endfor %} diff --git a/themes/grav/templates/partials/tools-backups-titlebar.html.twig b/themes/grav/templates/partials/tools-backups-titlebar.html.twig index 8b168f1e..1c218e60 100644 --- a/themes/grav/templates/partials/tools-backups-titlebar.html.twig +++ b/themes/grav/templates/partials/tools-backups-titlebar.html.twig @@ -1,7 +1,7 @@
    - {{ "PLUGIN_ADMIN.BACK"|tu }} + {{ "PLUGIN_ADMIN.BACK"|t }} {% include 'partials/backups-button.html.twig' %} - +
    -

    {{ "PLUGIN_ADMIN.TOOLS"|tu }} - {{ "PLUGIN_ADMIN.BACKUPS"|tu }}

    +

    {{ "PLUGIN_ADMIN.TOOLS"|t }} - {{ "PLUGIN_ADMIN.BACKUPS"|t }}

    diff --git a/themes/grav/templates/partials/tools-backups.html.twig b/themes/grav/templates/partials/tools-backups.html.twig index f0d88fc7..06eb4591 100644 --- a/themes/grav/templates/partials/tools-backups.html.twig +++ b/themes/grav/templates/partials/tools-backups.html.twig @@ -18,23 +18,23 @@ {% else %} {% set percent_used = 100 %} {% endif %} - {% set bar_msg = "PLUGIN_ADMIN.BACKUPS_PURGE_NUMBER"|tu([count, purge_config.max_backups_count]) %} + {% set bar_msg = "PLUGIN_ADMIN.BACKUPS_PURGE_NUMBER"|t(count, purge_config.max_backups_count) %} {% case 'time' %} {% set last = backups|last %} {% set days = last == null ? 0 : (date('now')).diff(last.time).days %} {% set percent_used = days == 0 ? 0 : 100 - (days / purge_config.max_backups_time * 100) %} - {% set bar_msg = "PLUGIN_ADMIN.BACKUPS_PURGE_TIME"|tu([(purge_config.max_backups_time - days)]) %} + {% set bar_msg = "PLUGIN_ADMIN.BACKUPS_PURGE_TIME"|t(purge_config.max_backups_time - days) %} {% default %} {% set space_used = grav.backups.getTotalBackupsSize() %} {% set space_available = purge_config.max_backups_space * 1024 * 1024 * 1024 %} {% set percent_used = space_used == 0 ? 0 : 100 - (space_used / space_available * 100) %} - {% set bar_msg = "PLUGIN_ADMIN.BACKUPS_PURGE_SPACE"|tu([space_used|nicefilesize, space_available|nicefilesize]) %} + {% set bar_msg = "PLUGIN_ADMIN.BACKUPS_PURGE_SPACE"|t(space_used|nicefilesize, space_available|nicefilesize) %} {% endswitch %}
    -

    {{ "PLUGIN_ADMIN.BACKUPS_STATS"|tu }}

    +

    {{ "PLUGIN_ADMIN.BACKUPS_STATS"|t }}

    @@ -53,19 +53,19 @@
    {{ backups|length }} - {{ "PLUGIN_ADMIN.BACKUPS_COUNT"|tu }} + {{ "PLUGIN_ADMIN.BACKUPS_COUNT"|t }} {{ profiles|count }} - {{ "PLUGIN_ADMIN.BACKUPS_PROFILES_COUNT"|tu }} + {{ "PLUGIN_ADMIN.BACKUPS_PROFILES_COUNT"|t }} {{ newest_backup }} - {{ "PLUGIN_ADMIN.BACKUPS_NEWEST"|tu }} + {{ "PLUGIN_ADMIN.BACKUPS_NEWEST"|t }} {{ oldest_backup }} - {{ "PLUGIN_ADMIN.BACKUPS_OLDEST"|tu }} + {{ "PLUGIN_ADMIN.BACKUPS_OLDEST"|t }}
    diff --git a/themes/grav/templates/partials/tools-direct-install.html.twig b/themes/grav/templates/partials/tools-direct-install.html.twig index bf5bce58..9b2f8df4 100644 --- a/themes/grav/templates/partials/tools-direct-install.html.twig +++ b/themes/grav/templates/partials/tools-direct-install.html.twig @@ -1,25 +1,25 @@ -

    {{ "PLUGIN_ADMIN.TOOLS_DIRECT_INSTALL_TITLE"|tu }}

    +

    {{ "PLUGIN_ADMIN.TOOLS_DIRECT_INSTALL_TITLE"|t }}

    -

    {{ "PLUGIN_ADMIN.TOOLS_DIRECT_INSTALL_UPLOAD_TITLE"|tu }}

    -

    {{ "PLUGIN_ADMIN.TOOLS_DIRECT_INSTALL_UPLOAD_DESC"|tu|raw }}

    +

    {{ "PLUGIN_ADMIN.TOOLS_DIRECT_INSTALL_UPLOAD_TITLE"|t }}

    +

    {{ "PLUGIN_ADMIN.TOOLS_DIRECT_INSTALL_UPLOAD_DESC"|t|raw }}

    - + {{ nonce_field('admin-form', 'admin-nonce')|raw }} -

    {{ "PLUGIN_ADMIN.TOOLS_DIRECT_INSTALL_URL_TITLE"|tu }}

    -

    {{ "PLUGIN_ADMIN.TOOLS_DIRECT_INSTALL_URL_DESC"|tu|raw }}

    +

    {{ "PLUGIN_ADMIN.TOOLS_DIRECT_INSTALL_URL_TITLE"|t }}

    +

    {{ "PLUGIN_ADMIN.TOOLS_DIRECT_INSTALL_URL_DESC"|t|raw }}

    - + {{ nonce_field('admin-form', 'admin-nonce')|raw }} diff --git a/themes/grav/templates/partials/tools-scheduler-titlebar.html.twig b/themes/grav/templates/partials/tools-scheduler-titlebar.html.twig index 20321e03..9741da4f 100644 --- a/themes/grav/templates/partials/tools-scheduler-titlebar.html.twig +++ b/themes/grav/templates/partials/tools-scheduler-titlebar.html.twig @@ -1,6 +1,6 @@
    - {{ "PLUGIN_ADMIN.BACK"|tu }} - + {{ "PLUGIN_ADMIN.BACK"|t }} +
    -

    {{ "PLUGIN_ADMIN.TOOLS"|tu }} - {{ "PLUGIN_ADMIN.SCHEDULER"|tu }}

    +

    {{ "PLUGIN_ADMIN.TOOLS"|t }} - {{ "PLUGIN_ADMIN.SCHEDULER"|t }}

    diff --git a/themes/grav/templates/partials/tools-scheduler.html.twig b/themes/grav/templates/partials/tools-scheduler.html.twig index 31ea0252..f2df9784 100644 --- a/themes/grav/templates/partials/tools-scheduler.html.twig +++ b/themes/grav/templates/partials/tools-scheduler.html.twig @@ -6,21 +6,21 @@ {% if cron_status == 1 %}
    -
    {{ "PLUGIN_ADMIN.SCHEDULER_INSTALL_INSTRUCTIONS"|tu }}
    - {{ "PLUGIN_ADMIN.SCHEDULER_INSTALLED_READY"|tu }} +
    {{ "PLUGIN_ADMIN.SCHEDULER_INSTALL_INSTRUCTIONS"|t }}
    + {{ "PLUGIN_ADMIN.SCHEDULER_INSTALLED_READY"|t }}
    {% elseif cron_status == 2 %} -
    {{ "PLUGIN_ADMIN.SCHEDULER_CRON_NA"|tu([user])|raw }}
    +
    {{ "PLUGIN_ADMIN.SCHEDULER_CRON_NA"|t(user)|raw }}
    {% else %} -
    {{ "PLUGIN_ADMIN.SCHEDULER_NOT_ENABLED"|tu([user])|raw }}
    +
    {{ "PLUGIN_ADMIN.SCHEDULER_NOT_ENABLED"|t(user)|raw }}
    {% endif %} -
    {{ "PLUGIN_ADMIN.SCHEDULER_WARNING"|tu([user]) }}
    +
    {{ "PLUGIN_ADMIN.SCHEDULER_WARNING"|t(user) }}
    {{- grav.scheduler.getCronCommand()|trim -}}
    -

    {{ "PLUGIN_ADMIN.SCHEDULER_POST_INSTRUCTIONS"|tu([user])|raw }}

    +

    {{ "PLUGIN_ADMIN.SCHEDULER_POST_INSTRUCTIONS"|t(user)|raw }}

    {% include 'partials/blueprints.html.twig' with { blueprints: data.blueprints, data: data } %} diff --git a/themes/grav/templates/partials/userinfo-avatar-credit.html.twig b/themes/grav/templates/partials/userinfo-avatar-credit.html.twig index 52ebd5d0..033a11bf 100644 --- a/themes/grav/templates/partials/userinfo-avatar-credit.html.twig +++ b/themes/grav/templates/partials/userinfo-avatar-credit.html.twig @@ -1 +1 @@ -

    {{ "PLUGIN_ADMIN.AVATAR_BY"|tu }} gravatar.com. {{ "PLUGIN_ADMIN.AVATAR_UPLOAD_OWN"|tu }}

    +

    {{ "PLUGIN_ADMIN.AVATAR_BY"|t }} gravatar.com. {{ "PLUGIN_ADMIN.AVATAR_UPLOAD_OWN"|t }}

    diff --git a/themes/grav/templates/plugins.html.twig b/themes/grav/templates/plugins.html.twig index c4a35422..1ee31868 100644 --- a/themes/grav/templates/plugins.html.twig +++ b/themes/grav/templates/plugins.html.twig @@ -7,7 +7,7 @@ {% set installing = plugin_slug starts with 'install' %} {% if installing %} - {% set title = "PLUGIN_ADMIN.PLUGINS"|tu %} + {% set title = "PLUGIN_ADMIN.PLUGINS"|t %} {% else %} {% set installed = true %} @@ -19,12 +19,12 @@ {% endif %} {% set plugin = package.toArray() %} - {% set title = "PLUGIN_ADMIN.PLUGIN"|tu ~ ": " ~ plugin.name|e %} + {% set title = "PLUGIN_ADMIN.PLUGIN"|t ~ ": " ~ plugin.name %} {% set data = admin.data('plugins/' ~ admin.route) %} {% set enabled = data.get('enabled') %} {% endif %} {% else %} - {% set title = "PLUGIN_ADMIN.PLUGINS"|tu %} + {% set title = "PLUGIN_ADMIN.PLUGINS"|t %} {% endif %} {% if admin.route or installing %} @@ -42,33 +42,33 @@ {% if not admin.route or installing %}
    {% if (installing) %} - {{ "PLUGIN_ADMIN.BACK"|tu }} + {{ "PLUGIN_ADMIN.BACK"|t }} {% else %} - {{ "PLUGIN_ADMIN.BACK"|tu }} - {{ "PLUGIN_ADMIN.ADD"|tu }} + {{ "PLUGIN_ADMIN.BACK"|t }} + {{ "PLUGIN_ADMIN.ADD"|t }} {% if authorize(['admin.maintenance', 'admin.super']) %} - + {% endif %} {% endif %}
    -

    {{ "PLUGIN_ADMIN.PLUGINS"|tu }}

    +

    {{ "PLUGIN_ADMIN.PLUGINS"|t }}

    {% else %} {% if (installed) %}
    - {{ "PLUGIN_ADMIN.BACK_TO_PLUGINS"|tu }} - {{ "PLUGIN_ADMIN.ADD"|tu }} + {{ "PLUGIN_ADMIN.BACK_TO_PLUGINS"|t }} + {{ "PLUGIN_ADMIN.ADD"|t }} {% include 'plugins/'~admin.route~'-buttons.html.twig' ignore missing %} {% if enabled %} - + {% endif %}
    {% else %}
    - {{ "PLUGIN_ADMIN.BACK_TO_PLUGINS"|tu }} + {{ "PLUGIN_ADMIN.BACK_TO_PLUGINS"|t }}
    {% endif %} -

    {{ "PLUGIN_ADMIN.PLUGIN"|tu }}: {{ plugin.name|e }}

    +

    {{ "PLUGIN_ADMIN.PLUGIN"|t }}: {{ plugin.name }}

    {% endif %} {% endblock %} diff --git a/themes/grav/templates/plugins/admin-buttons.html.twig b/themes/grav/templates/plugins/admin-buttons.html.twig index c540b895..e1ff5492 100644 --- a/themes/grav/templates/plugins/admin-buttons.html.twig +++ b/themes/grav/templates/plugins/admin-buttons.html.twig @@ -1,3 +1,3 @@ - - - + + + diff --git a/themes/grav/templates/preview.html.twig b/themes/grav/templates/preview.html.twig index bfb95e43..da891443 100644 --- a/themes/grav/templates/preview.html.twig +++ b/themes/grav/templates/preview.html.twig @@ -8,10 +8,10 @@ {% block titlebar %}
    - {{ "PLUGIN_ADMIN.BACK"|tu }} - {{ "PLUGIN_ADMIN.OPEN_NEW_TAB"|tu }} + {{ "PLUGIN_ADMIN.BACK"|t }} + {{ "PLUGIN_ADMIN.OPEN_NEW_TAB"|t }}
    -

    {{ "PLUGIN_ADMIN.PREVIEW"|tu }}: /{{ admin.route }}

    +

    {{ "PLUGIN_ADMIN.PREVIEW"|t }}: /{{ admin.route }}

    {% endblock %} {% block content_wrapper %} diff --git a/themes/grav/templates/register.html.twig b/themes/grav/templates/register.html.twig index 172e6ae2..ef9ce1a3 100644 --- a/themes/grav/templates/register.html.twig +++ b/themes/grav/templates/register.html.twig @@ -14,8 +14,8 @@
    - - + +
    diff --git a/themes/grav/templates/reset.html.twig b/themes/grav/templates/reset.html.twig index 77d14cc7..88a067ea 100644 --- a/themes/grav/templates/reset.html.twig +++ b/themes/grav/templates/reset.html.twig @@ -6,7 +6,7 @@ {% block inner_markup_field_close %}
    {% endblock %} {% endembed %}
    - +
    {% endblock %} diff --git a/themes/grav/templates/statistics.html.twig b/themes/grav/templates/statistics.html.twig index bf988b24..20504d0c 100644 --- a/themes/grav/templates/statistics.html.twig +++ b/themes/grav/templates/statistics.html.twig @@ -6,7 +6,7 @@

    - {{ "PLUGIN_ADMIN.VIEWS_STATISTICS"|tu }} + {{ "PLUGIN_ADMIN.VIEWS_STATISTICS"|t }}

    {% include 'partials/messages.html.twig' %} diff --git a/themes/grav/templates/themes.html.twig b/themes/grav/templates/themes.html.twig index e079e479..74b1ce87 100644 --- a/themes/grav/templates/themes.html.twig +++ b/themes/grav/templates/themes.html.twig @@ -4,7 +4,7 @@ {% set installing = admin.route starts with 'install' %} {% if installing %} - {% set title = "PLUGIN_ADMIN.THEMES"|tu %} + {% set title = "PLUGIN_ADMIN.THEMES"|t %} {% else %} {% set installed = true %} @@ -18,10 +18,10 @@ {% set theme = package.toArray() %} {% set state = config.get('system.pages.theme') == theme.slug ? 'active' : 'inactive' %} - {% set title = "PLUGIN_ADMIN.THEME"|tu ~ ": " ~ theme.name|e %} + {% set title = "PLUGIN_ADMIN.THEME"|t ~ ": " ~ theme.name %} {% endif %} {% else %} - {% set title = "PLUGIN_ADMIN.THEMES"|tu %} + {% set title = "PLUGIN_ADMIN.THEMES"|t %} {% endif %} {% if admin.route or installing %} @@ -39,30 +39,30 @@ {% if not admin.route or installing %}
    {% if (installing) %} - {{ "PLUGIN_ADMIN.BACK"|tu }} + {{ "PLUGIN_ADMIN.BACK"|t }} {% else %} - {{ "PLUGIN_ADMIN.BACK"|tu }} - {{ "PLUGIN_ADMIN.ADD"|tu }} + {{ "PLUGIN_ADMIN.BACK"|t }} + {{ "PLUGIN_ADMIN.ADD"|t }} {% if authorize(['admin.maintenance', 'admin.super']) %} - + {% endif %} {% endif %}
    -

    {{ "PLUGIN_ADMIN.THEMES"|tu }}

    +

    {{ "PLUGIN_ADMIN.THEMES"|t }}

    {% else %} {% if (installed) %}
    - {{ "PLUGIN_ADMIN.BACK_TO_THEMES"|tu }} + {{ "PLUGIN_ADMIN.BACK_TO_THEMES"|t }} {% if state == 'active' %} - + {% endif %}
    {% else %}
    - {{ "PLUGIN_ADMIN.BACK_TO_THEMES"|tu }} + {{ "PLUGIN_ADMIN.BACK_TO_THEMES"|t }}
    {% endif %} -

    {{ "PLUGIN_ADMIN.THEME"|tu }}: {{ theme.name|e }}

    +

    {{ "PLUGIN_ADMIN.THEME"|t }}: {{ theme.name }}

    {% endif %} {% endblock %} diff --git a/themes/grav/templates/tools.html.twig b/themes/grav/templates/tools.html.twig index 383c1eca..7706707a 100644 --- a/themes/grav/templates/tools.html.twig +++ b/themes/grav/templates/tools.html.twig @@ -1,8 +1,8 @@ {% extends 'partials/base.html.twig' %} -{% set tools_slug = uri.basename|e %} +{% set tools_slug = uri.basename %} {% if tools_slug == 'tools' %}{% set tools_slug = 'backups' %}{% endif %} -{% set title = "PLUGIN_ADMIN.TOOLS"|tu ~ ": " ~ ("PLUGIN_ADMIN." ~ tools_slug|underscorize|upper)|tu %} +{% set title = "PLUGIN_ADMIN.TOOLS"|t ~ ": " ~ ("PLUGIN_ADMIN." ~ tools_slug|underscorize|upper)|t %} {% set tools = admin.tools() %} {% set titlebar -%} @@ -14,9 +14,9 @@ {{ titlebar }} {% else %}
    - {{ "PLUGIN_ADMIN.BACK"|tu }} + {{ "PLUGIN_ADMIN.BACK"|t }}
    -

    {{ "PLUGIN_ADMIN.TOOLS"|tu }} - {{ ("PLUGIN_ADMIN." ~ tools_slug|underscorize|upper)|tu }}

    +

    {{ "PLUGIN_ADMIN.TOOLS"|t }} - {{ ("PLUGIN_ADMIN." ~ tools_slug|underscorize|upper)|t }}

    {% endif %} {% endblock %} @@ -29,7 +29,7 @@ {% set name = tool|last %} {% if authorize(perms) %} - {{ name|tu|capitalize }} + {{ name|t|capitalize }} {% endif %} {% endfor %} diff --git a/themes/grav/templates/user.html.twig b/themes/grav/templates/user.html.twig index fd6de897..7cb5aae1 100644 --- a/themes/grav/templates/user.html.twig +++ b/themes/grav/templates/user.html.twig @@ -2,32 +2,32 @@ {% if admin.route %} {% set user = admin.data('users/' ~ admin.route) %} - {% set title = "PLUGIN_ADMIN.USER"|tu ~ ": " ~ admin.route|e %} + {% set title = "PLUGIN_ADMIN.USER"|t ~ ": " ~ admin.route|e %} {% else %} - {% set title = "PLUGIN_ADMIN_PRO.USERS"|tu %} + {% set title = "PLUGIN_ADMIN_PRO.USERS"|t %} {% endif %} {% block titlebar %} {% if not admin.route %} {% if authorize(['admin.users', 'admin.super']) %}
    - {{ "PLUGIN_ADMIN.ADD_ACCOUNT"|tu }} + {{ "PLUGIN_ADMIN.ADD_ACCOUNT"|t }}
    -

    {{ "PLUGIN_ADMIN.USERS"|tu }}

    +

    {{ "PLUGIN_ADMIN.USERS"|t }}

    {% else %} -

    {{ "PLUGIN_ADMIN.ACCESS_DENIED"|tu }}

    +

    {{ "PLUGIN_ADMIN.ACCESS_DENIED"|t }}

    {% endif %} {% else %} {% if authorize(['admin.users', 'admin.super']) or grav.user.username == user.username %}
    {% if config.plugins["admin-pro"].enabled %} - {{ "PLUGIN_ADMIN.BACK"|tu }} + {{ "PLUGIN_ADMIN.BACK"|t }} {% endif %} - +
    -

    {{ "PLUGIN_ADMIN.USER"|tu }}: {{ user.username|e }}

    +

    {{ "PLUGIN_ADMIN.USER"|t }}: {{ user.username }}

    {% else %} -

    {{ "PLUGIN_ADMIN.ACCESS_DENIED"|tu }}

    +

    {{ "PLUGIN_ADMIN.ACCESS_DENIED"|t }}

    {% endif %} {% endif %} {% endblock %} @@ -48,14 +48,14 @@
    -

    {{ "PLUGIN_ADMIN.MODAL_CHANGED_DETECTED_TITLE"|tu }}

    +

    {{ "PLUGIN_ADMIN.MODAL_CHANGED_DETECTED_TITLE"|t }}

    - {{ "PLUGIN_ADMIN.MODAL_CHANGED_DETECTED_DESC"|tu }} + {{ "PLUGIN_ADMIN.MODAL_CHANGED_DETECTED_DESC"|t }}


    - {{ "PLUGIN_ADMIN.CANCEL"|tu }} - {{ "PLUGIN_ADMIN.CONTINUE"|tu }} + {{ "PLUGIN_ADMIN.CANCEL"|t }} + {{ "PLUGIN_ADMIN.CONTINUE"|t }}
    From e6e7a5dbab68ed01d7e90d67b4946ef8ad5e26f5 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Fri, 20 Aug 2021 14:30:12 +0300 Subject: [PATCH 7/9] Admin form now use layout `admin`, meaning you can create admin specific field templates by `forms/fields/myfield/admin-field.html.twig` --- CHANGELOG.md | 1 + themes/grav/templates/partials/blueprints-copy.html.twig | 1 + themes/grav/templates/partials/blueprints-new-folder.html.twig | 1 + themes/grav/templates/partials/blueprints-new.html.twig | 1 + themes/grav/templates/partials/blueprints-raw.html.twig | 1 + themes/grav/templates/partials/blueprints.html.twig | 1 + themes/grav/templates/partials/login.html.twig | 1 + themes/grav/templates/partials/page-move.html.twig | 1 + themes/grav/templates/partials/register.html.twig | 1 + 9 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0c6cfa1..0b150869 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * Updated SCSS compiler to v1.6 2. [](#improved) * Updated forms and nested fields to use new form logic + * Admin form now use layout `admin`, meaning you can create admin specific field templates by `forms/fields/myfield/admin-field.html.twig` * Stop using `|tu` filter, Grav already has the same logic in `|t` for admin * Remove unneeded escapes 3. [](#bugfix) diff --git a/themes/grav/templates/partials/blueprints-copy.html.twig b/themes/grav/templates/partials/blueprints-copy.html.twig index 3af694e7..e35f2e1f 100644 --- a/themes/grav/templates/partials/blueprints-copy.html.twig +++ b/themes/grav/templates/partials/blueprints-copy.html.twig @@ -1,5 +1,6 @@ {% set form_id = form_id ? form_id : 'blueprints' %} {% set scope = scope ?: 'data.' %} +{% set field_layout = 'admin' %}
    {% embed 'forms/default/fields.html.twig' with {name: null, fields: blueprints.fields} %} diff --git a/themes/grav/templates/partials/blueprints-new-folder.html.twig b/themes/grav/templates/partials/blueprints-new-folder.html.twig index 29d56b8d..128eb496 100644 --- a/themes/grav/templates/partials/blueprints-new-folder.html.twig +++ b/themes/grav/templates/partials/blueprints-new-folder.html.twig @@ -1,5 +1,6 @@ {% set form_id = form_id ? form_id : 'blueprints' %} {% set scope = scope ?: 'data.' %} +{% set field_layout = 'admin' %} {% embed 'forms/default/fields.html.twig' with {name: null, fields: blueprints.fields} %} diff --git a/themes/grav/templates/partials/blueprints-new.html.twig b/themes/grav/templates/partials/blueprints-new.html.twig index 033541a3..2012e06f 100644 --- a/themes/grav/templates/partials/blueprints-new.html.twig +++ b/themes/grav/templates/partials/blueprints-new.html.twig @@ -1,5 +1,6 @@ {% set form_id = form_id ? form_id : 'blueprints' %} {% set scope = scope ?: 'data.' %} +{% set field_layout = 'admin' %} {% embed 'forms/default/fields.html.twig' with {name: null, fields: blueprints.fields} %} diff --git a/themes/grav/templates/partials/blueprints-raw.html.twig b/themes/grav/templates/partials/blueprints-raw.html.twig index c7fe133d..7ab3a6e1 100644 --- a/themes/grav/templates/partials/blueprints-raw.html.twig +++ b/themes/grav/templates/partials/blueprints-raw.html.twig @@ -1,5 +1,6 @@ {% set form_id = form_id ? form_id : 'blueprints' %} {% set scope = scope ?: 'data.' %} +{% set field_layout = 'admin' %} {% if admin.findFormFields('file', blueprints.fields) %} {% set multipart = ' enctype="multipart/form-data"' %} diff --git a/themes/grav/templates/partials/blueprints.html.twig b/themes/grav/templates/partials/blueprints.html.twig index 77728e6a..f4ab5e74 100644 --- a/themes/grav/templates/partials/blueprints.html.twig +++ b/themes/grav/templates/partials/blueprints.html.twig @@ -2,6 +2,7 @@ {% set data = data ?? form.data %} {% set form_id = form_id ?? 'blueprints' %} {% set scope = scope ?: 'data.' %} +{% set field_layout = 'admin' %} {% if admin.findFormFields('file', blueprints.fields) %} {% set multipart = ' enctype="multipart/form-data"' %} diff --git a/themes/grav/templates/partials/login.html.twig b/themes/grav/templates/partials/login.html.twig index e7520272..e554a813 100644 --- a/themes/grav/templates/partials/login.html.twig +++ b/themes/grav/templates/partials/login.html.twig @@ -1,5 +1,6 @@ {% extends 'partials/base.html.twig' %} {% set scope = form.scope %} +{% set field_layout = 'admin' %} {% block messages %}{% endblock %} diff --git a/themes/grav/templates/partials/page-move.html.twig b/themes/grav/templates/partials/page-move.html.twig index c6432550..ff6347c3 100644 --- a/themes/grav/templates/partials/page-move.html.twig +++ b/themes/grav/templates/partials/page-move.html.twig @@ -1,5 +1,6 @@ {% set form_id = form_id ? form_id : 'page-move' %} {% set scope = scope ?: 'data.' %} +{% set field_layout = 'admin' %}

    Move

    diff --git a/themes/grav/templates/partials/register.html.twig b/themes/grav/templates/partials/register.html.twig index b7848e7b..da9173c2 100644 --- a/themes/grav/templates/partials/register.html.twig +++ b/themes/grav/templates/partials/register.html.twig @@ -1,5 +1,6 @@ {% extends 'partials/base.html.twig' %} {% set scope = form.scope %} +{% set field_layout = 'admin' %} {% block body %} From c397f18fdd151a6ed864c116274ca3e9b78ee334 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Fri, 20 Aug 2021 10:14:16 -0600 Subject: [PATCH 8/9] fixes issue #2167 --- CHANGELOG.md | 1 + .../partials/plugins-details.html.twig | 19 +++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0c6cfa1..f0c3d61c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * Updated forms and nested fields to use new form logic * Stop using `|tu` filter, Grav already has the same logic in `|t` for admin * Remove unneeded escapes + * Allow removal of plugin when disabled [#2167](https://github.com/getgrav/grav-plugin-admin/issues/2167) 3. [](#bugfix) * Fixed missing values in `fieldset` form field diff --git a/themes/grav/templates/partials/plugins-details.html.twig b/themes/grav/templates/partials/plugins-details.html.twig index a44ea4df..46ea88e9 100644 --- a/themes/grav/templates/partials/plugins-details.html.twig +++ b/themes/grav/templates/partials/plugins-details.html.twig @@ -31,16 +31,6 @@ {% set data = admin.data('plugins/' ~ admin.route) %} {% if data.get('enabled') %} {% include 'partials/blueprints.html.twig' with { data: data, blueprints: data.blueprints } %} - - {% if (plugin.form.fields.enabled.type != 'hidden' and plugin.form.fields.tabs.fields.login.fields.enabled.type != 'hidden') %} -
    - - {% if not plugin.symlink %} - - {% endif %} - {{ "PLUGIN_ADMIN.REMOVE_PLUGIN"|t }} -
    - {% endif %} {% else %}
    @@ -55,6 +45,15 @@
    {% endif %} + {% if (plugin.form.fields.enabled.type != 'hidden' and plugin.form.fields.tabs.fields.login.fields.enabled.type != 'hidden') %} +
    + + {% if not plugin.symlink %} + + {% endif %} + {{ "PLUGIN_ADMIN.REMOVE_PLUGIN"|t }} +
    + {% endif %} {% else %}
    {% if (plugin.premium and not admin.license(plugin.slug)) %} From 73e0952377d0b1404078cbbf81b72dbff2fb13da Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Tue, 31 Aug 2021 12:19:44 -0600 Subject: [PATCH 9/9] prepare for release --- CHANGELOG.md | 4 ++-- blueprints.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abb4b3af..532c4559 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # v1.10.19 -## mm/dd/2021 +## 08/31/2021 1. [](#new) - * Require **Grav 1.7.19** and **Form 5.1.0** + * Require **Grav 1.7.19** and **Form 5.1.0** and **Login 3.5.0** * Updated SCSS compiler to v1.6 2. [](#improved) * Updated forms and nested fields to use new form logic diff --git a/blueprints.yaml b/blueprints.yaml index b4e65c01..5020bc61 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,7 +1,7 @@ name: Admin Panel slug: admin type: plugin -version: 1.10.18 +version: 1.10.19 description: Adds an advanced administration panel to manage your site icon: empire author: @@ -17,9 +17,9 @@ license: MIT dependencies: - { name: grav, version: '>=1.7.19' } - { name: form, version: '>=5.1.0' } - - { name: login, version: '>=3.3.5' } - - { name: email, version: '>=3.0.9' } - - { name: flex-objects, version: '>=1.0.0' } + - { name: login, version: '>=3.5.0' } + - { name: email, version: '>=3.1.0' } + - { name: flex-objects, version: '>=1.1.0' } form: validation: loose
    {{ "PLUGIN_ADMIN.VERSION"|tu }}:{{ "PLUGIN_ADMIN.VERSION"|t }}: {{ theme.version }}
    {{ "PLUGIN_ADMIN.AUTHOR"|tu }}:{{ "PLUGIN_ADMIN.AUTHOR"|t }}: {% if theme.author.url %} {{ theme.author.name }} @@ -51,25 +51,25 @@ {% endif %} {% if theme.homepage %}
    {{ "PLUGIN_ADMIN.HOMEPAGE"|tu }}:{{ "PLUGIN_ADMIN.HOMEPAGE"|t }}: {{ theme.homepage }}
    {{ "PLUGIN_ADMIN.DEMO"|tu }}:{{ "PLUGIN_ADMIN.DEMO"|t }}: {{ theme.demo }}
    {{ "PLUGIN_ADMIN.BUG_TRACKER"|tu }}:{{ "PLUGIN_ADMIN.BUG_TRACKER"|t }}: {{ theme.bugs }}
    {{ "PLUGIN_ADMIN.KEYWORDS"|tu }}:{{ "PLUGIN_ADMIN.KEYWORDS"|t }}: {{ theme.keywords|join(', ') }}
    {{ "PLUGIN_ADMIN.LICENSE"|tu }}:{{ "PLUGIN_ADMIN.LICENSE"|t }}:{{ theme.license }}
    {{ "PLUGIN_ADMIN.DESCRIPTION"|tu }}:{{ "PLUGIN_ADMIN.DESCRIPTION"|t }}: {{ theme.description_html|raw }}
    {{ theme.readme ? "PLUGIN_ADMIN.README"|tu : "PLUGIN_ADMIN.DOCS"|tu }}:{{ theme.readme ? "PLUGIN_ADMIN.README"|t : "PLUGIN_ADMIN.DOCS"|t }}: {{ readme_link }}
    {{ "PLUGIN_ADMIN.CHANGELOG"|tu }}:{{ "PLUGIN_ADMIN.CHANGELOG"|t }}: View Changelog
    {{ "PLUGIN_ADMIN.OFFLINE_WARNING"|tu }}
    {{ "PLUGIN_ADMIN.OFFLINE_WARNING"|t }}