diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 76325b2..a2cc910 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,11 +1,11 @@ [ { "id": 1001201001, - "pid": "/backend", + "pid": "/", "type": 1, "subtype": 1, "name": "Messages", - "uri": "{/lang}/backend/messages/dashboard?{?}", + "uri": "{/prefix}messages/dashboard?{?}", "target": "self", "icon": "fa fa-envelope", "order": 10, @@ -15,11 +15,11 @@ "children": [ { "id": 1001202001, - "pid": "/backend", + "pid": "/", "type": 3, "subtype": 1, "name": "Inbox", - "uri": "{/lang}/backend/messages/dashboard?{?}", + "uri": "{/prefix}messages/dashboard?{?}", "target": "self", "icon": null, "order": 1, @@ -30,11 +30,11 @@ }, { "id": 1001203001, - "pid": "/backend", + "pid": "/", "type": 3, "subtype": 1, "name": "Outbox", - "uri": "{/lang}/backend/messages/outbox?{?}", + "uri": "{/prefix}messages/outbox?{?}", "target": "self", "icon": null, "order": 5, @@ -45,11 +45,11 @@ }, { "id": 1001204001, - "pid": "/backend", + "pid": "/", "type": 3, "subtype": 1, "name": "Trash", - "uri": "{/lang}/backend/messages/trash?{?}", + "uri": "{/prefix}messages/trash?{?}", "target": "self", "icon": null, "order": 10, @@ -60,11 +60,11 @@ }, { "id": 1001205001, - "pid": "/backend", + "pid": "/", "type": 3, "subtype": 1, "name": "Spam", - "uri": "{/lang}/backend/messages/spam?{?}", + "uri": "{/prefix}messages/spam?{?}", "target": "self", "icon": null, "order": 15, @@ -75,11 +75,11 @@ }, { "id": 1001206001, - "pid": "/backend", + "pid": "/", "type": 3, "subtype": 1, "name": "Draft", - "uri": "{/lang}/backend/messages/draft?{?}", + "uri": "{/prefix}messages/draft?{?}", "target": "self", "icon": null, "order": 20, @@ -90,11 +90,11 @@ }, { "id": 1001207001, - "pid": "/backend", + "pid": "/", "type": 3, "subtype": 1, "name": "Settings", - "uri": "{/lang}/backend/messages/settings?{?}", + "uri": "{/prefix}messages/settings?{?}", "target": "self", "icon": null, "order": 50, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index e7510ac..6bb2ccf 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/messages/dashboard.*$' => [ + '^.*/messages/dashboard.*$' => [ [ 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageInbox', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/backend/messages/outbox.*$' => [ + '^.*/messages/outbox.*$' => [ [ 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageOutbox', 'verb' => RouteVerb::GET, @@ -28,7 +28,7 @@ return [ ], ], ], - '^.*/backend/messages/trash.*$' => [ + '^.*/messages/trash.*$' => [ [ 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageTrash', 'verb' => RouteVerb::GET, @@ -39,7 +39,7 @@ return [ ], ], ], - '^.*/backend/messages/spam.*$' => [ + '^.*/messages/spam.*$' => [ [ 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageSpam', 'verb' => RouteVerb::GET, @@ -50,7 +50,7 @@ return [ ], ], ], - '^.*/backend/messages/settings.*$' => [ + '^.*/messages/settings.*$' => [ [ 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageSettings', 'verb' => RouteVerb::GET, @@ -61,7 +61,7 @@ return [ ], ], ], - '^.*/backend/messages/mail/create.*$' => [ + '^.*/messages/mail/create.*$' => [ [ 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageCreate', 'verb' => RouteVerb::GET, @@ -72,7 +72,7 @@ return [ ], ], ], - '^.*/backend/messages/mail/single.*$' => [ + '^.*/messages/mail/single.*$' => [ [ 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageView', 'verb' => RouteVerb::GET, @@ -83,7 +83,7 @@ return [ ], ], ], - '^.*/api/messages/mail/single.*$' => [ + '^.*/messages/mail/single.*$' => [ [ 'dest' => '\Modules\Messages\Controller\BackendController:viewMessageView', 'verb' => RouteVerb::GET, diff --git a/Theme/Backend/dashboard.tpl.php b/Theme/Backend/dashboard.tpl.php index a15c20c..b7927d8 100644 --- a/Theme/Backend/dashboard.tpl.php +++ b/Theme/Backend/dashboard.tpl.php @@ -20,7 +20,7 @@ echo $this->getData('nav')->render(); ?>
@@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?> printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?> $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?> printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>> @@ -49,7 +49,7 @@ echo $this->getData('nav')->render(); ?> $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?> printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>> diff --git a/Theme/Backend/mail-out-view.tpl.php b/Theme/Backend/mail-out-view.tpl.php index 287ea70..8dfc1d3 100644 --- a/Theme/Backend/mail-out-view.tpl.php +++ b/Theme/Backend/mail-out-view.tpl.php @@ -19,7 +19,7 @@ echo $this->getData('nav')->render(); ?>
@@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?> printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?> $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?> printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>> diff --git a/Theme/Backend/mail-spam-view.tpl.php b/Theme/Backend/mail-spam-view.tpl.php index 287ea70..8dfc1d3 100644 --- a/Theme/Backend/mail-spam-view.tpl.php +++ b/Theme/Backend/mail-spam-view.tpl.php @@ -19,7 +19,7 @@ echo $this->getData('nav')->render(); ?>
@@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?> printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?> $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?> printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>> diff --git a/Theme/Backend/mail-trash-view.tpl.php b/Theme/Backend/mail-trash-view.tpl.php index 287ea70..8dfc1d3 100644 --- a/Theme/Backend/mail-trash-view.tpl.php +++ b/Theme/Backend/mail-trash-view.tpl.php @@ -19,7 +19,7 @@ echo $this->getData('nav')->render(); ?>
@@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?> printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?> $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?> printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>> diff --git a/info.json b/info.json index 8e77b13..4a104f1 100644 --- a/info.json +++ b/info.json @@ -25,7 +25,7 @@ "load": [ { "pid": [ - "/backend/message" + "/message" ], "type": 4, "for": 0, @@ -34,7 +34,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 5, "from": "Messages",