[checkmk-commits] Check_MK Git: check_mk: Fixed context button icons for icons read from icons/ directory

Module: check_mk Branch: master Commit: a555a87db91574cc945e36cab7dae0a31ec0aede URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a555a87db91574… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon May 11 11:57:20 2015 +0200 Fixed context button icons for icons read from icons/ directory --- web/htdocs/htmllib.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 64d9ac2..d504c2f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -362,14 +362,7 @@ class html: if not self.mobile: self.write('</label>') - def icon(self, help, icon): - self.write(self.render_icon(icon, help)) - - def render_icon(self, icon_name, help="", middle=True, id=None): - align = middle and ' align=absmiddle' or '' - title = help and ' title="%s"' % self.attrencode(help) or "" - id = id and ' id="%s"' % id or '' - + def detect_icon_path(self, icon_name): # Detect whether or not the icon is available as images/icon_*.png # or images/icons/*.png. When an icon is available as internal icon, # always use this onec @@ -379,11 +372,19 @@ class html: base_path = defaults.web_dir+"/htdocs/images" if os.path.exists(base_path+'/icon_'+icon_name+'.png'): - src = "images/icon_%s.png" % icon_name + return "images/icon_%s.png" % icon_name else: - src = "images/icons/%s.png" % icon_name + return "images/icons/%s.png" % icon_name - return '<img src="%s" class=icon%s%s%s />' % (src, align, title, id) + def icon(self, help, icon): + self.write(self.render_icon(icon, help)) + + def render_icon(self, icon_name, help="", middle=True, id=None): + align = middle and ' align=absmiddle' or '' + title = help and ' title="%s"' % self.attrencode(help) or "" + id = id and ' id="%s"' % id or '' + + return '<img src="%s" class=icon%s%s%s />' % (self.detect_icon_path(icon_name), align, title, id) def empty_icon(self): self.write('<img class=icon src="images/trans.png" />') @@ -464,7 +465,8 @@ class html: self.begin_context_buttons() if icon: - title = '<img src="images/icon_%s.png">%s' % (self.attrencode(icon), self.attrencode(title)) + title = '<img src="%s">%s' % (self.attrencode(self.detect_icon_path(icon)), self.attrencode(title)) + if id: idtext = " id='%s'" % self.attrencode(id) else: