improve baseline

This commit is contained in:
Dennis Eichhorn 2020-02-06 23:54:01 +01:00
parent 5b73722fc5
commit 3f1ea85dc8
3 changed files with 15 additions and 15 deletions

View File

@ -71,7 +71,7 @@ final class BackendController extends Controller
*/
public function viewProfileList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Profile/Theme/Backend/profile-list');
$view->setData('accounts', ProfileMapper::getNewest(25));
@ -96,7 +96,7 @@ final class BackendController extends Controller
*/
public function viewProfileSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$view = new View($this->app->l11nManager, $request, $response);
/** @var \phpOMS\Model\Html\Head $head */
$head = $response->get('Content')->getData('head');
@ -105,17 +105,17 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/Profile/Theme/Backend/profile-single');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000301001, $request, $response));
$mediaListView = new \Modules\Media\Theme\Backend\Components\Media\BaseView($this->app, $request, $response);
$mediaListView = new \Modules\Media\Theme\Backend\Components\Media\BaseView($this->app->l11nManager, $request, $response);
$mediaListView->setTemplate('/Modules/Media/Theme/Backend/Components/Media/list');
$view->addData('medialist', $mediaListView);
$calendarView = new \Modules\Calendar\Theme\Backend\Components\Calendar\BaseView($this->app, $request, $response);
$calendarView = new \Modules\Calendar\Theme\Backend\Components\Calendar\BaseView($this->app->l11nManager, $request, $response);
$calendarView->setTemplate('/Modules/Calendar/Theme/Backend/Components/Calendar/mini');
$view->addData('calendar', $calendarView);
$view->setData('account', ProfileMapper::get((int) $request->getData('id')));
$accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app, $request, $response);
$accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('accGrpSelector', $accGrpSelector);
$settings = $this->app->appSettings->get([
@ -146,7 +146,7 @@ final class BackendController extends Controller
*/
public function viewProfileAdminSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Profile/Theme/Backend/modules-settings');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000300000, $request, $response));
@ -166,11 +166,11 @@ final class BackendController extends Controller
*/
public function viewProfileAdminCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Profile/Theme/Backend/modules-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000300000, $request, $response));
$accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app, $request, $response);
$accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('accGrpSelector', $accGrpSelector);
return $view;

View File

@ -14,7 +14,7 @@ declare(strict_types=1);
namespace Modules\Profile\Theme\Backend\Components\AccountGroupSelector;
use phpOMS\ApplicationAbstract;
use phpOMS\Localization\L11nManager;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View;
@ -37,12 +37,12 @@ class BaseView extends View
/**
* {@inheritdoc}
*/
public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
public function __construct(L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response)
{
parent::__construct($app, $request, $response);
parent::__construct($l11n, $request, $response);
$this->setTemplate('/Modules/Profile/Theme/Backend/Components/AccountGroupSelector/base');
$view = new PopupView($app, $request, $response);
$view = new PopupView($l11n, $request, $response);
$this->addData('popup', $view);
}

View File

@ -14,7 +14,7 @@ declare(strict_types=1);
namespace Modules\Profile\Theme\Backend\Components\AccountGroupSelector;
use phpOMS\ApplicationAbstract;
use phpOMS\Localization\L11nManager;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View;
@ -35,9 +35,9 @@ class PopupView extends View
/**
* {@inheritdoc}
*/
public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response)
public function __construct(L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response)
{
parent::__construct($app, $request, $response);
parent::__construct($l11n, $request, $response);
$this->setTemplate('/Modules/Profile/Theme/Backend/Components/AccountGroupSelector/popup');
}