From 64f44be321ab4e8619724fafc90833b6c36f3c33 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 8 Nov 2017 22:39:51 +0100 Subject: [PATCH] Fix #13 --- Admin/Install/Navigation.install.json | 28 ++++++++++++------------- Theme/Backend/category-list.tpl.php | 2 +- Theme/Backend/cause-list.tpl.php | 2 +- Theme/Backend/cockpit.tpl.php | 4 ++-- Theme/Backend/department-list.tpl.php | 2 +- Theme/Backend/department-single.tpl.php | 14 ++++++------- Theme/Backend/process-list.tpl.php | 2 +- Theme/Backend/project-list.tpl.php | 2 +- Theme/Backend/risk-create.tpl.php | 10 ++++----- Theme/Backend/risk-list.tpl.php | 2 +- Theme/Backend/risk-single.tpl.php | 10 ++++----- Theme/Backend/solution-list.tpl.php | 2 +- Theme/Backend/unit-list.tpl.php | 2 +- Theme/Backend/unit-single.tpl.php | 16 +++++++------- 14 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 828e9a9..9dfce1f 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -5,7 +5,7 @@ "type": 2, "subtype": 1, "name": "RiskManagement", - "uri": "{/base}/{/lang}/backend/riskmanagement/cockpit?{?}", + "uri": "/{/lang}/backend/riskmanagement/cockpit?{?}", "target": "self", "icon": null, "order": 1, @@ -19,7 +19,7 @@ "type": 3, "subtype": 1, "name": "Cockpit", - "uri": "{/base}/{/lang}/backend/riskmanagement/cockpit?{?}", + "uri": "/{/lang}/backend/riskmanagement/cockpit?{?}", "target": "self", "icon": null, "order": 1, @@ -34,7 +34,7 @@ "type": 3, "subtype": 1, "name": "Units", - "uri": "{/base}/{/lang}/backend/riskmanagement/unit/list?{?}", + "uri": "/{/lang}/backend/riskmanagement/unit/list?{?}", "target": "self", "icon": null, "order": 5, @@ -49,7 +49,7 @@ "type": 3, "subtype": 1, "name": "Departments", - "uri": "{/base}/{/lang}/backend/riskmanagement/department/list?{?}", + "uri": "/{/lang}/backend/riskmanagement/department/list?{?}", "target": "self", "icon": null, "order": 10, @@ -64,7 +64,7 @@ "type": 3, "subtype": 1, "name": "Categories", - "uri": "{/base}/{/lang}/backend/riskmanagement/category/list?{?}", + "uri": "/{/lang}/backend/riskmanagement/category/list?{?}", "target": "self", "icon": null, "order": 15, @@ -79,7 +79,7 @@ "type": 3, "subtype": 1, "name": "Projects", - "uri": "{/base}/{/lang}/backend/riskmanagement/project/list?{?}", + "uri": "/{/lang}/backend/riskmanagement/project/list?{?}", "target": "self", "icon": null, "order": 20, @@ -94,7 +94,7 @@ "type": 3, "subtype": 1, "name": "Processes", - "uri": "{/base}/{/lang}/backend/riskmanagement/process/list?{?}", + "uri": "/{/lang}/backend/riskmanagement/process/list?{?}", "target": "self", "icon": null, "order": 25, @@ -109,7 +109,7 @@ "type": 3, "subtype": 1, "name": "Risks", - "uri": "{/base}/{/lang}/backend/riskmanagement/risk/list?{?}", + "uri": "/{/lang}/backend/riskmanagement/risk/list?{?}", "target": "self", "icon": null, "order": 30, @@ -123,7 +123,7 @@ "type": 5, "subtype": 1, "name": "Create", - "uri": "{/base}/{/lang}/backend/riskmanagement/risk/create?{?}", + "uri": "/{/lang}/backend/riskmanagement/risk/create?{?}", "target": "self", "icon": null, "order": 1, @@ -138,7 +138,7 @@ "type": 5, "subtype": 1, "name": "Delete", - "uri": "{/base}/{/lang}/backend/riskmanagement/risk/delete?{?}", + "uri": "/{/lang}/backend/riskmanagement/risk/delete?{?}", "target": "self", "icon": null, "order": 1, @@ -153,7 +153,7 @@ "type": 0, "subtype": 1, "name": "Risk", - "uri": "{/base}/{/lang}/backend/riskmanagement/risk/single/dashboard?{?}", + "uri": "/{/lang}/backend/riskmanagement/risk/single/dashboard?{?}", "target": "self", "icon": null, "order": 1, @@ -170,7 +170,7 @@ "type": 3, "subtype": 1, "name": "Causes", - "uri": "{/base}/{/lang}/backend/riskmanagement/cause/list?{?}", + "uri": "/{/lang}/backend/riskmanagement/cause/list?{?}", "target": "self", "icon": null, "order": 35, @@ -185,7 +185,7 @@ "type": 3, "subtype": 1, "name": "Solutions", - "uri": "{/base}/{/lang}/backend/riskmanagement/solution/list?{?}", + "uri": "/{/lang}/backend/riskmanagement/solution/list?{?}", "target": "self", "icon": null, "order": 40, @@ -200,7 +200,7 @@ "type": 3, "subtype": 1, "name": "Settings", - "uri": "{/base}/{/lang}/backend/riskmanagement/settings/dashboard?{?}", + "uri": "/{/lang}/backend/riskmanagement/settings/dashboard?{?}", "target": "self", "icon": null, "order": 45, diff --git a/Theme/Backend/category-list.tpl.php b/Theme/Backend/category-list.tpl.php index 6ce20d0..ed87955 100644 --- a/Theme/Backend/category-list.tpl.php +++ b/Theme/Backend/category-list.tpl.php @@ -27,7 +27,7 @@ echo $this->getData('nav')->render(); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/category/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/category/single?{?}&id=' . $value->getId()); ?> printHtml($value->getId()); ?> printHtml($value->getTitle()); ?> diff --git a/Theme/Backend/cause-list.tpl.php b/Theme/Backend/cause-list.tpl.php index 7b64831..4a74c5f 100644 --- a/Theme/Backend/cause-list.tpl.php +++ b/Theme/Backend/cause-list.tpl.php @@ -28,7 +28,7 @@ echo $this->getData('nav')->render(); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> printHtml($value->getId()); ?> printHtml($value->getTitle()); ?> diff --git a/Theme/Backend/cockpit.tpl.php b/Theme/Backend/cockpit.tpl.php index 0432766..06103b6 100644 --- a/Theme/Backend/cockpit.tpl.php +++ b/Theme/Backend/cockpit.tpl.php @@ -42,7 +42,7 @@ echo $this->getData('nav')->render(); ?> render(); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?> printHtml($value->getId()); ?> printHtml($value->getName()); ?> @@ -61,7 +61,7 @@ echo $this->getData('nav')->render(); ?>
diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php index 7fe7b62..097ef95 100644 --- a/Theme/Backend/department-list.tpl.php +++ b/Theme/Backend/department-list.tpl.php @@ -27,7 +27,7 @@ echo $this->getData('nav')->render(); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/department/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/department/single?{?}&id=' . $value->getId()); ?> printHtml($value->getId()); ?> printHtml($value->getDepartment()->getName()); ?> diff --git a/Theme/Backend/department-single.tpl.php b/Theme/Backend/department-single.tpl.php index 61815cf..58046ef 100644 --- a/Theme/Backend/department-single.tpl.php +++ b/Theme/Backend/department-single.tpl.php @@ -35,7 +35,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Department') ?>

