diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index e556467..baecf69 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,11 +1,11 @@ [ { "id": 1000401001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "Media", - "uri": "{/lang}/backend/media/list?{?}", + "uri": "{/prefix}media/list?{?}", "target": "self", "icon": null, "order": 20, @@ -15,11 +15,11 @@ "children": [ { "id": 1000402001, - "pid": "/backend/media", + "pid": "/media", "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/backend/media/list?{?}", + "uri": "{/prefix}media/list?{?}", "target": "self", "icon": null, "order": 1, @@ -30,11 +30,11 @@ }, { "id": 1000403001, - "pid": "/backend/media", + "pid": "/media", "type": 3, "subtype": 5, "name": "Create", - "uri": "{/lang}/backend/media/create?{?}", + "uri": "{/prefix}media/create?{?}", "target": "self", "icon": null, "order": 5, @@ -47,11 +47,11 @@ }, { "id": 1000410001, - "pid": "/backend/profile/single", + "pid": "/profile/single", "type": 2, "subtype": 2, "name": "Media", - "uri": "{/lang}/backend/profile/single/media?{?}", + "uri": "{/prefix}profile/single/media?{?}", "target": "self", "icon": null, "order": 3, @@ -62,11 +62,11 @@ }, { "id": 1000410002, - "pid": "/backend/admin/account", + "pid": "/admin/account", "type": 3, "subtype": 1, "name": "Media", - "uri": "{/lang}/backend/admin/account/single/media?{?}", + "uri": "{/prefix}admin/account/single/media?{?}", "target": "self", "icon": null, "order": 3, diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index e42e0c7..23f67de 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/media$' => [ + '^.*/media$' => [ [ 'dest' => '\Modules\Media\Controller\ApiController:apiMediaUpload', 'verb' => RouteVerb::SET, @@ -22,7 +22,7 @@ return [ ], ], ], - '^.*/api/media/create.*$' => [ + '^.*/media/create.*$' => [ [ 'dest' => '\Modules\Media\Controller\ApiController:apiMediaCreate', 'verb' => RouteVerb::SET, @@ -34,7 +34,7 @@ return [ ], ], // todo: the order of find is bad but needed for now. - '^.*/api/media/find.*$' => [ + '^.*/media/find.*$' => [ [ 'dest' => '\Modules\Media\Controller\ApiController:apiMediaFind', 'verb' => RouteVerb::GET, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 08145b5..8e554bd 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/media/list.*$' => [ + '^.*/media/list.*$' => [ [ 'dest' => '\Modules\Media\Controller\BackendController:viewMediaList', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/backend/media/create.*$' => [ + '^.*/media/create.*$' => [ [ 'dest' => '\Modules\Media\Controller\BackendController:setUpFileUploader', 'verb' => RouteVerb::GET, @@ -37,7 +37,7 @@ return [ ], ], ], - '^.*/backend/media/single.*$' => [ + '^.*/media/single.*$' => [ [ 'dest' => '\Modules\Media\Controller\BackendController:viewMediaSingle', 'verb' => RouteVerb::GET, diff --git a/Theme/Backend/Components/Media/list.tpl.php b/Theme/Backend/Components/Media/list.tpl.php index dd9a6f6..f01822d 100644 --- a/Theme/Backend/Components/Media/list.tpl.php +++ b/Theme/Backend/Components/Media/list.tpl.php @@ -11,7 +11,7 @@ media as $key => $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/media/single?{?}&id=' . $value->getId()); + $url = \phpOMS\Uri\UriFactory::build('{/prefix}media/single?{?}&id=' . $value->getId()); $icon = ''; $extensionType = \phpOMS\System\File\FileUtils::getExtensionType($value->getExtension()); diff --git a/Theme/Backend/media-create.tpl.php b/Theme/Backend/media-create.tpl.php index 649aac5..7a1f3ff 100644 --- a/Theme/Backend/media-create.tpl.php +++ b/Theme/Backend/media-create.tpl.php @@ -20,7 +20,7 @@ echo $this->getData('nav')->render(); ?>

getHtml('Upload') ?>

-
+ diff --git a/Theme/Backend/media-single.tpl.php b/Theme/Backend/media-single.tpl.php index af190b2..ebfd1c4 100644 --- a/Theme/Backend/media-single.tpl.php +++ b/Theme/Backend/media-single.tpl.php @@ -64,7 +64,7 @@ echo $this->getData('nav')->render(); || $media->getPath() === '' ) : foreach ($media as $key => $value) : - $url = UriFactory::build('{/lang}/backend/media/single?{?}&id=' . $value->getId()); + $url = UriFactory::build('{/prefix}media/single?{?}&id=' . $value->getId()); $icon = $fileIconFunction(FileUtils::getExtensionType($value->getExtension())); ?> @@ -77,7 +77,7 @@ echo $this->getData('nav')->render(); dirPathFunction($media, $this->request->getData('sub') ?? ''); ?> $value) : - $url = UriFactory::build('{/lang}/backend/media/single?{?}&id=' . $media->getId() . '&sub=' . \substr($value, \strlen($media->getPath()))); + $url = UriFactory::build('{/prefix}media/single?{?}&id=' . $media->getId() . '&sub=' . \substr($value, \strlen($media->getPath()))); $icon = $this->fileIconFunction(FileUtils::getExtensionType(!\is_dir($value) ? File::extension($value) : 'collection')); ?> diff --git a/info.json b/info.json index b2a5e1d..9a0db2a 100644 --- a/info.json +++ b/info.json @@ -26,7 +26,7 @@ "load": [ { "pid": [ - "/backend/media" + "/media" ], "type": 4, "for": "Content", @@ -35,7 +35,7 @@ }, { "pid": [ - "/backend/admin" + "/admin" ], "type": 4, "for": "Admin", @@ -44,7 +44,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 5, "from": "Media",
diff --git a/Theme/Backend/media-list.tpl.php b/Theme/Backend/media-list.tpl.php index 8ddbb1c..a52c512 100644 --- a/Theme/Backend/media-list.tpl.php +++ b/Theme/Backend/media-list.tpl.php @@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?> $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/media/single?{?}&id=' . $value->getId()); + $url = \phpOMS\Uri\UriFactory::build('{/prefix}media/single?{?}&id=' . $value->getId()); $icon = $fileIconFunction(\phpOMS\System\File\FileUtils::getExtensionType($value->getExtension())); ?>