Restructure

This commit is contained in:
Dennis Eichhorn 2015-12-31 18:05:19 +01:00
parent 80213d2be0
commit 54292bb6fb
11 changed files with 19 additions and 16 deletions

View File

@ -15,7 +15,7 @@
*/ */
namespace Modules\Profile\Admin; namespace Modules\Profile\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\ActivateAbstract; use phpOMS\Module\ActivateAbstract;

View File

@ -15,7 +15,7 @@
*/ */
namespace Modules\Profile\Admin; namespace Modules\Profile\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\DeactivateAbstract; use phpOMS\Module\DeactivateAbstract;

View File

@ -14,6 +14,7 @@
* @link http://orange-management.com * @link http://orange-management.com
*/ */
namespace Modules\Profile\Admin\Install; namespace Modules\Profile\Admin\Install;
use phpOMS\DataStorage\Database\Pool;
/** /**
* Navigation class. * Navigation class.
@ -33,6 +34,7 @@ class Navigation
$navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
$class = '\\Modules\\Navigation\\Admin\\Installer'; $class = '\\Modules\\Navigation\\Admin\\Installer';
/** @var $class \Modules\Navigation\Admin\Installer */
$class::installExternal($dbPool, $navData); $class::installExternal($dbPool, $navData);
} }
} }

View File

@ -15,7 +15,7 @@
*/ */
namespace Modules\Profile\Admin; namespace Modules\Profile\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\UninstallAbstract; use phpOMS\Module\UninstallAbstract;

View File

@ -15,9 +15,10 @@
*/ */
namespace Modules\Profile\Admin; namespace Modules\Profile\Admin;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\UpdateAbstract; use phpOMS\Module\UpdateAbstract;
use phpOMS\System\FileSystem;
/** /**
* Navigation class. * Navigation class.
@ -38,6 +39,8 @@ class Update extends UpdateAbstract
*/ */
public static function update(Pool $dbPool, array $info) public static function update(Pool $dbPool, array $info)
{ {
FileSystem::deletePath(__DIR__ . '/Update');
mkdir('Update');
parent::update($dbPool, $info); parent::update($dbPool, $info);
} }
} }

View File

@ -62,7 +62,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var \string * @var \string
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $module = 'Profile'; const MODULE_NAME = 'Profile';
/** /**
* Localization files. * Localization files.
@ -71,7 +71,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $localization = [ protected static $localization = [
RequestDestination::BACKEND => ['backend'], RequestDestination::BACKEND => [''],
]; ];
/** /**
@ -80,9 +80,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var \string * @var \string
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $providing = [ protected static $providing = [];
'Content',
];
/** /**
* Dependencies. * Dependencies.
@ -115,7 +113,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function viewProfileList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewProfileList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Profile/Theme/backend/profile-list'); $view->setTemplate('/Modules/Profile/Theme/Backend/profile-list');
return $view; return $view;
} }
@ -134,7 +132,7 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
$nav = Navigation::getInstance($request, $this->app->dbPool); $nav = Navigation::getInstance($request, $this->app->dbPool);
$navView = new NavigationView($this->app, $request, $response); $navView = new NavigationView($this->app, $request, $response);
$navView->setTemplate('/Modules/Navigation/Theme/backend/mid'); $navView->setTemplate('/Modules/Navigation/Theme/Backend/mid');
$navView->setNav($nav->getNav()); $navView->setNav($nav->getNav());
$navView->setLanguage($request->getL11n()->language); $navView->setLanguage($request->getL11n()->language);
$navView->setParent($pageId); $navView->setParent($pageId);

View File

@ -17,13 +17,13 @@
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
*/ */
$nav = new \Modules\Navigation\Views\NavigationView($this->app, $this->request, $this->response); $nav = new \Modules\Navigation\Views\NavigationView($this->app, $this->request, $this->response);
$nav->setTemplate('/Modules/Navigation/Theme/backend/mid'); $nav->setTemplate('/Modules/Navigation/Theme/Backend/mid');
$nav->setNav($this->getData('nav')); $nav->setNav($this->getData('nav'));
$nav->setLanguage($this->l11n->language); $nav->setLanguage($this->l11n->language);
$nav->setParent(1000301001); $nav->setParent(1000301001);
$sidenav = new \Modules\Navigation\Views\NavigationView($this->app, $this->request, $this->response); $sidenav = new \Modules\Navigation\Views\NavigationView($this->app, $this->request, $this->response);
$sidenav->setTemplate('/Modules/Navigation/Theme/backend/mid-side'); $sidenav->setTemplate('/Modules/Navigation/Theme/Backend/mid-side');
$sidenav->setNav($this->getData('nav')); $sidenav->setNav($this->getData('nav'));
$sidenav->setLanguage($this->l11n->language); $sidenav->setLanguage($this->l11n->language);
$sidenav->setParent(1000301001); $sidenav->setParent(1000301001);
@ -33,7 +33,7 @@ $sidenav->setParent(1000301001);
<div class="b-7" id="i3-2-1"> <div class="b-7" id="i3-2-1">
<div class="b-5" id="i3-2-4"> <div class="b-5" id="i3-2-4">
<div class="bc-1"> <div class="bc-1">
<img src="/Modules/Profile/Theme/backend/img/profile-default-small.jpg" itemprop="image"> <img src="/Modules/Profile/Theme/Backend/img/profile-default-small.jpg" itemprop="image">
</div> </div>
</div> </div>
<?= $sidenav->render(); ?> <?= $sidenav->render(); ?>

View File

@ -35,7 +35,7 @@
], ],
"type": 5, "type": 5,
"for": "Content", "for": "Content",
"file": "backend", "file": "",
"from": "Profile" "from": "Profile"
}, },
{ {
@ -45,7 +45,7 @@
"type": 5, "type": 5,
"from": "Profile", "from": "Profile",
"for": "Navigation", "for": "Navigation",
"file": "nav.backend" "file": "Navigation"
} }
] ]
} }