12 May
2012
12 May
'12
6:44 p.m.
Module: check_mk
Branch: master
Commit: 430e14c404260dec944117b430427efdcf4650ab
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=430e14c404260d…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sat May 12 18:44:52 2012 +0200
Layout fix: prevent header from wrapping
---
web/htdocs/htmllib.py | 6 +++---
web/htdocs/pages.css | 42 +++++++++++++++++++++++-------------------
web/htdocs/wato.css | 6 ++----
3 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index e83f455..5a130c3 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -792,9 +792,9 @@ class html:
login_text += ')'
else:
login_text = _("not logged in")
- self.write("<table class=header><tr><td
class=left>%s</td><td class=right>"
- "%s <b
id=headertime>%s</b>" %
- (title, login_text, time.strftime("%H:%M")))
+ self.write('<table class=header><tr><td width="*"
class=heading>%s</td>' % title)
+ self.write('<td width=240 class=right>%s <b
id=headertime>%s</b>' %
+ (login_text, time.strftime("%H:%M")))
self.help_visible = config.load_user_file("help", False) # cache for
later usage
cssclass = self.help_visible and "active" or "passive"
self.write('<a id=helpbutton class=%s href="#"
onclick="help_toggle();" style="display: none"></a>' %
diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css
index 037ccb0..1d2be12 100644
--- a/web/htdocs/pages.css
+++ b/web/htdocs/pages.css
@@ -58,38 +58,30 @@ body.main div.main {
/* The content page header containing the title, user, date */
body.main table.header {
width: 100%;
+ max-width: 100%;
margin: 0 0 10px 0;
padding: 0px 0px 10px 0px;
border-spacing: 0px;
color: #fff;
}
-body.main hr.header {
- background-color: #fff;
- height: 1px;
- position: absolute;
- width: 100%;
- left: 0px;
- padding: 0;
- margin: 0;
- border: 0;
- top: 42px;
- /* Needed for older IE versions */
+body.main table.header td {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ vertical-align: bottom;
color: #fff;
}
-
-body.main table.header td.left {
+body.main table.header td.heading {
font-size: 15pt;
- /*font-weight: bold;*/
- vertical-align: bottom;
padding-left: 0px;
height: 31px;
+ max-width: 100px;
}
body.main table.header td.right {
text-align: right;
- vertical-align: bottom;
- color: #fff;
font-size: 10pt;
}
@@ -99,6 +91,20 @@ body.main table.header td.right img {
top: 5px;
}
+body.main hr.header {
+ background-color: #fff;
+ height: 1px;
+ position: absolute;
+ width: 100%;
+ left: 0px;
+ padding: 0;
+ margin: 0;
+ border: 0;
+ top: 42px;
+ /* Needed for older IE versions */
+ color: #fff;
+}
+
body.main div.urldebug {
color: white;
width: 100%;
@@ -432,8 +438,6 @@ td.content hr {
}
td.legend {
- /* padding-top: 3px; */
- color: #884;
width: 150px;
}
diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css
index ae0446a..46cc711 100644
--- a/web/htdocs/wato.css
+++ b/web/htdocs/wato.css
@@ -477,10 +477,8 @@ table.validationerror img {
.wato div.info {
margin-top: 10px;
margin-bottom: 10px;
- padding: 5px 8px;
- -moz-border-radius: 3px;
- background-image: url("images/form_background.png");
- background-repeat: repeat;
+ padding-left: 1px;
+ color: white;
}
/* Controls for the audit log paged mechanism */