diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 2921260..66c0c49 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,7 +1,7 @@ [ { "id": 1002901001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 0, "name": "Support", @@ -15,11 +15,11 @@ "children": [ { "id": 1002901101, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Ticket", - "uri": "{/lang}/backend/support/list?{?}", + "uri": "{/prefix}support/list?{?}", "target": "self", "icon": null, "order": 1, @@ -29,11 +29,11 @@ "children": [ { "id": 1002903101, - "pid": "/backend/support", + "pid": "/support", "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/backend/support/list?{?}", + "uri": "{/prefix}support/list?{?}", "target": "self", "icon": null, "order": 1, @@ -45,11 +45,11 @@ }, { "id": 1002903201, - "pid": "/backend/support", + "pid": "/support", "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/backend/support/create?{?}", + "uri": "{/prefix}support/create?{?}", "target": "self", "icon": null, "order": 5, @@ -63,11 +63,11 @@ }, { "id": 1002901201, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Settings", - "uri": "{/lang}/backend/support/settings/dashboard?{?}", + "uri": "{/prefix}support/settings/dashboard?{?}", "target": "self", "icon": null, "order": 5, @@ -79,11 +79,11 @@ }, { "id": 1002901301, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Analysis", - "uri": "{/lang}/backend/support/analysis/dashboard?{?}", + "uri": "{/prefix}support/analysis/dashboard?{?}", "target": "self", "icon": null, "order": 10, @@ -97,11 +97,11 @@ }, { "id": 1002902001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Support", - "uri": "{/lang}/backend/private/support/dashboard?{?}", + "uri": "{/prefix}private/support/dashboard?{?}", "target": "self", "icon": null, "order": 5, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 3bf2903..e83557b 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/support/list.*$' => [ + '^.*/support/list.*$' => [ [ 'dest' => '\Modules\Support\Controller\BackendController:viewSupportList', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/backend/support/single.*$' => [ + '^.*/support/single.*$' => [ [ 'dest' => '\Modules\Support\Controller\BackendController:viewSupportTicket', 'verb' => RouteVerb::GET, @@ -28,7 +28,7 @@ return [ ], ], ], - '^.*/backend/support/create.*$' => [ + '^.*/support/create.*$' => [ [ 'dest' => '\Modules\Support\Controller\BackendController:viewSupportCreate', 'verb' => RouteVerb::GET, @@ -39,7 +39,7 @@ return [ ], ], ], - '^.*/backend/support/analysis.*$' => [ + '^.*/support/analysis.*$' => [ [ 'dest' => '\Modules\Support\Controller\BackendController:viewSupportAnalysis', 'verb' => RouteVerb::GET, @@ -50,7 +50,7 @@ return [ ], ], ], - '^.*/backend/support/settings.*$' => [ + '^.*/support/settings.*$' => [ [ 'dest' => '\Modules\Support\Controller\BackendController:viewSupportSettings', 'verb' => RouteVerb::GET, @@ -61,7 +61,7 @@ return [ ], ], ], - '^.*/backend/private/support/dashboard.*$' => [ + '^.*/private/support/dashboard.*$' => [ [ 'dest' => '\Modules\Support\Controller\BackendController:viewPrivateSupportDashboard', 'verb' => RouteVerb::GET, diff --git a/Theme/Backend/support-list.tpl.php b/Theme/Backend/support-list.tpl.php index 6ae7000..d32541b 100644 --- a/Theme/Backend/support-list.tpl.php +++ b/Theme/Backend/support-list.tpl.php @@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>
$ticket) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/support/single?{?}&id=' . $ticket->getId()); + $url = \phpOMS\Uri\UriFactory::build('{/prefix}support/single?{?}&id=' . $ticket->getId()); $color = 'darkred'; if ($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; } elseif ($ticket->getTask()->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; } diff --git a/Theme/Backend/ticket-create.tpl.php b/Theme/Backend/ticket-create.tpl.php index 2471246..8e7ef64 100644 --- a/Theme/Backend/ticket-create.tpl.php +++ b/Theme/Backend/ticket-create.tpl.php @@ -20,7 +20,7 @@ echo $this->getData('nav')->render(); ?>