Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

Precompiled agent test: Skip msibuid sources

by Lars Michelsen

Module: check_mk Branch: master Commit: 5fff008876d26c6c47031616094a0a16159a0922 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fff008876d26c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 23 10:45:08 2016 +0200 Precompiled agent test: Skip msibuid sources --- tests/agents/windows/test_precompiled_age.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/agents/windows/test_precompiled_age.py b/tests/agents/windows/test_precompiled_age.py index a5d19a3..617c3c5 100644 --- a/tests/agents/windows/test_precompiled_age.py +++ b/tests/agents/windows/test_precompiled_age.py @@ -37,10 +37,14 @@ def find_newest_source_file(): for dirpath, dirnames, filenames in os.walk("%s/agents/windows" % cmk_path()): for filename in filenames: + path = "%s/%s" % (dirpath, filename) + if not filename.endswith(".cc") and not filename.endswith(".h"): continue - path = "%s/%s" % (dirpath, filename) + if "/msibuild/" in path: + continue + commit_time = last_commit_time(path) if commit_time > newest_commit_time: newest_path, newest_commit_time = path, commit_time

7 years, 10 months

fixed ValueError

by Simon Betz

Module: check_mk Branch: master Commit: b14588061f724b20ad0b1d5c43009cbc7ce8d6c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b14588061f724b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 23 10:24:17 2016 +0200 fixed ValueError --- web/plugins/views/layouts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 4b71696..8bb4bc3 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -290,7 +290,7 @@ def grouped_row_title(index, group_spec, num_rows, trclass, num_painters): # and a tuple of the group_spec and the number of rows in this group is the value def calculate_grouping_of_services(rows): if not config.service_view_grouping: - return {} + return {}, rows # First create dictionaries for each found group containing the # group spec and the row indizes of the grouped rows

7 years, 10 months

Cleaned up additional traceback calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d90fa4aa60159b4fc11d3b07a0c9ad522005228 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d90fa4aa60159… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 23 10:08:45 2016 +0200 Cleaned up additional traceback calls --- web/htdocs/metrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 5e20973..08b56a7 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -37,6 +37,7 @@ import math, time, colorsys, shlex, operator, random import config, defaults, pagetypes, table import sites +import traceback from lib import * from valuespec import * from livestatus import MKLivestatusNotFoundError @@ -1070,7 +1071,6 @@ def page_pnp_template(): html.write(output) except Exception, e: - import traceback html.write("An error occured:\n%s\n" % traceback.format_exc())

7 years, 10 months

3763 FIX Fixed playing sounds in views when using current Firefox

by Lars Michelsen

