From d8ad7319e8673c04ca9bc2d2fcfcfb6f5ae5bd27 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 9 Mar 2019 23:21:29 +0100
Subject: [PATCH] Make app,localization in url optional+tld+subdomain

---
 Admin/Install/Navigation.install.json    | 8 ++++----
 Admin/Routes/Web/Backend.php             | 2 +-
 Theme/Backend/calendar-dashboard.tpl.php | 4 ++--
 info.json                                | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index a738ca1..d3d0623 100644
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -1,11 +1,11 @@
 [
     {
         "id": 1000901001,
-        "pid": "/backend",
+        "pid": "/",
         "type": 1,
         "subtype": 1,
         "name": "Calendar",
-        "uri": "{/lang}/backend/calendar/dashboard?{?}",
+        "uri": "{/prefix}calendar/dashboard?{?}",
         "target": "self",
         "icon": "fa fa-calendar",
         "order": 10,
@@ -16,11 +16,11 @@
     },
     {
         "id": 1000901002,
-        "pid": "/backend",
+        "pid": "/",
         "type": 2,
         "subtype": 1,
         "name": "Calendar",
-        "uri": "{/lang}/backend/calendar/dashboard?{?}",
+        "uri": "{/prefix}calendar/dashboard?{?}",
         "target": "self",
         "icon": null,
         "order": 30,
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 745ac17..4ce3d28 100644
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType;
 use phpOMS\Router\RouteVerb;
 
 return [
-    '^.*/backend/calendar/dashboard.*$' => [
+    '^.*/calendar/dashboard.*$' => [
         [
             'dest' => '\Modules\Calendar\Controller\BackendController:viewCalendarDashboard',
             'verb' => RouteVerb::GET,
diff --git a/Theme/Backend/calendar-dashboard.tpl.php b/Theme/Backend/calendar-dashboard.tpl.php
index 64250b8..f251ab8 100644
--- a/Theme/Backend/calendar-dashboard.tpl.php
+++ b/Theme/Backend/calendar-dashboard.tpl.php
@@ -5,8 +5,8 @@ $calendar = $this->getData('calendar');
     <div class="col-xs-12 col-md-9">
         <div class="box wf-100">
             <ul class="btns floatLeft">
-                <li><a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('{/lang}/backend/calendar/dashboard?date=' . $calendar->getDate()->createModify(0, -1, 0)->format('Y-m-d'))); ?>"><i class="fa fa-arrow-left"></i></a>
-                <li><a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('{/lang}/backend/calendar/dashboard?date=' . $calendar->getDate()->createModify(0, 1, 0)->format('Y-m-d'))); ?>"><i class="fa fa-arrow-right"></i></a>
+                <li><a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('{/prefix}calendar/dashboard?date=' . $calendar->getDate()->createModify(0, -1, 0)->format('Y-m-d'))); ?>"><i class="fa fa-arrow-left"></i></a>
+                <li><a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('{/prefix}calendar/dashboard?date=' . $calendar->getDate()->createModify(0, 1, 0)->format('Y-m-d'))); ?>"><i class="fa fa-arrow-right"></i></a>
             </ul>
             <ul class="btns floatRight">
                 <li><a href=""><?= $this->getHtml('Day'); ?></a>
diff --git a/info.json b/info.json
index df3a55c..38e4979 100644
--- a/info.json
+++ b/info.json
@@ -25,7 +25,7 @@
     "load": [
         {
             "pid": [
-                "/backend/calendar"
+                "/calendar"
             ],
             "type": 4,
             "for": "Content",
@@ -34,7 +34,7 @@
         },
         {
             "pid": [
-                "/backend"
+                "/"
             ],
             "type": 5,
             "from": "Calendar",