From 10192993eaddaa2f2732b0cd21c13a0f8f29e045 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 | 32 +++++++++---------
 Theme/Backend/item-create.tpl.php     | 48 +++++++++++++--------------
 Theme/Backend/sales-item-list.tpl.php |  2 +-
 Theme/Backend/stock-list.tpl.php      |  2 +-
 4 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 045b8d3..3db403f 100644
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Articles",
-        "uri": "{/base}/{/lang}/backend/sales/item/list?{?}",
+        "uri": "/{/lang}/backend/sales/item/list?{?}",
         "target": "self",
         "icon": null,
         "order": 10,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/base}/{/lang}/backend/sales/item/list?{?}",
+                "uri": "/{/lang}/backend/sales/item/list?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -33,7 +33,7 @@
                         "type": 3,
                         "subtype": 1,
                         "name": "Article",
-                        "uri": "{/base}/{/lang}/backend/sales/item/single?{?}",
+                        "uri": "/{/lang}/backend/sales/item/single?{?}",
                         "target": "self",
                         "icon": null,
                         "order": 1,
@@ -50,7 +50,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/base}/{/lang}/backend/sales/item/create?{?}",
+                "uri": "/{/lang}/backend/sales/item/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -67,7 +67,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Articles",
-        "uri": "{/base}/{/lang}/backend/purchase/item/list?{?}",
+        "uri": "/{/lang}/backend/purchase/item/list?{?}",
         "target": "self",
         "icon": null,
         "order": 10,
@@ -81,7 +81,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/base}/{/lang}/backend/purchase/item/list?{?}",
+                "uri": "/{/lang}/backend/purchase/item/list?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -95,7 +95,7 @@
                         "type": 3,
                         "subtype": 1,
                         "name": "Article",
-                        "uri": "{/base}/{/lang}/backend/purchase/item/single?{?}",
+                        "uri": "/{/lang}/backend/purchase/item/single?{?}",
                         "target": "self",
                         "icon": null,
                         "order": 1,
@@ -112,7 +112,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/base}/{/lang}/backend/purchase/item/create?{?}",
+                "uri": "/{/lang}/backend/purchase/item/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -129,7 +129,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Stock",
-        "uri": "{/base}/{/lang}/backend/warehouse/stock/list?{?}",
+        "uri": "/{/lang}/backend/warehouse/stock/list?{?}",
         "target": "self",
         "icon": null,
         "order": 10,
@@ -143,7 +143,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/base}/{/lang}/backend/warehouse/stock/list?{?}",
+                "uri": "/{/lang}/backend/warehouse/stock/list?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -157,7 +157,7 @@
                         "type": 3,
                         "subtype": 1,
                         "name": "Article",
-                        "uri": "{/base}/{/lang}/backend/warehouse/stock/single?{?}",
+                        "uri": "/{/lang}/backend/warehouse/stock/single?{?}",
                         "target": "self",
                         "icon": null,
                         "order": 1,
@@ -174,7 +174,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/base}/{/lang}/backend/warehouse/stock/create?{?}",
+                "uri": "/{/lang}/backend/warehouse/stock/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -191,7 +191,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Articles",
-        "uri": "{/base}/{/lang}/backend/production/item/list?{?}",
+        "uri": "/{/lang}/backend/production/item/list?{?}",
         "target": "self",
         "icon": null,
         "order": 5,
@@ -205,7 +205,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/base}/{/lang}/backend/production/item/list?{?}",
+                "uri": "/{/lang}/backend/production/item/list?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -219,7 +219,7 @@
                         "type": 3,
                         "subtype": 1,
                         "name": "Article",
-                        "uri": "{/base}/{/lang}/backend/production/item/single?{?}",
+                        "uri": "/{/lang}/backend/production/item/single?{?}",
                         "target": "self",
                         "icon": null,
                         "order": 1,
@@ -236,7 +236,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/base}/{/lang}/backend/production/item/create?{?}",
+                "uri": "/{/lang}/backend/production/item/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 5,
diff --git a/Theme/Backend/item-create.tpl.php b/Theme/Backend/item-create.tpl.php
index 8ea28e8..f428233 100644
--- a/Theme/Backend/item-create.tpl.php
+++ b/Theme/Backend/item-create.tpl.php
@@ -43,7 +43,7 @@ echo $this->getData('nav')->render(); ?>
                     <section class="box wf-100">
                         <header><h1><?= $this->getHtml('Item'); ?></h1></header>
                         <div class="inner">
