Don't use the dropdown for one item only
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
parent
e0b040d623
commit
0229c16e5f
|
@ -459,7 +459,6 @@ class OC_App {
|
||||||
|
|
||||||
// This is private as well. It simply works, so don't ask for more details
|
// This is private as well. It simply works, so don't ask for more details
|
||||||
private static function proceedNavigation($list) {
|
private static function proceedNavigation($list) {
|
||||||
$headerIconCount = 8;
|
|
||||||
usort($list, function($a, $b) {
|
usort($list, function($a, $b) {
|
||||||
if (isset($a['order']) && isset($b['order'])) {
|
if (isset($a['order']) && isset($b['order'])) {
|
||||||
return ($a['order'] < $b['order']) ? -1 : 1;
|
return ($a['order'] < $b['order']) ? -1 : 1;
|
||||||
|
@ -482,6 +481,11 @@ class OC_App {
|
||||||
}
|
}
|
||||||
unset($navEntry);
|
unset($navEntry);
|
||||||
|
|
||||||
|
if (count($list) <= 8) {
|
||||||
|
return $list;
|
||||||
|
}
|
||||||
|
|
||||||
|
$headerIconCount = 7;
|
||||||
if($activeAppIndex > ($headerIconCount-1)) {
|
if($activeAppIndex > ($headerIconCount-1)) {
|
||||||
$active = $list[$activeAppIndex];
|
$active = $list[$activeAppIndex];
|
||||||
$lastInHeader = $list[$headerIconCount-1];
|
$lastInHeader = $list[$headerIconCount-1];
|
||||||
|
@ -502,7 +506,6 @@ class OC_App {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function proceedAppNavigation($entries) {
|
public static function proceedAppNavigation($entries) {
|
||||||
$headerIconCount = 8;
|
|
||||||
$activeAppIndex = -1;
|
$activeAppIndex = -1;
|
||||||
$list = self::proceedNavigation($entries);
|
$list = self::proceedNavigation($entries);
|
||||||
|
|
||||||
|
@ -515,6 +518,13 @@ class OC_App {
|
||||||
$navEntry['active'] = false;
|
$navEntry['active'] = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (count($list) <= 8) {
|
||||||
|
return $list;
|
||||||
|
}
|
||||||
|
|
||||||
|
$headerIconCount = 7;
|
||||||
// move active item to last position
|
// move active item to last position
|
||||||
if($activeAppIndex > ($headerIconCount-1)) {
|
if($activeAppIndex > ($headerIconCount-1)) {
|
||||||
$active = $list[$activeAppIndex];
|
$active = $list[$activeAppIndex];
|
||||||
|
|
|
@ -530,7 +530,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
|
||||||
}
|
}
|
||||||
previousEntry = entry;
|
previousEntry = entry;
|
||||||
// do not show apps from #appmenu in #navigation
|
// do not show apps from #appmenu in #navigation
|
||||||
if(i < 7) {
|
if(i <= 7) {
|
||||||
$('#navigation li').eq(i).addClass('in-header');
|
$('#navigation li').eq(i).addClass('in-header');
|
||||||
} else {
|
} else {
|
||||||
$('#navigation li').eq(i).removeClass('in-header');
|
$('#navigation li').eq(i).removeClass('in-header');
|
||||||
|
|
Loading…
Reference in New Issue