Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: Some login dialog styling

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6ece370e20ef980b3c694b7ced7295f7cc976a45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ece370e20ef98… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 1 17:02:09 2011 +0100 Some login dialog styling --- web/htdocs/check_mk.css | 45 +++++++++++++++++++++++++++------- web/htdocs/images/mk_logo_126x72.gif | Bin 0 -> 2234 bytes web/htdocs/login.py | 32 ++++++++---------------- 3 files changed, 47 insertions(+), 30 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 9c3c35a..78f9105 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -2717,16 +2717,16 @@ table.debug_vars td { width: 100%; text-align:center; } -/*#login #logo { - width: 320px; - margin: 7em auto; - height: 55px; +#login #logo { + width: 126px; + margin: 5em auto 0 auto; + height: 72px; background-repeat: no-repeat; - background-image: url("images/sidebar_top.png"); -}*/ + background-image: url("images/mk_logo_126x72.gif"); +} #login h1 { width: 300px; - margin: 3em auto 2em auto; + margin: 0.2em auto 1em auto; } #login a { color: #ffffff; @@ -2734,9 +2734,36 @@ table.debug_vars td { #login a:hover { text-decoration: none; } -#login #table { - width: 320px; margin: 0 auto; +#login #form { + width: 320px; + margin: 0 auto 10px auto; + padding: 8px 20px 8px 20px; + background-image: url("images/form_background.png"); + border-radius: 15px; +} +#login p { + text-align: left; +} +#login label { + font-size: 1.4em; + padding-top: 0; + margin: 0; } +#login p input { + width: 312px; + font-size: 1.5em; + margin-top: 2px; +} +#login #table td.submit { + padding-top: 5px; +} +#login p.submit { + text-align: right; +} +#login p.submit input { + width: auto; +} + #login #foot { font-size: 0.8em; font-style: italic; diff --git a/web/htdocs/images/mk_logo_126x72.gif b/web/htdocs/images/mk_logo_126x72.gif new file mode 100644 index 0000000..8122270 Binary files /dev/null and b/web/htdocs/images/mk_logo_126x72.gif differ diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 93b9443..0365234 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -190,35 +190,25 @@ def login_page(): html.write("<div id=login>") html.write("<div id=logo></div>") html.write("<h1>Check_MK Multisite</h2>") - html.write("<table id=table>") - html.write("<tr class=form>\n") - html.write("<td>") + + html.write('<div id=form>') html.begin_form("login", method = 'POST', add_transid = False) html.hidden_field('_origin', htmllib.attrencode(origin)) - html.write("<div class=whiteborder>\n") - html.write("<table class=\"form\">\n") - - html.write("<tr>") - html.write("<td class=legend>%s</td>" % _('Username')) - html.write("<td class=content>") + html.write('<p>') + html.write("<label class=legend for=_username>%s</label><br />" % _('Username')) html.text_input("_username", size = 50) - html.write("</td>") - html.write("</tr>") + html.write('</p>') - html.write("<tr>") - html.write("<td class=legend>%s</td>" % _('Password')) - html.write("<td class=content>") + html.write('<p>') + html.write("<label class=legend for=_password>%s</label><br />" % _('Password')) html.password_input("_password", size = 50) - html.write("</td>") - html.write("</tr>") + html.write('</p>') - html.write("<tr>") - html.write("<td colspan=2 class=legend>") + html.write('<p class=submit>') html.button("_login", _('Login')) - html.write("</td>") - html.write("</tr>") + html.write('</p>') + html.write('</div>') - html.write("</table>") html.write("<div id=foot>Version: %s - © " "<a href=\"http://mathias-kettner.de\">Mathias Kettner</a></div>" % defaults.check_mk_version) html.write("</div>")

12 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0417

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d43dea02af02284d7d536f00f3f07ad8d0a75a00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d43dea02af0228… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 29 15:20:52 2011 +0100 Updated bug entries #0417 --- .bugs/417 | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/.bugs/417 b/.bugs/417 new file mode 100644 index 0000000..0b0fb12 --- /dev/null +++ b/.bugs/417 @@ -0,0 +1,17 @@ +Title: Split SNMPv2 and snmpwulkwalk options +Component: core +Benefit: 4 +State: open +Cost: 2 +Date: 2011-11-29 15:16:00 +Targetversion: 1.1.13i1 +Class: nastiness + +Einige Geräte können zwar SNMPv2, setzen aber snmpbulkwalks nicht korrekt um oder +antworten gar nicht auf bulkwalks. Normale snmpwalks funktionieren gut. + +Das ist mir sowohl bei Switchen, als auch gerade bei einem netapp filer aufgefallen. + +Für solch einen Fall ist es wichtig, dass man SNMPv2 und die Bulkwalk Option getrennt +schalten kann. Man könnte z.B. bei gesetztem "bulk" Implizit "snmpv2" setzen, bei +manuell gesetztem "snmpv2" aber nicht automatisch "bulk".

