Checkmk git commits March 2012

checkmk-commits@lists.checkmk.com

3 participants
160 discussions

Check_MK Git: check_mk: Treeangle redesigned

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0967ab2ad4a3c7cf2b04a9fce22fe5bac5985463 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0967ab2ad4a3c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 9 16:31:30 2012 +0100 Treeangle redesigned --- web/htdocs/images/image_button_l.png | Bin 2233 -> 1133 bytes web/htdocs/images/image_button_r.png | Bin 2801 -> 2083 bytes web/htdocs/images/someproblem.png | Bin 589 -> 173 bytes web/htdocs/images/tree_00.png | Bin 265 -> 433 bytes web/htdocs/images/tree_10.png | Bin 9484 -> 478 bytes web/htdocs/images/tree_20.png | Bin 9266 -> 476 bytes web/htdocs/images/tree_30.png | Bin 8707 -> 423 bytes web/htdocs/images/tree_40.png | Bin 9650 -> 481 bytes web/htdocs/images/tree_50.png | Bin 10294 -> 506 bytes web/htdocs/images/tree_60.png | Bin 9617 -> 466 bytes web/htdocs/images/tree_70.png | Bin 9840 -> 479 bytes web/htdocs/images/tree_80.png | Bin 9402 -> 496 bytes web/htdocs/images/tree_90.png | Bin 256 -> 451 bytes 13 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/image_button_l.png b/web/htdocs/images/image_button_l.png index 340936e..3b18a86 100644 Binary files a/web/htdocs/images/image_button_l.png and b/web/htdocs/images/image_button_l.png differ diff --git a/web/htdocs/images/image_button_r.png b/web/htdocs/images/image_button_r.png index cd374b0..3688f77 100644 Binary files a/web/htdocs/images/image_button_r.png and b/web/htdocs/images/image_button_r.png differ diff --git a/web/htdocs/images/someproblem.png b/web/htdocs/images/someproblem.png index b3ee9fd..13a1e3a 100644 Binary files a/web/htdocs/images/someproblem.png and b/web/htdocs/images/someproblem.png differ diff --git a/web/htdocs/images/tree_00.png b/web/htdocs/images/tree_00.png index 536b367..e2453a6 100644 Binary files a/web/htdocs/images/tree_00.png and b/web/htdocs/images/tree_00.png differ diff --git a/web/htdocs/images/tree_10.png b/web/htdocs/images/tree_10.png index 07ed95c..d34d98a 100644 Binary files a/web/htdocs/images/tree_10.png and b/web/htdocs/images/tree_10.png differ diff --git a/web/htdocs/images/tree_20.png b/web/htdocs/images/tree_20.png index 9ab379f..6f765b5 100644 Binary files a/web/htdocs/images/tree_20.png and b/web/htdocs/images/tree_20.png differ diff --git a/web/htdocs/images/tree_30.png b/web/htdocs/images/tree_30.png index 93537ba..529ee89 100644 Binary files a/web/htdocs/images/tree_30.png and b/web/htdocs/images/tree_30.png differ diff --git a/web/htdocs/images/tree_40.png b/web/htdocs/images/tree_40.png index b480a0b..98ff0b8 100644 Binary files a/web/htdocs/images/tree_40.png and b/web/htdocs/images/tree_40.png differ diff --git a/web/htdocs/images/tree_50.png b/web/htdocs/images/tree_50.png index 9fea72c..9ad1672 100644 Binary files a/web/htdocs/images/tree_50.png and b/web/htdocs/images/tree_50.png differ diff --git a/web/htdocs/images/tree_60.png b/web/htdocs/images/tree_60.png index 2f92ee3..8d79467 100644 Binary files a/web/htdocs/images/tree_60.png and b/web/htdocs/images/tree_60.png differ diff --git a/web/htdocs/images/tree_70.png b/web/htdocs/images/tree_70.png index b087817..ead2107 100644 Binary files a/web/htdocs/images/tree_70.png and b/web/htdocs/images/tree_70.png differ diff --git a/web/htdocs/images/tree_80.png b/web/htdocs/images/tree_80.png index da85b6f..59f8208 100644 Binary files a/web/htdocs/images/tree_80.png and b/web/htdocs/images/tree_80.png differ diff --git a/web/htdocs/images/tree_90.png b/web/htdocs/images/tree_90.png index 908eb1a..d184bc9 100644 Binary files a/web/htdocs/images/tree_90.png and b/web/htdocs/images/tree_90.png differ

