diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index ac04e61..911d84e 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -5,7 +5,7 @@ "type": 2, "subtype": 0, "name": "Marketing", - "uri": "{/base}/{/lang}/backend/marketing/dashboard?{?}", + "uri": "/{/lang}/backend/marketing/dashboard?{?}", "target": "self", "icon": "fa fa-paint-brush", "order": 60, @@ -19,7 +19,7 @@ "type": 2, "subtype": 1, "name": "Promotions", - "uri": "{/base}/{/lang}/backend/marketing/promotion/list?{?}", + "uri": "/{/lang}/backend/marketing/promotion/list?{?}", "target": "self", "icon": null, "order": 1, @@ -33,7 +33,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/{/lang}/backend/marketing/promotion/list?{?}", + "uri": "/{/lang}/backend/marketing/promotion/list?{?}", "target": "self", "icon": null, "order": 1, @@ -48,7 +48,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/base}/{/lang}/backend/marketing/promotion/create?{?}", + "uri": "/{/lang}/backend/marketing/promotion/create?{?}", "target": "self", "icon": null, "order": 5, @@ -65,7 +65,7 @@ "type": 2, "subtype": 1, "name": "Events", - "uri": "{/base}/{/lang}/backend/marketing/event/list?{?}", + "uri": "/{/lang}/backend/marketing/event/list?{?}", "target": "self", "icon": null, "order": 5, @@ -79,7 +79,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/{/lang}/backend/marketing/event/list?{?}", + "uri": "/{/lang}/backend/marketing/event/list?{?}", "target": "self", "icon": null, "order": 1, @@ -94,7 +94,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/base}/{/lang}/backend/marketing/event/create?{?}", + "uri": "/{/lang}/backend/marketing/event/create?{?}", "target": "self", "icon": null, "order": 5, diff --git a/Controller.php b/Controller.php index c2ef68a..90bc90f 100644 --- a/Controller.php +++ b/Controller.php @@ -123,7 +123,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/Marketing/Theme/Backend/promotion-profile'); diff --git a/Theme/Backend/event-create.tpl.php b/Theme/Backend/event-create.tpl.php index c7c24d9..e33b058 100644 --- a/Theme/Backend/event-create.tpl.php +++ b/Theme/Backend/event-create.tpl.php @@ -22,7 +22,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Event'); ?>

-
+
diff --git a/Theme/Backend/promotion-create.tpl.php b/Theme/Backend/promotion-create.tpl.php index 841d851..1e7b61d 100644 --- a/Theme/Backend/promotion-create.tpl.php +++ b/Theme/Backend/promotion-create.tpl.php @@ -22,7 +22,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Promotion'); ?>

- + $value) : $count++; - $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/marketing/promotion/profile?{?}&id=' . $value->getId());?> + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/marketing/promotion/profile?{?}&id=' . $value->getId());?>
diff --git a/Theme/Backend/promotion-list.tpl.php b/Theme/Backend/promotion-list.tpl.php index 03ee01d..9507c1c 100644 --- a/Theme/Backend/promotion-list.tpl.php +++ b/Theme/Backend/promotion-list.tpl.php @@ -36,7 +36,7 @@ echo $this->getData('nav')->render(); ?> render(); ?>
printHtml($value->getName()); ?> printHtml($value->getStart()->format('Y-m-d')); ?> diff --git a/Theme/Backend/promotion-profile.tpl.php b/Theme/Backend/promotion-profile.tpl.php index b56ee31..ae7add1 100644 --- a/Theme/Backend/promotion-profile.tpl.php +++ b/Theme/Backend/promotion-profile.tpl.php @@ -21,7 +21,7 @@ echo $this->getData('nav')->render(); ?>

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

- +