tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Navigation: Support empty labels for creating containers

Browse Source 
refs #5543
This commit is contained in:
Eric Lippmann 2015-09-27 15:42:26 +02:00
parent d8f45fc9b1
commit 63e0549618
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Web/Navigation/NavigationItem.php
View File

@ -436,7 +436,7 @@ class NavigationItem implements IteratorAggregate
*/ */
public function getLabel() public function getLabel()
{ {
return $this->label ?: $this->getName(); return $this->label !== null ? $this->label : $this->getName();
} }
/** /**

6
library/Icinga/Web/Navigation/Renderer/NavigationItemRenderer.php
View File

@ -56,7 +56,7 @@ class NavigationItemRenderer
*/ */
public function init() public function init()
{ {
} }
/** /**
@ -164,13 +164,15 @@ class NavigationItemRenderer
$this->renderTargetAttribute(), $this->renderTargetAttribute(),
$label $label
); );
} else { } elseif ($label) {
$content = sprintf( $content = sprintf(
'<%1$s%2$s>%3$s</%1$s>', '<%1$s%2$s>%3$s</%1$s>',
$item::LINK_ALTERNATIVE, $item::LINK_ALTERNATIVE,
$this->view()->propertiesToString($item->getAttributes()), $this->view()->propertiesToString($item->getAttributes()),
$label $label
); );
} else {
$content = '';
} }
return $content; return $content;