12 years, 8 months

Check_MK Git: check_mk: Fix syntax error due to previous merge

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3cb4a406197d9b3a346c4e08a5b35eb6ed984207 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cb4a406197d9b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 26 14:46:46 2012 +0100 Fix syntax error due to previous merge --- web/htdocs/htmllib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0f1ecd9..f422c32 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -357,7 +357,7 @@ class html: 'src="images/button_%s_lo.png" ' 'onmouseover=\"hilite_icon(this, 1)\" ' 'onmouseout=\"hilite_icon(this, 0)\">' - '</a>\n' % (idtxt, onclick, url, onclick, help, icon)) + '</a>\n' % (idtxt, onclick, url, help, icon)) def empty_icon_button(self): self.write('<img class="iconbutton trans" src="images/trans.png">\n')

12 years, 8 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk into tobi

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e70230a3d18e9eb77dbb9c83c8e011b974a838ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e70230a3d18e9e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 20 17:00:43 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk into tobi ---

12 years, 8 months

Check_MK Git: check_mk: Intermediate layout state

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0334ae1bf1c4ac5dfdef0a2bec0c16e0e0629227 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0334ae1bf1c4ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 2 11:45:00 2012 +0100 Intermediate layout state --- web/htdocs/images/contentframe_background.jpg | Bin 75953 -> 98551 bytes web/htdocs/images/dashadow-e.png | Bin 127 -> 110 bytes web/htdocs/images/dashadow-n.png | Bin 133 -> 117 bytes web/htdocs/images/dashadow-ne.png | Bin 311 -> 213 bytes web/htdocs/images/dashadow-nw.png | Bin 288 -> 191 bytes web/htdocs/images/dashadow-s.png | Bin 132 -> 110 bytes web/htdocs/images/dashadow-se.png | Bin 299 -> 110 bytes web/htdocs/images/dashadow-sw.png | Bin 271 -> 110 bytes web/htdocs/images/dashadow-w.png | Bin 127 -> 110 bytes web/htdocs/images/login_error_message.png | Bin 0 -> 1236 bytes web/htdocs/images/login_input_error.png | Bin 0 -> 508 bytes web/htdocs/images/login_input_normal.png | Bin 0 -> 517 bytes web/htdocs/images/sidebar_background.jpg | Bin 15599 -> 13636 bytes web/htdocs/login.css | 36 ++++++++++++++++-------- 14 files changed, 24 insertions(+), 12 deletions(-) diff --git a/web/htdocs/images/contentframe_background.jpg b/web/htdocs/images/contentframe_background.jpg index 9ec68b6..c8f85a1 100644 Binary files a/web/htdocs/images/contentframe_background.jpg and b/web/htdocs/images/contentframe_background.jpg differ diff --git a/web/htdocs/images/dashadow-e.png b/web/htdocs/images/dashadow-e.png index 394cdc5..47bcb0b 100644 Binary files a/web/htdocs/images/dashadow-e.png and b/web/htdocs/images/dashadow-e.png differ diff --git a/web/htdocs/images/dashadow-n.png b/web/htdocs/images/dashadow-n.png index 89309b8..756b3b2 100644 Binary files a/web/htdocs/images/dashadow-n.png and b/web/htdocs/images/dashadow-n.png differ diff --git a/web/htdocs/images/dashadow-ne.png b/web/htdocs/images/dashadow-ne.png index f4498a6..9f0b055 100644 Binary files a/web/htdocs/images/dashadow-ne.png and b/web/htdocs/images/dashadow-ne.png differ diff --git a/web/htdocs/images/dashadow-nw.png b/web/htdocs/images/dashadow-nw.png index eaac3de..a611e7c 100644 Binary files a/web/htdocs/images/dashadow-nw.png and b/web/htdocs/images/dashadow-nw.png differ diff --git a/web/htdocs/images/dashadow-s.png b/web/htdocs/images/dashadow-s.png index 02e3da4..f38e9f9 100644 Binary files a/web/htdocs/images/dashadow-s.png and b/web/htdocs/images/dashadow-s.png differ diff --git a/web/htdocs/images/dashadow-se.png b/web/htdocs/images/dashadow-se.png index 1e213f7..47bcb0b 100644 Binary files a/web/htdocs/images/dashadow-se.png and b/web/htdocs/images/dashadow-se.png differ diff --git a/web/htdocs/images/dashadow-sw.png b/web/htdocs/images/dashadow-sw.png index 383754f..47bcb0b 100644 Binary files a/web/htdocs/images/dashadow-sw.png and b/web/htdocs/images/dashadow-sw.png differ diff --git a/web/htdocs/images/dashadow-w.png b/web/htdocs/images/dashadow-w.png index 1a9452d..f38e9f9 100644 Binary files a/web/htdocs/images/dashadow-w.png and b/web/htdocs/images/dashadow-w.png differ diff --git a/web/htdocs/images/login_error_message.png b/web/htdocs/images/login_error_message.png new file mode 100644 index 0000000..2430b32 Binary files /dev/null and b/web/htdocs/images/login_error_message.png differ diff --git a/web/htdocs/images/login_input_error.png b/web/htdocs/images/login_input_error.png new file mode 100644 index 0000000..018740c Binary files /dev/null and b/web/htdocs/images/login_input_error.png differ diff --git a/web/htdocs/images/login_input_normal.png b/web/htdocs/images/login_input_normal.png new file mode 100644 index 0000000..5775aa3 Binary files /dev/null and b/web/htdocs/images/login_input_normal.png differ diff --git a/web/htdocs/images/sidebar_background.jpg b/web/htdocs/images/sidebar_background.jpg index a0c289a..bc3aa8e 100644 Binary files a/web/htdocs/images/sidebar_background.jpg and b/web/htdocs/images/sidebar_background.jpg differ diff --git a/web/htdocs/login.css b/web/htdocs/login.css index 287e44a..75e4f37 100644 --- a/web/htdocs/login.css +++ b/web/htdocs/login.css @@ -106,8 +106,19 @@ label { } #input_user, #input_pass { - width: 130px; - height: 16px; + width: 160px; + height: 20px; + border: none; + border-radius: 0px; + outline: none; + padding: 0px 0px 5px 0px; + background-image: url("images/login_input_normal.png"); + background-repeat: no-repeat; +} + +.inputerror #input_user, .inputerror #input_pass { + background-image: url("images/login_input_error.png"); + background-repeat: no-repeat; } #button_login { @@ -123,8 +134,8 @@ label { #button_text { position: absolute; - top: 350px; - left: 500px; + top: 355px; + left: 505px; text-align: center; width: 61px; color: white; @@ -135,15 +146,16 @@ label { #login_error { position: absolute; - top: 350px; - left: 264px; - width: 205px; + top: 0px; + left: 0px; + width: 180px; + height: 30px; z-index: 100; -} - -#login_error div.error { - margin:0; - padding:6px 0; + background-image: url("images/login_error_message.png"); + background-repeat: no-repeat; + border: none; + margin: 0px; + padding: 0px; } #foot {

