diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 827eaee..9234f9b 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -5,7 +5,7 @@ "type": 2, "subtype": 1, "name": "Profiles", - "uri": "{/base}/{/lang}/backend/profile/list?{?}", + "uri": "/{/lang}/backend/profile/list?{?}", "target": "self", "icon": null, "order": 10, @@ -19,7 +19,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/{/lang}/backend/profile/list?{?}", + "uri": "/{/lang}/backend/profile/list?{?}", "target": "self", "icon": null, "order": 1, @@ -34,7 +34,7 @@ "type": 5, "subtype": 1, "name": "Profile", - "uri": "{/base}/{/lang}/backend/profile/single/front?{?}", + "uri": "/{/lang}/backend/profile/single/front?{?}", "target": "self", "icon": null, "order": 3, @@ -49,7 +49,7 @@ "type": 5, "subtype": 1, "name": "Settings", - "uri": "{/base}/{/lang}/backend/profile/single/settings?{?}", + "uri": "/{/lang}/backend/profile/single/settings?{?}", "target": "self", "icon": null, "order": 999, diff --git a/Controller.php b/Controller.php index de5412b..2d9fbff 100644 --- a/Controller.php +++ b/Controller.php @@ -98,7 +98,7 @@ class Controller extends ModuleAbstract implements WebInterface { /** @var Head $head */ $head = $response->get('Content')->getData('head'); - $head->addAsset(AssetType::CSS, $request->getUri()->getBase() . 'Modules/Profile/Theme/Backend/css/styles.css'); + $head->addAsset(AssetType::CSS, '/Modules/Profile/Theme/Backend/css/styles.css'); } /** @@ -135,7 +135,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/Profile/Theme/Backend/profile-single'); diff --git a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php index 7ea6d1c..effc00e 100644 --- a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php +++ b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php @@ -3,9 +3,9 @@ { "listener": "click", "action": [ {"key": 1, "type": "dom.popup", "selector": "#acc-grp-tpl", "aniIn": "fadeIn", "id": "= $this->printHtml($this->getId()); ?>"}, - {"key": 2, "type": "message.request", "uri": "= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"}, + {"key": 2, "type": "message.request", "uri": "= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"}, {"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}, - {"key": 4, "type": "message.request", "uri": "= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"}, + {"key": 4, "type": "message.request", "uri": "= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"}, {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1} ] } diff --git a/Theme/Backend/profile-list.tpl.php b/Theme/Backend/profile-list.tpl.php index ec54f8e..3d0ae5e 100644 --- a/Theme/Backend/profile-list.tpl.php +++ b/Theme/Backend/profile-list.tpl.php @@ -38,7 +38,7 @@ $accounts = $this->getData('accounts');
+