From 04277beee95b7a3dcd76b9aa651208c88abf0530 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 8 Nov 2017 22:39:51 +0100 Subject: [PATCH] Fix #13 --- Admin/Install/Navigation.install.json | 6 +++--- Controller.php | 2 +- Theme/Backend/projectmanagement-list.tpl.php | 2 +- Theme/Backend/projectmanagement-profile.tpl.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index ea2645a..39e37c6 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -5,7 +5,7 @@ "type": 2, "subtype": 1, "name": "ProjectManagement", - "uri": "{/base}/{/lang}/backend/projectmanagement/list?{?}", + "uri": "/{/lang}/backend/projectmanagement/list?{?}", "target": "self", "icon": null, "order": 60, @@ -19,7 +19,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/{/lang}/backend/projectmanagement/list?{?}", + "uri": "/{/lang}/backend/projectmanagement/list?{?}", "target": "self", "icon": null, "order": 1, @@ -34,7 +34,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/base}/{/lang}/backend/projectmanagement/create?{?}", + "uri": "/{/lang}/backend/projectmanagement/create?{?}", "target": "self", "icon": null, "order": 5, diff --git a/Controller.php b/Controller.php index 552cd53..c5c4e40 100644 --- a/Controller.php +++ b/Controller.php @@ -142,7 +142,7 @@ class Controller extends ModuleAbstract implements WebInterface { /** @var Head $head */ $head = $response->get('Content')->getData('head'); - $head->addAsset(AssetType::CSS, $request->getUri()->getBase() . 'Modules/Calendar/Theme/Backend/css/styles.css'); + $head->addAsset(AssetType::CSS, '/Modules/Calendar/Theme/Backend/css/styles.css'); $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/ProjectManagement/Theme/Backend/projectmanagement-profile'); diff --git a/Theme/Backend/projectmanagement-list.tpl.php b/Theme/Backend/projectmanagement-list.tpl.php index 429a674..18e9d00 100644 --- a/Theme/Backend/projectmanagement-list.tpl.php +++ b/Theme/Backend/projectmanagement-list.tpl.php @@ -36,7 +36,7 @@ echo $this->getData('nav')->render(); ?> render(); ?> $value) : $count++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/projectmanagement/profile?{?}&id=' . $value->getId());?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/projectmanagement/profile?{?}&id=' . $value->getId());?> printHtml($value->getName()); ?> printHtml($value->getStart()->format('Y-m-d')); ?> diff --git a/Theme/Backend/projectmanagement-profile.tpl.php b/Theme/Backend/projectmanagement-profile.tpl.php index 0e9b85c..cb6fdf2 100644 --- a/Theme/Backend/projectmanagement-profile.tpl.php +++ b/Theme/Backend/projectmanagement-profile.tpl.php @@ -20,7 +20,7 @@ echo $this->getData('nav')->render(); ?>

printHtml($project->getName()); ?>

-
+