From 36de85e71d53847a7ced6a5fe374fab1391b87b7 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/dashboard-news.tpl.php  |  2 +-
 Theme/Backend/news-archive.tpl.php    |  2 +-
 Theme/Backend/news-create.tpl.php     |  2 +-
 Theme/Backend/news-dashboard.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 10e6096..b61d0d9 100644
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "News",
-        "uri": "{/base}/{/lang}/backend/news/dashboard?{?}",
+        "uri": "/{/lang}/backend/news/dashboard?{?}",
         "target": "self",
         "icon": null,
         "order": 40,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "News",
-                "uri": "{/base}/{/lang}/backend/news/dashboard?{?}",
+                "uri": "/{/lang}/backend/news/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Archive",
-                "uri": "{/base}/{/lang}/backend/news/archive?{?}",
+                "uri": "/{/lang}/backend/news/archive?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -49,7 +49,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/base}/{/lang}/backend/news/create?{?}",
+                "uri": "/{/lang}/backend/news/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 10,
@@ -64,7 +64,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Draft",
-                "uri": "{/base}/{/lang}/backend/news/draft/list?{?}",
+                "uri": "/{/lang}/backend/news/draft/list?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 15,
diff --git a/Theme/Backend/dashboard-news.tpl.php b/Theme/Backend/dashboard-news.tpl.php
index abbdd42..d4430e1 100644
--- a/Theme/Backend/dashboard-news.tpl.php
+++ b/Theme/Backend/dashboard-news.tpl.php
@@ -28,7 +28,7 @@ $newsList = $this->getData('news');
                 <td><?= $this->getHtml('Title', 'News') ?>
             <tbody>
             <?php $count = 0; foreach ($newsList as $key => $news) : $count++;
-            $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/news/article?{?}&id=' . $news->getId());
+            $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/news/article?{?}&id=' . $news->getId());
             $color = 'darkred';
             if ($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
             elseif ($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; }
diff --git a/Theme/Backend/news-archive.tpl.php b/Theme/Backend/news-archive.tpl.php
index a7c47ff..31733d6 100644
--- a/Theme/Backend/news-archive.tpl.php
+++ b/Theme/Backend/news-archive.tpl.php
@@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr>
                     <td colspan="4"><?= $footerView->render(); ?>
                         <tbody>
-                        <?php $count = 0; foreach ($articles as $key => $news) : $count++; $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/news/article?{?}&id=' . $news->getId());
+                        <?php $count = 0; foreach ($articles as $key => $news) : $count++; $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/news/article?{?}&id=' . $news->getId());
                             $color = 'darkred';
                             if ($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
                             elseif ($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; }
diff --git a/Theme/Backend/news-create.tpl.php b/Theme/Backend/news-create.tpl.php
index b6a3c0e..18f699e 100644
--- a/Theme/Backend/news-create.tpl.php
+++ b/Theme/Backend/news-create.tpl.php
@@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12 col-md-3">
         <section class="box wf-100">
             <div class="inner">
-                <form id="docForm" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/news?{?}&csrf={$CSRF}'); ?>">
+                <form id="docForm" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/news?{?}&csrf={$CSRF}'); ?>">
                     <table class="layout wf-100">
                         <tr><td colspan="2"><label for="publish"><?= $this->getHtml('Status'); ?></label>
                         <tr><td colspan="2"><select name="status">
diff --git a/Theme/Backend/news-dashboard.tpl.php b/Theme/Backend/news-dashboard.tpl.php
index 3470ac0..843f764 100644
--- a/Theme/Backend/news-dashboard.tpl.php
+++ b/Theme/Backend/news-dashboard.tpl.php
@@ -33,7 +33,7 @@ echo $this->getData('nav')->render(); ?>
                     <td><?= $this->getHtml('Date') ?>
                 <tbody>
                 <?php $count = 0; foreach ($newsList as $key => $news) : $count++;
-                $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/news/article?{?}&id=' . $news->getId());
+                $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/news/article?{?}&id=' . $news->getId());
                 $color = 'darkred';
                 if ($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
                 elseif ($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; }