12 Sep
2013
12 Sep
'13
3:58 a.m.
Module: check_mk
Branch: master
Commit: f087624e589a5c0f87a551785d0d5a661de1a9ee
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f087624e589a5c…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Sep 11 16:10:14 2013 +0200
Producing valid HTML/XML for login dialog now ...
---
web/htdocs/htmllib.py | 29 +++++++++++++++--------------
web/htdocs/login.py | 30 +++++++++++++++---------------
2 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index 6547a43..f754d33 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -200,7 +200,8 @@ class html:
def hidden_field(self, var, value, id = None, add_var = False):
if value != None:
id = id and ' id="%s"' % id or ''
- self.write("<input type=hidden name=\"%s\"
value=\"%s\"%s>" % (self.attrencode(var), self.attrencode(value), id))
+ self.write("<input type=\"hidden\" name=\"%s\"
value=\"%s\"%s />\n" %
+ (self.attrencode(var), self.attrencode(value), id))
if add_var:
self.add_form_var(var)
@@ -253,7 +254,7 @@ class html:
def image_button(self, varname, title, cssclass = ''):
if not self.mobile:
- self.write('<label for="%s" class=image_button>' %
varname)
+ self.write('<label for="%s"
class="image_button">' % varname)
self.raw_button(varname, title, cssclass)
if not self.mobile:
self.write('</label>')
@@ -263,8 +264,8 @@ class html:
def raw_button(self, varname, title, cssclass=""):
self.write("<input onfocus=\"if (this.blur) this.blur();\"
"
- "type=submit name=\"%s\" id=\"%s\"
value=\"%s\" "
- "class=\"%s\">\n" % \
+ "type=\"submit\" name=\"%s\"
id=\"%s\" value=\"%s\" "
+ "class=\"%s\" />\n" % \
( varname, varname, title, cssclass))
@@ -282,18 +283,18 @@ class html:
title = ' disabled="%s"' % disabled
if not self.mobile:
- self.write('<label for="%s" class=image_button>' %
obj_id)
- self.write('<input%s%s%s%s value="%s" class=buttonlink
type=button onclick="location.href=\'%s\'">' % \
+ self.write('<label for="%s"
class="image_button">' % obj_id)
+ self.write('<input%s%s%s%s value="%s"
class="buttonlink" type="button"
onclick="location.href=\'%s\'" />\n' % \
(obj_id, style, title, disabled, text, href))
if not self.mobile:
self.write('</label>')
def icon(self, help, icon):
- self.write('<img align=absmiddle class=icon title="%s"
src="images/icon_%s.png">' % (
+ self.write('<img align=absmiddle class=icon title="%s"
src="images/icon_%s.png" />' % (
help, icon))
def empty_icon(self):
- self.write('<img class=icon src="images/trans.png">')
+ self.write('<img class=icon src="images/trans.png" />')
def icon_button(self, url, help, icon, id="", onclick="",
style="", target="", cssclass=""):
if id:
@@ -400,7 +401,7 @@ class html:
if args["size"] == "max":
add_style = "width: 100%; "
else:
- addprops += " size=%d" % (args["size"] + 1)
+ addprops += " size=\"%d\"" % (args["size"]
+ 1)
if "width:" not in args.get("style", "")
and not self.mobile:
add_style = "width: %d.8ex; " % args["size"]
@@ -428,17 +429,17 @@ class html:
error = self.user_errors.get(varname)
html = ""
if error:
- html = "<x class=inputerror>"
+ html = "<x class=\"inputerror\">"
if label:
if not id:
id = "ti_%s" % varname
html += '<label for="%s">%s</label>' % (id,
label)
if id:
- addprops += " id='%s'" % id
+ addprops += ' id="%s"' % id
attributes = ' ' + ' '.join([ '%s="%s"' % (k,
v) for k, v in attrs.iteritems() ])
- html += "<input type=%s class=%s value=\"%s\"
name=\"%s\"%s%s>" % \
+ html += "<input type=\"%s\" class=\"%s\"
value=\"%s\" name=\"%s\"%s%s />\n" % \
(mytype, cssclass, self.attrencode(value), varname, addprops,
attributes)
if error:
html += "</x>"
@@ -662,7 +663,7 @@ class html:
self.write(
u'''<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01
Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html><head>
-<meta http-equiv="Content-Type" content="text/html;
charset=utf-8">\n''')
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"
/>\n''')
self.write('<title>')
self.write(title)
self.write('</title>\n')
@@ -675,7 +676,7 @@ class html:
# Load all specified style sheets and all user style sheets in htdocs/css
for css in [ "check_mk" ] + stylesheets:
- self.write('<link rel="stylesheet"
type="text/css" href="%s.css">\n' % css)
+ self.write('<link rel="stylesheet"
type="text/css" href="%s.css" />\n' % css)
self.write('<!--[if IE]>\n'
'<link rel="stylesheet" href="ie.css"
type="text/css" />\n'
'<![endif]-->\n')
diff --git a/web/htdocs/login.py b/web/htdocs/login.py
index 051850f..5cb2f23 100644
--- a/web/htdocs/login.py
+++ b/web/htdocs/login.py
@@ -249,37 +249,37 @@ def normal_login_page(called_directly = True):
html.immediate_browser_redirect(0.5, origtarget and origtarget or
'index.py')
return apache.OK
- html.write("<div id=login>")
- html.write("<img id=login_window
src=\"images/login_window.png\">")
- html.write("<div id=version>%s</div>" %
defaults.check_mk_version)
+ html.write('<div id="login">\n')
+ html.write('<img id="login_window"
src="images/login_window.png" />\n')
+ html.write('<div id="version">%s</div>\n' %
defaults.check_mk_version)
html.begin_form("login", method = 'POST', add_transid = False,
action = 'login.py')
html.hidden_field('_login', '1')
html.hidden_field('_origtarget', html.attrencode(origtarget))
- html.write("<label id=label_user class=legend
for=_username>%s:</label><br />" % _('Username'))
+ html.write('<label id="label_user" class="legend"
for="_username">%s:</label><br />\n' %
_('Username'))
html.text_input("_username", id="input_user")
- html.write("<label id=label_pass class=legend
for=_password>%s:</label><br />" % _('Password'))
+ html.write('<label id="label_pass" class="legend"
for="_password">%s:</label><br />\n' %
_('Password'))
html.password_input("_password", id="input_pass", size=None)
if html.has_user_errors():
- html.write('<div id=login_error>')
+ html.write('<div id="login_error">')
html.show_user_errors()
- html.write('</div>')
+ html.write('</div>\n')
- html.write("<div id=button_text>")
+ html.write('<div id="button_text">')
html.image_button("_login", _('Login'))
- html.write("</div>")
+ html.write("</div>\n")
- html.write("<div id=foot>Version: %s - © "
- "<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 id="foot">Version: %s - © '
+ '<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>\n")
- html.write("</div>")
html.set_focus('_username')
html.hidden_fields()
html.end_form()
+ html.write("</div>\n")
html.footer()
return apache.OK