diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 6f485d5..f682899 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,11 +1,11 @@ [ { "id": 1007001001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Exchange", - "uri": "{/lang}/backend/admin/exchange/dashboard?{?}", + "uri": "{/prefix}admin/exchange/dashboard?{?}", "target": "self", "icon": null, "order": 50, @@ -15,11 +15,11 @@ "children": [ { "id": 1007002001, - "pid": "/backend/admin/exchange", + "pid": "/admin/exchange", "type": 3, "subtype": 1, "name": "Dashboard", - "uri": "{/lang}/backend/admin/exchange/dashboard?{?}", + "uri": "{/prefix}admin/exchange/dashboard?{?}", "target": "self", "icon": null, "order": 1, @@ -30,11 +30,11 @@ }, { "id": 1007002002, - "pid": "/backend/admin/exchange", + "pid": "/admin/exchange", "type": 3, "subtype": 1, "name": "Import", - "uri": "{/lang}/backend/admin/exchange/import/list?{?}", + "uri": "{/prefix}admin/exchange/import/list?{?}", "target": "self", "icon": null, "order": 5, @@ -45,11 +45,11 @@ }, { "id": 1007002003, - "pid": "/backend/admin/exchange", + "pid": "/admin/exchange", "type": 3, "subtype": 1, "name": "Export", - "uri": "{/lang}/backend/admin/exchange/export/list?{?}", + "uri": "{/prefix}admin/exchange/export/list?{?}", "target": "self", "icon": null, "order": 10, diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index d7c7a9f..46e91dd 100644 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; return [ - '^.*/api/admin/exchange/import/profile.*$' => [ + '^.*/admin/exchange/import/profile.*$' => [ [ 'dest' => '\Modules\Exchange\Controller\ApiController:apiExchangeImport', 'verb' => RouteVerb::SET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/api/admin/exchange/export/profile.*$' => [ + '^.*/admin/exchange/export/profile.*$' => [ [ 'dest' => '\Modules\Exchange\Controller\ApiController:apiExchangeExport', 'verb' => RouteVerb::SET, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index e652f57..0a14e9f 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/exchange/import/list.*$' => [ + '^.*/admin/exchange/import/list.*$' => [ [ 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeImportList', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/backend/admin/exchange/export/list.*$' => [ + '^.*/admin/exchange/export/list.*$' => [ [ 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeExportList', 'verb' => RouteVerb::GET, @@ -28,7 +28,7 @@ return [ ], ], ], - '^.*/backend/admin/exchange/import/profile.*$' => [ + '^.*/admin/exchange/import/profile.*$' => [ [ 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeImport', 'verb' => RouteVerb::GET, @@ -39,7 +39,7 @@ return [ ], ], ], - '^.*/backend/admin/exchange/export/profile.*$' => [ + '^.*/admin/exchange/export/profile.*$' => [ [ 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeExport', 'verb' => RouteVerb::GET, @@ -50,7 +50,7 @@ return [ ], ], ], - '^.*/backend/admin/exchange/dashboard.*$' => [ + '^.*/admin/exchange/dashboard.*$' => [ [ 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeDashboard', 'verb' => RouteVerb::GET, diff --git a/Interfaces/GSD/import.tpl.php b/Interfaces/GSD/import.tpl.php index dc19023..c019983 100644 --- a/Interfaces/GSD/import.tpl.php +++ b/Interfaces/GSD/import.tpl.php @@ -4,7 +4,7 @@

getHtml('Import') ?> - GSD

-
+ $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/admin/exchange/export/profile?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/exchange/export/profile?{?}&id=' . $value->getId()); ?> $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/admin/exchange/import/profile?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/exchange/import/profile?{?}&id=' . $value->getId()); ?>
diff --git a/Theme/Backend/exchange-export-list.tpl.php b/Theme/Backend/exchange-export-list.tpl.php index 41ea975..b7cc019 100644 --- a/Theme/Backend/exchange-export-list.tpl.php +++ b/Theme/Backend/exchange-export-list.tpl.php @@ -28,7 +28,7 @@ echo $this->getData('nav')->render(); getHtml('Title') ?>
printHtml($value->getName()); ?> diff --git a/Theme/Backend/exchange-import-list.tpl.php b/Theme/Backend/exchange-import-list.tpl.php index 29634a6..e1163bb 100644 --- a/Theme/Backend/exchange-import-list.tpl.php +++ b/Theme/Backend/exchange-import-list.tpl.php @@ -28,7 +28,7 @@ echo $this->getData('nav')->render(); getHtml('Title') ?>
printHtml($value->getName()); ?> diff --git a/info.json b/info.json index e8ebbd1..5ca141d 100644 --- a/info.json +++ b/info.json @@ -25,7 +25,7 @@ "load": [ { "pid": [ - "/backend" + "/" ], "type": 5, "from": "Exchange", @@ -34,7 +34,7 @@ }, { "pid": [ - "/backend/admin/exchange" + "/admin/exchange" ], "type": 4, "for": "Content",