[checkmk-commits] Check_MK Git: check_mk: Removed old WATO icon gif

Module: check_mk Branch: master Commit: aa1097057e48e6fe2ee1cdaea0f2fc378cb64b0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa1097057e48e6… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Dec 1 11:06:16 2014 +0100 Removed old WATO icon gif --- .bugs/2132 | 7 +++++-- web/htdocs/htmllib.py | 10 ++++++++++ web/htdocs/images/icon_wato.gif | Bin 1506 -> 0 bytes web/plugins/icons/wato.py | 6 +++--- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.bugs/2132 b/.bugs/2132 index 407ab21..70195ba 100644 --- a/.bugs/2132 +++ b/.bugs/2132 @@ -1,11 +1,14 @@ Title: WATO context button on quicksearch result page broken Component: multisite -State: open +Class: bug +State: works4me Date: 2014-07-04 09:30:24 Targetversion: 1.2.5i1 -Class: bug When searching for a host substring, for example "node", results in a page listing all services of the hosts node1 and node2. When clicking on the context button WATO, it displays a red error message that the host "node" (the substring) is not managed by WATO. + +2014-12-01 11:05:43: changed state open -> works4me +old bug, already fixed. diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 1727e0f..618f67d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -24,6 +24,16 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Notes for future rewrite: +# +# - Make clear which functions return values and which write out values +# render_*, add_*, write_* (e.g. icon() -> outputs directly, +# render_icon() -> returns icon +# render_icon() -> returns icon +# +# - Order of arguments: +# e.g. icon(help, icon) -> change and make help otional? + import time, os, pwd, urllib, random from lib import * diff --git a/web/htdocs/images/icon_wato.gif b/web/htdocs/images/icon_wato.gif deleted file mode 100644 index 5aae7e8..0000000 Binary files a/web/htdocs/images/icon_wato.gif and /dev/null differ diff --git a/web/plugins/icons/wato.py b/web/plugins/icons/wato.py index 6f0b705..053b301 100644 --- a/web/plugins/icons/wato.py +++ b/web/plugins/icons/wato.py @@ -35,11 +35,11 @@ def wato_link(folder, site, hostname, where): (html.urlencode(folder), html.urlencode(hostname)) if where == "inventory": url += "&mode=inventory" - help = _("Edit services in WATO - the Check_MK Web Administration Tool") + help = _("Edit services") else: url += "&mode=edithost" - help = _("Open this host in WATO - the Check_MK Web Administration Tool") - return '<a href="%s"><img class=icon src="images/icon_wato.gif" ' \ + help = _("Edit this host") + return '<a href="%s"><img class=icon src="images/icon_wato.png" ' \ 'title="%s"></a>' % (url, help) else: return ""