diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 2d968ad..7f3b0b0 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,11 +1,11 @@ [ { "id": 1000701001, - "pid": "/backend", + "pid": "/", "type": 2, "subtype": 1, "name": "News", - "uri": "{/lang}/backend/news/dashboard?{?}", + "uri": "{/prefix}news/dashboard?{?}", "target": "self", "icon": null, "order": 40, @@ -15,11 +15,11 @@ "children": [ { "id": 1000702001, - "pid": "/backend/news", + "pid": "/news", "type": 3, "subtype": 1, "name": "News", - "uri": "{/lang}/backend/news/dashboard?{?}", + "uri": "{/prefix}news/dashboard?{?}", "target": "self", "icon": null, "order": 1, @@ -30,11 +30,11 @@ }, { "id": 1000703001, - "pid": "/backend/news", + "pid": "/news", "type": 3, "subtype": 1, "name": "Archive", - "uri": "{/lang}/backend/news/archive?{?}", + "uri": "{/prefix}news/archive?{?}", "target": "self", "icon": null, "order": 5, @@ -45,11 +45,11 @@ }, { "id": 1000704001, - "pid": "/backend/news", + "pid": "/news", "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/backend/news/create?{?}", + "uri": "{/prefix}news/create?{?}", "target": "self", "icon": null, "order": 10, @@ -60,11 +60,11 @@ }, { "id": 1000705001, - "pid": "/backend/news", + "pid": "/news", "type": 3, "subtype": 1, "name": "Draft", - "uri": "{/lang}/backend/news/draft/list?{?}", + "uri": "{/prefix}news/draft/list?{?}", "target": "self", "icon": null, "order": 15, diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index ed33797..71a738f 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/news.*$' => [ + '^.*/news.*$' => [ [ 'dest' => '\Modules\News\Controller\ApiController:apiNewsCreate', 'verb' => RouteVerb::PUT, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index b16ee8a..18cc02b 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/news/dashboard.*$' => [ + '^.*/news/dashboard.*$' => [ [ 'dest' => '\Modules\News\Controller\BackendController:viewNewsDashboard', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/backend/news/article.*$' => [ + '^.*/news/article.*$' => [ [ 'dest' => '\Modules\News\Controller\BackendController:viewNewsArticle', 'verb' => RouteVerb::GET, @@ -28,7 +28,7 @@ return [ ], ], ], - '^.*/backend/news/archive.*$' => [ + '^.*/news/archive.*$' => [ [ 'dest' => '\Modules\News\Controller\BackendController:viewNewsArchive', 'verb' => RouteVerb::GET, @@ -39,7 +39,7 @@ return [ ], ], ], - '^.*/backend/news/create.*$' => [ + '^.*/news/create.*$' => [ [ 'dest' => '\Modules\Editor\Controller\BackendController:setUpEditorEditor', 'verb' => RouteVerb::GET, diff --git a/Theme/Backend/dashboard-news.tpl.php b/Theme/Backend/dashboard-news.tpl.php index dddabff..8ad8ecb 100644 --- a/Theme/Backend/dashboard-news.tpl.php +++ b/Theme/Backend/dashboard-news.tpl.php @@ -27,7 +27,7 @@ $newsList = $this->getData('news'); getHtml('Title', 'News') ?> $news) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/news/article?{?}&id=' . $news->getId()); + $url = \phpOMS\Uri\UriFactory::build('{/prefix}news/article?{?}&id=' . $news->getId()); $color = 'darkred'; if ($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; } elseif ($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; } diff --git a/Theme/Backend/news-archive.tpl.php b/Theme/Backend/news-archive.tpl.php index 62e8fa3..e9fe81a 100644 --- a/Theme/Backend/news-archive.tpl.php +++ b/Theme/Backend/news-archive.tpl.php @@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?> - $news) : ++$count; $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/news/article?{?}&id=' . $news->getId()); + $news) : ++$count; $url = \phpOMS\Uri\UriFactory::build('{/prefix}news/article?{?}&id=' . $news->getId()); $color = 'darkred'; if ($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; } elseif ($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; } diff --git a/Theme/Backend/news-create.tpl.php b/Theme/Backend/news-create.tpl.php index a39ef72..0b2ee40 100644 --- a/Theme/Backend/news-create.tpl.php +++ b/Theme/Backend/news-create.tpl.php @@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?>
-
+ $news) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/news/article?{?}&id=' . $news->getId()); + $url = \phpOMS\Uri\UriFactory::build('{/prefix}news/article?{?}&id=' . $news->getId()); $color = 'darkred'; if ($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; } elseif ($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; } diff --git a/info.json b/info.json index de35925..e929414 100644 --- a/info.json +++ b/info.json @@ -26,7 +26,7 @@ "load": [ { "pid": [ - "/backend/news" + "/news" ], "type": 4, "for": 0, @@ -35,7 +35,7 @@ }, { "pid": [ - "/backend" + "/" ], "type": 5, "from": "News",
getHtml('Date') ?>