[checkmk-commits] Removed more bad looking gif images (from host diag page)

Module: check_mk Branch: master Commit: a2d6191df9ea5bd2b03c78700edf33d47ba9aeae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2d6191df9ea5b… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Aug 22 10:33:10 2016 +0200 Removed more bad looking gif images (from host diag page) --- web/htdocs/images/icon_loading.gif | Bin 7696 -> 0 bytes web/htdocs/images/icon_passive.gif | Bin 612 -> 0 bytes web/htdocs/images/icon_pnp.gif | Bin 1098 -> 0 bytes web/htdocs/images/icon_retry.gif | Bin 1852 -> 0 bytes web/htdocs/images/icon_retry_disabled.gif | Bin 1800 -> 0 bytes web/htdocs/js/checkmk.js | 2 +- web/htdocs/js/wato.js | 7 +++++-- web/htdocs/wato.py | 4 ++-- web/plugins/views/painters.py | 2 -- 9 files changed, 8 insertions(+), 7 deletions(-) diff --git a/web/htdocs/images/icon_loading.gif b/web/htdocs/images/icon_loading.gif deleted file mode 100644 index 5b30ae7..0000000 Binary files a/web/htdocs/images/icon_loading.gif and /dev/null differ diff --git a/web/htdocs/images/icon_passive.gif b/web/htdocs/images/icon_passive.gif deleted file mode 100644 index 8653ea3..0000000 Binary files a/web/htdocs/images/icon_passive.gif and /dev/null differ diff --git a/web/htdocs/images/icon_pnp.gif b/web/htdocs/images/icon_pnp.gif deleted file mode 100644 index 6476315..0000000 Binary files a/web/htdocs/images/icon_pnp.gif and /dev/null differ diff --git a/web/htdocs/images/icon_retry.gif b/web/htdocs/images/icon_retry.gif deleted file mode 100644 index db29279..0000000 Binary files a/web/htdocs/images/icon_retry.gif and /dev/null differ diff --git a/web/htdocs/images/icon_retry_disabled.gif b/web/htdocs/images/icon_retry_disabled.gif deleted file mode 100644 index eae1235..0000000 Binary files a/web/htdocs/images/icon_retry_disabled.gif and /dev/null differ diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 7ae541f..b88ef15 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2687,7 +2687,7 @@ function toggle_popup(event, trigger_obj, ident, what, data, url_vars, menu_cont if (what) { popup_data = data; - menu.innerHTML = '<img src="images/icon_loading.gif" class=icon>'; + menu.innerHTML = '<img src="images/icon_reload.png" class="icon reloading">'; // populate the menu using a webservice, because the list of dashboards // is not known in the javascript code. But it might have been cached diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 1e38291..91026db 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -739,6 +739,7 @@ function handle_host_diag_result(ident, response_text) { var img = document.getElementById(ident + '_img'); var log = document.getElementById(ident + '_log'); var retry = document.getElementById(ident + '_retry'); + remove_class(img, "reloading"); if (response_text[0] == "0") { img.src = "images/icon_success.png"; @@ -751,7 +752,7 @@ function handle_host_diag_result(ident, response_text) { log.innerHTML = response_text.substr(1).replace(/\n/g, "<br>\n"); - retry.src = "images/icon_retry.gif"; + retry.src = "images/icon_reload.png"; retry.style.display = 'inline'; } @@ -794,7 +795,9 @@ function start_host_diag_test(ident, hostname) { vars += '&snmp_retries=' + encodeURIComponent(document.getElementsByName('vs_rules_p_snmp_retries')[0].value); vars += '&datasource_program=' + encodeURIComponent(document.getElementsByName('vs_rules_p_datasource_program')[0].value); - img.src = "images/icon_loading.gif"; + img.src = "images/icon_reload.png"; + add_class(img, "reloading"); + log.innerHTML = "..."; get_url("wato_ajax_diag_host.py?host=" + encodeURIComponent(hostname) + "&_test=" + encodeURIComponent(ident) + vars, diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6a8676a..75601df 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2574,9 +2574,9 @@ def mode_diag_host(phase): html.write('<h3>%s</h3>' % title) html.write('<table class="data test"><tr class="data odd0">') html.write('<td class="icons"><div>') - html.write('<img class="icon" id="%s_img" src="">' % ident) + html.write('<img class="icon" id="%s_img" src="images/icon_reload.png">' % ident) html.write('<a href="javascript:start_host_diag_test(\'%s\', \'%s\');">' - '<img class="icon retry" id="%s_retry" src="images/icon_retry_disabled.gif" title="%s"></a>' % + '<img class="icon retry" id="%s_retry" src="images/icon_reload.png" title="%s"></a>' % (ident, hostname, ident, _('Retry this test'))) html.write('</div></td>') html.write('<td><div class="log" id="%s_log"></div>' % ident) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index a2f294e..62dfe33 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -312,8 +312,6 @@ def process_multisite_icons(what, row, tags, custom_vars, toplevel): n = n[5:] if n.endswith(".png"): n = n[:-4] - elif n.endswith(".gif"): - n = n[:-4] icons.append((sort_index, n.encode('utf-8'), None, None)) continue