diff options
| author | Julius Haertl <jus@bitgrid.net> | 2017-03-01 23:04:27 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2017-03-16 11:55:09 +0100 |
| commit | a630e4629f2489e9d7678fbe6833cf926e2b968e (patch) | |
| tree | bdca715c7274eb4323eabc9e2fda8fa535f8eaf8 /core/templates/layout.user.php | |
| parent | e3e4cb3e67fb4d1399b4a9cf229633144008fdcf (diff) | |
| download | nextcloud-server-a630e4629f2489e9d7678fbe6833cf926e2b968e.tar.gz nextcloud-server-a630e4629f2489e9d7678fbe6833cf926e2b968e.zip | |
Generate seperate menu list for header bar
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Diffstat (limited to 'core/templates/layout.user.php')
| -rw-r--r-- | core/templates/layout.user.php | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 84e3690c91e..fb7ceb408c5 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -61,8 +61,7 @@ <div id="appmenu"> <ul> - <?php $navigation = array_slice($_['navigation'], 0, 3); ?> - <?php foreach($navigation as $entry): ?> + <?php foreach($_['headernavigation'] as $entry): ?> <li data-id="<?php p($entry['id']); ?>"> <a href="<?php print_unescaped($entry['href']); ?>" tabindex="3" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> @@ -74,7 +73,7 @@ </a> </li> <?php endforeach; ?> - <?php if (count($_['navigation'])>3): ?> + <?php if (count($_['navigation'])>4): ?> <li id="more-apps" class="menutoggle"> <a href="#"> <div class="icon-more-white"></div> @@ -83,7 +82,7 @@ </a> </li> <?php endif; ?> - <?php if (count($_['navigation'])<=3): ?> + <?php if (count($_['navigation'])<=4): ?> <?php /* show "More apps" link to app administration directly in app navigation, as last entry */ if(OC_User::isAdminUser(OC_User::getUser())): @@ -156,21 +155,24 @@ <nav role="navigation"><div id="navigation"> <div id="apps"> <ul> - <?php $navigation = array_slice($_['navigation'], 3); ?> - <?php foreach($navigation as $entry): ?> - <li data-id="<?php p($entry['id']); ?>"> - <a href="<?php print_unescaped($entry['href']); ?>" tabindex="3" - <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> - <svg width="32" height="32" viewBox="0 0 32 32"> - <defs><filter id="invert"><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)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon"></image> - </svg> - <div class="icon-loading-dark" style="display:none;"></div> - <span> + <?php foreach($_['navigation'] as $entry): ?> + <?php if($entry['showInHeader']): ?> + <li data-id="<?php p($entry['id']); ?>" class="in-header"> + <?php else: ?> + <li data-id="<?php p($entry['id']); ?>"> + <?php endif; ?> + <a href="<?php print_unescaped($entry['href']); ?>" tabindex="3" + <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> + <svg width="32" height="32" viewBox="0 0 32 32"> + <defs><filter id="invert"><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)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon"></image> + </svg> + <div class="icon-loading-dark" style="display:none;"></div> + <span> <?php p($entry['name']); ?> </span> - </a> - </li> + </a> + </li> <?php endforeach; ?> <?php /* show "More apps" link to app administration directly in app navigation, as last entry */ |