Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-01-06 15:43:01 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' into feature/admin_registration

Browse Source
This commit is contained in:
Andy Miller
2015-12-10 11:02:47 -07:00
parent ed51e48e35 88550797e3
commit 4e1f1109e1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin.php
View File

@@ -429,7 +429,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_simple'] . '/' . $twig->twig_vars['admin_route'];

2
themes/grav/templates/partials/base.html.twig
View File

@@ -13,7 +13,7 @@
<meta name="robots" content="{{ header.robots }}">
{% endif %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="icon" type="image/png" href="{{ base_url_relative_frontend }}{{ theme_url }}/images/favicon.png">
<link rel="icon" type="image/png" href="{{ base_url_simple }}{{ theme_url }}/images/favicon.png">
{% block stylesheets %}
{% do assets.addCss(theme_url~'/css-compiled/nucleus.css') %}