diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-03-26 18:40:56 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2017-03-26 19:08:51 +0200 |
| commit | ec330c7ac4d7d3a145dc06414e5707243f1057d7 (patch) | |
| tree | 9f55d6fce62d23ca7232c46c4f9ca2bf944addb1 /core/templates/layout.user.php | |
| parent | f154b1d32ce0d469e5c4f96195e169f1aa4d5406 (diff) | |
| download | nextcloud-server-ec330c7ac4d7d3a145dc06414e5707243f1057d7.tar.gz nextcloud-server-ec330c7ac4d7d3a145dc06414e5707243f1057d7.zip | |
Register the app management in the normal way
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'core/templates/layout.user.php')
| -rw-r--r-- | core/templates/layout.user.php | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index adeeaf03797..5eb93ade31f 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -61,7 +61,6 @@ <div id="appmenu"> <ul> - <?php $headerIconCount = 8; ?> <?php foreach($_['headernavigation'] as $entry): ?> <li data-id="<?php p($entry['id']); ?>"> <a href="<?php print_unescaped($entry['href']); ?>" tabindex="3" @@ -74,22 +73,12 @@ </a> </li> <?php endforeach; ?> - <li id="more-apps" class="menutoggle<?php if (!(count($_['navigation']) > $headerIconCount || (OC_User::isAdminUser(OC_User::getUser()) && count($_['navigation'])>=$headerIconCount))): ?> hidden<?php endif; ?>"> + <li id="more-apps" class="menutoggle<?php if (count($_['navigation']) <= 8): ?> hidden<?php endif; ?>"> <a href="#"> <div class="icon-more-white"></div> <span><?php p($l->t('More apps')); ?></span> </a> </li> - <?php if(OC_User::isAdminUser(OC_User::getUser())): ?> - <li <?php if(count($_['navigation'])>$headerIconCount-1): ?> class="hidden apps-management"<?php else: ?> class="apps-management" <?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']); ?>" /> - <div class="icon-loading-dark" style="display:none;"></div> - <span><?php p($l->t('Apps')); ?></span> - </a> - </li> - <?php endif; ?> </ul> </div> @@ -115,25 +104,6 @@ </a> </li> <?php endforeach; ?> - <?php - /* show "More apps" link to app administration directly in app navigation, as last entry */ - if(OC_User::isAdminUser(OC_User::getUser())): - ?> - <li class="apps-management"> - <a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" tabindex="4" - <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>> - <svg width="32" height="32" viewBox="0 0 32 32" class="app-icon"> - <defs><filter id="invert-appsmanagement"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs> - <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert-appsmanagement)" xlink:href="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>"></image> - </svg> - <div class="icon-loading-dark" style="display:none;"></div> - <span> - <?php p($l->t('Apps')); ?> - </span> - </a> - </li> - <?php endif; ?> - </ul> </div> </div></nav> |