Module: check_mk Branch: master Commit: 032ef86b74f9def04e4d8dae4eeb679abcbd4378 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=032ef86b74f9de… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 23 10:01:54 2016 +0200 3763 FIX Fixed playing sounds in views when using current Firefox Changed the way the sounds are played in HTML code from "object" tag to HTML5 "audio" tag. This should work in most modern browsers. Also did some refactoring along the way. --- .werks/3763 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 28 ++++----------------------- web/htdocs/views.py | 43 ++++++++++++++++++++++++++++++------------ web/plugins/views/layouts.py | 10 +++++----- 5 files changed, 53 insertions(+), 41 deletions(-) diff --git a/.werks/3763 b/.werks/3763 new file mode 100644 index 0000000..cf447c1 --- /dev/null +++ b/.werks/3763 @@ -0,0 +1,12 @@ +Title: Fixed playing sounds in views when using current Firefox +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i1 +Date: 1471939240 +Class: fix + +Changed the way the sounds are played in HTML code from "object" tag to +HTML5 "audio" tag. This should work in most modern browsers. + +Also did some refactoring along the way. diff --git a/ChangeLog b/ChangeLog index c7d049e..b5c9dc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -443,6 +443,7 @@ * 3753 FIX: Fixed graph hover popup of services having special characters in their names * 3758 FIX: Fixed wrong sorting of events in main dashboard in distributed environments * 3561 FIX: Removing a comment now also removes any linked acknowledgements... + * 3763 FIX: Fixed playing sounds in views when using current Firefox... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 6692f99..d373bff 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -717,6 +717,10 @@ class html(GUITester): self.write('<script type="text/javascript" src="js/%s.js"></script>\n' % name) + def play_sound(self, url): + self.write("<audio src=\"%s\" autoplay>\n" % self.attrencode(url)) + + # # HTML form rendering # @@ -1943,30 +1947,6 @@ class html(GUITester): # - # Sounds - # TODO: Move to views. Only used there. - # - - def register_event(self, name): - self.events.add(name) - - - def has_event(self, name): - return name in self.events - - - def play_sound(self, url): - self.write('<object type="audio/x-wav" data="%s" height="0" width="0">\n' - '<param name="filename" value="%s">\n' - '<param name="src" value="%s">\n' - '<param name="autostart" value="true">\n' - '<param name="playcount" value="1">\n' - '</object>\n' % (url, url, url)) - if self.enable_debug: - self.write("(playing sound %s)" % url) - - - # # Keyboard control # TODO: Can we move this specific feature to AQ? # diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 4812bdb..2affdd5 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -41,6 +41,7 @@ def load_plugins(force): # always reload the hosttag painters, because new hosttags might have been # added during runtime load_host_tag_painters() + clear_alarm_sound_states() return global multisite_datasources ; multisite_datasources = {} @@ -57,6 +58,7 @@ def load_plugins(force): load_web_plugins("views", globals()) load_host_tag_painters() + clear_alarm_sound_states() # This must be set after plugin loading to make broken plugins raise # exceptions all the time and not only the first time (when the plugins @@ -1457,18 +1459,44 @@ def do_table_join(master_ds, master_rows, master_filters, join_painters, join_co row["JOIN"] = joininfo +g_alarm_sound_states = set([]) + + +def clear_alarm_sound_states(): + g_alarm_sound_states.clear() + + +def save_state_for_playing_alarm_sounds(row): + if not config.enable_sounds or not config.sounds: + return + + # TODO: Move this to a generic place. What about -1? + host_state_map = { 0: "up", 1: "down", 2: "unreachable"} + service_state_map = { 0: "up", 1: "warning", 2: "critical", 3: "unknown"} + + for state_map, state in [ + (host_state_map, row.get("host_hard_state", row.get("host_state"))), + (service_state_map, row.get("service_last_hard_state", row.get("service_state"))) ]: + if state != None: + g_alarm_sound_states.add(state_map[int(state)]) + + def play_alarm_sounds(): - if not config.enable_sounds: + if not config.enable_sounds or not config.sounds: return url = config.sound_url if not url.endswith("/"): url += "/" - for event, wav in config.sounds: - if not event or html.has_event(event): + + html.debug(g_alarm_sound_states) + for state_name, wav in config.sounds: + html.debug(state_name) + if not state_name or state_name in g_alarm_sound_states: html.play_sound(url + wav) break # only one sound at one time + # How many data rows may the user query? def get_limit(): limitvar = html.var("limit", "soft") @@ -2423,15 +2451,6 @@ def paint_header(view, p, is_last_column_header=False): html.guitest_record_output("view", ("header", title)) -def register_events(row): - if config.sounds != []: - host_state = row.get("host_hard_state", row.get("host_state")) - if host_state != None: - html.register_event({0:"up", 1:"down", 2:"unreachable"}[saveint(host_state)]) - svc_state = row.get("service_last_hard_state", row.get("service_state")) - if svc_state != None: - html.register_event({0:"up", 1:"warning", 2:"critical", 3:"unknown"}[saveint(svc_state)]) - # The Group-value of a row is used for deciding wether # two rows are in the same group or not def group_value(row, group_painters): diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 9f1e097..4b71696 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -69,7 +69,7 @@ def render_group_checkbox_th(): # '----------------------------------------------------------------------' def render_single_dataset(rows, view, group_painters, painters, num_columns, _ignore_show_checkboxes): for row in rows: - register_events(row) # needed for playing sounds + save_state_for_playing_alarm_sounds(row) html.write('<table class="data single">\n') rownum = 0 @@ -130,7 +130,7 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show groups = [] last_group = None for row in rows: - register_events(row) # needed for playing sounds + save_state_for_playing_alarm_sounds(row) this_group = group_value(row, group_painters) if this_group != last_group: last_group = this_group @@ -209,7 +209,7 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show show_header_line() visible_row_number += 1 - register_events(row) # needed for playing sounds + save_state_for_playing_alarm_sounds(row) odd = odd == "odd" and "even" or "odd" @@ -536,7 +536,7 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ visible_row_number = 0 group_hidden, num_grouped_rows = None, 0 for index, row in rows_with_ids: - register_events(row) # needed for playing sounds + save_state_for_playing_alarm_sounds(row) # Show group header, if a new group begins. But only if grouping # is activated if len(group_painters) > 0: @@ -848,7 +848,7 @@ def create_matrices(rows, group_painters, painters, num_columns): col_num = 0 for row in rows: - register_events(row) # needed for playing sounds + save_state_for_playing_alarm_sounds(row) group_id = group_value(row, group_painters) if group_id != last_group_id: col_num += 1