12 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0415

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0a1b202b463ae42f5921dc87f84aee048b5a027a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a1b202b463ae4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 29 10:57:57 2011 +0100 Updated bug entries #0415 --- .bugs/415 | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/.bugs/415 b/.bugs/415 new file mode 100644 index 0000000..d187eb9 --- /dev/null +++ b/.bugs/415 @@ -0,0 +1,15 @@ +Title: View editor: Nach Änderung vom view_name geht der Reload auf den alten view_name +Component: multisite +Benefit: 2 +State: open +Cost: 2 +Date: 2011-11-29 10:49:10 +Targetversion: 1.1.12 +Class: bug + +Beim Aufrufen des View Editors wird der Parameter "back=" mit einer URL gefüllt, die +nach dem Edititieren als neue Ziel-Seite verwendet wird. Wenn man bei View-Editieren +den view_name anpasst, dann zeigt die back URL nicht auf die soeben editierte View. + +Man sollte nach dem Editieren auf die soeben editierte View kommen. Also muss man den +view_name in dieser URL dynamisch ersetzen/ergänzen.

12 years, 10 months

Check_MK Git: check_mk: FIX: Fixed view editor redirection to new view after changing the view_name

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 82e4f7ba2871638a2c4809143043b22468395d20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82e4f7ba287163… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 29 11:40:21 2011 +0100 FIX: Fixed view editor redirection to new view after changing the view_name Conflicts: ChangeLog web/htdocs/views.py --- ChangeLog | 3 +++ web/htdocs/views.py | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ecd0f36..f888728 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,9 @@ Multisite: * FIX: sidebar snapin Hostgroups and Servicegroups sometimes failed with non-existing "available_views". + * FIX: Fix host related WATO context button links to point to the hosts site + * FIX: Fixed view editor redirection to new view after changing the view_name + 1.1.12p3: Core, Setup, etc.: * FIX: really suppress precompiling on PING-only hosts now diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 0bfc925..8187c43 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -503,9 +503,15 @@ def page_edit_view(): load_views() html.multisite_views[(config.user_id, view["name"])] = view oldname = html.var("old_name") - # Handle renaming of views -> delete old entry - if oldname and oldname != view["name"] and (config.user_id, oldname) in html.multisite_views: - del html.multisite_views[(config.user_id, oldname)] + # Handle renaming of views + if oldname and oldname != view["name"]: + # -> delete old entry + if (config.user_id, oldname) in html.multisite_views: + del html.multisite_views[(config.user_id, oldname)] + # -> change view_name in back parameter + if html.has_var('back'): + html.set_var('back', html.var('back', '').replace('view_name=' + oldname, + 'view_name=' + view["name"])) save_views(config.user_id) return page_message_and_forward(_("Your view has been saved."), "edit_views.py", "<script type='text/javascript'>if(top.frames[0]) top.frames[0].location.reload();</script>\n")

12 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0415

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e05dbe5d46e996a0e15f4c3f68171e1e1950a80e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e05dbe5d46e996… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 29 11:44:41 2011 +0100 Updated bug entries #0415 --- .bugs/415 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/415 b/.bugs/415 index d187eb9..f5f3305 100644 --- a/.bugs/415 +++ b/.bugs/415 @@ -1,11 +1,12 @@ Title: View editor: Nach Änderung vom view_name geht der Reload auf den alten view_name Component: multisite -Benefit: 2 -State: open Cost: 2 Date: 2011-11-29 10:49:10 -Targetversion: 1.1.12 +State: done Class: bug +Benefit: 2 +Fun: 0 +Targetversion: 1.1.12 Beim Aufrufen des View Editors wird der Parameter "back=" mit einer URL gefüllt, die nach dem Edititieren als neue Ziel-Seite verwendet wird. Wenn man bei View-Editieren @@ -13,3 +14,6 @@ den view_name anpasst, dann zeigt die back URL nicht auf die soeben editierte Vi Man sollte nach dem Editieren auf die soeben editierte View kommen. Also muss man den view_name in dieser URL dynamisch ersetzen/ergänzen. + +2011-11-29 11:44:38: changed state open -> done +Ist in 1.1.12p4 und 1.1.13 gefixt

12 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0416

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f4ab4a5909ba8b88cff82af5383ad3df2c45fd43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4ab4a5909ba8b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 29 13:13:41 2011 +0100 Updated bug entries #0416 --- .bugs/416 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/416 b/.bugs/416 new file mode 100644 index 0000000..a0eb941 --- /dev/null +++ b/.bugs/416 @@ -0,0 +1,13 @@ +Title: BI: Aggregation Groups snapin shows only agregations of local multisite instance +Component: bi +Benefit: 2 +State: open +Cost: 2 +Date: 2011-11-29 13:08:56 +Targetversion: 1.1.13i1 +Class: bug + +The reason is clear: BI is a pure mulitisite feature. But the wish to have the aggregations +groups of other sites shown is also clear. It could be solved like in the WATO folder snapin +before 1.1.13. Simply create links to the other sites BI aggregation groups which open +the multisite BI GUI of the other site.

12 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011