diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-03-26 15:48:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-26 15:48:19 -0600 |
| commit | 12c5c336ad8fdc5d47cb663f0c3c43744dfe5309 (patch) | |
| tree | a5286ba7186d02b619cc7b4d9e5d58b145227130 /core | |
| parent | 96d4e1cab5ebf030832bbd052d8f4705b9b726d2 (diff) | |
| parent | 8d3c461151ad9515772609059063f5bdf5a32bf3 (diff) | |
| download | nextcloud-server-12c5c336ad8fdc5d47cb663f0c3c43744dfe5309.tar.gz nextcloud-server-12c5c336ad8fdc5d47cb663f0c3c43744dfe5309.zip | |
Merge pull request #4077 from nextcloud/better-navigation-management
Register the app management in the normal way
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/header.scss | 22 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 38 |
2 files changed, 1 insertions, 59 deletions
diff --git a/core/css/header.scss b/core/css/header.scss index 3de0c50bcd3..6f41dd8154f 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -318,28 +318,6 @@ nav { } /* Apps management */ -.apps-management { - min-height: initial; - height: initial; - margin: 0; - a { - svg, - span { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=30)'; - opacity: .3; - } - /* icon opacity and hover effect */ - &:hover svg, - &:focus svg, - &.active svg, - &:hover span, - &:focus span, - &.active span { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; - opacity: 1; - } - } -} #apps { max-height: calc(100vh - 100px); diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index a7da4a39dd7..46a5c0211a5 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> @@ -173,12 +143,6 @@ </a> </li> <?php endforeach; ?> - <li> - <a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>> - <img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg') . '?v=' . $_['versionHash']); ?>"> - <?php p($l->t('Log out'));?> - </a> - </li> </ul> </div> |