diff options
Diffstat (limited to 'core/templates/layout.user.php')
| -rw-r--r-- | core/templates/layout.user.php | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index d551c53521b..e39bb94ed98 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -46,7 +46,13 @@ </div> <header><div id="header"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"> - <div class="logo-wide svg"></div> + <div class="logo-icon svg"></div> + </a> + <a href="#" class="menutoggle"> + <div class="header-appname"> + <?php p(!empty($_['application'])?$_['application']:'Apps'); ?> + </div> + <div class="icon-caret"></div> </a> <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <div id="settings" class="svg"> @@ -87,12 +93,13 @@ <nav><div id="navigation"> <div id="apps" class="svg"> - <ul class="wrapper"><!-- for sticky footer of apps management --> + <ul> <?php foreach($_['navigation'] as $entry): ?> <li data-id="<?php p($entry['id']); ?>"> <a href="<?php print_unescaped($entry['href']); ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> - <img class="icon svg" alt="" src="<?php print_unescaped($entry['icon']); ?>"/> + <img class="app-icon svg" alt="" src="<?php print_unescaped($entry['icon']); ?>"/> + <div class="icon-loading-dark" style="display:none;"></div> <span> <?php p($entry['name']); ?> </span> @@ -100,25 +107,20 @@ </li> <?php endforeach; ?> + <!-- show "More apps" link to app administration directly in app navigation, as last entry --> <?php if(OC_User::isAdminUser(OC_User::getUser())): ?> - <li class="push"></li><!-- for sticky footer of apps management --> - <?php endif; ?> - </ul> - - <!-- show "More apps" link to app administration directly in app navigation, as sticky footer --> - <?php if(OC_User::isAdminUser(OC_User::getUser())): ?> - <ul id="apps-management"> - <li> + <li id="apps-management"> <a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title="" <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>> - <img class="icon svg" alt="" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/> + <img class="app-icon svg" alt="" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/> <span> <?php p($l->t('Apps')); ?> </span> </a> </li> - </ul> <?php endif; ?> + + </ul> </div> </div></nav> |