From 0c2ac758cf08b023580170999630cb3b1bff98f2 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/dashboard-news.tpl.php  |  2 +-
 Theme/Backend/news-dashboard.tpl.php  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 7796b7c..7d2085e 100644
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "News",
-        "uri": "/{/lang}/backend/news/dashboard?{?}",
+        "uri": "{/base}/{/lang}/backend/news/dashboard?{?}",
         "target": "self",
         "icon": null,
         "order": 40,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "News",
-                "uri": "/{/lang}/backend/news/dashboard?{?}",
+                "uri": "{/base}/{/lang}/backend/news/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Archive",
-                "uri": "/{/lang}/backend/news/archive?{?}",
+                "uri": "{/base}/{/lang}/backend/news/archive?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -49,7 +49,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "/{/lang}/backend/news/create?{?}",
+                "uri": "{/base}/{/lang}/backend/news/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 10,
@@ -64,7 +64,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Draft",
-                "uri": "/{/lang}/backend/news/draft/list?{?}",
+                "uri": "{/base}/{/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 6f6ce0e..55f318f 100644
--- a/Theme/Backend/dashboard-news.tpl.php
+++ b/Theme/Backend/dashboard-news.tpl.php
@@ -30,7 +30,7 @@ $newsList = $this->getData('news');
                 <td class="wf-100"><?= $this->getText('Title', 'News'); ?>
             <tbody>
             <?php $count = 0; foreach($newsList as $key => $news) : $count++;
-            $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/news/article?{?}&id=' . $news->getId());
+            $url = \phpOMS\Uri\UriFactory::build('{/base}/{/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-dashboard.tpl.php b/Theme/Backend/news-dashboard.tpl.php
index 6b404dd..3cfec26 100644
--- a/Theme/Backend/news-dashboard.tpl.php
+++ b/Theme/Backend/news-dashboard.tpl.php
@@ -35,7 +35,7 @@ echo $this->getData('nav')->render(); ?>
                     <td><?= $this->getText('Date'); ?>
                 <tbody>
                 <?php $count = 0; foreach($newsList as $key => $news) : $count++;
-                $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/news/article?{?}&id=' . $news->getId());
+                $url = \phpOMS\Uri\UriFactory::build('{/base}/{/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'; }