summaryrefslogtreecommitdiffstats
path: root/lib/private/NavigationManager.php
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2017-05-16 01:40:10 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2017-06-23 12:36:37 +0200
commit560ab2e91158fa57b12cb5f382dfd79cbbc1ffc4 (patch)
tree679e3b4989fed3aea1d62d97f69b0a878fb75bf9 /lib/private/NavigationManager.php
parent247b305b79e16ef1e26b374a4efed7e44c241e91 (diff)
downloadnextcloud-server-560ab2e91158fa57b12cb5f382dfd79cbbc1ffc4.tar.gz
nextcloud-server-560ab2e91158fa57b12cb5f382dfd79cbbc1ffc4.zip
one settings link, common template, styling
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'lib/private/NavigationManager.php')
-rw-r--r--lib/private/NavigationManager.php20
1 files changed, 4 insertions, 16 deletions
diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php
index 300c24ff940..e0b83fe5e47 100644
--- a/lib/private/NavigationManager.php
+++ b/lib/private/NavigationManager.php
@@ -177,14 +177,14 @@ class NavigationManager implements INavigationManager {
]);
}
- // Personal settings
+ // Personal and (if applicable) admin settings
$this->add([
'type' => 'settings',
- 'id' => 'personal',
+ 'id' => 'settings',
'order' => 1,
'href' => $this->urlGenerator->linkToRoute('settings_personal'),
- 'name' => $l->t('Personal'),
- 'icon' => $this->urlGenerator->imagePath('settings', 'personal.svg'),
+ 'name' => $l->t('Settings'),
+ 'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
]);
// Logout
@@ -211,18 +211,6 @@ class NavigationManager implements INavigationManager {
'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
]);
}
-
- if ($this->isAdmin()) {
- // Admin settings
- $this->add([
- 'type' => 'settings',
- 'id' => 'admin',
- 'order' => 2,
- 'href' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index'),
- 'name' => $l->t('Admin'),
- 'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
- ]);
- }
}
if ($this->appManager === 'null') {