22 Oct
2018
22 Oct
'18
12:10 p.m.
Module: check_mk
Branch: master
Commit: 0029b986739abe5e272443135f97b495a78e9a04
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0029b986739abe…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Oct 22 07:34:22 2018 +0200
Fixed broken snapin/minmax icon and simplified code
Change-Id: Iec80b3855df4dda0a99a5a8dcb50ff7f07652470
---
cmk/gui/sidebar.py | 8 ++------
web/htdocs/js/sidebar.js | 7 ++-----
web/htdocs/sidebar.css | 8 +++++---
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/cmk/gui/sidebar.py b/cmk/gui/sidebar.py
index 4c0850b..339409b 100644
--- a/cmk/gui/sidebar.py
+++ b/cmk/gui/sidebar.py
@@ -424,10 +424,8 @@ class SidebarRenderer(object):
# When not permitted to open/close snapins, the snapins are always opened
if snapin.visible == SnapinVisibility.OPEN or not
config.user.may("general.configure_sidebar"):
style = None
- minimaxi = "mini"
else:
style = "display:none"
- minimaxi = "maxi"
toggle_url = "sidebar_openclose.py?name=%s&state=" % name
@@ -443,10 +441,8 @@ class SidebarRenderer(object):
if config.user.may("general.configure_sidebar"):
# Icon for mini/maximizing
- html.open_div(class_="minisnapin")
- html.icon_button(url=None, title=_("Toggle this snapin"),
icon="%ssnapin" % minimaxi,
- onclick="toggle_sidebar_snapin(this,
'%s')" % toggle_url)
- html.close_div()
+ html.div("", class_="minisnapin", title=_("Toggle
this snapin"),
+ onclick="toggle_sidebar_snapin(this, '%s')" %
toggle_url)
# Button for closing (removing) a snapin
html.open_div(class_="closesnapin")
diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js
index 8cdfca9..4d03f28 100644
--- a/web/htdocs/js/sidebar.js
+++ b/web/htdocs/js/sidebar.js
@@ -651,19 +651,16 @@ function toggle_sidebar_snapin(oH2, url) {
else if (child.tagName == 'DIV' && (child.className == 'head
open' || child.className == "head closed"))
var oHead = child;
}
- var oImgMini = oHead.childNodes[0].childNodes[0].childNodes[0];
// FIXME: Does oContent really exist?
var closed = oContent.style.display == "none";
if (closed) {
oContent.style.display = "block";
- oHead.className = "head open";
- oImgMini.src = "images/button_minisnapin.png";
+ change_class(oHead, "closed", "open");
}
else {
oContent.style.display = "none";
- oHead.className = "head closed";
- oImgMini.src = "images/button_maxisnapin.png";
+ change_class(oHead, "open", "closed");
}
/* make this persistent -> save */
get_url(url + (closed ? "open" : "closed"));
diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css
index 606ba75..852b09a 100644
--- a/web/htdocs/sidebar.css
+++ b/web/htdocs/sidebar.css
@@ -252,11 +252,13 @@ div.snapin div.minisnapin {
margin-top: 6px;
line-height: 0px;
height: 8px;
+ width: 8px;
+ cursor: pointer;
+ background-image: url("images/icon_minisnapin.png");
}
-div.snapin div.minisnapin img {
- width: 8px;
- height: 8px;
+div.snapin div.head.closed div.minisnapin {
+ background-image: url("images/icon_maxisnapin.png");
}
div.snapin div.content {