[checkmk-commits] Moved availability logic to dedicated module

Module: check_mk Branch: master Commit: b296fbc093360cfa6ee5c5182b11fa7c37bf5aa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b296fbc093360c… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Fri Dec 21 10:08:35 2018 +0100 Moved availability logic to dedicated module Change-Id: If880f985d9300a58722359420b60a54266412336 --- cmk/gui/plugins/views/availability.py | 8 +++--- web/htdocs/js/checkmk.js | 40 --------------------------- web/htdocs/js/index.js | 2 ++ web/htdocs/js/modules/availability.js | 51 +++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 44 deletions(-) diff --git a/cmk/gui/plugins/views/availability.py b/cmk/gui/plugins/views/availability.py index 192472b..84e3f67 100644 --- a/cmk/gui/plugins/views/availability.py +++ b/cmk/gui/plugins/views/availability.py @@ -396,8 +396,8 @@ def render_availability_timeline(what, av_entry, avoptions): for row_nr, row in enumerate(timeline_layout["table"]): table.row( id_="timetable_%d" % row_nr, - onmouseover="timetable_hover(%d, 1);" % row_nr, - onmouseout="timetable_hover(%d, 0);" % row_nr) + onmouseover="cmk.availability.timetable_hover(%d, 1);" % row_nr, + onmouseout="cmk.availability.timetable_hover(%d, 0);" % row_nr) table.cell(_("Links"), css="buttons") if what == "bi": url = html.makeuri([("timewarp", str(int(row["from"])))]) @@ -537,8 +537,8 @@ def render_timeline_bar(timeline_layout, style): if style == "standalone": td_attrs.update({ - "onmouseover": "timeline_hover(%d, 1);" % row_nr, - "onmouseout": "timeline_hover(%d, 0);" % row_nr, + "onmouseover": "cmk.availability.timeline_hover(%d, 1);" % row_nr, + "onmouseout": "cmk.availability.timeline_hover(%d, 0);" % row_nr, }) html.td('', **td_attrs) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index b032bd7..f3edf52 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2024,46 +2024,6 @@ function host_tag_update_value(prefix, grp) { } //#. -//# .-Availability-------------------------------------------------------. -//# | _ _ _ _ _ _ _ _ | -//# | / \__ ____ _(_) | __ _| |__ (_) (_) |_ _ _ | -//# | / _ \ \ / / _` | | |/ _` | '_ \| | | | __| | | | | -//# | / ___ \ V / (_| | | | (_| | |_) | | | | |_| |_| | | -//# | /_/ \_\_/ \__,_|_|_|\__,_|_.__/|_|_|_|\__|\__, | | -//# | |___/ | -//# +--------------------------------------------------------------------+ -//# | | -//# '--------------------------------------------------------------------' - -function timeline_hover(row_nr, onoff) -{ - var row = document.getElementById("timetable_" + row_nr); - if (!row) - return; - - if (onoff) { - add_class(row, 'hilite'); - } else { - remove_class(row, 'hilite'); - } -} - - -function timetable_hover(row_nr, onoff) -{ - var slice = document.getElementById("timeline_" + row_nr); - if (!slice) - return; - - if (onoff) { - add_class(slice, 'hilite'); - } else { - remove_class(slice, 'hilite'); - } -} - - -//#. //# .--SLA-----------------------------------------------------------------. //# | ____ _ _ | //# | / ___|| | / \ | diff --git a/web/htdocs/js/index.js b/web/htdocs/js/index.js index 578456b..cbf47be 100644 --- a/web/htdocs/js/index.js +++ b/web/htdocs/js/index.js @@ -34,6 +34,7 @@ import * as activation from "activation"; import * as selection from "selection"; import * as element_dragging from "element_dragging"; import * as help from "help"; +import * as availability from "availability"; import * as dashboard from "dashboard"; require("script-loader!./checkmk.js"); @@ -64,6 +65,7 @@ export default { selection: selection, element_dragging: element_dragging, help: help, + availability: availability, dashboard: dashboard }, // TODO: Compatibility for not yet modularized JS code diff --git a/web/htdocs/js/modules/availability.js b/web/htdocs/js/modules/availability.js new file mode 100644 index 0000000..c39f6a2 --- /dev/null +++ b/web/htdocs/js/modules/availability.js @@ -0,0 +1,51 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// ails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +import * as utils from "utils"; + +export function timeline_hover(row_nr, onoff) +{ + var row = document.getElementById("timetable_" + row_nr); + if (!row) + return; + + if (onoff) { + utils.add_class(row, "hilite"); + } else { + utils.remove_class(row, "hilite"); + } +} + +export function timetable_hover(row_nr, onoff) +{ + var slice = document.getElementById("timeline_" + row_nr); + if (!slice) + return; + + if (onoff) { + utils.add_class(slice, "hilite"); + } else { + utils.remove_class(slice, "hilite"); + } +}