Module: check_mk
Branch: master
Commit: d0cc30edbfa9ad5af64211e67f949f472783fadc
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0cc30edbfa9ad…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Nov 17 11:12:10 2015 +0100
Added new Check_MK logo to page headers and mobile login page
---
web/htdocs/dashboard.css | 2 +-
web/htdocs/htmllib.py | 3 ++-
web/htdocs/images/favicon.ico | Bin 1406 -> 3262 bytes
web/htdocs/images/logo_cmk_small.png | Bin 0 -> 3674 bytes
web/htdocs/images/logo_mk_small.png | Bin 1198 -> 0 bytes
web/htdocs/mobile.css | 4 +++-
web/htdocs/mobile.py | 7 ++++---
web/htdocs/pages.css | 29 ++++++++++++++++-------------
8 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css
index 8bbdb4b..6c8e7c5 100644
--- a/web/htdocs/dashboard.css
+++ b/web/htdocs/dashboard.css
@@ -33,7 +33,7 @@ body.main {
}
body.main table.header {
- padding: 5px 5px 10px 5px;
+ padding: 10px;
}
div#dashboard {
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index 65502fb..0a961c3 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -914,7 +914,8 @@ class html:
onclick="toggle_help()",
style="display:none", ty="icon", cssclass=cssclass)
self.write("%s</td></tr></table>" %
- _("<a href=\"http://mathias-kettner.de\"><img
src=\"images/logo_mk_small.png\"/></a>"))
+ _("<a class=head_logo
href=\"http://mathias-kettner.de\">"
+ "<img
src=\"images/logo_cmk_small.png\"/></a>"))
self.write("<hr class=header>\n")
if self.enable_debug:
self.dump_get_vars()
diff --git a/web/htdocs/images/favicon.ico b/web/htdocs/images/favicon.ico
index 2e8c4ea..ef3036f 100644
Binary files a/web/htdocs/images/favicon.ico and b/web/htdocs/images/favicon.ico differ
diff --git a/web/htdocs/images/logo_cmk_small.png b/web/htdocs/images/logo_cmk_small.png
new file mode 100644
index 0000000..f7cd0d6
Binary files /dev/null and b/web/htdocs/images/logo_cmk_small.png differ
diff --git a/web/htdocs/images/logo_mk_small.png b/web/htdocs/images/logo_mk_small.png
deleted file mode 100644
index 24f5560..0000000
Binary files a/web/htdocs/images/logo_mk_small.png and /dev/null differ
diff --git a/web/htdocs/mobile.css b/web/htdocs/mobile.css
index 2979b42..aaf8f7d 100644
--- a/web/htdocs/mobile.css
+++ b/web/htdocs/mobile.css
@@ -216,7 +216,9 @@ body.mobile table.dataset tr.data td.state {
margin-top: 1em;
}
img.logomk {
- width: 20%;
+ width: 25px;
+ height: 25px;
+ margin-bottom: 10px;
}
diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py
index bae0784..1b476a6 100644
--- a/web/htdocs/mobile.py
+++ b/web/htdocs/mobile.py
@@ -154,7 +154,7 @@ def page_login():
mobile_html_head(title)
jqm_page_header(title, id="login")
html.write('<div id="loginhead">%s</div>' %
- _("Welcome to Check_MK Multisite Mobile. Please Login."))
+ _("Welcome to Check_MK Mobile."))
html.begin_form("login", method = 'POST', add_transid = False)
# Keep information about original target URL
@@ -170,8 +170,9 @@ def page_login():
html.set_focus("_username")
html.end_form()
html.write('<div id="loginfoot">')
- html.write('<img class="logomk"
src="images/logo_mk.png">')
- html.write('<div class="copyright">%s</div>' %
_("Copyright Mathias Kettner 2012"))
+ html.write('<img class="logomk"
src="images/logo_cmk_small.png">')
+ html.write('<div class="copyright">%s</div>' %
+ _("© <a target=\"_blank\"
href=\"http://mathias-kettner.de\">Mathias Kettner</a>"))
html.write('</div>')
jqm_page_footer()
mobile_html_foot()
diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css
index 3105eb6..4d981d7 100644
--- a/web/htdocs/pages.css
+++ b/web/htdocs/pages.css
@@ -128,8 +128,20 @@ body.main table.header td.right {
body.main table.header td.right img {
- position: relative;
- top: 5px;
+ width: 19px;
+ height: 19px;
+ vertical-align: bottom;
+}
+
+body.main table.header td.right a.head_logo img {
+ width: 23px;
+ height: 23px;
+ margin: 0 0 1px 5px;
+}
+
+body.main table.header td.right a.head_logo img:hover {
+ opacity: 0.5;
+ filter: alpha(opacity=50);
}
body.main hr.header {
@@ -510,13 +522,9 @@ input[type=text], input[type=password] {
}
select {
height: 24px;
- /* border-style: solid none;
- border-width: 2px;
- border-color: red; */
box-shadow: 0.1px 1.2px 1.8px 0 #888 inset;
vertical-align: middle;
padding-top: 4px;
- /* padding: 1px 3px; */
}
@@ -890,13 +898,8 @@ div.togglebutton.checkbox.off { opacity: 0.5; filter:
alpha(opacity=50); }
| |
'-------------------------------------------------------------------------*/
-a#helpbutton {
- width: 19px;
- height: 19px;
- margin: 0 5px;
- position: relative;
- top: -8px;
- left: -2px;
+body.main table.header td.right a#helpbutton img {
+ margin: 1px 5px;
}
a#helpbutton.passive {