Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-07-13 16:23:22 +02:00
Code Issues Packages Projects Releases Activity

Fix site title issue when installing a theme/plugin, title was "Plugin: | Grav" or "Theme: | Grav"

Browse Source
This commit is contained in:
Flavio Copes
2016-03-10 18:28:26 +01:00
parent b99f6c5f92
commit 67c4a4e501
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
themes/grav/templates/plugins.html.twig
View File

@@ -5,19 +5,21 @@
{% if plugin_slug %}
{% set installing = plugin_slug starts with 'install' %}
{# Try installed packages first, then remote #}
{% set package = admin.plugins(true)[plugin_slug] %}
{% if (not package) %}
{# Remote #}
{% set package = admin.plugins(false)[plugin_slug] %}
{% set installed = false %}
{% if installing %}
{% set title = "PLUGIN_ADMIN.PLUGINS"|tu %}
{% else %}
{# Local #}
{% set installed = true %}
{% endif %}
{% set plugin = package.toArray() %}
{% set title = "PLUGIN_ADMIN.PLUGIN"|tu ~ ": " ~ plugin.name|e %}
{# Try installed packages first, then remote #}
{% set package = admin.plugins(true)[admin.route] %}
{% if (not package) %}
{% set package = admin.plugins(false)[admin.route] %}
{% set installed = false %}
{% endif %}
{% set plugin = package.toArray() %}
{% set title = "PLUGIN_ADMIN.PLUGIN"|tu ~ ": " ~ plugin.name|e %}
{% endif %}
{% else %}
{% set title = "PLUGIN_ADMIN.PLUGINS"|tu %}
{% endif %}

23
themes/grav/templates/themes.html.twig
View File

@@ -2,17 +2,22 @@
{% if admin.route %}
{% set installing = admin.route starts with 'install' %}
{% set installed = true %}
{# Try installed packages first, then remote #}
{% set package = admin.themes(true)[admin.route] %}
{% if (not package) %}
{% set package = admin.themes(false)[admin.route] %}
{% set installed = false %}
{% if installing %}
{% set title = "PLUGIN_ADMIN.THEMES"|tu %}
{% else %}
{% set installed = true %}
{# Try installed packages first, then remote #}
{% set package = admin.themes(true)[admin.route] %}
{% if (not package) %}
{% set package = admin.themes(false)[admin.route] %}
{% set installed = false %}
{% endif %}
{% set theme = package.toArray() %}
{% set title = "PLUGIN_ADMIN.THEME"|tu ~ ": " ~ theme.name|e %}
{% endif %}
{% set theme = package.toArray() %}
{% set title = "PLUGIN_ADMIN.THEME"|tu ~ ": " ~ theme.name|e %}
{% else %}
{% set title = "PLUGIN_ADMIN.THEMES"|tu %}
{% endif %}