-
+ $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/category/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/category/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/project/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/project/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/process/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/process/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/solution/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/solution/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/process/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/process/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/project/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/project/single?{?}&id=' . $value->getId()); ?>
getHtml('Name') ?>printHtml($department->getDepartment()->getName()); ?> @@ -111,7 +111,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getName()); ?> @@ -142,7 +142,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getTitle()); ?> @@ -170,7 +170,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getProject()->getName()); ?> @@ -198,7 +198,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getTitle()); ?> @@ -227,7 +227,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getTitle()); ?> @@ -258,7 +258,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getTitle()); ?> diff --git a/Theme/Backend/process-list.tpl.php b/Theme/Backend/process-list.tpl.php index b1bd581..4445679 100644 --- a/Theme/Backend/process-list.tpl.php +++ b/Theme/Backend/process-list.tpl.php @@ -27,7 +27,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getTitle()); ?> diff --git a/Theme/Backend/project-list.tpl.php b/Theme/Backend/project-list.tpl.php index 9b878ea..6b4dec0 100644 --- a/Theme/Backend/project-list.tpl.php +++ b/Theme/Backend/project-list.tpl.php @@ -27,7 +27,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getProject()->getName()); ?> diff --git a/Theme/Backend/risk-create.tpl.php b/Theme/Backend/risk-create.tpl.php index 6f1063f..4dd2506 100644 --- a/Theme/Backend/risk-create.tpl.php +++ b/Theme/Backend/risk-create.tpl.php @@ -32,7 +32,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Risk') ?>

