Module: check_mk
Branch: master
Commit: 92ba8102cca640511061e594bf156716f2d03e54
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92ba8102cca640…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Nov 17 11:22:47 2015 +0100
Added missing favicon to login page
---
web/htdocs/htmllib.py | 15 ++++++++++-----
web/htdocs/main.py | 10 ++++------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index 0a961c3..e65651d 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -786,16 +786,21 @@ class html:
self.write("</x>")
self.form_vars.append(varname)
+
+ def default_html_headers(self):
+ self.write('<meta http-equiv="Content-Type"
content="text/html; charset=utf-8" />\n')
+ self.write('<meta http-equiv="X-UA-Compatible"
content="IE=edge" />\n')
+ self.write('<link rel="shortcut icon"
href="images/favicon.ico" type="image/ico">\n')
+
+
def html_head(self, title, javascripts = [], stylesheets = ["pages"],
force=False):
if not self.header_sent or force:
- self.write(
- u'''<!DOCTYPE HTML>
-<html><head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"
/>\n''')
+ self.write('<!DOCTYPE HTML>\n'
+ '<html><head>\n')
+ self.default_html_headers()
self.write('<title>')
self.write(self.attrencode(title))
self.write('</title>\n')
- self.write('<meta http-equiv="X-UA-Compatible"
content="IE=edge" />')
# If the variable _link_target is set, then all links in this page
# should be targetted to the HTML frame named by _link_target. This
diff --git a/web/htdocs/main.py b/web/htdocs/main.py
index 8133673..80416ba 100644
--- a/web/htdocs/main.py
+++ b/web/htdocs/main.py
@@ -44,12 +44,10 @@ def page_index():
else:
heading = config.page_heading
- html.write("""<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01
Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<html>
-<head>
- <title>%s</title>
- <meta http-equiv="X-UA-Compatible" content="IE=edge" />
- <link rel="shortcut icon" href="images/favicon.ico"
type="image/ico">
+ html.write('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01
Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">\n'
+ '<html><head>\n')
+ html.default_html_headers()
+ html.write("""<title>%s</title>
</head>
<frameset cols="280,*" frameborder="0" framespacing="0"
border="0">
<frame src="side.py" name="side" noresize
scrolling="no">