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

Don't use the dropdown for one item only 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2017-03-26 21:23:18 +02:00
parent e0b040d623
commit 0229c16e5f
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/private/legacy/app.php
View File

@ -459,7 +459,6 @@ class OC_App {
// This is private as well. It simply works, so don't ask for more details
private static function proceedNavigation($list) {
$headerIconCount = 8;
usort($list, function($a, $b) {
if (isset($a['order']) && isset($b['order'])) {
return ($a['order'] < $b['order']) ? -1 : 1;
@ -482,6 +481,11 @@ class OC_App {
}
unset($navEntry);
if (count($list) <= 8) {
return $list;
}
$headerIconCount = 7;
if($activeAppIndex > ($headerIconCount-1)) {
$active = $list[$activeAppIndex];
$lastInHeader = $list[$headerIconCount-1];
@ -502,7 +506,6 @@ class OC_App {
}
public static function proceedAppNavigation($entries) {
$headerIconCount = 8;
$activeAppIndex = -1;
$list = self::proceedNavigation($entries);
@ -515,6 +518,13 @@ class OC_App {
$navEntry['active'] = false;
}
}
if (count($list) <= 8) {
return $list;
}
$headerIconCount = 7;
// move active item to last position
if($activeAppIndex > ($headerIconCount-1)) {
$active = $list[$activeAppIndex];

2
settings/js/apps.js
View File

@ -530,7 +530,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
}
previousEntry = entry;
// do not show apps from #appmenu in #navigation
if(i < 7) {
if(i <= 7) {
$('#navigation li').eq(i).addClass('in-header');
} else {
$('#navigation li').eq(i).removeClass('in-header');