diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index ae2f433..d6e13df 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,11 +1,11 @@ [ { "id": 1006201001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Auditor", - "uri": "{/lang}/backend/admin/audit/list?{?}", + "uri": "{/prefix}admin/audit/list?{?}", "target": "self", "icon": null, "order": 75, @@ -15,11 +15,11 @@ "children": [ { "id": 1006202001, - "pid": "/backend/admin/audit", + "pid": "/admin/audit", "type": 3, "subtype": 1, "name": "Audits", - "uri": "{/lang}/backend/admin/audit/list?{?}", + "uri": "{/prefix}admin/audit/list?{?}", "target": "self", "icon": null, "order": 1, @@ -30,11 +30,11 @@ }, { "id": 1006203001, - "pid": "/backend/admin/audit", + "pid": "/admin/audit", "type": 3, "subtype": 1, "name": "Modules", - "uri": "{/lang}/backend/admin/audit/module/list?{?}", + "uri": "{/prefix}admin/audit/module/list?{?}", "target": "self", "icon": null, "order": 5, @@ -45,11 +45,11 @@ }, { "id": 1006204001, - "pid": "/backend/admin/audit", + "pid": "/admin/audit", "type": 3, "subtype": 1, "name": "Accounts", - "uri": "{/lang}/backend/admin/audit/account/list?{?}", + "uri": "{/prefix}admin/audit/account/list?{?}", "target": "self", "icon": null, "order": 10, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index fdb7c1a..6a29380 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; return [ - '^.*/backend/admin/audit/list.*$' => [ + '^.*/admin/audit/list.*$' => [ [ 'dest' => '\Modules\Auditor\Controller\BackendController:viewAuditorList', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/backend/admin/audit/single.*$' => [ + '^.*/admin/audit/single.*$' => [ [ 'dest' => '\Modules\Auditor\Controller\BackendController:viewAuditorSingle', 'verb' => RouteVerb::GET, @@ -28,7 +28,7 @@ return [ ], ], ], - '^.*/backend/admin/audit/module/list.*$' => [ + '^.*/admin/audit/module/list.*$' => [ [ 'dest' => '\Modules\Auditor\Controller\BackendController:viewAuditorModuleList', 'verb' => RouteVerb::GET, @@ -39,7 +39,7 @@ return [ ], ], ], - '^.*/backend/admin/audit/module/single.*$' => [ + '^.*/admin/audit/module/single.*$' => [ [ 'dest' => '\Modules\Auditor\Controller\BackendController:viewAuditorModuleSingle', 'verb' => RouteVerb::GET, @@ -50,7 +50,7 @@ return [ ], ], ], - '^.*/backend/admin/audit/account/list.*$' => [ + '^.*/admin/audit/account/list.*$' => [ [ 'dest' => '\Modules\Auditor\Controller\BackendController:viewAuditorAccountList', 'verb' => RouteVerb::GET, @@ -61,7 +61,7 @@ return [ ], ], ], - '^.*/backend/admin/audit/account/single.*$' => [ + '^.*/admin/audit/account/single.*$' => [ [ 'dest' => '\Modules\Auditor\Controller\BackendController:viewAuditorAccountSingle', 'verb' => RouteVerb::GET, diff --git a/Theme/Backend/account-list.tpl.php b/Theme/Backend/account-list.tpl.php index c3a951e..76bfea9 100644 --- a/Theme/Backend/account-list.tpl.php +++ b/Theme/Backend/account-list.tpl.php @@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?> $audit) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/admin/audit/single?{?}&id=' . $audit->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?> diff --git a/Theme/Backend/audit-list.tpl.php b/Theme/Backend/audit-list.tpl.php index c8f8d72..c0f586a 100644 --- a/Theme/Backend/audit-list.tpl.php +++ b/Theme/Backend/audit-list.tpl.php @@ -48,7 +48,7 @@ echo $this->getData('nav')->render(); ?> $audit) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/admin/audit/single?{?}&id=' . $audit->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?> getId(); ?> getModule(); ?> diff --git a/Theme/Backend/module-list.tpl.php b/Theme/Backend/module-list.tpl.php index c3a951e..76bfea9 100644 --- a/Theme/Backend/module-list.tpl.php +++ b/Theme/Backend/module-list.tpl.php @@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?> $audit) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/admin/audit/single?{?}&id=' . $audit->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?> diff --git a/info.json b/info.json index d8f3c0b..c64b185 100644 --- a/info.json +++ b/info.json @@ -25,7 +25,7 @@ "load": [ { "pid": [ - "/backend/admin/audit" + "/admin/audit" ], "type": 4, "for": "Content", @@ -34,7 +34,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 5, "from": "Auditor",