-                            <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                            <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iSource"><?= $this->getHtml('ID'); ?></label>
@@ -69,7 +69,7 @@ echo $this->getData('nav')->render(); ?>
                     <section class="box wf-100">
                         <header><h1><?= $this->getHtml('Language'); ?></h1></header>
                         <div class="inner">
-                            <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                            <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iLanguage"><?= $this->getHtml('Language'); ?></label>
@@ -97,7 +97,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Property'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPCustomsId"><?= $this->getHtml('Name'); ?></label>
@@ -116,7 +116,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Language'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPTradingUnit"><?= $this->getHtml('Language'); ?></label>
@@ -135,7 +135,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Language'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPTradingUnit"><?= $this->getHtml('Language'); ?></label>
@@ -155,7 +155,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Attribute'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPCustomsId"><?= $this->getHtml('Name'); ?></label>
@@ -174,7 +174,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Language'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPTradingUnit"><?= $this->getHtml('Language'); ?></label>
@@ -193,7 +193,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Language'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPTradingUnit"><?= $this->getHtml('Language'); ?></label>
@@ -215,7 +215,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Sales'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPType"><?= $this->getHtml('Status'); ?></label>
@@ -257,7 +257,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Price'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td colspan="2"><label for="iPName"><?= $this->getHtml('Name'); ?></label>
@@ -293,7 +293,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Purchase'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iSupplierId"><?= $this->getHtml('Supplier'); ?></label>
@@ -326,7 +326,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Price'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPName"><?= $this->getHtml('Name'); ?></label>
@@ -350,7 +350,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Stock'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPVariation"><?= $this->getHtml('Stock'); ?></label>
@@ -374,7 +374,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Supplier'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPName"><?= $this->getHtml('Name'); ?></label>
@@ -392,7 +392,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Accounting'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td colspan="2"><label for="iACostIndicator"><?= $this->getHtml('CostIndicator'); ?></label>
@@ -413,7 +413,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Production'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPType"><?= $this->getHtml('Status'); ?></label>
@@ -443,7 +443,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('StockList'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iSource"><?= $this->getHtml('ID'); ?></label>
@@ -461,7 +461,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('QM'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                         </table>
@@ -474,7 +474,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Packaging'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPVariation"><?= $this->getHtml('Container'); ?></label>
@@ -506,7 +506,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Media'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iDiscount"><?= $this->getHtml('Media'); ?></label>
@@ -522,7 +522,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Stock'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPVariation"><?= $this->getHtml('ShelfLife'); ?></label>
@@ -535,7 +535,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Stock'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPVariation"><?= $this->getHtml('Stock'); ?></label>
@@ -559,7 +559,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Disposal'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                         </table>
@@ -572,7 +572,7 @@ echo $this->getData('nav')->render(); ?>
             <section class="box w-33 floatLeft">
                 <header><h1><?= $this->getHtml('Files'); ?></h1></header>
                 <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/...'); ?>" method="post">
+                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iDiscount"><?= $this->getHtml('Files'); ?></label>
diff --git a/Theme/Backend/sales-item-list.tpl.php b/Theme/Backend/sales-item-list.tpl.php
index e5dcfbb..e31c0ea 100644
--- a/Theme/Backend/sales-item-list.tpl.php
+++ b/Theme/Backend/sales-item-list.tpl.php
@@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?>
                     <td colspan="6"><?= $footerView->render(); ?>
                 <tbody>
                 <?php $count = 0; foreach ($items as $key => $value) : $count++; 
-                $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/sales/item/single?{?}&id=' . $value->getId()); ?>
+                $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/sales/item/single?{?}&id=' . $value->getId()); ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getNumber()); ?></a>
                     <td>
diff --git a/Theme/Backend/stock-list.tpl.php b/Theme/Backend/stock-list.tpl.php
index 226806b..554e7ef 100644
--- a/Theme/Backend/stock-list.tpl.php
+++ b/Theme/Backend/stock-list.tpl.php
@@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td colspan="8"><?= $footerView->render(); ?>
                 <tbody>
                 <?php $c = 0; foreach ([] as $key => $value) : $c++;
-                $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/business/department/profile?{?}&id=' . $value->getId()); ?>
+                $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/business/department/profile?{?}&id=' . $value->getId()); ?>
                 <tr>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>