From 3ad0dcbae0cbbb336a08cafd827ff7730f586610 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 14 Dec 2016 21:27:04 +0100 Subject: [PATCH] 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