diff --git a/admin.php b/admin.php index 0ec5a6f7..8d04220f 100644 --- a/admin.php +++ b/admin.php @@ -393,11 +393,19 @@ class AdminPlugin extends Plugin $manifestFiles = $manager->hasSnapshots() ? [true] : []; } + $tools = $event['tools']; + Grav::instance()['log']->debug('[Admin] Tools before restore grav: ' . implode(',', array_keys($tools))); + if ($manifestFiles) { - $event['tools']['restore-grav'] = [['admin.super'], 'PLUGIN_ADMIN.RESTORE_GRAV']; + $tools['restore-grav'] = [['admin.super'], 'PLUGIN_ADMIN.RESTORE_GRAV']; + Grav::instance()['log']->debug('[Admin] Restore Grav tool enabled'); } + + $event['tools'] = $tools; + Grav::instance()['log']->debug('[Admin] Tools after register: ' . implode(',', array_keys($tools))); } catch (\Throwable $e) { // ignore availability errors, snapshots tool will simply stay hidden + Grav::instance()['log']->warning('[Admin] Restore Grav detection failed: ' . $e->getMessage()); } } diff --git a/themes/grav/templates/partials/tools-restore-grav.html.twig b/themes/grav/templates/partials/tools-restore-grav.html.twig index 8f557cf2..79d1b88a 100644 --- a/themes/grav/templates/partials/tools-restore-grav.html.twig +++ b/themes/grav/templates/partials/tools-restore-grav.html.twig @@ -1,3 +1,6 @@ +{% do assets.addInlineCss(' \ +.restore-grav-content {\n padding-bottom: 2rem;\n}\n\n.restore-grav-intro {\n margin-left: 1.5rem;\n margin-bottom: 1.5rem;\n}\n\n.restore-grav-table {\n margin-bottom: 1.5rem;\n}\n\n.restore-grav-table code {\n white-space: nowrap;\n}\n\n.restore-grav-content .button-bar {\n margin-bottom: 1rem;\n}\n') %} +

{{ "PLUGIN_ADMIN.RESTORE_GRAV"|t }}

@@ -20,7 +23,6 @@ {{ "PLUGIN_ADMIN.RESTORE_GRAV_TABLE_SNAPSHOT"|t }} {{ "PLUGIN_ADMIN.RESTORE_GRAV_TABLE_VERSION"|t }} {{ "PLUGIN_ADMIN.RESTORE_GRAV_TABLE_CREATED"|t }} - {{ "PLUGIN_ADMIN.RESTORE_GRAV_TABLE_LOCATION"|t }} {{ "PLUGIN_ADMIN.RESTORE_GRAV_TABLE_ACTIONS"|t }} @@ -41,13 +43,6 @@ {{ "PLUGIN_ADMIN.UNKNOWN"|t }} {% endif %} - - {% if snapshot.backup_path %} - {{ snapshot.backup_path }} - {% else %} - {{ "PLUGIN_ADMIN.UNKNOWN"|t }} - {% endif %} -
diff --git a/themes/grav/templates/tools.html.twig b/themes/grav/templates/tools.html.twig index 51ed06fa..7b168ef6 100644 --- a/themes/grav/templates/tools.html.twig +++ b/themes/grav/templates/tools.html.twig @@ -39,6 +39,7 @@
{% endif %} + {{ dump(tools) }} {% endblock %} {% block content %}