Merge branch 'release/1.10.17'

2026-09-02 09:37:07 +02:00 · 2021-06-15 13:10:18 -06:00
parent 2ec3f060b9 01f3aab692
commit c34e2c4bd1
9 changed files with 120 additions and 115 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,21 @@
+# v1.10.17
+## 06/15/2021
+
+1. [](#improved)
+    * Added timestamp as title in logs date [#2141](https://github.com/getgrav/grav-plugin-admin/issues/2141)
+    * Use `base64_encode` filter rather than function
+    * Composer update
+1. [](#bugfix)
+    * Fixed missing `Remove Theme` button when the theme is inactive
+    * Update taskGetChildTypes() to use Flex Pages (works without the plugin) [#2087](https://github.com/getgrav/grav-plugin-admin/issues/2087)
+
 # v1.10.16
 ## 06/02/2021

 1. [](#bugfix)
    * Fixed issue with some elements overflowing closed list items [#2146](https://github.com/getgrav/grav-plugin-admin/issues/2146)
    * Fixed configuration not fully updating on save [#2149](https://github.com/getgrav/grav-plugin-admin/issues/2149)
-    * Fixed display issue with "+ Add Page" and picking a different route [#2136](https://github.com/getgrav/grav-plugin-admin/issues/2136), [#2145](https://github.com/getgrav/grav-plugin-admin/issues/2145) 
+    * Fixed display issue with "+ Add Page" and picking a different route [#2136](https://github.com/getgrav/grav-plugin-admin/issues/2136), [#2145](https://github.com/getgrav/grav-plugin-admin/issues/2145)
    * Treat WebP as image when inserting / drag & dropping [#2150](https://github.com/getgrav/grav-plugin-admin/issues/2150)

 # v1.10.15
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Admin Panel
 slug: admin
 type: plugin
-version: 1.10.16
+version: 1.10.17
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:
--- a/classes/plugin/AdminController.php
+++ b/classes/plugin/AdminController.php
@@ -26,6 +26,7 @@ use Grav\Common\Security;
 use Grav\Common\User\Interfaces\UserCollectionInterface;
 use Grav\Common\User\Interfaces\UserInterface;
 use Grav\Common\Utils;
+use Grav\Framework\Flex\Flex;
 use Grav\Framework\Psr7\Response;
 use Grav\Framework\RequestHandler\Exception\RequestException;
 use Grav\Plugin\Login\TwoFactorAuth\TwoFactorAuth;
@@ -1851,17 +1852,13 @@ class AdminController extends AdminBaseController

        $data = $this->post;

-        $rawroute = $data['rawroute'] ?? null;
-
-        if ($rawroute) {
-            $pages = $this->admin::enablePages();
-
-            /** @var PageInterface $page */
-            $page = $pages->find($rawroute);
-
-            if ($page) {
+        $route = $data['rawroute'] ?? null;
+        if ($route) {
+            /** @var Flex $flex */
+            $flex = $this->grav['flex'];
+            $page = $flex->getObject(trim($route, '/'), 'pages');
+            if ($page instanceof PageInterface) {
                $child_type = $page->childType();
-
                if ($child_type !== '') {
                    $this->admin->json_response = [
                        'status' => 'success',
@@ -1875,7 +1872,6 @@ class AdminController extends AdminBaseController
        $this->admin->json_response = [
            'status'  => 'success',
            'child_type' => '',
-//            'message' => $this->admin::translate('PLUGIN_ADMIN.NO_CHILD_TYPE')
        ];

        return true;
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
        "php": "^7.3.6 || ^8.0",
        "ext-json": "*",
        "p3k/picofeed": "@stable",
-        "scssphp/scssphp": "^1.4"
+        "scssphp/scssphp": "^1.5"
    },
    "require-dev": {
        "codeception/codeception": "^2.4",
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "54cd13d690b7da1ef39003150531284a",
+    "content-hash": "e00ccb05e2b5cfc4c32a0ee55a9bb686",
    "packages": [
        {
            "name": "laminas/laminas-xml",
@@ -2476,16 +2476,16 @@
        },
        {
            "name": "symfony/browser-kit",
-            "version": "v4.4.22",
+            "version": "v4.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "4c8b42b4aae93517e8f67d68c5cbe69413e3e3c1"
+                "reference": "729b1f0eca3ef18ea4e1a29b166145aff75d8fa1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/4c8b42b4aae93517e8f67d68c5cbe69413e3e3c1",
-                "reference": "4c8b42b4aae93517e8f67d68c5cbe69413e3e3c1",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/729b1f0eca3ef18ea4e1a29b166145aff75d8fa1",
+                "reference": "729b1f0eca3ef18ea4e1a29b166145aff75d8fa1",
                "shasum": ""
            },
            "require": {
@@ -2527,7 +2527,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.22"
+                "source": "https://github.com/symfony/browser-kit/tree/v4.4.25"
            },
            "funding": [
                {
@@ -2543,20 +2543,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-04-08T07:40:10+00:00"
+            "time": "2021-05-26T17:39:37+00:00"
        },
        {
            "name": "symfony/console",
-            "version": "v4.4.23",
+            "version": "v4.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "1ab187ac21d41d7d34a4f529091a1f5d0bb2924f"
+                "reference": "a62acecdf5b50e314a4f305cd01b5282126f3095"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/1ab187ac21d41d7d34a4f529091a1f5d0bb2924f",
-                "reference": "1ab187ac21d41d7d34a4f529091a1f5d0bb2924f",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a62acecdf5b50e314a4f305cd01b5282126f3095",
+                "reference": "a62acecdf5b50e314a4f305cd01b5282126f3095",
                "shasum": ""
            },
            "require": {
@@ -2616,7 +2616,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.23"
+                "source": "https://github.com/symfony/console/tree/v4.4.25"
            },
            "funding": [
                {
@@ -2632,20 +2632,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-05-10T12:53:15+00:00"
+            "time": "2021-05-26T11:20:16+00:00"
        },
        {
            "name": "symfony/css-selector",
-            "version": "v4.4.22",
+            "version": "v4.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/css-selector.git",
-                "reference": "01c77324d1d47efbfd7891f62a7c256c69330115"
+                "reference": "c1e29de6dc893b130b45d20d8051efbb040560a9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/01c77324d1d47efbfd7891f62a7c256c69330115",
-                "reference": "01c77324d1d47efbfd7891f62a7c256c69330115",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/c1e29de6dc893b130b45d20d8051efbb040560a9",
+                "reference": "c1e29de6dc893b130b45d20d8051efbb040560a9",
                "shasum": ""
            },
            "require": {
@@ -2681,7 +2681,7 @@
            "description": "Converts CSS selectors to XPath expressions",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v4.4.22"
+                "source": "https://github.com/symfony/css-selector/tree/v4.4.25"
            },
            "funding": [
                {
@@ -2697,20 +2697,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-04-07T15:47:03+00:00"
+            "time": "2021-05-26T17:39:37+00:00"
        },
        {
            "name": "symfony/dom-crawler",
-            "version": "v4.4.20",
+            "version": "v4.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "be133557f1b0e6672367325b508e65da5513a311"
+                "reference": "41d15bb6d6b95d2be763c514bb2494215d9c5eef"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/be133557f1b0e6672367325b508e65da5513a311",
-                "reference": "be133557f1b0e6672367325b508e65da5513a311",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/41d15bb6d6b95d2be763c514bb2494215d9c5eef",
+                "reference": "41d15bb6d6b95d2be763c514bb2494215d9c5eef",
                "shasum": ""
            },
            "require": {
@@ -2754,7 +2754,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.20"
+                "source": "https://github.com/symfony/dom-crawler/tree/v4.4.25"
            },
            "funding": [
                {
@@ -2770,20 +2770,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-02-14T12:29:41+00:00"
+            "time": "2021-05-26T11:20:16+00:00"
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v4.4.20",
+            "version": "v4.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "c352647244bd376bf7d31efbd5401f13f50dad0c"
+                "reference": "047773e7016e4fd45102cedf4bd2558ae0d0c32f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c352647244bd376bf7d31efbd5401f13f50dad0c",
-                "reference": "c352647244bd376bf7d31efbd5401f13f50dad0c",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/047773e7016e4fd45102cedf4bd2558ae0d0c32f",
+                "reference": "047773e7016e4fd45102cedf4bd2558ae0d0c32f",
                "shasum": ""
            },
            "require": {
@@ -2837,7 +2837,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.20"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.25"
            },
            "funding": [
                {
@@ -2853,7 +2853,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-01-27T09:09:26+00:00"
+            "time": "2021-05-26T17:39:37+00:00"
        },
        {
            "name": "symfony/event-dispatcher-contracts",
@@ -2936,16 +2936,16 @@
        },
        {
            "name": "symfony/finder",
-            "version": "v4.4.23",
+            "version": "v4.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "67b77716f517e3f864759232e1201e7aa2ab0e82"
+                "reference": "ed33314396d968a8936c95f5bd1b88bd3b3e94a3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/67b77716f517e3f864759232e1201e7aa2ab0e82",
-                "reference": "67b77716f517e3f864759232e1201e7aa2ab0e82",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/ed33314396d968a8936c95f5bd1b88bd3b3e94a3",
+                "reference": "ed33314396d968a8936c95f5bd1b88bd3b3e94a3",
                "shasum": ""
            },
            "require": {
@@ -2977,7 +2977,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.23"
+                "source": "https://github.com/symfony/finder/tree/v4.4.25"
            },
            "funding": [
                {
@@ -2993,20 +2993,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-05-09T09:13:09+00:00"
+            "time": "2021-05-26T11:20:16+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
                "shasum": ""
            },
            "require": {
@@ -3018,7 +3018,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@@ -3056,7 +3056,7 @@
                "portable"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
            },
            "funding": [
                {
@@ -3072,20 +3072,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-02-19T12:13:01+00:00"
        },
        {
            "name": "symfony/polyfill-intl-idn",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "2d63434d922daf7da8dd863e7907e67ee3031483"
+                "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483",
-                "reference": "2d63434d922daf7da8dd863e7907e67ee3031483",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65",
+                "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65",
                "shasum": ""
            },
            "require": {
@@ -3099,7 +3099,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@@ -3143,7 +3143,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0"
            },
            "funding": [
                {
@@ -3159,20 +3159,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-01-22T09:19:47+00:00"
+            "time": "2021-05-27T09:27:20+00:00"
        },
        {
            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248"
+                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248",
-                "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
+                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
                "shasum": ""
            },
            "require": {
@@ -3184,7 +3184,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@@ -3227,7 +3227,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0"
            },
            "funding": [
                {
@@ -3243,20 +3243,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-01-22T09:19:47+00:00"
+            "time": "2021-02-19T12:13:01+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
+                "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
-                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
+                "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
                "shasum": ""
            },
            "require": {
@@ -3268,7 +3268,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@@ -3307,7 +3307,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0"
            },
            "funding": [
                {
@@ -3323,20 +3323,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-01-22T09:19:47+00:00"
+            "time": "2021-05-27T09:27:20+00:00"
        },
        {
            "name": "symfony/polyfill-php80",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91"
+                "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91",
-                "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0",
+                "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0",
                "shasum": ""
            },
            "require": {
@@ -3345,7 +3345,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@@ -3390,7 +3390,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0"
            },
            "funding": [
                {
@@ -3406,20 +3406,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-02-19T12:13:01+00:00"
        },
        {
            "name": "symfony/process",
-            "version": "v4.4.22",
+            "version": "v4.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "f5481b22729d465acb1cea3455fc04ce84b0148b"
+                "reference": "cd61e6dd273975c6625316de9d141ebd197f93c9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/f5481b22729d465acb1cea3455fc04ce84b0148b",
-                "reference": "f5481b22729d465acb1cea3455fc04ce84b0148b",
+                "url": "https://api.github.com/repos/symfony/process/zipball/cd61e6dd273975c6625316de9d141ebd197f93c9",
+                "reference": "cd61e6dd273975c6625316de9d141ebd197f93c9",
                "shasum": ""
            },
            "require": {
@@ -3451,7 +3451,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v4.4.22"
+                "source": "https://github.com/symfony/process/tree/v4.4.25"
            },
            "funding": [
                {
@@ -3467,7 +3467,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-04-07T16:22:29+00:00"
+            "time": "2021-05-26T11:20:16+00:00"
        },
        {
            "name": "symfony/service-contracts",
@@ -3550,16 +3550,16 @@
        },
        {
            "name": "symfony/yaml",
-            "version": "v4.4.22",
+            "version": "v4.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/yaml.git",
-                "reference": "1c2fd24147961525eaefb65b11987cab75adab59"
+                "reference": "81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/1c2fd24147961525eaefb65b11987cab75adab59",
-                "reference": "1c2fd24147961525eaefb65b11987cab75adab59",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc",
+                "reference": "81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc",
                "shasum": ""
            },
            "require": {
@@ -3601,7 +3601,7 @@
            "description": "Loads and dumps YAML files",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/yaml/tree/v4.4.22"
+                "source": "https://github.com/symfony/yaml/tree/v4.4.25"
            },
            "funding": [
                {
@@ -3617,7 +3617,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-04-23T12:09:37+00:00"
+            "time": "2021-05-26T17:39:37+00:00"
        },
        {
            "name": "theseer/tokenizer",
--- a/themes/grav/templates/partials/themes-details.html.twig
+++ b/themes/grav/templates/partials/themes-details.html.twig
@@ -109,20 +109,10 @@
    </table>
 </div>

-{% if (installed) %}
-  {% if (state == 'active') %}
+{% if installed %}
+  {% if state == 'active' %}
    {% set data = admin.data('themes/' ~ admin.route) %}
    {% include 'partials/blueprints.html.twig' with { data: data, blueprints: data.blueprints } %}
-
-    {% if (config.get('system.pages.theme') != admin.route) %}
-    <div class="button-bar danger">
-        <span class="danger-zone"></span>
-        {% if not theme.symlink %}
-            <a class="button button-reinstall-package hidden" href="#" data-remodal-target="reinstall-package"><i class="fa fa-fw fa-repeat"></i> {{ "PLUGIN_ADMIN.REINSTALL_THEME"|tu }}</a>
-        {% endif %}
-        <a class="button" href="#" data-remodal-target="remove-package"><i class="fa fa-fw fa-warning"></i> {{ "PLUGIN_ADMIN.REMOVE_THEME"|tu }}</a>
-    </div>
-    {% endif %}
  {% else %}
    <div class="theme" data-gpm-theme="{{ theme.slug }}" data-gpm-name="{{ theme.name }}">
      <div style="display:none;" class="gpm-name"><a>{{ theme.name }}</a></div>
@@ -139,6 +129,14 @@
        </div>
      </form>
    </div>
+
+    <div class="button-bar danger">
+      <span class="danger-zone"></span>
+      {% if not theme.symlink %}
+          <a class="button button-reinstall-package hidden" href="#" data-remodal-target="reinstall-package"><i class="fa fa-fw fa-repeat"></i> {{ "PLUGIN_ADMIN.REINSTALL_THEME"|tu }}</a>
+      {% endif %}
+      <a class="button" href="#" data-remodal-target="remove-package"><i class="fa fa-fw fa-warning"></i> {{ "PLUGIN_ADMIN.REMOVE_THEME"|tu }}</a>
+    </div>
  {% endif %}
 {% else %}
    <div class="button-bar success">
--- a/themes/grav/templates/partials/tools-logs.html.twig
+++ b/themes/grav/templates/partials/tools-logs.html.twig
@@ -53,7 +53,7 @@
            <tbody>
                {% for log in logs %}
                <tr>
-                    <td class="date">{{ log.date|date }}</td>
+                    <td class="date" title="{{ log.date|date('r') }}">{{ log.date|date }}</td>
                    <td class="level"><span class="badge {{ log.level|lower }}">{{ log.level }}</span></td>
                    <td class="message">{{ log.message }}</td>
                    {% if verbose %}
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -29,7 +29,7 @@ private static $installed = array (
    'aliases' => 
    array (
    ),
-    'reference' => '6e5839ded659cc193765e47cfdb9ccfeb31d8050',
+    'reference' => '0b66fc80312bf6a9553af43e825d731a627a90ed',
    'name' => 'getgrav/grav-plugin-admin',
  ),
  'versions' => 
@@ -41,7 +41,7 @@ private static $installed = array (
      'aliases' => 
      array (
      ),
-      'reference' => '6e5839ded659cc193765e47cfdb9ccfeb31d8050',
+      'reference' => '0b66fc80312bf6a9553af43e825d731a627a90ed',
    ),
    'laminas/laminas-xml' => 
    array (
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -6,7 +6,7 @@
    'aliases' => 
    array (
    ),
-    'reference' => '6e5839ded659cc193765e47cfdb9ccfeb31d8050',
+    'reference' => '0b66fc80312bf6a9553af43e825d731a627a90ed',
    'name' => 'getgrav/grav-plugin-admin',
  ),
  'versions' => 
@@ -18,7 +18,7 @@
      'aliases' => 
      array (
      ),
-      'reference' => '6e5839ded659cc193765e47cfdb9ccfeb31d8050',
+      'reference' => '0b66fc80312bf6a9553af43e825d731a627a90ed',
    ),
    'laminas/laminas-xml' => 
    array (