From d3e3bec73de7076324e7f836fec159844df3e63a Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Wed, 8 Nov 2017 22:39:51 +0100
Subject: [PATCH] Fix #13

---
 Admin/Install/Navigation.install.json       | 10 +++++-----
 Theme/Backend/Components/Tasks/list.tpl.php |  2 +-
 Theme/Backend/task-create.tpl.php           |  2 +-
 Theme/Backend/task-dashboard.tpl.php        |  2 +-
 Theme/Backend/task-single.tpl.php           |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 0387daa..edeedff 100644
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 1,
         "subtype": 1,
         "name": "Tasks",
-        "uri": "{/base}/{/lang}/backend/task/dashboard?{?}",
+        "uri": "/{/lang}/backend/task/dashboard?{?}",
         "target": "self",
         "icon": "fa fa-bolt",
         "order": 15,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/base}/{/lang}/backend/task/dashboard?{?}",
+                "uri": "/{/lang}/backend/task/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -33,7 +33,7 @@
                         "type": 0,
                         "subtype": 1,
                         "name": "Tasks",
-                        "uri": "{/base}/{/lang}/backend/task/single?{?}",
+                        "uri": "/{/lang}/backend/task/single?{?}",
                         "target": "self",
                         "icon": null,
                         "order": 1,
@@ -50,7 +50,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/base}/{/lang}/backend/task/create?{?}",
+                "uri": "/{/lang}/backend/task/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 10,
@@ -65,7 +65,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Analysis",
-                "uri": "{/base}/{/lang}/backend/task/analysis?{?}",
+                "uri": "/{/lang}/backend/task/analysis?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 20,
diff --git a/Theme/Backend/Components/Tasks/list.tpl.php b/Theme/Backend/Components/Tasks/list.tpl.php
index 8ae7b76..dc57fb8 100644
--- a/Theme/Backend/Components/Tasks/list.tpl.php
+++ b/Theme/Backend/Components/Tasks/list.tpl.php
@@ -7,7 +7,7 @@
     <tfoot>
     <tbody>
     <?php $c = 0; foreach ($this->tasks as $key => $task) : $c++;
-    $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/task/single?{?}&id=' . $task->getId());
+    $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/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 caf39a7..7d880a3 100644
--- a/Theme/Backend/task-create.tpl.php
+++ b/Theme/Backend/task-create.tpl.php
@@ -22,7 +22,7 @@ echo $this->getData('nav')->render(); ?>
             <header><h1><?= $this->getHtml('Task') ?></h1></header>
 
             <div class="inner">
-                <form id="fTask" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/task?{?}&csrf={$CSRF}'); ?>">
+                <form id="fTask" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/task?{?}&csrf={$CSRF}'); ?>">
                     <table class="layout wf-100">
                         <tbody>
                         <tr><td colspan="2"><label for="iReceiver"><?= $this->getHtml('To') ?></label>
diff --git a/Theme/Backend/task-dashboard.tpl.php b/Theme/Backend/task-dashboard.tpl.php
index 82569d5..f125fbc 100644
--- a/Theme/Backend/task-dashboard.tpl.php
+++ b/Theme/Backend/task-dashboard.tpl.php
@@ -32,7 +32,7 @@ echo $this->getData('nav')->render(); ?>
                 <tfoot>
                 <tbody>
                 <?php $c = 0; foreach ($tasks as $key => $task) : $c++;
-                $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/task/single?{?}&id=' . $task->getId());
+                $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/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-single.tpl.php b/Theme/Backend/task-single.tpl.php
index faf96e0..dc6b650 100644
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -101,7 +101,7 @@ echo $this->getData('nav')->render(); ?>
 
         <section class="box wf-100">
             <div class="inner">
-                <form id="taskElementCreate" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/task/element?{?}&csrf={$CSRF}'); ?>">
+                <form id="taskElementCreate" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/task/element?{?}&csrf={$CSRF}'); ?>">
                     <table class="layout wf-100">
                         <tr><td><label for="iMessage"><?= $this->getHtml('Message') ?></label>
                         <tr><td><textarea id="iMessage" name="description"></textarea>