From d252a78f9727e2e807088b44dec1ad36d1687a97 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 11 Feb 2019 11:38:15 +0100 Subject: [PATCH] Fix absolute path to relative paths --- Admin/Install/Navigation.install.json | 18 +++++++++--------- .../GroupTagSelector/group-selector.tpl.php | 4 ++-- Theme/Backend/accounts-create.tpl.php | 2 +- Theme/Backend/accounts-list.tpl.php | 2 +- Theme/Backend/accounts-single.tpl.php | 8 ++++---- Theme/Backend/groups-create.tpl.php | 2 +- Theme/Backend/groups-list.tpl.php | 2 +- Theme/Backend/groups-single.tpl.php | 8 ++++---- Theme/Backend/modules-list.tpl.php | 2 +- Theme/Backend/modules-single.tpl.php | 10 +++++----- Theme/Backend/settings-general.tpl.php | 8 ++++---- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 245ef21..d3612f5 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -19,7 +19,7 @@ "type": 2, "subtype": 1, "name": "General", - "uri": "/{/lang}/backend/admin/settings/general?{?}", + "uri": "{/lang}/backend/admin/settings/general?{?}", "target": "self", "icon": null, "order": 1, @@ -34,7 +34,7 @@ "type": 2, "subtype": 1, "name": "Groups", - "uri": "/{/lang}/backend/admin/group/list?{?}", + "uri": "{/lang}/backend/admin/group/list?{?}", "target": "self", "icon": null, "order": 2, @@ -48,7 +48,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "/{/lang}/backend/admin/group/list?{?}", + "uri": "{/lang}/backend/admin/group/list?{?}", "target": "self", "icon": null, "order": 1, @@ -63,7 +63,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "/{/lang}/backend/admin/group/create?{?}", + "uri": "{/lang}/backend/admin/group/create?{?}", "target": "self", "icon": null, "order": 5, @@ -80,7 +80,7 @@ "type": 2, "subtype": 1, "name": "Accounts", - "uri": "/{/lang}/backend/admin/account/list?{?}", + "uri": "{/lang}/backend/admin/account/list?{?}", "target": "self", "icon": null, "order": 3, @@ -94,7 +94,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "/{/lang}/backend/admin/account/list?{?}", + "uri": "{/lang}/backend/admin/account/list?{?}", "target": "self", "icon": null, "order": 1, @@ -109,7 +109,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "/{/lang}/backend/admin/account/create?{?}", + "uri": "{/lang}/backend/admin/account/create?{?}", "target": "self", "icon": null, "order": 5, @@ -126,7 +126,7 @@ "type": 2, "subtype": 1, "name": "Modules", - "uri": "/{/lang}/backend/admin/module/list?{?}", + "uri": "{/lang}/backend/admin/module/list?{?}", "target": "self", "icon": null, "order": 4, @@ -140,7 +140,7 @@ "type": 3, "subtype": 1, "name": "Settings", - "uri": "/{/lang}/backend/admin/module/setting?{?}", + "uri": "{/lang}/backend/admin/module/setting?{?}", "target": "self", "icon": null, "order": 4, diff --git a/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php b/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php index fc94deb..54e7f7d 100644 --- a/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php +++ b/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php @@ -5,9 +5,9 @@ { "key": 1, "listener": "click", "action": [ {"key": 1, "type": "dom.popup", "selector": "#group-selector-tpl", "aniIn": "fadeIn", "id": "printHtml($this->getId()); ?>"}, - {"key": 2, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, + {"key": 2, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, {"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}, - {"key": 4, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, + {"key": 4, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1} ] } diff --git a/Theme/Backend/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php index b37d1bc..64a0335 100644 --- a/Theme/Backend/accounts-create.tpl.php +++ b/Theme/Backend/accounts-create.tpl.php @@ -21,7 +21,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Account'); ?>

-
+ getData('list:elements') as $key => $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/account/settings?{?}&id=' . $value->getId()); + $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/admin/account/settings?{?}&id=' . $value->getId()); $color = 'darkred'; if ($value->getStatus() === AccountStatus::ACTIVE) { $color = 'green'; } elseif ($value->getStatus() === AccountStatus::INACTIVE) { $color = 'darkblue'; } diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php index e127b59..a858eb6 100644 --- a/Theme/Backend/accounts-single.tpl.php +++ b/Theme/Backend/accounts-single.tpl.php @@ -28,7 +28,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Account'); ?>

- +
diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php index 24511b7..44c86ae 100644 --- a/Theme/Backend/accounts-list.tpl.php +++ b/Theme/Backend/accounts-list.tpl.php @@ -34,7 +34,7 @@ echo $this->getData('nav')->render(); ?>
getGroups(); foreach ($groups as $key => $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?>
@@ -103,7 +103,7 @@ echo $this->getData('nav')->render(); ?> getHtml('Name') ?>
printHtml($value->getId()); ?> @@ -117,7 +117,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Groups'); ?>

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

getHtml('Permissions'); ?>

- +
diff --git a/Theme/Backend/groups-create.tpl.php b/Theme/Backend/groups-create.tpl.php index 9caa20a..4a4f571 100644 --- a/Theme/Backend/groups-create.tpl.php +++ b/Theme/Backend/groups-create.tpl.php @@ -21,7 +21,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Group'); ?>

- + getData('list:elements') as $key => $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); + $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); $color = 'darkred'; if ($value->getStatus() === \phpOMS\Account\GroupStatus::ACTIVE) { $color = 'green'; } elseif ($value->getStatus() === \phpOMS\Account\GroupStatus::INACTIVE) { $color = 'darkblue'; } diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php index 2042fa4..f82f9a1 100644 --- a/Theme/Backend/groups-single.tpl.php +++ b/Theme/Backend/groups-single.tpl.php @@ -35,7 +35,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Group'); ?>

- +
diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php index 973d7ae..6d3f0d4 100644 --- a/Theme/Backend/groups-list.tpl.php +++ b/Theme/Backend/groups-list.tpl.php @@ -30,7 +30,7 @@ echo $this->getData('nav')->render(); ?>
@@ -68,7 +68,7 @@ echo $this->getData('nav')->render(); ?> $value) : $c++; ?>
- getName1(); ?> + getName1(); ?>
getHtml('Empty', 0, 0); ?> @@ -78,7 +78,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Accounts'); ?>

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

getHtml('Permissions'); ?>

- + $module) : $count++; - $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/module/settings?{?}&id=' . $module['name']['internal']); + $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/admin/module/settings?{?}&id=' . $module['name']['internal']); if (isset($active[$module['name']['internal']])) { $status = ModuleStatus::ACTIVE; } elseif (isset($installed[$module['name']['internal']])) { $status = ModuleStatus::INACTIVE; } else { $status = ModuleStatus::AVAILABLE; } diff --git a/Theme/Backend/modules-single.tpl.php b/Theme/Backend/modules-single.tpl.php index cafd75e..f43c669 100644 --- a/Theme/Backend/modules-single.tpl.php +++ b/Theme/Backend/modules-single.tpl.php @@ -54,21 +54,21 @@ if ($nav !== null) {
diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php index a42def0..5b3a5ae 100644 --- a/Theme/Backend/modules-list.tpl.php +++ b/Theme/Backend/modules-list.tpl.php @@ -37,7 +37,7 @@ $installed = $this->app->moduleManager->getInstalledModules();
- + -
+
-
+
-
+
-
+
diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php index ece6545..b09cbde 100644 --- a/Theme/Backend/settings-general.tpl.php +++ b/Theme/Backend/settings-general.tpl.php @@ -46,7 +46,7 @@ $temperatures = \phpOMS\Utils\Converter\TemperatureType::getConstants();

getHtml('Settings'); ?>

-
+
@@ -62,7 +62,7 @@ $temperatures = \phpOMS\Utils\Converter\TemperatureType::getConstants();

getHtml('Security'); ?>

- +
@@ -96,7 +96,7 @@ $temperatures = \phpOMS\Utils\Converter\TemperatureType::getConstants();

getHtml('Logging'); ?>

- +
@@ -121,7 +121,7 @@ $temperatures = \phpOMS\Utils\Converter\TemperatureType::getConstants();

getHtml('Localization'); ?>

- +