Module: check_mk
Branch: master
Commit: 1523d38bc989e126024b9b82bc4e12cb617523d6
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1523d38bc989e1…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Feb 20 12:15:28 2015 +0100
#2009 FIX Fixed styling of site login page for establishing a distributed monitoring WATO
sync
This page was not fitting our current form styling. This has been consolidated now.
---
.werks/2009 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 21 +++++++--------------
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/.werks/2009 b/.werks/2009
new file mode 100644
index 0000000..1be39da
--- /dev/null
+++ b/.werks/2009
@@ -0,0 +1,10 @@
+Title: Fixed styling of site login page for establishing a distributed monitoring WATO
sync
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1424430878
+
+This page was not fitting our current form styling. This has been consolidated now.
diff --git a/ChangeLog b/ChangeLog
index c9222f7..92e3c3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -242,6 +242,7 @@
* 1986 FIX: Added nicer error message when calling the rename host page with a non
existant host
* 1987 FIX: Editing auxtags shows existing topics in dropdown instead of as
"create new topic"
* 2001 FIX: Fix exception of missing .site when editing a non-existing host
+ * 2009 FIX: Fixed styling of site login page for establishing a distributed
monitoring WATO sync...
Notifications:
* 1662 notification plugin spectrum: finalized script. now able to handle host
notications
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 3d3702e..6a8ee20 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -9966,33 +9966,26 @@ def mode_sites(phase):
wato_html_head(_("Login into site '%s'") %
site["alias"])
if error:
html.show_error(error)
- html.write("<div class=message>")
- html.write("<h3>%s</h3>" % _("Login
credentials"))
- html.write(_("For the initial login into the slave site %s "
+
+ html.write('<p>%s</p>' % (_("For the initial login
into the slave site %s "
"we need once your administration login for the Multsite
"
"GUI on that site. Your credentials will only be used for
"
"the initial handshake and not be stored. If the login is
"
"successful then both side will exchange a login secret
"
- "which is used for the further remote calls.") %
site["alias"])
+ "which is used for the further remote calls.") %
site["alias"]))
html.begin_form("login", method="POST")
- html.write("<table class=form>")
- html.write("<tr><td class=legend>%s</td>" %
_("Administrator login"))
- html.write("<td class=content>")
-
html.write("<table><tr><td>%s</td><td>" %
_("Adminstrator name:"))
+ forms.header(_('Login credentials'))
+ forms.section(_('Adminstrator name:'))
html.text_input("_name")
html.set_focus("_name")
-
html.write("</td></tr><tr><td>%s</td><td>" %
_("Administrator password:"))
+ forms.section(_('Adminstrator password:'))
html.password_input("_passwd")
- html.write("</td></tr></table>")
- html.write("</td></tr>")
- html.write("<tr><td class=buttons colspan=2>")
+ forms.end()
html.button("_do_login", _("Login"))
html.button("_abort", _("Abort"))
- html.write("</td></tr></table>")
html.hidden_field("_login", login_id)
html.hidden_fields()
html.end_form()
- html.write("</div>")
return ""
return