diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 487d282..7ac64b5 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -1,6 +1,6 @@ [ { - "id": 1000701001, + "id": 1000601001, "pid": "/", "type": 2, "subtype": 1, @@ -14,7 +14,7 @@ "parent": 1006901001, "children": [ { - "id": 1000702001, + "id": 1000602001, "pid": "/news", "type": 3, "subtype": 1, @@ -25,11 +25,11 @@ "order": 1, "from": "News", "permission": { "permission": 2, "type": null, "element": null }, - "parent": 1000701001, + "parent": 1000601001, "children": [] }, { - "id": 1000703001, + "id": 1000603001, "pid": "/news", "type": 3, "subtype": 1, @@ -40,11 +40,11 @@ "order": 5, "from": "News", "permission": { "permission": 2, "type": null, "element": null }, - "parent": 1000701001, + "parent": 1000601001, "children": [] }, { - "id": 1000704001, + "id": 1000604001, "pid": "/news", "type": 3, "subtype": 1, @@ -55,11 +55,11 @@ "order": 10, "from": "News", "permission": { "permission": 4, "type": null, "element": null }, - "parent": 1000701001, + "parent": 1000601001, "children": [] }, { - "id": 1000705001, + "id": 1000605001, "pid": "/news", "type": 3, "subtype": 1, @@ -70,7 +70,22 @@ "order": 15, "from": "News", "permission": { "permission": 4, "type": null, "element": null }, - "parent": 1000701001, + "parent": 1000601001, + "children": [] + }, + { + "id": 1000606001, + "pid": "/news", + "type": 3, + "subtype": 1, + "name": "Analysis", + "uri": "{/prefix}news/analysis", + "target": "self", + "icon": null, + "order": 15, + "from": "News", + "permission": { "permission": 4, "type": null, "element": null }, + "parent": 1000601001, "children": [] } ] diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 704a355..c0fb886 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -90,4 +90,15 @@ return [ ], ], ], + '^.*/news/analysis.*$' => [ + [ + 'dest' => '\Modules\Editor\Controller\BackendController:viewNewsAnalysis', + 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => BackendController::MODULE_NAME, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::ANALYSIS, + ], + ], + ], ]; diff --git a/Controller/BackendController.php b/Controller/BackendController.php index a979259..63f91ef 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -57,7 +57,7 @@ final class BackendController extends Controller implements DashboardElementInte $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/News/Theme/Backend/news-dashboard'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); if ($request->getData('ptype') === 'p') { $view->setData('news', @@ -153,7 +153,7 @@ final class BackendController extends Controller implements DashboardElementInte } $view->setTemplate('/Modules/News/Theme/Backend/news-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); $view->addData('news', $article); $view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission( PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::NEWS, $article->getId()) @@ -190,7 +190,7 @@ final class BackendController extends Controller implements DashboardElementInte $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/News/Theme/Backend/news-archive'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); if ($request->getData('ptype') === 'p') { $view->setData('news', @@ -230,7 +230,7 @@ final class BackendController extends Controller implements DashboardElementInte $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/News/Theme/Backend/news-draft'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); if ($request->getData('ptype') === 'p') { $view->setData('news', @@ -264,7 +264,7 @@ final class BackendController extends Controller implements DashboardElementInte $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/News/Theme/Backend/news-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $view->addData('editor', $editor); @@ -295,7 +295,7 @@ final class BackendController extends Controller implements DashboardElementInte $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/News/Theme/Backend/news-create'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $view->addData('editor', $editor); @@ -310,4 +310,26 @@ final class BackendController extends Controller implements DashboardElementInte return $view; } + + /** + * Routing end-point for application behaviour. + * + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + * @codeCoverageIgnore + */ + public function viewNewsAnalysis(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + { + $view = new View($this->app->l11nManager, $request, $response); + + $view->setTemplate('/Modules/News/Theme/Backend/news-analysis'); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); + + return $view; + } } diff --git a/Docs/Dev/en/SUMMARY.md b/Docs/Dev/en/SUMMARY.md old mode 100644 new mode 100755 diff --git a/Docs/Dev/en/structure.md b/Docs/Dev/en/structure.md old mode 100644 new mode 100755 diff --git a/Models/NewsSeen.php b/Models/NewsSeen.php old mode 100644 new mode 100755 diff --git a/Models/NewsSeenMapper.php b/Models/NewsSeenMapper.php old mode 100644 new mode 100755 diff --git a/Models/NullNewsSeen.php b/Models/NullNewsSeen.php old mode 100644 new mode 100755 diff --git a/Models/PermissionState.php b/Models/PermissionState.php index b671800..de6428f 100755 --- a/Models/PermissionState.php +++ b/Models/PermissionState.php @@ -27,4 +27,6 @@ use phpOMS\Stdlib\Base\Enum; abstract class PermissionState extends Enum { public const NEWS = 1; + + public const ANALYSIS = 2; } diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/news-analysis.tpl.php b/Theme/Backend/news-analysis.tpl.php new file mode 100644 index 0000000..ef17d7f --- /dev/null +++ b/Theme/Backend/news-analysis.tpl.php @@ -0,0 +1,21 @@ +getData('nav')->render(); ?> +