tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/broken-badges-7736' 

fixes #7736
This commit is contained in:
Marius Hein 2014-11-19 15:28:48 +01:00
parent c36c8be98c 32af89e0a7
commit 4fb2b621ee
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Icinga/Web/Menu/MonitoringMenuItemRenderer.php
View File

@ -81,20 +81,20 @@ class MonitoringMenuItemRenderer implements MenuItemRenderer {
}
if ($menu->getIcon() && strpos($menu->getIcon(), '.') === false) {
return sprintf(
'<a href="%s" class="icon-%s">%s%s</a>',
'%s <a href="%s" class="icon-%s">%s</a>',
$badge,
$menu->getUrl() ?: '#',
$menu->getIcon(),
htmlspecialchars($menu->getTitle()),
$badge
htmlspecialchars($menu->getTitle())
);
}
return sprintf(
'<a href="%s">%s%s%s</a>',
'%s<a href="%s">%s%s<span></span></a>',
$badge,
$menu->getUrl() ?: '#',
$menu->getIcon() ? '<img src="' . Url::fromPath($menu->getIcon()) . '" class="icon" /> ' : '',
htmlspecialchars($menu->getTitle()),
$badge
htmlspecialchars($menu->getTitle())
);
}
}

38
public/css/icinga/widgets.less
View File

@ -204,17 +204,20 @@ li li .badge-container {
margin-right: 0.75em;
}
#menu > ul > li.active > a > .badge-container {
/*
#layout.hoveredmenu .active > .badge-container {
display: none;
}
#layout.hoveredmenu .hover > a > .badge-container {
margin-right: 14.15em;
#layout.hoveredmenu .hover > .badge-container {
//margin-right: 14.15em;
display: none;
}
*/
.badge {
position: relative;
top: -0.1em;
top: 0.3em;
display: inline-block;
min-width: 1em;
padding: 3px 7px;
@ -228,6 +231,33 @@ li li .badge-container {
background-color: @colorInvalid;
}
#menu > ul > li.active > .badge-container {
display: none;
}
#menu > ul > li.hover > .badge-container {
display: none;
}
#menu > ul > li.active > ul > li .badge-container {
position: relative;
top: -0.5em;
}
#menu > ul > li.hover > ul > li > a {
width: 12.5em;
}
#menu > ul > li.hover > ul > li .badge-container {
position: relative;
top: -0.5em;
}
#menu > ul > li.hover > ul > li {
// prevent floating badges from resizing list items in webkit
//max-height: 2em;
}
li li .badge {
font-size: 0.975em;
}