From 36c982139b4c1d3646fa69838a4cfdf3c13febfb 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 | 6 +++---
 Controller.php                        | 6 +++---
 Theme/Backend/draw-create.tpl.php     | 2 +-
 Theme/Backend/draw-list.tpl.php       | 2 +-
 Theme/Backend/draw-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 8288266..cd12e61 100644
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Draw",
-        "uri": "{/base}/{/lang}/backend/draw/list?{?}",
+        "uri": "/{/lang}/backend/draw/list?{?}",
         "target": "self",
         "icon": null,
         "order": 70,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/base}/{/lang}/backend/draw/list?{?}",
+                "uri": "/{/lang}/backend/draw/list?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 5,
                 "name": "Create",
-                "uri": "{/base}/{/lang}/backend/draw/create?{?}",
+                "uri": "/{/lang}/backend/draw/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 15,
diff --git a/Controller.php b/Controller.php
index d0fe3f9..474c346 100644
--- a/Controller.php
+++ b/Controller.php
@@ -107,9 +107,9 @@ class Controller extends ModuleAbstract implements WebInterface
     {
         /** @var Head $head */
         $head = $response->get('Content')->getData('head');
-        $head->addAsset(AssetType::JSLATE, $request->getUri()->getBase() . 'Modules/Draw/Controller.js');
-        $head->addAsset(AssetType::JSLATE, $request->getUri()->getBase() . 'Modules/Draw/Models/DrawType.enum.js');
-        $head->addAsset(AssetType::JSLATE, $request->getUri()->getBase() . 'Modules/Draw/Models/Editor.js');
+        $head->addAsset(AssetType::JSLATE, '/Modules/Draw/Controller.js');
+        $head->addAsset(AssetType::JSLATE, '/Modules/Draw/Models/DrawType.enum.js');
+        $head->addAsset(AssetType::JSLATE, '/Modules/Draw/Models/Editor.js');
     }
 
     /**
diff --git a/Theme/Backend/draw-create.tpl.php b/Theme/Backend/draw-create.tpl.php
index db5cf1d..930de58 100644
--- a/Theme/Backend/draw-create.tpl.php
+++ b/Theme/Backend/draw-create.tpl.php
@@ -21,7 +21,7 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <section class="box wf-100">
             <div class="inner">
-                <form id="drawForm" action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/draw?{?}&csrf={$CSRF}'); ?>" method="POST">
+                <form id="drawForm" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/draw?{?}&csrf={$CSRF}'); ?>" method="POST">
                     <input type="text" id="iTitle" name="title" class="wf-100"><input type="submit" value="<?= $this->getHtml('Create', 0, 0); ?>">
                 </form>
             </div>
diff --git a/Theme/Backend/draw-list.tpl.php b/Theme/Backend/draw-list.tpl.php
index adcb215..aa9b2a5 100644
--- a/Theme/Backend/draw-list.tpl.php
+++ b/Theme/Backend/draw-list.tpl.php
@@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?>
                     <td colspan="3"><?= $footerView->render(); ?>
                 <tbody>
                 <?php $count = 0; foreach ($images as $key => $value) : $count++;
-                $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/draw/single?{?}&id=' . $value->getId()); ?>
+                $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/draw/single?{?}&id=' . $value->getId()); ?>
                     <tr>
                         <td data-label="<?= $this->getHtml('Name') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getMedia()->getName()); ?></a>
                         <td data-label="<?= $this->getHtml('Creator') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getMedia()->getCreatedBy()); ?></a>
diff --git a/Theme/Backend/draw-single.tpl.php b/Theme/Backend/draw-single.tpl.php
index 6373203..709ea95 100644
--- a/Theme/Backend/draw-single.tpl.php
+++ b/Theme/Backend/draw-single.tpl.php
@@ -23,7 +23,7 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <section class="box wf-100">
             <div class="inner">
-                <form id="drawForm" action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/draw?{?}&csrf={$CSRF}'); ?>" method="POST">
+                <form id="drawForm" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/draw?{?}&csrf={$CSRF}'); ?>" method="POST">
                     <input type="text" id="iTitle" name="title" class="wf-100" value="<?= $this->printHtml($image->getMedia()->getName()); ?>"><input type="submit" value="<?= $this->getHtml('Save', 0, 0); ?>">
                 </form>
             </div>