Module: check_mk
Branch: master
Commit: 481b05139d0a7b4ac59b5f360044f6b0436fc196
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=481b05139d0a7b…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri May 11 10:15:02 2012 +0200
Cleanup of CSS styles for forms
---
web/htdocs/pages.css | 49 +++++++++++--------------------------------------
web/htdocs/wato.css | 25 +------------------------
web/htdocs/wato.py | 2 +-
3 files changed, 13 insertions(+), 63 deletions(-)
diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css
index 82ba271..057c07c 100644
--- a/web/htdocs/pages.css
+++ b/web/htdocs/pages.css
@@ -355,6 +355,9 @@ table.form {
empty-cells: show;
border-spacing: 0px;
margin: 0px 10px 10px 0px;
+ border-width: 1px;
+ border-style: none none solid solid;
+ border-color: #2f5f74;
}
/* Sorry for the mess here. It is due to using foldable_containter
within a form table (currently only in WATO in the host and
@@ -362,31 +365,27 @@ table.form {
table.form.nomargin {
margin: 0;
+ border-bottom-style: none;
}
-table.form.nomargin td.legend,
+/* table.form.nomargin td.legend,
table.form.nomargin td.content,
table.form.nomargin td.checkbox,
table.form.nomargin td.buttons {
border-top-style: none;
-}
+}*/
+
table.form.nomargin td.title {
- border-top-style: none;
background-image: url("images/form_background.png");
background-repeat: repeat;
}
+
table.form > tbody > tr > td {
padding: 5px 8px;
color: #000;
border-width: 1px;
- border-style: solid;
border-color: #2f5f73;
+ border-style: solid solid none none;
}
-/*table.form > tbody > tr > th {
- border-width: 1px;
- border-color: #fff;
- border-style: solid solid none solid;
- padding: 4px 4px;
-}*/
table.form img.toggleheader {
width: 20px;
@@ -399,24 +398,10 @@ table.form img.toggleheader.hover {
cursor: pointer;
}
-/* Left side where title and help is printed */
-/*table.form td.legend,
-table.form td.title,
-table.form td.content,
-table.form td.checkbox {
- color: #000;
- border-width: 1px;
- border-style: solid;
- border-color: #2f5f73;
-}*/
/* Bottom row with action buttons, right justified */
table.form td.buttons {
color: #274750;
- border-width: 1px;
- border-style: solid;
- border-color: #2f5f73;
- /* text-align: right; */
}
/* Inter-heading row over complete width */
@@ -426,7 +411,7 @@ table.form td.title {
}
table.form td.legend.border {
- border-right-style: solid;
+/* border-right-style: solid; */
}
table.form td.hilite {
background-image: url("images/form_background.png");
@@ -436,19 +421,7 @@ table.form td.hilite {
table.form td.lgend.button {
text-align: right;
- border-right: 1px solid #fff;
-}
-
-/* table.form td.content {
- border-width: 1px;
- border-style: solid;
- border-color: #2f5f73;
- border-left-style: none;
-}*/
-
-td.legend, td.content {
- /* border: 1px solid #884; */
- /* padding: 2px 0.5ex; */
+/* border-right: 1px solid #fff; */
}
td.content hr {
diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css
index 8292b30..145875b 100644
--- a/web/htdocs/wato.css
+++ b/web/htdocs/wato.css
@@ -85,9 +85,6 @@ Boston, MA 02110-1301 USA.
margin-left: 0px;
}
-.wato table.form td {
- /* border-style: dashed; */
-}
.wato table.form td.legend {
width: 300px;
@@ -99,10 +96,7 @@ Boston, MA 02110-1301 USA.
font-size: 9pt;
font-weight: normal;
}
-1* Foldable sections in host properties */
-.wato table.form td.title {
- /* border-style: none none solid none; */
-}
+/* Foldable sections in host properties */
.wato table.form td.title i {
font-weight: normal;
@@ -116,20 +110,6 @@ Boston, MA 02110-1301 USA.
/* color: #eee; */
}
-.wato table.form td.content {
- /* border-left-style: solid; */
- /* width: 494px; */
-}
-
-.wato table.form tr.top td,
-.wato table.form tr.top td,
-.wato table.form tr.top td.checkbox {
- /* border-top-style: none; */
-}
-
-.wato table.form.nomargin td.checkbox {
- /* border-top-style: none; */
-}
.wato table.form td.checkbox {
@@ -138,9 +118,6 @@ Boston, MA 02110-1301 USA.
/* padding-top: 7px; */
/* vertical-align: top; */
text-align: center;
- /* border-width: 1px; */
- /* border-style: solid none solid none; */
- /* border-color: #2f5f73 */
}
.wato form.new_rule {
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index c93b383..d9eca53 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -4734,7 +4734,7 @@ def configure_attributes(hosts, for_what, parent, myself=None,
without_attribute
if topic_is_volatile:
volatile_topics.append((topic or _("Basic
settings")).encode('utf-8'))
if topic == topics[-1]:
- html.write('<table class="form nomargin">')
+ html.write('<table class="form">')
def dump_json(obj):
return repr(obj).replace('None', 'null')