Minor improvements

This commit is contained in:
Sommerregen
2015-10-26 21:30:33 +01:00
parent 1354009df1
commit 42b3a09982

View File

@@ -195,6 +195,16 @@ class AdminPlugin extends Plugin
$plugins = Grav::instance()['config']->get('plugins', []); $plugins = Grav::instance()['config']->get('plugins', []);
foreach($plugins as $plugin => $data) { foreach($plugins as $plugin => $data) {
$path = $locator->findResource(
"user://plugins/{$plugin}/pages/admin/{$self->template}.md");
if (file_exists($path)) {
$page->init(new \SplFileInfo($path));
$page->slug(basename($self->template));
return $page;
}
// DEPRECATED: Will be removed!
$folder = GRAV_ROOT . "/user/plugins/" . $plugin . "/admin"; $folder = GRAV_ROOT . "/user/plugins/" . $plugin . "/admin";
if (file_exists($folder)) { if (file_exists($folder)) {
@@ -245,6 +255,9 @@ class AdminPlugin extends Plugin
$twig->twig_vars['admin'] = $this->admin; $twig->twig_vars['admin'] = $this->admin;
// Gather Plugin-hooked nav items // Gather Plugin-hooked nav items
$this->grav->fireEvent('onAdminMenu');
// DEPRECATED
$this->grav->fireEvent('onAdminTemplateNavPluginHook'); $this->grav->fireEvent('onAdminTemplateNavPluginHook');
switch ($this->template) { switch ($this->template) {