From 848c62cf5be4e09deabf38219f2ff573e73f8f6e Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Tue, 30 May 2017 18:21:27 +0200
Subject: [PATCH] fixes #62

---
 Admin/Install/Navigation.install.json    | 10 +++++-----
 Theme/Backend/department-list.tpl.php    |  2 +-
 Theme/Backend/planning-dashboard.tpl.php |  2 +-
 Theme/Backend/staff-list.tpl.php         |  2 +-
 Theme/Backend/staff-single.tpl.php       |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 4095673..3b19666 100644
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -19,7 +19,7 @@
                 "type": 2,
                 "subtype": 1,
                 "name": "Employees",
-                "uri": "/{/lang}/backend/hr/staff/list?{?}",
+                "uri": "{/base}/{/lang}/backend/hr/staff/list?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -33,7 +33,7 @@
                         "type": 3,
                         "subtype": 1,
                         "name": "List",
-                        "uri": "/{/lang}/backend/hr/staff/list?{?}",
+                        "uri": "{/base}/{/lang}/backend/hr/staff/list?{?}",
                         "target": "self",
                         "icon": null,
                         "order": 1,
@@ -49,7 +49,7 @@
                         "type": 3,
                         "subtype": 1,
                         "name": "Create",
-                        "uri": "/{/lang}/backend/hr/staff/create?{?}",
+                        "uri": "{/base}/{/lang}/backend/hr/staff/create?{?}",
                         "target": "self",
                         "icon": null,
                         "order": 5,
@@ -67,7 +67,7 @@
                 "type": 2,
                 "subtype": 1,
                 "name": "Departments",
-                "uri": "/{/lang}/backend/hr/department/list?{?}",
+                "uri": "{/base}/{/lang}/backend/hr/department/list?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -81,7 +81,7 @@
                         "type": 3,
                         "subtype": 1,
                         "name": "List",
-                        "uri": "/{/lang}/backend/hr/department/list?{?}",
+                        "uri": "{/base}/{/lang}/backend/hr/department/list?{?}",
                         "target": "self",
                         "icon": null,
                         "order": 1,
diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php
index 33326dd..3443493 100644
--- a/Theme/Backend/department-list.tpl.php
+++ b/Theme/Backend/department-list.tpl.php
@@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?>
         <tr><td colspan="4"><?= $footerView->render(); ?>
         <tbody>
         <?php $c = 0; foreach ([] as $key => $value) : $c++;
-        $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?>
+        $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?>
         <tr>
             <td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
             <td><a href="<?= $url; ?>"><?= $value->getName(); ?></a>
diff --git a/Theme/Backend/planning-dashboard.tpl.php b/Theme/Backend/planning-dashboard.tpl.php
index d878407..63fa6c9 100644
--- a/Theme/Backend/planning-dashboard.tpl.php
+++ b/Theme/Backend/planning-dashboard.tpl.php
@@ -25,7 +25,7 @@
         </table>
         <!-- @formatter:on -->
         <div class="cT">
-            <a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/sales/analysis/clients/dashboard'); ?>"
+            <a href="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/sales/analysis/clients/dashboard'); ?>"
                class="button"><?= $this->app->accountManager->get($request->getAccount())->getL11n()->lang[0]['More'] ?></a>
         </div>
     </div>
diff --git a/Theme/Backend/staff-list.tpl.php b/Theme/Backend/staff-list.tpl.php
index 3bb938d..2d43b8e 100644
--- a/Theme/Backend/staff-list.tpl.php
+++ b/Theme/Backend/staff-list.tpl.php
@@ -42,7 +42,7 @@ echo $this->getData('nav')->render(); ?>
         <tr><td colspan="5"><?= $footerView->render(); ?>
         <tbody>
         <?php $c = 0; foreach ($employees as $key => $value) : $c++;
-            $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?>
+            $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?>
             <tr>
                 <td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
                 <td><a href="<?= $url; ?>"><?= $value->getNewestHistory()->getPosition(); ?></a>
diff --git a/Theme/Backend/staff-single.tpl.php b/Theme/Backend/staff-single.tpl.php
index 2a82aa4..6ea3f49 100644
--- a/Theme/Backend/staff-single.tpl.php
+++ b/Theme/Backend/staff-single.tpl.php
@@ -103,7 +103,7 @@ echo $this->getData('nav')->render(); ?>
         <tr><td colspan="4"><?= $footerView->render(); ?>
         <tbody>
         <?php $c = 0; foreach ($employees as $key => $value) : $c++;
-            $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?>
+            $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?>
             <tr>
                 <td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
                 <td><a href="<?= $url; ?>"><?= $value->getNewestHistory()->getPosition(); ?></a>
@@ -127,7 +127,7 @@ echo $this->getData('nav')->render(); ?>
         <tr><td colspan="4"><?= $footerView->render(); ?>
         <tbody>
         <?php $c = 0; foreach ($employees as $key => $value) : $c++;
-            $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?>
+            $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?>
             <tr>
                 <td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
                 <td><a href="<?= $url; ?>"><?= $value->getNewestHistory()->getPosition(); ?></a>