* [MOD] Improved layouts/templates handling. Work in progress.

* [MOD] Improved bootstrap workflow. Work in progress.
* [MOD] Improved installer workflow. Work in progress.
This commit is contained in:
nuxsmin
2018-02-13 01:22:49 +01:00
parent 90c347a552
commit 8ef11d0d6c
17 changed files with 227 additions and 113 deletions

View File

@@ -110,7 +110,6 @@ abstract class ControllerBase
$this->controllerName = substr($class, strrpos($class, '\\') + 1, -strlen('Controller'));
$this->actionName = $actionName;
$this->view = new Template();
$this->view->setBase(strtolower($this->controllerName));
$this->icons = $this->theme->getIcons();
@@ -149,8 +148,9 @@ abstract class ControllerBase
* @param EventDispatcher $ev
* @param Acl $acl
* @param Klein $router
* @param Template $view
*/
public function inject(Config $config, Session $session, Theme $theme, EventDispatcher $ev, Acl $acl, Klein $router)
public function inject(Config $config, Session $session, Theme $theme, EventDispatcher $ev, Acl $acl, Klein $router, Template $view)
{
$this->config = $config;
$this->configData = $config->getConfigData();
@@ -159,6 +159,7 @@ abstract class ControllerBase
$this->eventDispatcher = $ev;
$this->acl = $acl;
$this->router = $router;
$this->view = $view;
}
/**