diff options
| author | Julius Haertl <jus@bitgrid.net> | 2017-03-03 13:00:37 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2017-03-16 11:55:10 +0100 |
| commit | 1d6fba03f4788dd562308df5a63582816c33a5a5 (patch) | |
| tree | 59bd7449fa968a9f8c6b297561e97b47a1a842aa /core/templates/layout.user.php | |
| parent | efc681dcfe330b09123b05a6a61d8dedaf76696e (diff) | |
| download | nextcloud-server-1d6fba03f4788dd562308df5a63582816c33a5a5.tar.gz nextcloud-server-1d6fba03f4788dd562308df5a63582816c33a5a5.zip | |
Make enabling/disabling apps work with the new menu
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Diffstat (limited to 'core/templates/layout.user.php')
| -rw-r--r-- | core/templates/layout.user.php | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 4b0f6354b1c..58c666fe714 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -74,22 +74,19 @@ </a> </li> <?php endforeach; ?> - <?php if (count($_['navigation'])>$headerIconCount - || (OC_User::isAdminUser(OC_User::getUser()) && count($_['navigation'])>=$headerIconCount)): ?> - <li id="more-apps" class="menutoggle"> + <li id="more-apps" class="menutoggle<?php + if ( !(count($_['navigation']) > $headerIconCount + || (OC_User::isAdminUser(OC_User::getUser()) && count($_['navigation'])>=$headerIconCount))): ?> hidden<?php endif; ?>"> <a href="#"> <div class="icon-more-white"></div> - <span>More apps + <span><?php p($l->t('More apps')); ?> </span> </a> </li> - <?php endif; ?> - <?php if (count($_['navigation'])<$headerIconCount): ?> <?php /* show "More apps" link to app administration directly in app navigation, as last entry */ - if(OC_User::isAdminUser(OC_User::getUser())): - ?> - <li id="apps-management"> + ?> + <li id="apps-management" <?php if(OC_User::isAdminUser(OC_User::getUser()) && count($_['navigation'])>$headerIconCount-1): ?>class="hidden"<?php endif; ?>> <a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" tabindex="4" <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>> <img src="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>" /> @@ -100,8 +97,6 @@ </span> </a> </li> - <?php endif; ?> - <?php endif; ?> </ul> </div> |