summaryrefslogtreecommitdiffstats
path: root/core/templates
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-08-31 12:56:36 +0200
committerkondou <kondou@ts.unde.re>2013-08-31 12:56:36 +0200
commit5d653753bd8f6f1294dfbfa112757e5509ddc80d (patch)
tree54853c3cf28f4d3ec58d7f9230be68e8e70d4998 /core/templates
parent30526ded803e352f3f7322ed96ebc480d5e3f9c1 (diff)
parent92e90c8eb995c886b3e9cd77c14e3f0b25b95cd7 (diff)
downloadnextcloud-server-5d653753bd8f6f1294dfbfa112757e5509ddc80d.tar.gz
nextcloud-server-5d653753bd8f6f1294dfbfa112757e5509ddc80d.zip
Merge branch 'master' into oc_avatars
Diffstat (limited to 'core/templates')
-rw-r--r--core/templates/layout.user.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index edac4c040fa..c67df07bd41 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -81,6 +81,7 @@
<nav><div id="navigation">
<ul id="apps" class="svg">
+ <div class="wrapper"><!-- for sticky footer of apps management -->
<?php foreach($_['navigation'] as $entry): ?>
<li data-id="<?php p($entry['id']); ?>">
<a href="<?php print_unescaped($entry['href']); ?>" title=""
@@ -92,15 +93,19 @@
</a>
</li>
<?php endforeach; ?>
+ <?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
+ <div class="push"></div><!-- for for sticky footer of apps management -->
+ <?php endif; ?>
+ </div>
- <!-- show "More apps" link to app administration directly in app navigation -->
+ <!-- show "More apps" link to app administration directly in app navigation, as sticky footer -->
<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
<li id="apps-management">
<a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title=""
<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
<img class="icon svg" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/>
<span>
- <?php p($l->t('More apps')); ?>
+ <?php p($l->t('Apps')); ?>
</span>
</a>
</li>