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

move 'add apps' entry into normal navigation instead of a new line

This commit is contained in:
Jan-Christoph Borchardt 2014-06-04 15:27:46 +02:00
parent 26bf64631d
commit d831afc792
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/css/styles.css
View File

@ -720,7 +720,6 @@ label.infield {
#navigation { #navigation {
position: fixed; position: fixed;
top: 0; top: 0;
bottom: 0;
left: 0; left: 0;
width: 80px; width: 80px;
margin-top:45px; margin-top:45px;
@ -780,21 +779,11 @@ label.infield {
} }
/* Apps management as sticky footer, less obtrusive in the list */ /* Apps management as sticky footer, less obtrusive in the list */
#navigation .wrapper {
min-height: 100%;
margin: 0 auto -82px 0;
}
#apps-management {
height: 72px;
}
#apps-management { #apps-management {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
filter: alpha(opacity=60); filter: alpha(opacity=60);
opacity: .6; opacity: .6;
} }
#apps-management .icon {
padding-bottom: 0;
}

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

@ -93,7 +93,7 @@
<nav><div id="navigation"> <nav><div id="navigation">
<div id="apps" class="svg"> <div id="apps" class="svg">
<ul class="wrapper"><!-- for sticky footer of apps management --> <ul>
<?php foreach($_['navigation'] as $entry): ?> <?php foreach($_['navigation'] as $entry): ?>
<li data-id="<?php p($entry['id']); ?>"> <li data-id="<?php p($entry['id']); ?>">
<a href="<?php print_unescaped($entry['href']); ?>" title="" <a href="<?php print_unescaped($entry['href']); ?>" title=""
@ -106,12 +106,10 @@
</a> </a>
</li> </li>
<?php endforeach; ?> <?php endforeach; ?>
</ul>
<!-- show "More apps" link to app administration directly in app navigation, as sticky footer --> <!-- show "More apps" link to app administration directly in app navigation, as last entry -->
<?php if(OC_User::isAdminUser(OC_User::getUser())): ?> <?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
<ul id="apps-management"> <li id="apps-management">
<li>
<a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title="" <a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title=""
<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>> <?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="icon svg" alt="" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/>
@ -120,8 +118,9 @@
</span> </span>
</a> </a>
</li> </li>
</ul>
<?php endif; ?> <?php endif; ?>
</ul>
</div> </div>
</div></nav> </div></nav>