diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 8e5981c..392d5a7 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,11 +1,11 @@ [ { "id": 1001101001, - "pid": "/backend", + "pid": "/", "type": 1, "subtype": 1, "name": "Tasks", - "uri": "{/lang}/backend/task/dashboard?{?}", + "uri": "{/prefix}task/dashboard?{?}", "target": "self", "icon": "fa fa-bolt", "order": 15, @@ -15,11 +15,11 @@ "children": [ { "id": 1001102001, - "pid": "/backend/task", + "pid": "/task", "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/backend/task/dashboard?{?}", + "uri": "{/prefix}task/dashboard?{?}", "target": "self", "icon": null, "order": 1, @@ -29,11 +29,11 @@ "children": [ { "id": 1001102101, - "pid": "/backend/task", + "pid": "/task", "type": 0, "subtype": 1, "name": "Tasks", - "uri": "{/lang}/backend/task/single?{?}", + "uri": "{/prefix}task/single?{?}", "target": "self", "icon": null, "order": 1, @@ -46,11 +46,11 @@ }, { "id": 1001103001, - "pid": "/backend/task", + "pid": "/task", "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/backend/task/create?{?}", + "uri": "{/prefix}task/create?{?}", "target": "self", "icon": null, "order": 10, @@ -61,11 +61,11 @@ }, { "id": 1001104001, - "pid": "/backend/task", + "pid": "/task", "type": 3, "subtype": 1, "name": "Analysis", - "uri": "{/lang}/backend/task/analysis?{?}", + "uri": "{/prefix}task/analysis?{?}", "target": "self", "icon": null, "order": 20, diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index cf43f09..a5498a6 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/task(\?.*|$)' => [ + '^.*/task(\?.*|$)' => [ [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskCreate', 'verb' => RouteVerb::PUT, @@ -35,7 +35,7 @@ return [ ], ], ], - '^.*/api/task/element.*$' => [ + '^.*/task/element.*$' => [ [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementCreate', 'verb' => RouteVerb::PUT, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 194f300..8270fd9 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/task/dashboard.*$' => [ + '^.*/task/dashboard.*$' => [ [ 'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskDashboard', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/backend/task/single.*$' => [ + '^.*/task/single.*$' => [ [ 'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskView', 'verb' => RouteVerb::GET, @@ -28,7 +28,7 @@ return [ ], ], ], - '^.*/backend/task/create.*$' => [ + '^.*/task/create.*$' => [ [ 'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskCreate', 'verb' => RouteVerb::GET, @@ -39,7 +39,7 @@ return [ ], ], ], - '^.*/backend/task/analysis.*$' => [ + '^.*/task/analysis.*$' => [ [ 'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskAnalysis', 'verb' => RouteVerb::GET, diff --git a/Theme/Backend/Components/Tasks/list.tpl.php b/Theme/Backend/Components/Tasks/list.tpl.php index b361533..1b8e73d 100644 --- a/Theme/Backend/Components/Tasks/list.tpl.php +++ b/Theme/Backend/Components/Tasks/list.tpl.php @@ -7,7 +7,7 @@ tasks as $key => $task) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/task/single?{?}&id=' . $task->getId()); + $url = \phpOMS\Uri\UriFactory::build('{/prefix}task/single?{?}&id=' . $task->getId()); $color = 'darkred'; if ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; } elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; } diff --git a/Theme/Backend/task-create.tpl.php b/Theme/Backend/task-create.tpl.php index 106279c..180e45a 100644 --- a/Theme/Backend/task-create.tpl.php +++ b/Theme/Backend/task-create.tpl.php @@ -25,7 +25,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Task') ?>

-
+ $task) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/task/single?{?}&id=' . $task->getId()); + $url = \phpOMS\Uri\UriFactory::build('{/prefix}task/single?{?}&id=' . $task->getId()); $color = 'darkred'; if ($task->getStatus() === TaskStatus::DONE) { $color = 'green'; } elseif ($task->getStatus() === TaskStatus::OPEN) { $color = 'darkblue'; } @@ -65,7 +65,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Settings') ?>

- +
diff --git a/Theme/Backend/task-dashboard.tpl.php b/Theme/Backend/task-dashboard.tpl.php index 18b2935..3de432a 100644 --- a/Theme/Backend/task-dashboard.tpl.php +++ b/Theme/Backend/task-dashboard.tpl.php @@ -34,7 +34,7 @@ echo $this->getData('nav')->render(); ?>
getData('editor')->render('task-editor'); ?> diff --git a/info.json b/info.json index f76e670..428d4fd 100644 --- a/info.json +++ b/info.json @@ -28,7 +28,7 @@ "load": [ { "pid": [ - "/backend/task" + "/task" ], "type": 4, "for": 0, @@ -37,7 +37,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 4, "from": "Tasks", @@ -46,7 +46,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 5, "from": "Tasks",