Module: check_mk
Branch: master
Commit: 7b831e7a1cc1096198c2969bf5be61dc73ae493a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b831e7a1cc109…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun May 6 14:10:27 2012 +0200
Minor layout fixes
---
web/htdocs/check_mk.css | 7 ++++---
web/htdocs/htmllib.py | 5 +++--
web/htdocs/login.css | 1 +
web/htdocs/login.py | 4 ++--
web/htdocs/pages.css | 3 ---
web/htdocs/wato.css | 3 ++-
web/plugins/wato/check_mk_configuration.py | 1 +
7 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css
index a0c5c43..047873b 100644
--- a/web/htdocs/check_mk.css
+++ b/web/htdocs/check_mk.css
@@ -67,14 +67,15 @@ input, select, textarea {
border: 1px #73767A solid;
outline-style: none;
outline-width: medium;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
background-color: #fff;
font-family: arial, helvetica, sans-serif;
vertical-align: middle;
}
+input[type=text] {
+ box-shadow: 0.5px 0.5px 0.8px 0 #888 inset;
+}
+
select {
padding: 1px 3px;
}
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index 7604c72..30add17 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -451,9 +451,10 @@ class html:
default_value = ""
addprops = ""
add_style = ""
- if "size" in args:
+ if "size" in args and args["size"]:
addprops += " size=%d" % (args["size"] + 1)
- add_style = "width: %dex; " % args["size"]
+ if "width:" not in args.get("style", ""):
+ add_style = "width: %d.5ex; " % args["size"]
if "type" in args:
mytype = args["type"]
diff --git a/web/htdocs/login.css b/web/htdocs/login.css
index 545c9e8..796700d 100644
--- a/web/htdocs/login.css
+++ b/web/htdocs/login.css
@@ -114,6 +114,7 @@ label {
padding: 3px 5px 3px 5px;
background-image: url("images/login_input_normal.png");
background-repeat: no-repeat;
+ box-shadow: none;
}
.inputerror #input_user, .inputerror #input_pass {
diff --git a/web/htdocs/login.py b/web/htdocs/login.py
index 0d7b2d1..0035894 100644
--- a/web/htdocs/login.py
+++ b/web/htdocs/login.py
@@ -243,9 +243,9 @@ def normal_login_page(called_directly = True):
html.hidden_field('_login', '1')
html.hidden_field('_origtarget', htmllib.attrencode(origtarget))
html.write("<label id=label_user class=legend
for=_username>%s:</label><br />" % _('Username'))
- html.text_input("_username", size = 50, id="input_user")
+ html.text_input("_username", id="input_user")
html.write("<label id=label_pass class=legend
for=_password>%s:</label><br />" % _('Password'))
- html.password_input("_password", size = 50, id="input_pass")
+ html.password_input("_password", id="input_pass", size=None)
if html.has_user_errors():
html.write('<div id=login_error>')
diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css
index 3b0816d..d861b05 100644
--- a/web/htdocs/pages.css
+++ b/web/htdocs/pages.css
@@ -474,9 +474,6 @@ input.tab#results, input.tabactive#results { background-color: #fe6;
}
/* input elements in forms */
-table.form input.text {
-}
-
table.form input.number {
text-align: right;
}
diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css
index 0eae8ea..f738e39 100644
--- a/web/htdocs/wato.css
+++ b/web/htdocs/wato.css
@@ -45,9 +45,10 @@ Boston, MA 02110-1301 USA.
/* Tables in WATO are not size to 100% per default */
.wato table.data {
- box-shadow: 0 0 3px #334488;
+ /* box-shadow: 0 0 3px #334488; */
width: auto;
}
+
.wato table.data th {
-moz-border-radius: 0px;
background-color: #508aa1;
diff --git a/web/plugins/wato/check_mk_configuration.py
b/web/plugins/wato/check_mk_configuration.py
index 5356642..826ed4d 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -149,6 +149,7 @@ register_configvar(group,
help = _("When you point your browser to the Multisite GUI, usually
the dashboard "
"is shown in the main (right) frame. You can replace this
with any other "
"URL you like here."),
+ size = 80,
default_value = "dashboard.py"),
domain = "multisite")