Skip to content

Commit 7711080

Browse files
committed
link from app-navigation-settings to personal settings
Signed-off-by: szaimen <[email protected]>
1 parent 7ccc8d2 commit 7711080

File tree

4 files changed

+23
-0
lines changed

4 files changed

+23
-0
lines changed

css/style.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,15 @@
194194
margin-left: 5px;
195195
}
196196

197+
#activity-personal-settings-link {
198+
text-decoration: underline;
199+
200+
a {
201+
display: block;
202+
padding: 10px 0px 10px 27px;
203+
}
204+
}
205+
197206
.activitymessage .avatar-name-wrapper,
198207
.activitysubject .avatar-name-wrapper {
199208
position: relative;

lib/Navigation.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public function getTemplate($forceActive = 'all') {
8686
$template->assign('activeNavigation', $active);
8787
$template->assign('navigations', $this->getLinkList());
8888
$template->assign('rssLink', $this->getRSSLink());
89+
$template->assign('personalSettingsLink', $this->getPersonalSettingsLink());
8990

9091
return $template;
9192
}
@@ -129,4 +130,11 @@ public function getLinkList() {
129130

130131
return $entries;
131132
}
133+
134+
/**
135+
* @return string
136+
*/
137+
protected function getPersonalSettingsLink() {
138+
return $this->URLGenerator->linkToRouteAbsolute('settings.PersonalSettings.index', ['section' => 'activity']);
139+
}
132140
}

templates/stream.app.navigation.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@
5353
<input id="feed-link" class="feed-link" type="text" readonly="readonly" value="<?php p($_['rssLink']); ?>" />
5454
<a class="icon-clippy" data-clipboard-target="#rssurl input"></a>
5555
</span>
56+
<div id="activity-personal-settings-link">
57+
<a href="<?php p($_['personalSettingsLink']); ?>">
58+
<span class="no-icon"><?php p($l->t('Personal Activity Settings') . ''); ?></span>
59+
</a>
60+
</div>
5661
</div>
5762
</div>
5863
</div>

tests/Controller/ActivitiesControllerTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public function testShowList(): void {
9797
$template->assign('activeNavigation', 'all');
9898
$template->assign('navigations', []);
9999
$template->assign('rssLink', '');
100+
$template->assign('personalSettingsLink', '');
100101
$this->navigation->expects($this->any())
101102
->method('getTemplate')
102103
->willReturn($template);

0 commit comments

Comments
 (0)