From b719340c66fe7cde18e7901a21aee035f96c902a Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 9 Oct 2016 20:07:30 +0200 Subject: [PATCH 1/7] Fix install --- Admin/Install/Navigation.php | 2 +- Admin/Installer.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 5edb3cc..ec9842f 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool; */ class Navigation { - public static function install(Pool $dbPool) + public static function install(string $path, Pool $dbPool) { $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); diff --git a/Admin/Installer.php b/Admin/Installer.php index fcbb763..bc24639 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -37,9 +37,9 @@ class Installer extends InstallerAbstract /** * {@inheritdoc} */ - public static function install(Pool $dbPool, InfoManager $info) + public static function install(string $path, Pool $dbPool, InfoManager $info) { - parent::install($dbPool, $info); + parent::install($path, $dbPool, $info); switch ($dbPool->get('core')->getType()) { case DatabaseType::MYSQL: From afce86894fc6100b599c846f8c0e5933f6500f20 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 29 Oct 2016 20:44:52 +0200 Subject: [PATCH 2/7] Adjust database pool name --- Admin/Activate.php | 4 ++-- Admin/Deactivate.php | 4 ++-- Admin/Install/Navigation.php | 4 ++-- Admin/Installer.php | 4 ++-- Admin/Uninstall.php | 4 ++-- Admin/Update.php | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Admin/Activate.php b/Admin/Activate.php index 268a9cc..59b5eb6 100644 --- a/Admin/Activate.php +++ b/Admin/Activate.php @@ -16,7 +16,7 @@ namespace Modules\RiskManagement\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\ActivateAbstract; use phpOMS\Module\InfoManager; @@ -37,7 +37,7 @@ class Activate extends ActivateAbstract /** * {@inheritdoc} */ - public static function activate(Pool $dbPool, InfoManager $info) + public static function activate(DatabasePool $dbPool, InfoManager $info) { parent::activate($dbPool, $info); } diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php index bf9a2e5..5f49b89 100644 --- a/Admin/Deactivate.php +++ b/Admin/Deactivate.php @@ -16,7 +16,7 @@ namespace Modules\RiskManagement\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\DeactivateAbstract; use phpOMS\Module\InfoManager; @@ -37,7 +37,7 @@ class Deactivate extends DeactivateAbstract /** * {@inheritdoc} */ - public static function deactivate(Pool $dbPool, InfoManager $info) + public static function deactivate(DatabasePool $dbPool, InfoManager $info) { parent::deactivate($dbPool, $info); } diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index ec9842f..171918a 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -14,7 +14,7 @@ * @link http://orange-management.com */ namespace Modules\RiskManagement\Admin\Install; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; /** * Navigation class. @@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool; */ class Navigation { - public static function install(string $path, Pool $dbPool) + public static function install(string $path, DatabasePool $dbPool) { $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); diff --git a/Admin/Installer.php b/Admin/Installer.php index bc24639..f394546 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -16,7 +16,7 @@ namespace Modules\RiskManagement\Admin; use phpOMS\DataStorage\Database\DatabaseType; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\InfoManager; use phpOMS\Module\InstallerAbstract; @@ -37,7 +37,7 @@ class Installer extends InstallerAbstract /** * {@inheritdoc} */ - public static function install(string $path, Pool $dbPool, InfoManager $info) + public static function install(string $path, DatabasePool $dbPool, InfoManager $info) { parent::install($path, $dbPool, $info); diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php index 805680e..16f416a 100644 --- a/Admin/Uninstall.php +++ b/Admin/Uninstall.php @@ -16,7 +16,7 @@ namespace Modules\RiskManagement\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\Schema\Builder; use phpOMS\Module\UninstallAbstract; @@ -37,7 +37,7 @@ class Uninstall extends UninstallAbstract /** * {@inheritdoc} */ - public static function uninstall(Pool $dbPool, InfoManager $info) + public static function uninstall(DatabasePool $dbPool, InfoManager $info) { parent::uninstall($dbPool, $info); diff --git a/Admin/Update.php b/Admin/Update.php index a0bdd46..651feaa 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -16,7 +16,7 @@ namespace Modules\RiskManagement\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\UpdateAbstract; use phpOMS\System\File\Directory; @@ -37,7 +37,7 @@ class Update extends UpdateAbstract /** * {@inheritdoc} */ - public static function update(Pool $dbPool, array $info) + public static function update(DatabasePool $dbPool, array $info) { Directory::deletePath(__DIR__ . '/Update'); mkdir('Update'); From 5d33978efc3367314df1b3db8c325580144e4eb3 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 23 Nov 2016 23:50:37 +0100 Subject: [PATCH 3/7] [RiskManagement] Template cleanup --- Admin/Routes/Web/Backend.php | 6 +++ Controller.php | 19 ++++++++ Theme/backend/cockpit.tpl.php | 5 +++ Theme/backend/risk-create.tpl.php | 72 +++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+) diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index f9f0406..cc2b3d9 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -15,6 +15,12 @@ return [ 'verb' => RouteVerb::GET, ], ], + '^.*/backend/controlling/riskmanagement/risk/create.*$' => [ + [ + 'dest' => '\Modules\RiskManagement\Controller:viewRiskCreate', + 'verb' => RouteVerb::GET, + ], + ], '^.*/backend/controlling/riskmanagement/cause/list.*$' => [ [ 'dest' => '\Modules\RiskManagement\Controller:viewRiskCauseList', diff --git a/Controller.php b/Controller.php index 71bb7c1..d96d128 100644 --- a/Controller.php +++ b/Controller.php @@ -118,6 +118,25 @@ class Controller extends ModuleAbstract implements WebInterface return $view; } + /** + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + * @author Dennis Eichhorn + */ + public function viewRiskCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + { + $view = new View($this->app, $request, $response); + $view->setTemplate('/Modules/RiskManagement/Theme/Backend/risk-create'); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + + return $view; + } + /** * @param RequestAbstract $request Request * @param ResponseAbstract $response Response diff --git a/Theme/backend/cockpit.tpl.php b/Theme/backend/cockpit.tpl.php index ffe2d59..5edc20c 100644 --- a/Theme/backend/cockpit.tpl.php +++ b/Theme/backend/cockpit.tpl.php @@ -57,6 +57,11 @@ echo $this->getData('nav')->render(); ?>
+
+
+ getText('NewRisk'); ?> +
+

getText('Statistics'); ?>

diff --git a/Theme/backend/risk-create.tpl.php b/Theme/backend/risk-create.tpl.php index ac22ab8..854c352 100644 --- a/Theme/backend/risk-create.tpl.php +++ b/Theme/backend/risk-create.tpl.php @@ -14,3 +14,75 @@ * @link http://orange-management.com */ echo $this->getData('nav')->render(); ?> + +
+
+
    +
  • +
  • +
  • +
+
+
+ +
+
+

getText('Risk'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+

getText('Permissions'); ?>

+ +
+
+ + +
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
\ No newline at end of file From 068c1baa889261af53e8761f8cd4f9097a4b8c6c Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 23 Nov 2016 23:50:51 +0100 Subject: [PATCH 4/7] [RiskManagement] Path fix --- Theme/Backend/cockpit.tpl.php | 5 +++ Theme/Backend/risk-create.tpl.php | 72 +++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/Theme/Backend/cockpit.tpl.php b/Theme/Backend/cockpit.tpl.php index ffe2d59..5edc20c 100644 --- a/Theme/Backend/cockpit.tpl.php +++ b/Theme/Backend/cockpit.tpl.php @@ -57,6 +57,11 @@ echo $this->getData('nav')->render(); ?>
+
+
+ getText('NewRisk'); ?> +
+

getText('Statistics'); ?>

diff --git a/Theme/Backend/risk-create.tpl.php b/Theme/Backend/risk-create.tpl.php index ac22ab8..854c352 100644 --- a/Theme/Backend/risk-create.tpl.php +++ b/Theme/Backend/risk-create.tpl.php @@ -14,3 +14,75 @@ * @link http://orange-management.com */ echo $this->getData('nav')->render(); ?> + +
+
+
    +
  • +
  • +
  • +
+
+
+ +
+
+

getText('Risk'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+

getText('Permissions'); ?>

+ +
+
+ + +
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
\ No newline at end of file From ed3da09524eda3d20664a17beed2c21d447e2d34 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 7 Dec 2016 20:23:04 +0100 Subject: [PATCH 5/7] Prepare const visibility --- Controller.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Controller.php b/Controller.php index d96d128..1cad233 100644 --- a/Controller.php +++ b/Controller.php @@ -45,7 +45,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_PATH = __DIR__; + /* public */ const MODULE_PATH = __DIR__; /** * Module version. @@ -53,7 +53,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_VERSION = '1.0.0'; + /* public */ const MODULE_VERSION = '1.0.0'; /** * Module name. @@ -61,7 +61,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_NAME = 'RiskManagement'; + /* public */ const MODULE_NAME = 'RiskManagement'; /** * Providing. From f9ba82cd0d7fb80fc2b4343a0207ed4c2311d7b9 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 7 Dec 2016 20:56:15 +0100 Subject: [PATCH 6/7] Increase php version requirement --- Admin/Activate.php | 2 +- Admin/Deactivate.php | 2 +- Admin/Install/Navigation.php | 2 +- Admin/Installer.php | 2 +- Admin/Uninstall.php | 2 +- Admin/Update.php | 2 +- Controller.php | 2 +- Theme/Backend/Lang/Navigation.en.lang.php | 2 +- Theme/Backend/Lang/en.lang.php | 2 +- Theme/Backend/category-list.tpl.php | 2 +- Theme/Backend/cause-create.tpl.php | 2 +- Theme/Backend/cause-list.tpl.php | 2 +- Theme/Backend/cockpit.tpl.php | 2 +- Theme/Backend/department-list.tpl.php | 2 +- Theme/Backend/process-list.tpl.php | 2 +- Theme/Backend/project-list.tpl.php | 2 +- Theme/Backend/risk-create.tpl.php | 2 +- Theme/Backend/risk-list.tpl.php | 2 +- Theme/Backend/risk-single-cause.tpl.php | 2 +- Theme/Backend/risk-single-dashboard.tpl.php | 2 +- Theme/Backend/risk-single-solution.tpl.php | 2 +- Theme/Backend/settings-dashboard.tpl.php | 2 +- Theme/Backend/solution-create.tpl.php | 2 +- Theme/Backend/solution-list.tpl.php | 2 +- Theme/Backend/unit-list.tpl.php | 2 +- Theme/backend/Lang/Navigation.en.lang.php | 2 +- Theme/backend/Lang/en.lang.php | 2 +- Theme/backend/category-list.tpl.php | 2 +- Theme/backend/cause-create.tpl.php | 2 +- Theme/backend/cause-list.tpl.php | 2 +- Theme/backend/cockpit.tpl.php | 2 +- Theme/backend/department-list.tpl.php | 2 +- Theme/backend/process-list.tpl.php | 2 +- Theme/backend/project-list.tpl.php | 2 +- Theme/backend/risk-create.tpl.php | 2 +- Theme/backend/risk-list.tpl.php | 2 +- Theme/backend/risk-single-cause.tpl.php | 2 +- Theme/backend/risk-single-dashboard.tpl.php | 2 +- Theme/backend/risk-single-solution.tpl.php | 2 +- Theme/backend/settings-dashboard.tpl.php | 2 +- Theme/backend/solution-create.tpl.php | 2 +- Theme/backend/solution-list.tpl.php | 2 +- Theme/backend/unit-list.tpl.php | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Admin/Activate.php b/Admin/Activate.php index 59b5eb6..01a8e96 100644 --- a/Admin/Activate.php +++ b/Admin/Activate.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php index 5f49b89..5195f3f 100644 --- a/Admin/Deactivate.php +++ b/Admin/Deactivate.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 171918a..81a8644 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Installer.php b/Admin/Installer.php index f394546..c8cd5ec 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php index 16f416a..e5131bf 100644 --- a/Admin/Uninstall.php +++ b/Admin/Uninstall.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Update.php b/Admin/Update.php index 651feaa..a130a0d 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Controller.php b/Controller.php index 1cad233..bb4b34f 100644 --- a/Controller.php +++ b/Controller.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index cf4c92f..8f15e08 100644 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 817f1da..016c00e 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/category-list.tpl.php b/Theme/Backend/category-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/Backend/category-list.tpl.php +++ b/Theme/Backend/category-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/cause-create.tpl.php b/Theme/Backend/cause-create.tpl.php index ac22ab8..9648889 100644 --- a/Theme/Backend/cause-create.tpl.php +++ b/Theme/Backend/cause-create.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/cause-list.tpl.php b/Theme/Backend/cause-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/Backend/cause-list.tpl.php +++ b/Theme/Backend/cause-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/cockpit.tpl.php b/Theme/Backend/cockpit.tpl.php index 5edc20c..a2503fd 100644 --- a/Theme/Backend/cockpit.tpl.php +++ b/Theme/Backend/cockpit.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/Backend/department-list.tpl.php +++ b/Theme/Backend/department-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/process-list.tpl.php b/Theme/Backend/process-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/Backend/process-list.tpl.php +++ b/Theme/Backend/process-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/project-list.tpl.php b/Theme/Backend/project-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/Backend/project-list.tpl.php +++ b/Theme/Backend/project-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/risk-create.tpl.php b/Theme/Backend/risk-create.tpl.php index 854c352..2c1f035 100644 --- a/Theme/Backend/risk-create.tpl.php +++ b/Theme/Backend/risk-create.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/risk-list.tpl.php b/Theme/Backend/risk-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/Backend/risk-list.tpl.php +++ b/Theme/Backend/risk-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/risk-single-cause.tpl.php b/Theme/Backend/risk-single-cause.tpl.php index ac22ab8..9648889 100644 --- a/Theme/Backend/risk-single-cause.tpl.php +++ b/Theme/Backend/risk-single-cause.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/risk-single-dashboard.tpl.php b/Theme/Backend/risk-single-dashboard.tpl.php index ac22ab8..9648889 100644 --- a/Theme/Backend/risk-single-dashboard.tpl.php +++ b/Theme/Backend/risk-single-dashboard.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/risk-single-solution.tpl.php b/Theme/Backend/risk-single-solution.tpl.php index ac22ab8..9648889 100644 --- a/Theme/Backend/risk-single-solution.tpl.php +++ b/Theme/Backend/risk-single-solution.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/settings-dashboard.tpl.php b/Theme/Backend/settings-dashboard.tpl.php index ac22ab8..9648889 100644 --- a/Theme/Backend/settings-dashboard.tpl.php +++ b/Theme/Backend/settings-dashboard.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/solution-create.tpl.php b/Theme/Backend/solution-create.tpl.php index ac22ab8..9648889 100644 --- a/Theme/Backend/solution-create.tpl.php +++ b/Theme/Backend/solution-create.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/solution-list.tpl.php b/Theme/Backend/solution-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/Backend/solution-list.tpl.php +++ b/Theme/Backend/solution-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/Backend/unit-list.tpl.php +++ b/Theme/Backend/unit-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php index cf4c92f..8f15e08 100644 --- a/Theme/backend/Lang/Navigation.en.lang.php +++ b/Theme/backend/Lang/Navigation.en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php index 817f1da..016c00e 100644 --- a/Theme/backend/Lang/en.lang.php +++ b/Theme/backend/Lang/en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/category-list.tpl.php b/Theme/backend/category-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/backend/category-list.tpl.php +++ b/Theme/backend/category-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/cause-create.tpl.php b/Theme/backend/cause-create.tpl.php index ac22ab8..9648889 100644 --- a/Theme/backend/cause-create.tpl.php +++ b/Theme/backend/cause-create.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/cause-list.tpl.php b/Theme/backend/cause-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/backend/cause-list.tpl.php +++ b/Theme/backend/cause-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/cockpit.tpl.php b/Theme/backend/cockpit.tpl.php index 5edc20c..a2503fd 100644 --- a/Theme/backend/cockpit.tpl.php +++ b/Theme/backend/cockpit.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/department-list.tpl.php b/Theme/backend/department-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/backend/department-list.tpl.php +++ b/Theme/backend/department-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/process-list.tpl.php b/Theme/backend/process-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/backend/process-list.tpl.php +++ b/Theme/backend/process-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/project-list.tpl.php b/Theme/backend/project-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/backend/project-list.tpl.php +++ b/Theme/backend/project-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/risk-create.tpl.php b/Theme/backend/risk-create.tpl.php index 854c352..2c1f035 100644 --- a/Theme/backend/risk-create.tpl.php +++ b/Theme/backend/risk-create.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/risk-list.tpl.php b/Theme/backend/risk-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/backend/risk-list.tpl.php +++ b/Theme/backend/risk-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/risk-single-cause.tpl.php b/Theme/backend/risk-single-cause.tpl.php index ac22ab8..9648889 100644 --- a/Theme/backend/risk-single-cause.tpl.php +++ b/Theme/backend/risk-single-cause.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/risk-single-dashboard.tpl.php b/Theme/backend/risk-single-dashboard.tpl.php index ac22ab8..9648889 100644 --- a/Theme/backend/risk-single-dashboard.tpl.php +++ b/Theme/backend/risk-single-dashboard.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/risk-single-solution.tpl.php b/Theme/backend/risk-single-solution.tpl.php index ac22ab8..9648889 100644 --- a/Theme/backend/risk-single-solution.tpl.php +++ b/Theme/backend/risk-single-solution.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/settings-dashboard.tpl.php b/Theme/backend/settings-dashboard.tpl.php index ac22ab8..9648889 100644 --- a/Theme/backend/settings-dashboard.tpl.php +++ b/Theme/backend/settings-dashboard.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/solution-create.tpl.php b/Theme/backend/solution-create.tpl.php index ac22ab8..9648889 100644 --- a/Theme/backend/solution-create.tpl.php +++ b/Theme/backend/solution-create.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/solution-list.tpl.php b/Theme/backend/solution-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/backend/solution-list.tpl.php +++ b/Theme/backend/solution-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/unit-list.tpl.php b/Theme/backend/unit-list.tpl.php index ac22ab8..9648889 100644 --- a/Theme/backend/unit-list.tpl.php +++ b/Theme/backend/unit-list.tpl.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD From 3ad0dcbae0cbbb336a08cafd827ff7730f586610 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 14 Dec 2016 21:27:04 +0100 Subject: [PATCH 7/7] Template & lang fixes --- Controller.php | 1 + Theme/Backend/Lang/en.lang.php | 16 +++ Theme/Backend/cockpit.tpl.php | 5 +- Theme/Backend/risk-create.tpl.php | 205 ++++++++++++++++++++++++++++-- Theme/backend/Lang/en.lang.php | 16 +++ Theme/backend/cockpit.tpl.php | 5 +- Theme/backend/risk-create.tpl.php | 205 ++++++++++++++++++++++++++++-- 7 files changed, 429 insertions(+), 24 deletions(-) diff --git a/Controller.php b/Controller.php index bb4b34f..06230b9 100644 --- a/Controller.php +++ b/Controller.php @@ -78,6 +78,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 */ protected static $dependencies = [ + 'Media' ]; /** diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 016c00e..b417076 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -16,6 +16,7 @@ return ['RiskManagement' => [ 'Active' => 'Active', 'All' => 'All', + 'Assessment' => 'Assessment', 'AvgRiskAmount' => 'Avg. Risk Amount', 'Basic' => 'Basic', 'Categories' => 'Categories', @@ -31,6 +32,7 @@ return ['RiskManagement' => [ 'Due' => 'Due', 'Evaluation' => 'Evaluation', 'Export' => 'Export', + 'Frequency' => 'Frequency', 'Front' => 'Front', 'History' => 'History', 'Interval' => 'Interval', @@ -42,9 +44,11 @@ return ['RiskManagement' => [ 'MainCategory' => 'Main Category', 'MainDepartment' => 'Main Department', 'Manager' => 'Manager', + 'Media' => 'Media', 'Name' => 'Name', 'Navigation' => 'Navigation', 'New' => 'New', + 'NewRisk' => 'New Risk', 'NextReevaluation' => 'Next Reevaluation', 'Outdated' => 'Outdated', 'OverallRisk' => 'Overall Risk', @@ -59,13 +63,22 @@ return ['RiskManagement' => [ 'Reduction' => 'Reduction', 'RemainingRisk' => 'Remaining Risk', 'Responsible' => 'Responsible', + 'Responsibility' => 'Responsibility', + 'Review' => 'Review', 'Risk' => 'Risk', 'RiskAcceptance' => 'Risk Acceptance', + 'RiskConsequence' => 'Risk Consequence', 'RiskIndex' => 'Risk Index', 'RiskLevels' => 'Risk Levels', + 'RiskLikelihood' => 'Risk Likelihood', + 'RiskObject' => 'Risk Object', + 'RiskObjects' => 'Risk Objects', + 'RiskObjectStatus' => 'Risk Object Status', 'RiskProbabilities' => 'Risk Probabilities', 'RiskProtection' => 'Risk Protection', + 'RiskStatus' => 'Risk Status', 'Risks' => 'Risks', + 'Select' => 'Select', 'Severity' => 'Severity', 'Solution' => 'Solution', 'Solutions' => 'Solutions', @@ -78,5 +91,8 @@ return ['RiskManagement' => [ 'Type' => 'Type', 'Unit' => 'Unit', 'Units' => 'Units', + 'Upload' => 'Upload', + 'UserGroup' => 'User/Group', + 'Value' => 'Value', 'Watchlist' => 'Watchlist', ]]; diff --git a/Theme/Backend/cockpit.tpl.php b/Theme/Backend/cockpit.tpl.php index a2503fd..9466c2d 100644 --- a/Theme/Backend/cockpit.tpl.php +++ b/Theme/Backend/cockpit.tpl.php @@ -38,6 +38,7 @@ echo $this->getData('nav')->render(); ?> getText('Category'); ?> getText('Process'); ?> getText('Project'); ?> + getText('Unit'); ?> render(); ?> @@ -48,10 +49,11 @@ echo $this->getData('nav')->render(); ?> getName(); ?> + - getText('Empty', 0, 0); ?> + getText('Empty', 0, 0); ?>
@@ -62,6 +64,7 @@ echo $this->getData('nav')->render(); ?> getText('NewRisk'); ?>
+

getText('Statistics'); ?>

diff --git a/Theme/Backend/risk-create.tpl.php b/Theme/Backend/risk-create.tpl.php index 2c1f035..c3ae3d2 100644 --- a/Theme/Backend/risk-create.tpl.php +++ b/Theme/Backend/risk-create.tpl.php @@ -19,8 +19,10 @@ echo $this->getData('nav')->render(); ?>
  • -
  • -
  • +
  • +
  • +
  • +
@@ -37,14 +39,6 @@ echo $this->getData('nav')->render(); ?> - - - - @@ -62,7 +56,23 @@ echo $this->getData('nav')->render(); ?>
-

getText('Permissions'); ?>

+

getText('Media'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+ +
+

getText('Responsibility'); ?>

@@ -80,9 +90,182 @@ echo $this->getData('nav')->render(); ?>
+
+

getText('RiskStatus'); ?>

+ +
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+

getText('Media'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+

getText('RiskObjects'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+ +
+

getText('Media'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+ +
+
+

getText('RiskObjectStatus'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+
+
+ +
+

getText('Media'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+ +
+
+

getText('Solution'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+

getText('Media'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php index 016c00e..b417076 100644 --- a/Theme/backend/Lang/en.lang.php +++ b/Theme/backend/Lang/en.lang.php @@ -16,6 +16,7 @@ return ['RiskManagement' => [ 'Active' => 'Active', 'All' => 'All', + 'Assessment' => 'Assessment', 'AvgRiskAmount' => 'Avg. Risk Amount', 'Basic' => 'Basic', 'Categories' => 'Categories', @@ -31,6 +32,7 @@ return ['RiskManagement' => [ 'Due' => 'Due', 'Evaluation' => 'Evaluation', 'Export' => 'Export', + 'Frequency' => 'Frequency', 'Front' => 'Front', 'History' => 'History', 'Interval' => 'Interval', @@ -42,9 +44,11 @@ return ['RiskManagement' => [ 'MainCategory' => 'Main Category', 'MainDepartment' => 'Main Department', 'Manager' => 'Manager', + 'Media' => 'Media', 'Name' => 'Name', 'Navigation' => 'Navigation', 'New' => 'New', + 'NewRisk' => 'New Risk', 'NextReevaluation' => 'Next Reevaluation', 'Outdated' => 'Outdated', 'OverallRisk' => 'Overall Risk', @@ -59,13 +63,22 @@ return ['RiskManagement' => [ 'Reduction' => 'Reduction', 'RemainingRisk' => 'Remaining Risk', 'Responsible' => 'Responsible', + 'Responsibility' => 'Responsibility', + 'Review' => 'Review', 'Risk' => 'Risk', 'RiskAcceptance' => 'Risk Acceptance', + 'RiskConsequence' => 'Risk Consequence', 'RiskIndex' => 'Risk Index', 'RiskLevels' => 'Risk Levels', + 'RiskLikelihood' => 'Risk Likelihood', + 'RiskObject' => 'Risk Object', + 'RiskObjects' => 'Risk Objects', + 'RiskObjectStatus' => 'Risk Object Status', 'RiskProbabilities' => 'Risk Probabilities', 'RiskProtection' => 'Risk Protection', + 'RiskStatus' => 'Risk Status', 'Risks' => 'Risks', + 'Select' => 'Select', 'Severity' => 'Severity', 'Solution' => 'Solution', 'Solutions' => 'Solutions', @@ -78,5 +91,8 @@ return ['RiskManagement' => [ 'Type' => 'Type', 'Unit' => 'Unit', 'Units' => 'Units', + 'Upload' => 'Upload', + 'UserGroup' => 'User/Group', + 'Value' => 'Value', 'Watchlist' => 'Watchlist', ]]; diff --git a/Theme/backend/cockpit.tpl.php b/Theme/backend/cockpit.tpl.php index a2503fd..9466c2d 100644 --- a/Theme/backend/cockpit.tpl.php +++ b/Theme/backend/cockpit.tpl.php @@ -38,6 +38,7 @@ echo $this->getData('nav')->render(); ?> getText('Category'); ?> getText('Process'); ?> getText('Project'); ?> + getText('Unit'); ?> render(); ?> @@ -48,10 +49,11 @@ echo $this->getData('nav')->render(); ?> getName(); ?> + - getText('Empty', 0, 0); ?> + getText('Empty', 0, 0); ?> @@ -62,6 +64,7 @@ echo $this->getData('nav')->render(); ?> getText('NewRisk'); ?>
+

getText('Statistics'); ?>

diff --git a/Theme/backend/risk-create.tpl.php b/Theme/backend/risk-create.tpl.php index 2c1f035..c3ae3d2 100644 --- a/Theme/backend/risk-create.tpl.php +++ b/Theme/backend/risk-create.tpl.php @@ -19,8 +19,10 @@ echo $this->getData('nav')->render(); ?>
  • -
  • -
  • +
  • +
  • +
  • +
@@ -37,14 +39,6 @@ echo $this->getData('nav')->render(); ?> - - - - @@ -62,7 +56,23 @@ echo $this->getData('nav')->render(); ?>
-

getText('Permissions'); ?>

+

getText('Media'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+ +
+

getText('Responsibility'); ?>

@@ -80,9 +90,182 @@ echo $this->getData('nav')->render(); ?>
+
+

getText('RiskStatus'); ?>

+ +
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+

getText('Media'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+

getText('RiskObjects'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+ +
+

getText('Media'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+ +
+
+

getText('RiskObjectStatus'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+
+
+ +
+

getText('Media'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+ +
+
+

getText('Solution'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+

getText('Media'); ?>

+ +
+
+ + +
+
+
+
+
+
+
+
\ No newline at end of file