diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-04-25 19:42:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 19:42:01 +0200 |
| commit | db94b5d4af711f6e18aac0c9d4b0357a3b9123d1 (patch) | |
| tree | 94765548709d2ee9612c715d0f1e775e56bf773a /core/templates | |
| parent | 51da0442d9604f9285d02b56f2b1f669701da90b (diff) | |
| parent | 27b19aaba1c9a710bb2b1d3338a74ba05ea0678e (diff) | |
| download | nextcloud-server-db94b5d4af711f6e18aac0c9d4b0357a3b9123d1.tar.gz nextcloud-server-db94b5d4af711f6e18aac0c9d4b0357a3b9123d1.zip | |
Merge pull request #4439 from nextcloud/appmenu-responsive
Responsive app menu
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/layout.user.php | 63 |
1 files changed, 30 insertions, 33 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 40e47c7e582..91b7eb3490b 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -60,54 +60,51 @@ <div class="icon-caret"></div> </a> - <div id="appmenu"> - <ul> - <?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; ?>> - <img src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon" /> - <div class="icon-loading-dark" style="display:none;"></div> - <span> + <ul id="appmenu"> + <?php foreach ($_['navigation'] as $entry): ?> + <li data-id="<?php p($entry['id']); ?>" class="hidden"> + <a href="<?php print_unescaped($entry['href']); ?>" + tabindex="3" + <?php if ($entry['active']): ?> class="active"<?php endif; ?>> + <img src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" + class="app-icon"/> + <div class="icon-loading-small-dark" + style="display:none;"></div> + <span> <?php p($entry['name']); ?> </span> - </a> - </li> - <?php endforeach; ?> - <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> - </ul> - </div> + </a> + </li> + <?php endforeach; ?> + <li id="more-apps" class="menutoggle"> + <a href="#"> + <div class="icon-more-white"></div> + <span><?php p($l->t('More apps')); ?></span> + </a> + </li> + </ul> - <nav role="navigation"><div id="navigation"> + <nav role="navigation"> + <div id="navigation"> <div id="apps"> <ul> <?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; ?> + <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"> + <svg width="16" height="16" viewBox="0 0 16 16"> <defs><filter id="invert-<?php p($entry['id']); ?>"><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-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon"></image> + <image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" 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> + <div class="icon-loading-small-dark" style="display:none;"></div> + <span><?php p($entry['name']); ?></span> </a> </li> <?php endforeach; ?> </ul> </div> - </div></nav> + </div> + </nav> </div> |