diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 9aaa160..8b62ab6 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,11 +1,11 @@ [ { "id": 1000301001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Profiles", - "uri": "{/lang}/backend/profile/list?{?}", + "uri": "{/prefix}profile/list?{?}", "target": "self", "icon": null, "order": 10, @@ -15,11 +15,11 @@ "children": [ { "id": 1000302001, - "pid": "/backend/profile", + "pid": "/profile", "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/backend/profile/list?{?}", + "uri": "{/prefix}profile/list?{?}", "target": "self", "icon": null, "order": 1, @@ -30,11 +30,11 @@ }, { "id": 1000303001, - "pid": "/backend/profile", + "pid": "/profile", "type": 5, "subtype": 1, "name": "Profile", - "uri": "{/lang}/backend/profile/single/front?{?}", + "uri": "{/prefix}profile/single/front?{?}", "target": "self", "icon": null, "order": 3, @@ -45,11 +45,11 @@ }, { "id": 1000303002, - "pid": "/backend/profile", + "pid": "/profile", "type": 5, "subtype": 1, "name": "Settings", - "uri": "{/lang}/backend/profile/single/settings?{?}", + "uri": "{/prefix}profile/single/settings?{?}", "target": "self", "icon": null, "order": 999, @@ -62,11 +62,11 @@ }, { "id": 1000304001, - "pid": "/backend/admin/module/settings", + "pid": "/admin/module/settings", "type": 3, "subtype": 1, "name": "Overview", - "uri": "{/lang}/backend/admin/module/settings?{?}", + "uri": "{/prefix}admin/module/settings?{?}", "target": "self", "icon": null, "order": 1, @@ -77,11 +77,11 @@ }, { "id": 1000304002, - "pid": "/backend/admin/module/settings", + "pid": "/admin/module/settings", "type": 3, "subtype": 1, "name": "Settings", - "uri": "{/lang}/backend/admin/module/settings/profile/settings?{?}", + "uri": "{/prefix}admin/module/settings/profile/settings?{?}", "target": "self", "icon": null, "order": 1, @@ -92,11 +92,11 @@ }, { "id": 1000304003, - "pid": "/backend/admin/module/settings", + "pid": "/admin/module/settings", "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/backend/admin/module/settings/profile/create?{?}", + "uri": "{/prefix}admin/module/settings/profile/create?{?}", "target": "self", "icon": null, "order": 2, diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index c6bb98a..0dcf6d1 100644 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; return [ - '^.*/api/profile.*$' => [ + '^.*/profile.*$' => [ [ 'dest' => '\Modules\Profile\Controller\ApiController:apiProfileCreate', 'verb' => RouteVerb::PUT, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 34f88e8..ff50f38 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/profile.*$' => [ + '^.*/profile.*$' => [ [ 'dest' => '\Modules\Profile\Controller\BackendController:setupProfileStyles', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/backend/profile/list.*$' => [ + '^.*/profile/list.*$' => [ [ 'dest' => '\Modules\Profile\Controller\BackendController:viewProfileList', 'verb' => RouteVerb::GET, @@ -28,7 +28,7 @@ return [ ], ], ], - '^.*/backend/profile/single.*$' => [ + '^.*/profile/single.*$' => [ [ 'dest' => '\Modules\Profile\Controller\BackendController:viewProfileSingle', 'verb' => RouteVerb::GET, @@ -39,7 +39,7 @@ return [ ], ], ], - '^.*/backend/admin/module/settings/profile/settings.*$' => [ + '^.*/admin/module/settings/profile/settings.*$' => [ [ 'dest' => '\Modules\Profile\Controller\BackendController:viewProfileAdminSettings', 'verb' => RouteVerb::GET, @@ -50,7 +50,7 @@ return [ ], ], ], - '^.*/backend/admin/module/settings/profile/create.*$' => [ + '^.*/admin/module/settings/profile/create.*$' => [ [ 'dest' => '\Modules\Profile\Controller\BackendController:viewProfileAdminCreate', 'verb' => RouteVerb::GET, diff --git a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php index 8e7b3f6..0681e40 100644 --- a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php +++ b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php @@ -5,9 +5,9 @@ { "key": 1, "listener": "click", "action": [ {"key": 1, "type": "dom.popup", "selector": "#acc-grp-tpl", "aniIn": "fadeIn", "id": "printHtml($this->getId()); ?>"}, - {"key": 2, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, + {"key": 2, "type": "message.request", "uri": "", "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": "", "method": "GET", "request_type": "json"}, + {"key": 4, "type": "message.request", "uri": "", "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/modules-create.tpl.php b/Theme/Backend/modules-create.tpl.php index 365a781..9faca55 100644 --- a/Theme/Backend/modules-create.tpl.php +++ b/Theme/Backend/modules-create.tpl.php @@ -9,7 +9,7 @@ echo $this->getData('nav')->render();

getHtml('CreateProfile'); ?>

-
+ $account) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/profile/single?{?}&id=' . $account->getAccount()->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}profile/single?{?}&id=' . $account->getAccount()->getId()); ?>
diff --git a/Theme/Backend/profile-list.tpl.php b/Theme/Backend/profile-list.tpl.php index a974090..0fd9c70 100644 --- a/Theme/Backend/profile-list.tpl.php +++ b/Theme/Backend/profile-list.tpl.php @@ -37,7 +37,7 @@ $accounts = $this->getData('accounts');
printHtml($account->getAccount()->getId()); ?> printHtml($account->getAccount()->getName3() . ' ' . $account->getAccount()->getName2() . ' ' . $account->getAccount()->getName1()); ?> diff --git a/Theme/Backend/profile-single.tpl.php b/Theme/Backend/profile-single.tpl.php index 0630c2d..c85b58d 100644 --- a/Theme/Backend/profile-single.tpl.php +++ b/Theme/Backend/profile-single.tpl.php @@ -49,7 +49,7 @@ echo $this->getData('nav')->render();

printHtml(empty($account->getAccount()->getName3()) ? $account->getAccount()->getName2() : $account->getAccount()->getName3()); ?>, printHtml($account->getAccount()->getName1()); ?>

- <?= $this->getHtml('ProfileImage'); ?> + <?= $this->getHtml('ProfileImage'); ?> @@ -128,7 +128,7 @@ echo $this->getData('nav')->render();

getHtml('Localization'); ?>

- +
diff --git a/info.json b/info.json index b156726..5f7168f 100644 --- a/info.json +++ b/info.json @@ -29,7 +29,7 @@ "load": [ { "pid": [ - "/backend/profile" + "/profile" ], "type": 4, "for": "Content", @@ -38,7 +38,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 5, "from": "Profile",