From 623aaf7b5dad88be6af40a4fd24976cf9b7843c5 Mon Sep 17 00:00:00 2001 From: szaimen Date: Thu, 22 Jul 2021 17:33:12 +0200 Subject: [PATCH] link from app-navigation-settings to personal settings Signed-off-by: szaimen --- css/style.scss | 9 +++++++++ lib/Navigation.php | 8 ++++++++ templates/stream.app.navigation.php | 5 +++++ tests/Controller/ActivitiesControllerTest.php | 1 + 4 files changed, 23 insertions(+) diff --git a/css/style.scss b/css/style.scss index f0445290b..575eb1e08 100755 --- a/css/style.scss +++ b/css/style.scss @@ -208,6 +208,15 @@ margin-left: 5px; } +#activity-personal-settings-link { + text-decoration: underline; + + a { + display: block; + padding: 10px 0px 10px 25px; + } +} + .activitymessage .avatar-name-wrapper, .activitysubject .avatar-name-wrapper { position: relative; diff --git a/lib/Navigation.php b/lib/Navigation.php index e1e03a17b..b05828622 100644 --- a/lib/Navigation.php +++ b/lib/Navigation.php @@ -87,6 +87,7 @@ public function getTemplate($forceActive = 'all') { $template->assign('activeNavigation', $active); $template->assign('navigations', $this->getLinkList()); $template->assign('rssLink', $this->getRSSLink()); + $template->assign('personalSettingsLink', $this->getPersonalSettingsLink()); return $template; } @@ -130,4 +131,11 @@ public function getLinkList() { return $entries; } + + /** + * @return string + */ + protected function getPersonalSettingsLink() { + return $this->URLGenerator->linkToRouteAbsolute('settings.PersonalSettings.index', ['section' => 'activity']); + } } diff --git a/templates/stream.app.navigation.php b/templates/stream.app.navigation.php index 26699ac91..342c51c7b 100644 --- a/templates/stream.app.navigation.php +++ b/templates/stream.app.navigation.php @@ -53,6 +53,11 @@ + diff --git a/tests/Controller/ActivitiesControllerTest.php b/tests/Controller/ActivitiesControllerTest.php index a83d2f0a6..15fb58348 100644 --- a/tests/Controller/ActivitiesControllerTest.php +++ b/tests/Controller/ActivitiesControllerTest.php @@ -97,6 +97,7 @@ public function testShowList(): void { $template->assign('activeNavigation', 'all'); $template->assign('navigations', []); $template->assign('rssLink', ''); + $template->assign('personalSettingsLink', ''); $this->navigation->expects($this->any()) ->method('getTemplate') ->willReturn($template);