- +
@@ -106,7 +106,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('RiskStatus') ?>

- +
@@ -161,7 +161,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('RiskObjects') ?>

- +
@@ -202,7 +202,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('RiskObjectStatus') ?>

- +
@@ -247,7 +247,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Solution') ?>

- + $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/risk/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/risk/single?{?}&id=' . $value->getId()); ?>
diff --git a/Theme/Backend/risk-list.tpl.php b/Theme/Backend/risk-list.tpl.php index 892a165..19f659b 100644 --- a/Theme/Backend/risk-list.tpl.php +++ b/Theme/Backend/risk-list.tpl.php @@ -30,7 +30,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getName()); ?> diff --git a/Theme/Backend/risk-single.tpl.php b/Theme/Backend/risk-single.tpl.php index f4ccafc..d0ef5fd 100644 --- a/Theme/Backend/risk-single.tpl.php +++ b/Theme/Backend/risk-single.tpl.php @@ -33,7 +33,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Risk') ?>

- +
getHtml('Name') ?>printHtml($risk->getName()); ?> @@ -97,7 +97,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('RiskStatus') ?>

- +
@@ -152,7 +152,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('RiskObjects') ?>

- +
@@ -193,7 +193,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('RiskObjectStatus') ?>

- +
@@ -238,7 +238,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Solution') ?>

- + $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/solution/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/solution/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/unit/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/unit/single?{?}&id=' . $value->getId()); ?>
diff --git a/Theme/Backend/solution-list.tpl.php b/Theme/Backend/solution-list.tpl.php index 5e7e148..d9b68a4 100644 --- a/Theme/Backend/solution-list.tpl.php +++ b/Theme/Backend/solution-list.tpl.php @@ -30,7 +30,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getTitle()); ?> diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php index 1119a37..a386d9e 100644 --- a/Theme/Backend/unit-list.tpl.php +++ b/Theme/Backend/unit-list.tpl.php @@ -27,7 +27,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getName()); ?> diff --git a/Theme/Backend/unit-single.tpl.php b/Theme/Backend/unit-single.tpl.php index f831102..932b4ef 100644 --- a/Theme/Backend/unit-single.tpl.php +++ b/Theme/Backend/unit-single.tpl.php @@ -36,7 +36,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Unit') ?>

- + $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/department/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/department/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/category/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/category/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/project/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/project/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/process/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/process/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/cause/single?{?}&id=' . $value->getId()); ?> $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/solution/single?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/riskmanagement/solution/single?{?}&id=' . $value->getId()); ?>
getHtml('Name') ?>printHtml($unit->getName()); ?> @@ -112,7 +112,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getName()); ?> @@ -143,7 +143,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getDepartment()->getName()); ?> @@ -171,7 +171,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getTitle()); ?> @@ -199,7 +199,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getProject()->getName()); ?> @@ -227,7 +227,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getTitle()); ?> @@ -256,7 +256,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getTitle()); ?> @@ -287,7 +287,7 @@ echo $this->getData('nav')->render(); ?>
printHtml($value->getId()); ?> printHtml($value->getTitle()); ?>