12 years, 8 months

Check_MK Git: check_mk: Merge branch 'master' into tobi

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3aeeead1b093e333e5186702d2ea27ad69084c1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3aeeead1b093e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 17:46:08 2012 +0100 Merge branch 'master' into tobi ---

12 years, 8 months

Check_MK Git: check_mk: Relayout of dashboard

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3613d2558698e7dba0739757529b55ce0b88d318 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3613d2558698e7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 2 12:10:37 2012 +0100 Relayout of dashboard --- web/htdocs/dashboard.css | 7 ++++--- web/htdocs/dashboard.py | 7 +++++-- web/htdocs/js/dashboard.js | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css index 05f5aef..ae4168e 100644 --- a/web/htdocs/dashboard.css +++ b/web/htdocs/dashboard.css @@ -51,8 +51,9 @@ div.dashlet div.dashlet_inner { /* Dashlets with "background" set to True */ div.dashlet div.dashlet_inner.background { - background-image: url("images/form_background.png"); - background-repeat: repeat; + /* background-image: url("images/form_background.png"); */ + /* background-repeat: repeat; */ + background-color: #ccc; } div.dashlet iframe { @@ -118,7 +119,7 @@ div.dashlet img.shadow.sw { } div.dashlet img.shadow.ne { top: -2px; - right: -2px; + right: 3px; width: 13px; height: 23px; } diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 34d70a0..5c4b666 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -47,7 +47,8 @@ MAX = -1 header_height = 60 # Distance from top of the screen to the lower border of the heading screen_margin = 5 # Distance from the left border of the main-frame to the dashboard area -dashlet_padding = 21, 11, 10, 11 # Margin (N, E, S, W) between outer border of dashlet and its content +dashlet_padding = 21, 5, 5, 0 # Margin (N, E, S, W) between outer border of dashlet and its content +corner_overlap = 22 title_height = 0 # Height of dashlet title-box raster = 32, 32 # Raster the dashlet choords are measured in @@ -148,12 +149,14 @@ var header_height = %d; var screen_margin = %d; var title_height = %d; var dashlet_padding = Array%s; +var corner_overlap = %d; var refresh_dashlets = %r; var dashboard_name = '%s'; set_dashboard_size(); window.onresize = function () { set_dashboard_size(); } dashboard_scheduler(1); - """ % (header_height, screen_margin, title_height, dashlet_padding, refresh_dashlets, name)) + """ % (header_height, screen_margin, title_height, dashlet_padding, + corner_overlap, refresh_dashlets, name)) html.body_end() # omit regular footer with status icons, etc. diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 64a1a89..5fabf24 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -79,12 +79,12 @@ function resize_dashlets(id, code) oShadow = document.getElementById("dashadow_n_" + d_number); if (oShadow) oShadow.style.display = disstyle; if (oShadow && d_width - 32 > 0) - oShadow.style.width = netto_width + "px"; + oShadow.style.width = netto_width - corner_overlap + "px"; oShadow = document.getElementById("dashadow_s_" + d_number); if (oShadow) oShadow.style.display = disstyle; if (oShadow && d_width - 32 > 0) - oShadow.style.width = netto_width + "px"; + oShadow.style.width = netto_width - corner_overlap + "px"; // resize content div oDash = document.getElementById("dashlet_inner_" + d_number);

12 years, 8 months

Check_MK Git: check_mk: Redesign of login screen

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 33fb22b87297bd496d915cb3d60251efc8155306 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33fb22b87297bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 16 12:25:06 2012 +0100 Redesign of login screen --- web/htdocs/htmllib.py | 10 ++- web/htdocs/images/button_login_hi.png | Bin 0 -> 1068 bytes web/htdocs/images/button_login_lo.png | Bin 0 -> 1104 bytes web/htdocs/images/login_dark_bg.png | Bin 0 -> 4670 bytes web/htdocs/images/login_spotlight.png | Bin 0 -> 334182 bytes web/htdocs/images/login_window.png | Bin 0 -> 10934 bytes web/htdocs/images/snapin_closed.png | Bin 844 -> 832 bytes web/htdocs/login.css | 145 +++++++++++++++++++++++---------- web/htdocs/login.py | 41 +++++----- 9 files changed, 129 insertions(+), 67 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9d4ff21..f37ca06 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -330,12 +330,16 @@ class html: def empty_icon(self): self.write('<img class=icon src="images/trans.png">') - def icon_button(self, url, help, icon): - self.write('<a href="%s">' + def icon_button(self, url, help, icon, id=None): + if id: + idtxt = "id='%s' " % id + else: + idtxt = "" + self.write('<a %sonfocus="if (this.blur) this.blur();" href="%s">' '<img align=absmiddle class=iconbutton title="%s" src="images/button_%s_lo.png" ' 'onmouseover=\"hilite_icon(this, 1)\" ' 'onmouseout=\"hilite_icon(this, 0)\">' - '</a>\n' % (url, help, icon)) + '</a>\n' % (idtxt, url, help, icon)) def empty_icon_button(self): self.write('<img class="iconbutton trans" src="images/trans.png">\n') diff --git a/web/htdocs/images/button_login_hi.png b/web/htdocs/images/button_login_hi.png new file mode 100644 index 0000000..f07d282 Binary files /dev/null and b/web/htdocs/images/button_login_hi.png differ diff --git a/web/htdocs/images/button_login_lo.png b/web/htdocs/images/button_login_lo.png new file mode 100644 index 0000000..eeeef84 Binary files /dev/null and b/web/htdocs/images/button_login_lo.png differ diff --git a/web/htdocs/images/login_dark_bg.png b/web/htdocs/images/login_dark_bg.png new file mode 100644 index 0000000..d02f332 Binary files /dev/null and b/web/htdocs/images/login_dark_bg.png differ diff --git a/web/htdocs/images/login_spotlight.png b/web/htdocs/images/login_spotlight.png new file mode 100644 index 0000000..ab3abf6 Binary files /dev/null and b/web/htdocs/images/login_spotlight.png differ diff --git a/web/htdocs/images/login_window.png b/web/htdocs/images/login_window.png new file mode 100644 index 0000000..931dab3 Binary files /dev/null and b/web/htdocs/images/login_window.png differ diff --git a/web/htdocs/images/snapin_closed.png b/web/htdocs/images/snapin_closed.png index 86a669e..0151a0c 100644 Binary files a/web/htdocs/images/snapin_closed.png and b/web/htdocs/images/snapin_closed.png differ diff --git a/web/htdocs/login.css b/web/htdocs/login.css index d6792f4..73ffd6b 100644 --- a/web/htdocs/login.css +++ b/web/htdocs/login.css @@ -36,61 +36,118 @@ Boston, MA 02110-1301 USA. | Styling of the login page (when not HTTP Basic Auth is used) | '-------------------------------------------------------------------------*/ -#login { - margin: 0; - height: 100%; - width: 100%; - text-align:center; +body.main { + background-image: url("images/login_dark_bg.png"); + background-position: center; + text-align: center; + vertical-align: middle; } -#login #logo { - width: 126px; - margin: 5em auto 0 auto; - height: 72px; - background-repeat: no-repeat; - background-image: url("images/mk_logo_126x72.gif"); + + +div#login { + background-image: url("images/login_spotlight.png"); + width: 605px; + height: 410px; + position: absolute; + top: 50%; + left: 50%; + margin: -205px 0px 0px -302px; + /* border: 1px solid yellow; */ +} + +img#login_window { + width: 370px; + height: 230px; + position: relative; + left: 10px; + top: 10px; + float: none; } -#login h1 { - width: 300px; - margin: 0.2em auto 1em auto; + +label { + color: white; } -#login a { - color: #ffffff; + +#version { + position: absolute; + top: 25px; + left: 420px; + color: white; } -#login a:hover { - text-decoration: none; + +#label_user, #label_pass { + left: 174px; } -#login #form { - width: 320px; - margin: 0 auto 10px auto; - padding: 8px 20px 8px 20px; - background-image: url("images/form_background.png"); - border-radius: 15px; + +#input_user, #input_pass { + left: 250px; } -#login p { - text-align: left; + +#label_user { + position: absolute; + top: 132px; } -#login label { - font-size: 1.4em; - padding-top: 0; - margin: 0; +#input_user { + position: absolute; + top: 128px; } -#login p input { - width: 312px; - font-size: 1.5em; - margin-top: 2px; + +#label_pass { + position: absolute; + top: 168px; } -#login #table td.submit { - padding-top: 5px; +#input_pass { + position: absolute; + top: 164px; } -#login p.submit { - text-align: right; + +#input_user, #input_pass { + width: 130px; + height: 16px; } -#login p.submit input { - width: auto; + +#button_login { + position: absolute; + top: 190px; + left: 415px; } -#login #foot { - font-size: 0.8em; - font-style: italic; - color: #ffffff; +#button_login img { + width: 63px; + height: 32px; } + +#button_text { + position: absolute; + top: 198px; + left: 415px; + text-align: center; + width: 61px; + color: white; + z-index: 100; +} + +#login_error { + position: absolute; + top: -60px; + left: 135px; + width: 360px; + z-index: 100; +} + + +#foot { + position: absolute; + text-align: center; + top: 250px; + left: 135px; + width: 350px; + color: white; + font-size: 8pt; +} + + +#foot a, #foot a:hover { + color: white; +} + diff --git a/web/htdocs/login.py b/web/htdocs/login.py index a1a3f8c..1e2afab 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -220,34 +220,35 @@ def normal_login_page(): origtarget = html.req.uri html.write("<div id=login>") - html.write("<div id=logo></div>") - html.write("<h1>%s</h2>" % _("Check_MK Multisite")) - html.write('<div id=form>') - if html.has_user_errors(): + html.write('<div id=login_error>') html.show_user_errors() + html.write('</div>') + + html.write("<img id=login_window src=\"images/login_window.png\">") + html.write("<div id=version>%s</div>" % defaults.check_mk_version) html.begin_form("login", method = 'POST', add_transid = False) + html.hidden_field('_login', '1') html.hidden_field('_origtarget', htmllib.attrencode(origtarget)) - html.write('<p>') - html.write("<label class=legend for=_username>%s</label><br />" % _('Username')) - html.text_input("_username", size = 50) - html.write('</p>') - - html.write('<p>') - html.write("<label class=legend for=_password>%s</label><br />" % _('Password')) - html.password_input("_password", size = 50) - html.write('</p>') - - html.write('<p class=submit>') - html.button("_login", _('Login')) - html.write('</p>') - html.write('</div>') - + html.write("<label id=label_user class=legend for=_username>%s:</label><br />" % _('Username')) + html.text_input("_username", size = 50, id="input_user") + html.write("<label id=label_pass class=legend for=_password>%s:</label><br />" % _('Password')) + html.password_input("_password", size = 50, id="input_pass") + html.write("<div id=button_text>%s</div>" % _("Login")) + html.icon_button("javascript:document.getElementById('form_login').submit();", _("Login"), "login", id="button_login") + html.write('<input type=submit style="display: none;">') + + # Footer with copyright and stuff html.write("<div id=foot>Version: %s - © " - "<a href=\"http://mathias-kettner.de\">Mathias Kettner</a></div>" % defaults.check_mk_version) + "<a href=\"http://mathias-kettner.de\">Mathias Kettner</a><br><br>" % defaults.check_mk_version) + html.write(_("You can use, modify and distribute Check_MK under the terms of the <a href='%s'>" + "GNU GPL Version 2</a>." % "http://mathias-kettner.de/gpl.html")) + html.write("</div>") + html.write("</div>") html.set_focus('_username') + html.hidden_fields() html.end_form() html.footer()

12 years, 8 months

Check_MK Git: check_mk: livestatus: added event_handler to hosts table

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c279dd9d0bd43dd6990017108dfef03e8972f630 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c279dd9d0bd43d… Author: Sven Nierlein <sven(a)nierlein.de> Date: Thu Mar 15 12:53:02 2012 +0100 livestatus: added event_handler to hosts table Signed-off-by: Sven Nierlein <sven(a)nierlein.de> --- livestatus/src/TableHosts.cc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index cd9be33..525fd61 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -89,6 +89,8 @@ void TableHosts::addColumns(Table *table, string prefix, int indirect_offset) "IP address", (char *)(&hst.address) - ref, indirect_offset)); table->addColumn(new OffsetStringColumn(prefix + "check_command", "Nagios command for active host check of this host", (char *)(&hst.host_check_command) - ref, indirect_offset)); + table->addColumn(new OffsetStringColumn(prefix + "event_handler", + "Nagios command used as event handler", (char *)(&hst.event_handler) - ref, indirect_offset)); table->addColumn(new OffsetStringColumn(prefix + "notification_period", "Time period in which problems of this host will be notified. If empty then notification will be always", (char *)(&hst.notification_period) - ref, indirect_offset)); table->addColumn(new OffsetStringColumn(prefix + "check_period",

12 years, 8 months

Check_MK Git: check_mk: WATO: allow custom user attributes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1ee35d8aeb2eada8afb7635561a25a5a26ad31a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ee35d8aeb2ead… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Mar 25 17:08:17 2012 +0200 WATO: allow custom user attributes --- web/htdocs/wato.py | 34 +++++++++++++++++++++++++++++----- web/plugins/wato/auth.py | 2 +- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b90dcb4..c13a521 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6624,6 +6624,14 @@ def delete_distributed_wato_file(): # | Mode for managing users and contacts. | # '----------------------------------------------------------------------' +# Custom user attributes +user_attributes = [] +user_attribute = {} + +def declare_user_attribute(name, vs): + user_attributes.append((name, vs)) + user_attribute[name] = vs + def mode_users(phase): if phase == "title": return _("Users & Contacts") @@ -6904,6 +6912,11 @@ def mode_edit_user(phase): new_user[what + "_notification_options"] = "".join( [ opt for opt in opts if html.get_checkbox(what + "_" + opt) ]) + # Custom attributes + for name, vs in user_attributes: + value = vs.from_html_vars('ua_' + name) + vs.validate_value(value, "ua_" + name) + new_user[name] = value # Saving save_users(users) @@ -7093,6 +7106,14 @@ def mode_edit_user(phase): select_language(user.get('language', '')) + for name, vs in user_attributes: + html.write("<tr><td colspan=2 class=legend>%s" % vs.title()) + if vs.help(): + html.write("<br><i>%s</i>" % vs.help()) + html.write("</td><td class=content>") + vs.render_input("ua_" + name, user.get(name, vs.default_value())) + html.write("</td></tr>") + # TODO: Later we could add custom macros here, which # then could be used for notifications. On the other hand, # if we implement some check_mk --notify, we could directly @@ -7210,11 +7231,12 @@ def save_users(profiles): # TODO: delete var/check_mk/web/$USER of non-existing users. Do we # need to remove other references as well? - # Keys not to put into contact definitions for Check_MK - non_contact_keys = [ "roles", "notifications_enabled", "password", "locked", "automation_secret", "language" ] + custom_values = [ name for (name, vs) in user_attributes ] + # Keys not to put into contact definitions for Check_MK + non_contact_keys = [ "roles", "notifications_enabled", "password", "locked", "automation_secret", "language" ] + custom_values # Keys to put into multisite configuration - multisite_keys = [ "roles", "notifications_enabled", "locked", "automation_secret", "alias", "language", ] + multisite_keys = [ "roles", "notifications_enabled", "locked", "automation_secret", "alias", "language", ] + custom_values # Remove multisite keys in contacts. And use only such entries # that have any contact groups assigned to. @@ -9724,7 +9746,6 @@ def page_user_profile(): html.footer() #. -#. # .--Sampleconfig--------------------------------------------------------. # | ____ _ __ _ | # | / ___| __ _ _ __ ___ _ __ | | ___ ___ ___ _ __ / _(_) __ _ | @@ -10328,10 +10349,13 @@ def load_plugins(): loaded_with_language = current_language # Reset global vars - global extra_buttons, configured_host_tags, host_attributes + global extra_buttons, configured_host_tags, host_attributes, user_attributes, \ + user_attribute extra_buttons = [] configured_host_tags = None host_attributes = [] + user_attributes = [] + user_attribute = {} # Declare WATO-specific permissions config.declare_permission_section("wato", _("WATO - Check_MK's Web Administration Tool")) diff --git a/web/plugins/wato/auth.py b/web/plugins/wato/auth.py index 343d9cb..0290501 100644 --- a/web/plugins/wato/auth.py +++ b/web/plugins/wato/auth.py @@ -80,7 +80,7 @@ def parse_php(data, lvl = 1): elif data is None: s += 'null' else: - s += data + s += str(data) return s

12 years, 8 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e2b90fc64a9c8e5737d361f37976063bdd992cf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2b90fc64a9c8e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Mar 25 12:19:02 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2012