diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index adeeaf0379..5eb93ade31 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -61,7 +61,6 @@
@@ -115,25 +104,6 @@
-
-
- class="active">
-
-
-
- t('Apps')); ?>
-
-
-
-
-
diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php
index f7bc02943a..396fc50e79 100644
--- a/lib/private/NavigationManager.php
+++ b/lib/private/NavigationManager.php
@@ -178,6 +178,17 @@ class NavigationManager implements INavigationManager {
'name' => $l->t($nav['name']),
]);
}
+
+ if ($this->isAdmin()) {
+ $l = $this->l10nFac->get('settings');
+ $this->add([
+ 'id' => 'core_apps',
+ 'order' => 9999,
+ 'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
+ 'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
+ 'name' => $l->t('Apps'),
+ ]);
+ }
}
private function isAdmin() {
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 956cba4008..6dc925f8f8 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -95,14 +95,8 @@ class TemplateLayout extends \OC_Template {
}
}
$userDisplayName = \OC_User::getDisplayName();
- $appsMgmtActive = strpos(\OC::$server->getRequest()->getRequestUri(), \OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')) === 0;
- if ($appsMgmtActive) {
- $l = \OC::$server->getL10N('lib');
- $this->assign('application', $l->t('Apps'));
- }
$this->assign('user_displayname', $userDisplayName);
$this->assign('user_uid', \OC_User::getUser());
- $this->assign('appsmanagement_active', $appsMgmtActive);
if (\OC_User::getUser() === false) {
$this->assign('userAvatarSet', false);
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 5343e7ad17..31fa0a9e2d 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -531,9 +531,6 @@ class OC_App {
// This is private as well. It simply works, so don't ask for more details
private static function proceedNavigation($list) {
$headerIconCount = 8;
- if(OC_User::isAdminUser(OC_User::getUser())) {
- $headerIconCount--;
- }
usort($list, function($a, $b) {
if (isset($a['order']) && isset($b['order'])) {
return ($a['order'] < $b['order']) ? -1 : 1;
@@ -577,9 +574,6 @@ class OC_App {
public static function proceedAppNavigation($entries) {
$headerIconCount = 8;
- if(OC_User::isAdminUser(OC_User::getUser())) {
- $headerIconCount--;
- }
$activeAppIndex = -1;
$list = self::proceedNavigation($entries);