7 years, 10 months

Updated bug entries #2467

by Lars Michelsen

Module: check_mk Branch: master Commit: 667038c6455ab904c1ee0a177b67744045fd6b35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=667038c6455ab9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 23 09:10:37 2016 +0200 Updated bug entries #2467 --- .bugs/2467 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.bugs/2467 b/.bugs/2467 new file mode 100644 index 0000000..a499f0e --- /dev/null +++ b/.bugs/2467 @@ -0,0 +1,15 @@ +Title: Distributed Monitoring: Ensure that local site entry exists (not deletable) +Component: wato +State: open +Date: 2016-08-23 09:09:48 +Targetversion: future +Class: bug + +Maybe this is already fixed in master. Please test this case: + +Wir hatten hier ein Master/Slave Setup. +Auf dem Master sollte nichts gemonitored werden. + +Jetzt war der Master allerdings nicht bei der Site Konfiguriation eingerichtet. +Er hatte damit keine distributed_wato.mk bekommen und dachte somit er +wäre für alles verantwortlich.

7 years, 10 months

Fixed recently introduced issue with logo rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: d516fc2c278ebacc772f421514484571233353cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d516fc2c278eba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 23 09:31:07 2016 +0200 Fixed recently introduced issue with logo rendering --- web/htdocs/images/sidebar_top.png | Bin 18000 -> 16767 bytes web/htdocs/sidebar.css | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/images/sidebar_top.png b/web/htdocs/images/sidebar_top.png index cdab624..d66e7f0 100644 Binary files a/web/htdocs/images/sidebar_top.png and b/web/htdocs/images/sidebar_top.png differ diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 70b3caa..9307394 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -72,8 +72,8 @@ body.side.screenshotmode { position: absolute; top: 0; left: 0; - width: 280px; - height: 55px; + width: 271px; + height: 46px; z-index: 10; }

7 years, 10 months

Cleaned up foldable container treeangle animation

by Lars Michelsen

Module: check_mk Branch: master Commit: 06cef8609b9cc5f8fe4f776b298d25d964e7fdd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06cef8609b9cc5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 11:01:32 2016 +0200 Cleaned up foldable container treeangle animation --- web/htdocs/check_mk.css | 11 +++++ web/htdocs/htmllib.py | 11 ++--- web/htdocs/images/tree_10.png | Bin 376 -> 0 bytes web/htdocs/images/tree_20.png | Bin 373 -> 0 bytes web/htdocs/images/tree_30.png | Bin 309 -> 0 bytes web/htdocs/images/tree_40.png | Bin 380 -> 0 bytes web/htdocs/images/tree_50.png | Bin 371 -> 0 bytes web/htdocs/images/tree_60.png | Bin 339 -> 0 bytes web/htdocs/images/tree_70.png | Bin 372 -> 0 bytes web/htdocs/images/tree_80.png | Bin 367 -> 0 bytes web/htdocs/images/tree_90.png | Bin 299 -> 0 bytes web/htdocs/images/tree_black_10.png | Bin 398 -> 0 bytes web/htdocs/images/tree_black_20.png | Bin 393 -> 0 bytes web/htdocs/images/tree_black_30.png | Bin 334 -> 0 bytes web/htdocs/images/tree_black_40.png | Bin 406 -> 0 bytes web/htdocs/images/tree_black_50.png | Bin 405 -> 0 bytes web/htdocs/images/tree_black_60.png | Bin 350 -> 0 bytes web/htdocs/images/tree_black_70.png | Bin 396 -> 0 bytes web/htdocs/images/tree_black_80.png | Bin 395 -> 0 bytes web/htdocs/images/tree_black_90.png | Bin 333 -> 0 bytes .../{tree_black_00.png => tree_black_closed.png} | Bin 315 -> 315 bytes web/htdocs/images/{tree_00.png => tree_closed.png} | Bin 311 -> 311 bytes web/htdocs/js/checkmk.js | 51 ++++---------------- web/htdocs/pages.css | 2 - web/plugins/views/layouts.py | 4 +- 25 files changed, 28 insertions(+), 51 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=06cef8609b…

