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

Merge remote-tracking branch 'origin/develop' into feature/es6_revamp

Browse Source 
# Conflicts:
#	languages/en.yaml
#	themes/grav/css-compiled/template.css
#	themes/grav/css-compiled/template.css.map
#	themes/grav/templates/forms/fields/tabs/tabs.html.twig
This commit is contained in:
Djamil Legato
2016-02-09 13:04:16 -08:00
parent fab26a31fc 5b3f64069d
commit 22055f8a19
43 changed files with 6323 additions and 4024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
admin.php
View File

@@ -257,7 +257,7 @@ class AdminPlugin extends Plugin
}
// Replace themes service with admin.
$this->grav['themes'] = function ($c) {
$this->grav['themes'] = function () {
require_once __DIR__ . '/classes/themes.php';
return new Themes($this->grav);
};
@@ -411,9 +411,6 @@ class AdminPlugin extends Plugin
{
$twig = $this->grav['twig'];
// Dynamic type support
$format = $this->uri->extension();
$twig->twig_vars['location'] = $this->template;
$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'), '/');
@@ -436,7 +433,18 @@ class AdminPlugin extends Plugin
break;
case 'pages':
$page = $this->admin->page(true);
$path = $this->route;
if (!$path) {
$path = '/';
}
if (!isset($this->pages[$path])) {
$page = null;
} else {
$page = $this->pages[$path];
}
if ($page != null) {
$twig->twig_vars['file'] = File::instance($page->filePath());
$twig->twig_vars['media_types'] = str_replace('defaults,', '',
@@ -555,6 +563,7 @@ class AdminPlugin extends Plugin
$this->admin = new Admin($this->grav, $this->base, $this->template, $this->route);
// And store the class into DI container.
$this->grav['admin'] = $this->admin;