mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4660 from owncloud/apps-management-sticky 

Apps management as sticky footer and rename to 'Apps', fix #4622
This commit is contained in:
Morris Jobke 2013-08-30 03:47:15 -07:00
parent 22e1f73d5e c9c4ab22a4
commit bf6981312a
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/css/styles.css
View File

@ -501,6 +501,9 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
#navigation:hover {
overflow-y: auto; /* show scrollbar only on hover */
}
#apps {
height: 100%;
}
#navigation a span {
display: block;
text-decoration: none;
@ -545,9 +548,24 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
padding-top: 20px;
}
/* Apps management as sticky footer, less obtrusive in the list */
#navigation .wrapper {
min-height: 100%;
margin: 0 auto -72px;
}
#apps-management, #navigation .push {
height: 70px;
}
#apps-management {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
filter: alpha(opacity=60);
opacity: .6;
}
#apps-management .icon {
padding-bottom: 0;
}
/* USER MENU */

9
core/templates/layout.user.php
View File

@ -78,6 +78,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=""
@ -89,15 +90,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>