7 years, 10 months

Cleaned up foldable container treeangle hover handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 3c266bc47d9decbd063184cf1b3eeaa88a5128e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c266bc47d9dec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 11:01:56 2016 +0200 Cleaned up foldable container treeangle hover handling --- web/htdocs/check_mk.css | 1 + web/htdocs/htmllib.py | 2 -- web/htdocs/pages.css | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index aaef6e0..77c5cf6 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -255,6 +255,7 @@ img.treeangle { height: 12px; margin-right: 3px; margin-top: 0px; + cursor: pointer; -webkit-transition: -webkit-transform .2s ease-in-out; -moz-transition: -moz-transform .2s ease-in-out; diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index ac102ba..022b51a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1741,8 +1741,6 @@ class html(GUITester): onclick = ' onclick="toggle_foldable_container(\'%s\', \'%s\', \'%s\')"' % ( treename, id, fetch_url and fetch_url or ''); - onclick += ' onmouseover="this.style.cursor=\'pointer\';" ' - onclick += ' onmouseout="this.style.cursor=\'auto\';" ' if indent == "nform": self.write('<tr class=heading><td id="nform.%s.%s" %s colspan=2>' % (treename, id, onclick)) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 6a88730..16d5f09 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -838,6 +838,7 @@ table.nform tr.heading > td { height: 20px; vertical-align: middle; padding-left: 10px; + cursor: pointer; } table.nform tr.heading > td:hover { background-image: url("images/white_20percent.png");

7 years, 10 months

Replaced some more images with simple CSS definitions

by Lars Michelsen

Module: check_mk Branch: master Commit: 70cb918a9c6177a313aea577fc6080e197a11a57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70cb918a9c6177… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 13:14:56 2016 +0200 Replaced some more images with simple CSS definitions --- web/htdocs/images/sidebar_bottom.png | Bin 409 -> 0 bytes web/htdocs/images/sidebar_top.png | Bin 18195 -> 18000 bytes web/htdocs/images/snapin_background.png | Bin 143 -> 0 bytes web/htdocs/images/snapin_closed.png | Bin 720 -> 0 bytes web/htdocs/images/snapin_footer.png | Bin 402 -> 0 bytes web/htdocs/images/snapin_header.png | Bin 438 -> 0 bytes web/htdocs/images/snapinfooter_addsnapin_down.png | Bin 839 -> 0 bytes .../images/snapinfooter_einstellungen_down.png | Bin 1080 -> 0 bytes web/htdocs/images/snapinfooter_logout_down.png | Bin 1178 -> 0 bytes web/htdocs/js/sidebar.js | 5 - web/htdocs/sidebar.css | 96 +++++++++----------- web/htdocs/sidebar.py | 2 +- 12 files changed, 46 insertions(+), 57 deletions(-) diff --git a/web/htdocs/images/sidebar_bottom.png b/web/htdocs/images/sidebar_bottom.png deleted file mode 100644 index 1257ff4..0000000 Binary files a/web/htdocs/images/sidebar_bottom.png and /dev/null differ diff --git a/web/htdocs/images/sidebar_top.png b/web/htdocs/images/sidebar_top.png index 43fa2ab..cdab624 100644 Binary files a/web/htdocs/images/sidebar_top.png and b/web/htdocs/images/sidebar_top.png differ diff --git a/web/htdocs/images/snapin_background.png b/web/htdocs/images/snapin_background.png deleted file mode 100644 index 197eb87..0000000 Binary files a/web/htdocs/images/snapin_background.png and /dev/null differ diff --git a/web/htdocs/images/snapin_closed.png b/web/htdocs/images/snapin_closed.png deleted file mode 100644 index a338dbf..0000000 Binary files a/web/htdocs/images/snapin_closed.png and /dev/null differ diff --git a/web/htdocs/images/snapin_footer.png b/web/htdocs/images/snapin_footer.png deleted file mode 100644 index bde4972..0000000 Binary files a/web/htdocs/images/snapin_footer.png and /dev/null differ diff --git a/web/htdocs/images/snapin_header.png b/web/htdocs/images/snapin_header.png deleted file mode 100644 index 378c2f5..0000000 Binary files a/web/htdocs/images/snapin_header.png and /dev/null differ diff --git a/web/htdocs/images/snapinfooter_addsnapin_down.png b/web/htdocs/images/snapinfooter_addsnapin_down.png deleted file mode 100644 index f099384..0000000 Binary files a/web/htdocs/images/snapinfooter_addsnapin_down.png and /dev/null differ diff --git a/web/htdocs/images/snapinfooter_einstellungen_down.png b/web/htdocs/images/snapinfooter_einstellungen_down.png deleted file mode 100644 index 88d58d9..0000000 Binary files a/web/htdocs/images/snapinfooter_einstellungen_down.png and /dev/null differ diff --git a/web/htdocs/images/snapinfooter_logout_down.png b/web/htdocs/images/snapinfooter_logout_down.png deleted file mode 100644 index c136422..0000000 Binary files a/web/htdocs/images/snapinfooter_logout_down.png and /dev/null differ diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 134281e..07745fd 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -659,8 +659,6 @@ function toggle_sidebar_snapin(oH2, url) { var oContent = child; else if (child.tagName == 'DIV' && (child.className == 'head open' || child.className == "head closed")) var oHead = child; - else if (child.tagName == 'DIV' && child.className == 'foot') - var oFoot = child; } var oImgMini = oHead.childNodes[0].childNodes[0].childNodes[0]; @@ -668,13 +666,11 @@ function toggle_sidebar_snapin(oH2, url) { var closed = oContent.style.display == "none"; if (closed) { oContent.style.display = "block"; - oFoot.style.display = "block"; oHead.className = "head open"; oImgMini.src = "images/button_minisnapin.png"; } else { oContent.style.display = "none"; - oFoot.style.display = "none"; oHead.className = "head closed"; oImgMini.src = "images/button_maxisnapin.png"; } @@ -682,7 +678,6 @@ function toggle_sidebar_snapin(oH2, url) { get_url(url + (closed ? "open" : "closed")); oContent = null; oHead = null; - oFoot = null; childs = null; } diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index e6d3f4a..70b3caa 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -56,10 +56,16 @@ body.side.screenshotmode { position: relative; top: 0px; left: 0px; - width: 100%; - height: 55px; + width: 274px; + height: 49px; z-index: 10; - background-repeat: no-repeat; + + border: 1px solid #264755; + border-top: 0; + border-left: 0; + border-bottom-right-radius: 5px; + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.50); + background: #498aa6; } #side_bg { @@ -86,18 +92,19 @@ body.side.screenshotmode { width: 10px; height: 55px; z-index: 15; + cursor: pointer; } + #side_fold:hover { background-repeat: no-repeat; background-position: -3px 7px; background-image: url("images/side_fold.png"); } - #side_version { position: absolute; top: 12px; - right: 20px; + right: 10px; z-index: 54; color: #fff; text-align: right; @@ -146,16 +153,22 @@ body.side.screenshotmode { position: absolute; bottom: 0; left: 0; - height: 44px; - width: 100%; + height: 38px; + width: 274px; z-index: 10; - background-repeat: no-repeat; - background-image: url("images/sidebar_bottom.png"); + margin: 0; + + border-color: #86b1c4 #264755; + border-width: 1px 1px 0 0; + border-style: solid; + border-top-right-radius: 5px; + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.50); + background: #498aa6; } #side_footer img.iconbutton { position: relative; - top: 10px; + top: 4px; left: 9px; margin-right: 3px; width: 33px; @@ -164,10 +177,9 @@ body.side.screenshotmode { #side_footer div.copyright { color: #fff; - position: relative; - left: 141px; - top: -5px; - width: 122px; + position: absolute; + right: 10px; + bottom: 5px; text-align: right; } @@ -181,10 +193,16 @@ body.side.screenshotmode { /* General layout of snapins */ div.snapin { - width: 1555px; - margin: 0 0 0 5px; padding: 0; overflow: hidden; + border-color: #8ab1c0 #294753 #294753 #8ab1c0; + border-width: 1px; + border-style: solid; + width: 248px; + margin: 5px 10px; + border-radius: 5px; + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.50); + background: #508aa1; } div.snapin:last-child { @@ -193,35 +211,26 @@ div.snapin:last-child { /* Header of the snapin */ div.snapin div.head { - width: 260px; + background-color: #6da1b8; text-align: center; color: #fff; - height: 26px; - line-height: 29px; + height: 20px; + line-height: 20px; } div.snapin div.head b { font-weight: normal; } - -div.snapin div.head.open { - background-image: url("images/snapin_header.png"); -} - -div.snapin div.head.closed { - background-image: url("images/snapin_closed.png"); -} - /* close button on header */ div.snapin div.closesnapin { float: right; - margin-right: 12px; - margin-top: 11px; + margin-right: 6px; + margin-top: 6px; line-height: 0px; height: 8px; - width:8px; - padding:0; + width: 8px; + padding: 0; } div.snapin div.closesnapin img { @@ -231,8 +240,8 @@ div.snapin div.closesnapin img { div.snapin div.minisnapin { float: left; - margin-left: 13px; - margin-top: 11px; + margin-left: 6px; + margin-top: 6px; line-height: 0px; height: 8px; } @@ -242,24 +251,9 @@ div.snapin div.minisnapin img { height: 8px; } - div.snapin div.content { - background-image: url("images/snapin_background.png"); - background-repeat: repeat-y; - background-position: left; - - /* It's important for the left/right padding to be substracted - * from the width defined below. The regular width would be 260px. */ - padding: 10px 15px 5px; - width: 230px; -} - -div.snapin div.foot { - background-image: url("images/snapin_footer.png"); - background-repeat: no-repeat; - width: 260px; - height: 5px; - line-height: 5px; + padding: 10px; + width: 228px; } /* diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 5537565..e204f1b 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -370,7 +370,7 @@ def render_snapin(name, state): html.write('<script>get_url("%s", updateContents, "snapin_%s")</script>' % (refresh_url, name)) except Exception, e: snapin_exception(e) - html.write('</div><div class="foot"%s></div>\n' % style) + html.write('</div>\n') html.write('</div>') return refresh_url

7 years, 10 months

Replaced some image uses where CSS is usable

by Lars Michelsen

Module: check_mk Branch: master Commit: 823c3bbe6b4db63a03a5ba4d353cc49eb928b6d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=823c3bbe6b4db6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 22 11:03:12 2016 +0200 Replaced some image uses where CSS is usable --- web/htdocs/pages.css | 6 +----- web/htdocs/views.css | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 16d5f09..f00f45c 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -833,16 +833,12 @@ table.nform tr.heading td { } table.nform tr.heading > td { border-radius: 5px 5px 0px 0px; - background-image: url("images/white_20percent.png"); - background-repeat: repeat; + background-color: rgba(255, 255, 255, 0.2); height: 20px; vertical-align: middle; padding-left: 10px; cursor: pointer; } -table.nform tr.heading > td:hover { - background-image: url("images/white_20percent.png"); -} table.nform > tbody > tr td { color: black; diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 1ce7ec2..26db065 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -666,8 +666,7 @@ table.data.timewarp { } div.avlegend { - background-image: url("images/white_20percent.png"); - background-repeat: repeat; + background-color: rgba(255, 255, 255, 0.2); padding: 5px 15px; border-radius: 5px; margin-top: 10px;

7 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016