diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index aad1f48..1d03e7e 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,11 +1,11 @@ [ { "id": 1005501001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Workflows", - "uri": "{/lang}/backend/workflow/dashboard?{?}", + "uri": "{/prefix}workflow/dashboard?{?}", "target": "self", "icon": null, "order": 40, @@ -15,11 +15,11 @@ "children": [ { "id": 1005502001, - "pid": "/backend/workflow", + "pid": "/workflow", "type": 3, "subtype": 1, "name": "Dashboard", - "uri": "{/lang}/backend/workflow/dashboard?{?}", + "uri": "{/prefix}workflow/dashboard?{?}", "target": "self", "icon": null, "order": 1, @@ -30,11 +30,11 @@ }, { "id": 1005503001, - "pid": "/backend/workflow", + "pid": "/workflow", "type": 3, "subtype": 1, "name": "Templates", - "uri": "{/lang}/backend/workflow/template/list?{?}", + "uri": "{/prefix}workflow/template/list?{?}", "target": "self", "icon": null, "order": 5, @@ -45,11 +45,11 @@ }, { "id": 1005504001, - "pid": "/backend/workflow", + "pid": "/workflow", "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/backend/workflow/template/create?{?}", + "uri": "{/prefix}workflow/template/create?{?}", "target": "self", "icon": null, "order": 10, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index a855f57..b592449 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/workflow/template/list.*$' => [ + '^.*/workflow/template/list.*$' => [ [ 'dest' => '\Modules\Workflow\Controller\BackendController:viewWorkflowTemplates', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/backend/workflow/template/single.*$' => [ + '^.*/workflow/template/single.*$' => [ [ 'dest' => '\Modules\Workflow\Controller\BackendController:viewWorkflowTemplate', 'verb' => RouteVerb::GET, @@ -28,7 +28,7 @@ return [ ], ], ], - '^.*/backend/workflow/template/create.*$' => [ + '^.*/workflow/template/create.*$' => [ [ 'dest' => '\Modules\Workflow\Controller\BackendController:viewWorkflowTemplateCreate', 'verb' => RouteVerb::GET, @@ -39,7 +39,7 @@ return [ ], ], ], - '^.*/backend/workflow/dashboard.*$' => [ + '^.*/workflow/dashboard.*$' => [ [ 'dest' => '\Modules\Workflow\Controller\BackendController:viewWorkflowDashboard', 'verb' => RouteVerb::GET, @@ -50,7 +50,7 @@ return [ ], ], ], - '^.*/backend/workflow/single.*$' => [ + '^.*/workflow/single.*$' => [ [ 'dest' => '\Modules\Workflow\Controller\BackendController:viewWorkflowSingle', 'verb' => RouteVerb::GET, diff --git a/Theme/Backend/workflow-create.tpl.php b/Theme/Backend/workflow-create.tpl.php index 509bf3e..5d4a241 100644 --- a/Theme/Backend/workflow-create.tpl.php +++ b/Theme/Backend/workflow-create.tpl.php @@ -19,7 +19,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Task') ?>

-
+ $workflow) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/task/single?{?}&id=' . $workflow->getId()); + $url = \phpOMS\Uri\UriFactory::build('{/prefix}task/single?{?}&id=' . $workflow->getId()); $color = 'darkred'; if ($workflow->getStatus() === \Modules\Workflow\Models\WorkflowStatus::DONE) { $color = 'green'; } elseif ($workflow->getStatus() === \Modules\Workflow\Models\WorkflowStatus::OPEN) { $color = 'darkblue'; } diff --git a/info.json b/info.json index f4112bc..9db40c5 100644 --- a/info.json +++ b/info.json @@ -27,7 +27,7 @@ "load": [ { "pid": [ - "/backend/workflow" + "/workflow" ], "type": 4, "for": 0, @@ -36,7 +36,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 5, "from": "Workflow",
diff --git a/Theme/Backend/workflow-dashboard.tpl.php b/Theme/Backend/workflow-dashboard.tpl.php index 98d8135..ef05f90 100644 --- a/Theme/Backend/workflow-dashboard.tpl.php +++ b/Theme/Backend/workflow-dashboard.tpl.php @@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>