26 Mar
2012
26 Mar
'12
11:08 a.m.
Module: check_mk
Branch: master
Commit: 03e86e0fde839860d68331fc460b1edb07203416
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03e86e0fde8398…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Mar 26 18:07:36 2012 +0200
Last layout improvement before merge
---
web/.f12 | 3 ++-
web/htdocs/check_mk.css | 31 +++++++++++++++++++------------
web/htdocs/images/globe.png | Bin 18605 -> 18247 bytes
web/htdocs/images/image_button_l.png | Bin 1133 -> 1114 bytes
web/htdocs/login.css | 7 ++++---
web/htdocs/pages.css | 34 ++++++++++++++++++----------------
web/htdocs/sidebar.py | 2 +-
web/htdocs/wato.css | 24 +++++-------------------
8 files changed, 49 insertions(+), 52 deletions(-)
diff --git a/web/.f12 b/web/.f12
index ab3747a..21184a1 100644
--- a/web/.f12
+++ b/web/.f12
@@ -1,5 +1,6 @@
#!/bin/bash
SITE=${SITE:-$(omd sites --bare | head -n 1)}
-C=$(sudo cp --preserve=mode -rv * /omd/versions/default/share/check_mk/web/ | wc -l)
+# C=$(sudo cp --preserve=mode -rv * /omd/versions/default/share/check_mk/web/ | wc -l)
+C=$(sudo cp --preserve=mode -rv htdocs/*.{css,py}
/omd/versions/default/share/check_mk/web/htdocs/ | wc -l)
echo "$C files copied"
# sudo omd restart $SITE apache
diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css
index e210b5e..0cf4b61 100644
--- a/web/htdocs/check_mk.css
+++ b/web/htdocs/check_mk.css
@@ -71,6 +71,11 @@ input, select, textarea {
-moz-border-radius: 3px;
border-radius: 3px;
background-color: #fff;
+ font-family: arial, helvetica, sans-serif;
+}
+
+select {
+ padding: 1px 3px;
}
form {
@@ -115,29 +120,30 @@ a.button {
/* Image submit button styling */
label.image_button {
- display: block;
- margin: 0 auto;
+ display: inline-block;
+ margin: -5px -5px -0px 0; /* margin: 0 3px 0 0; */
background: transparent url('images/image_button_l.png') no-repeat;
- background-position: 0 -30px;
- padding: 0 0 0 14px;
+ background-position: -5px -30px;
+ padding: 0 0 0 8px;
height: 30px;
- float: left;
margin-right: 5px;
}
label.image_button:hover {
- background-position: 0 -60px;
+ background-position: -5px -60px;
}
label.image_button:active {
- background-position: 0 -90px;
+ background-position: -5px -90px;
}
label.image_button input {
height: 30px;
color: #fff;
border: none;
- padding-right: 10px;
+ padding-right: 11px;
+ padding-top: 5px;
background: transparent url('images/image_button_r.png') no-repeat;
background-position: right -30px;
float: left;
+ font-size: 8pt;
}
label.image_button input:hover {
background-position: right -60px;
@@ -266,23 +272,24 @@ table.debug_vars td {
'-------------------------------------------------------------------------*/
div.really {
- background-color: #f88;
+ background-color: #fdc400;
border-color: #800;
}
div.success {
- background-color: #8f8;
+ background-color: #9dbecd;
border-color: #080;
}
div.message {
- background-color: #8cf;
+ background-color: #9dbecd;
border-color: #048;
}
div.error {
- background-color: #f84;
+ background-color: #e70000;
border-color: #e40;
+ color: white;
}
div.warning {
diff --git a/web/htdocs/images/globe.png b/web/htdocs/images/globe.png
index 3e7dd3f..9478ce2 100644
Binary files a/web/htdocs/images/globe.png and b/web/htdocs/images/globe.png differ
diff --git a/web/htdocs/images/image_button_l.png b/web/htdocs/images/image_button_l.png
index 3b18a86..0312e3e 100644
Binary files a/web/htdocs/images/image_button_l.png and
b/web/htdocs/images/image_button_l.png differ
diff --git a/web/htdocs/login.css b/web/htdocs/login.css
index 6563332..545c9e8 100644
--- a/web/htdocs/login.css
+++ b/web/htdocs/login.css
@@ -134,8 +134,8 @@ label {
#button_text {
position: absolute;
- top: 351px;
- left: 505px;
+ top: 356px;
+ left: 513px;
text-align: center;
width: 61px;
color: white;
@@ -147,7 +147,7 @@ label {
#login_error {
position: absolute;
top: 347px;
- left: 285px;
+ left: 320px;
width: 180px;
height: 30px;
z-index: 100;
@@ -163,6 +163,7 @@ label {
background-color: transparent;
margin: 0px;
padding: 8px 0px 0px 0px;
+ color: black;
}
#foot {
diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css
index 1bb2a3f..ba65df5 100644
--- a/web/htdocs/pages.css
+++ b/web/htdocs/pages.css
@@ -395,16 +395,21 @@ table.form img.toggleheader.hover {
/* Left side where title and help is printed */
table.form td.legend, table.form td.title {
- color: #274750;
- border: 1px solid #fff;
+ color: #000;
+ border-width: 1px;
+ border-style: solid;
+ border-color: #2f5f73;
padding-top: 10px;
padding-bottom: 10px;
+ border-right-style: none;
}
/* Bottom row with action buttons, right justified */
table.form td.buttons {
color: #274750;
- border: 1px solid #fff;
+ border-width: 1px;
+ border-style: solid;
+ border-color: #2f5f73;
padding-top: 10px;
text-align: right;
}
@@ -431,10 +436,13 @@ table.form td.lgend.button {
table.form td.content {
padding-right: 2ex;
- border: 1px solid #fff;
+ border-width: 1px;
+ border-style: solid;
+ border-color: #2f5f73;
border-left-style: none;
- padding-top: 10px;
- padding-bottom: 10px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ padding-left: 10px;
}
td.legend, td.content {
@@ -473,7 +481,7 @@ input.date, input.time {
font-family: monospace;
}
-.inputerror input, .inputerror textarea, span.checkbox {
+.inputerror input, .inputerror textarea, .inputerror span.checkbox {
background-color: #f84;
}
@@ -503,11 +511,11 @@ span.checkbox {
| Confirmation dialogs, success and error messages when performing actions |
'-------------------------------------------------------------------------*/
div.really, div.success, div.error, div.message, div.warning {
- margin: 2em 2em 2em 2em;
+ margin: 2em 0em;
-moz-border-radius: 1ex;
padding: 1em 2em;
- border-width: 2px;
- border-style: solid;
+ /* border-width: 2px;
+ border-style: solid;*/
}
div.really h1, div.success h1, div.error h1, div.message h1, div.warning h1 {
@@ -518,9 +526,3 @@ div.really h1, div.success h1, div.error h1, div.message h1,
div.warning h1 {
margin-left: 0px;
}
-div.really input {
- font-weight: bold;
- margin-top: 1em;
- padding: 0.5ex 2em;
-}
-
diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py
index 6340f4e..ee45bff 100644
--- a/web/htdocs/sidebar.py
+++ b/web/htdocs/sidebar.py
@@ -132,7 +132,7 @@ def sidebar_foot():
if config.may("logout"):
html.write('<li><a class=logout target="_top"
href="logout.py" title="%s"></a></li>' %
_('Logout'))
html.write('</ul>')
- html.write("<div class=copyright>%s</div>\n" %
_("© <a target=\"main\"
href=\"http://mathias-kettner.de\">Mathias Kettner</a>"))
+ html.write("<div class=copyright>%s</div>\n" %
_("© <a target=\"_blank\"
href=\"http://mathias-kettner.de\">Mathias Kettner</a>"))
html.write('</div>')
# Standalone sidebar
diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css
index 7309cab..3205aa8 100644
--- a/web/htdocs/wato.css
+++ b/web/htdocs/wato.css
@@ -52,12 +52,6 @@ Boston, MA 02110-1301 USA.
background-color: #508aa1;
background-color: #73a1b4;
}
-.wato input[type=submit], .wato input[type=button], .wato select {
- box-shadow: 0px 0px 1px #888888;
-}
-.wato input[type=submit]:hover, .wato input[type=button]:hover, .wato select:hover {
- box-shadow: 0px 0px 1px white;
-}
@@ -66,7 +60,7 @@ Boston, MA 02110-1301 USA.
-moz-border-radius: 4px 0px 0px 0px;
}
.wato table.data td {
- border-style: dashed;
+ /* border-style: dashed; */
}
.wato table.data td.select {
@@ -87,15 +81,13 @@ Boston, MA 02110-1301 USA.
}
.wato table.form td {
- border-style: dashed;
+ /* border-style: dashed; */
}
.wato table.form td.legend {
width: 300px;
padding-bottom: 8px;
padding-left: 20px;
- border-left-style: none;
- border-right-style: none;
}
.wato table.form td.legend h3 {
@@ -105,7 +97,7 @@ Boston, MA 02110-1301 USA.
font-weight: normal;
}
.wato table.form td.title {
- border-style: none none dashed none;
+ border-style: none none solid none;
}
.wato table.form td.title i {
@@ -127,12 +119,6 @@ Boston, MA 02110-1301 USA.
padding-top: 7px;
padding-bottom: 7px;
padding-right: 20px;
- border-left-style: dashed;
- border-right-style: none;
-}
-
-.wato table.form td.buttons {
- border-style: solid none none none;
}
.wato table.form tr.top td,
@@ -153,8 +139,8 @@ Boston, MA 02110-1301 USA.
vertical-align: top;
text-align: right;
border-width: 1px;
- border-color: #fff;
- border-style: dashed none dashed none;
+ border-style: solid none solid none;
+ border-color: #2f5f73;
}
.wato div.sitestatus {