From 67519fd63293f97c74b008d84900df589e75c703 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Tue, 25 Aug 2015 17:20:07 +0200 Subject: [PATCH 01/53] fix #99 problem with site link --- admin.php | 2 +- themes/grav/templates/partials/base.html.twig | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/admin.php b/admin.php index c51875f2..93e75f02 100644 --- a/admin.php +++ b/admin.php @@ -207,7 +207,7 @@ class AdminPlugin extends Plugin $ext = '.' . ($format ? $format : 'html') . TWIG_EXT; $twig->twig_vars['location'] = $this->template; - $twig->twig_vars['base_url_relative_frontend'] = $twig->twig_vars['base_url_relative']; + $twig->twig_vars['base_url_relative_frontend'] = $twig->twig_vars['base_url_relative'] ?: '/'; $twig->twig_vars['admin_route'] = trim($this->config->get('plugins.admin.route'), '/'); $twig->twig_vars['base_url_relative'] .= ($twig->twig_vars['base_url_relative'] != '/' ? '/' : '') . $twig->twig_vars['admin_route']; diff --git a/themes/grav/templates/partials/base.html.twig b/themes/grav/templates/partials/base.html.twig index 377ebf8a..5c2ece7c 100644 --- a/themes/grav/templates/partials/base.html.twig +++ b/themes/grav/templates/partials/base.html.twig @@ -1,4 +1,3 @@ -{% set base_url_relative_frontend = base_url_relative_frontend is not empty ?: '/' %} From 77fb9e21c87ceaacbf3e053e7a9fbc25e2c15572 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Tue, 25 Aug 2015 17:20:15 +0200 Subject: [PATCH 02/53] Drop dump --- themes/grav/templates/pages.html.twig | 2 -- 1 file changed, 2 deletions(-) diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig index e40fc539..800a0b27 100644 --- a/themes/grav/templates/pages.html.twig +++ b/themes/grav/templates/pages.html.twig @@ -136,8 +136,6 @@ {% endif %} {% endif %} - {{ dump(admin_lang) }} -
{% if exists and admin.multilang %} From 6aac790f723d8ff7dff6777bcbe525f8b4a618d0 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Tue, 25 Aug 2015 10:20:07 -0600 Subject: [PATCH 03/53] Missed lang strings in english --- languages.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/languages.yaml b/languages.yaml index 51dd1bd9..e18105cd 100644 --- a/languages.yaml +++ b/languages.yaml @@ -207,6 +207,8 @@ en: DELIMITER_HELP: "The summary delimiter (default '===')" METADATA: Metadata METADATA_HELP: "Default metadata values that will be displayed on every page unless overridden by the page" + NAME: Name + CONTENT: Content REDIRECTS_AND_ROUTES: Redirects & Routes CUSTOM_REDIRECTS: Custom Redirects CUSTOM_REDIRECTS_HELP: "routes to redirect to other pages. Standard Regex replacement is valid" From 0603072c6626be4e8eaa414428baeabd623b42d0 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Tue, 25 Aug 2015 18:23:45 +0200 Subject: [PATCH 04/53] Fixes #97, missing admin language in the content languages list --- themes/grav/templates/pages.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig index 800a0b27..31541353 100644 --- a/themes/grav/templates/pages.html.twig +++ b/themes/grav/templates/pages.html.twig @@ -145,7 +145,7 @@