diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 4649afb..01827f3 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -19,7 +19,7 @@ "type": 2, "subtype": 1, "name": "General", - "uri": "{/base}/{/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": "{/base}/{/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": "{/base}/{/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": "{/base}/{/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": "{/base}/{/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": "{/base}/{/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": "{/base}/{/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": "{/base}/{/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": "{/base}/{/lang}/backend/admin/module/setting?{?}", + "uri": "/{/lang}/backend/admin/module/setting?{?}", "target": "self", "icon": null, "order": 4, diff --git a/Theme/Backend/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php index b0caf90..fcedb51 100644 --- a/Theme/Backend/accounts-create.tpl.php +++ b/Theme/Backend/accounts-create.tpl.php @@ -18,7 +18,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Account'); ?>

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

getHtml('Groups'); ?>

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

getHtml('Permissions'); ?>

- + getData('list:elements') as $key => $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/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() === \phpOMS\Account\AccountStatus::ACTIVE) { $color = 'green'; } elseif ($value->getStatus() === \phpOMS\Account\AccountStatus::INACTIVE) { $color = 'darkblue'; } diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php index 5da170b..1e4031a 100644 --- a/Theme/Backend/accounts-single.tpl.php +++ b/Theme/Backend/accounts-single.tpl.php @@ -25,7 +25,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 c945e2d..cc6c66d 100644 --- a/Theme/Backend/accounts-list.tpl.php +++ b/Theme/Backend/accounts-list.tpl.php @@ -42,7 +42,7 @@ echo $this->getData('nav')->render();
render(); ?>
getGroups(); foreach ($groups as $key => $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()); ?>
@@ -70,7 +70,7 @@ echo $this->getData('nav')->render(); ?> getHtml('Name') ?>
printHtml($value->getId()); ?> printHtml($value->getName()); ?> @@ -83,7 +83,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Groups'); ?>

- +
@@ -133,7 +133,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 a2026b4..7ca00cd 100644 --- a/Theme/Backend/groups-create.tpl.php +++ b/Theme/Backend/groups-create.tpl.php @@ -22,7 +22,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Group'); ?>

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

getHtml('Parent'); ?>

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

getHtml('Permissions'); ?>

- + getData('list:elements') as $key => $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()); $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 3da3206..5717a15 100644 --- a/Theme/Backend/groups-single.tpl.php +++ b/Theme/Backend/groups-single.tpl.php @@ -26,7 +26,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 29ba0dc..d795fed 100644 --- a/Theme/Backend/groups-list.tpl.php +++ b/Theme/Backend/groups-list.tpl.php @@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?>
render(); ?>
@@ -69,7 +69,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Parent'); ?>

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

getHtml('Permissions'); ?>

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

getHtml('Accounts'); ?>

- + $module) : $count++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/admin/module/settings?{?}&id=' . $module['name']['internal']); ?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/module/settings?{?}&id=' . $module['name']['internal']); ?>
diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php index 18eb08e..c89cb35 100644 --- a/Theme/Backend/modules-list.tpl.php +++ b/Theme/Backend/modules-list.tpl.php @@ -43,7 +43,7 @@ $footerView->setResults(count($modules)); render(); ?>
printHtml($module['name']['id']); ?> printHtml($module['name']['external']); ?> diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php index 2c61422..262121e 100644 --- a/Theme/Backend/settings-general.tpl.php +++ b/Theme/Backend/settings-general.tpl.php @@ -47,7 +47,7 @@ $currencies = \phpOMS\Localization\ISO4217Enum::getConstants();

getHtml('Settings'); ?>

- +
@@ -69,7 +69,7 @@ $currencies = \phpOMS\Localization\ISO4217Enum::getConstants();

getHtml('Localization'); ?>

- +