Module: check_mk
Branch: master
Commit: 4ea051329ae40e46a62820b96d79c82f40c0c45c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ea051329ae40e…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sat May 19 12:07:14 2012 +0200
Minor layout improvement in forms
---
web/htdocs/forms.py | 7 ++++---
web/htdocs/pages.css | 17 +++++++++++++++--
web/htdocs/wato.css | 4 ++--
web/htdocs/wato.py | 39 ++++++++++++++++++++++-----------------
4 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py
index 484c975..02dc244 100644
--- a/web/htdocs/forms.py
+++ b/web/htdocs/forms.py
@@ -131,13 +131,14 @@ def container():
(not g_section_isopen and "none" or ""))
g_section_open = True
-def section(title = None, checkbox = None, id = ""):
+def section(title = None, checkbox = None, id = "", simple=False):
global g_section_open
if g_section_open:
html.write('</td></tr>')
if id:
id = ' id="%s"' % id
- html.write('<tr style="display: %s"%s><td
class=legend>' % (not g_section_isopen and "none" or "", id))
+ html.write('<tr style="display: %s"%s><td
class="legend%s">' %
+ (not g_section_isopen and "none" or "", id, simple and
" simple" or ""))
if title:
html.write('<div class="title%s">%s<span
class="dots">%s</span></div>' %
(checkbox and " withcheckbox" or "", title,
"."*100))
@@ -151,7 +152,7 @@ def section(title = None, checkbox = None, id = ""):
html.write('</div>')
html.write('</td>')
- html.write('<td class=content>')
+ html.write('<td class="content%s">' % (simple and "
simple" or ""))
g_section_open = True
def end():
diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css
index 50418a3..6647502 100644
--- a/web/htdocs/pages.css
+++ b/web/htdocs/pages.css
@@ -518,15 +518,24 @@ table.nform > tbody > tr > td {
height: 27px;
}
+table.nform > tbody > tr > td.simple {
+ vertical-align: top;
+ height: 18px;
+}
+
table.nform td.legend {
text-align: left;
/* font-weight: bold; */
width: 240px;
padding-right: 8px;
vertical-align: top;
- padding-top: 11px;
+ padding-top: 8px;
padding-left: 10px;
}
+table.nform td.legend.simple {
+ padding-top: 5px;
+}
+
table.nform td.legend div.title {
float: left;
overflow: hidden;
@@ -548,6 +557,10 @@ table.nform td.legend div.checkbox {
table.nform td.content {
padding-left: 10px;
padding-right: 10px;
+ padding-bottom: 10px;
+}
+table.nform td.content.simple {
+ padding-bottom: 0px;
}
table.nform td.buttons {
@@ -558,7 +571,7 @@ table.nform tr.top td {
}
table.nform tr.bottom td {
- height: 10px;
+ height: 5px;
}
/*-------------------------------------------------------------------------.
diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css
index 1cb7d5f..6b9791d 100644
--- a/web/htdocs/wato.css
+++ b/web/htdocs/wato.css
@@ -776,9 +776,9 @@ div.varname {
max-width: 350px;
}
-.wato div.globalvars td {
+/*.wato div.globalvars td {
height: 20px;
-}
+}*/
/* Table in page "Global variables" */
.wato table.data.globalvars {
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index a96106f..51ad0db 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -1905,10 +1905,11 @@ def mode_edithost(phase, new, cluster):
# host name
forms.header(_("General Properties"))
- forms.section(_("Hostname"))
if hostname and mode == "edit":
+ forms.section(_("Hostname"), simple=True)
html.write(hostname)
else:
+ forms.section(_("Hostname"))
html.text_input("host")
html.set_focus("host")
@@ -5187,7 +5188,13 @@ def mode_globalvars(phase):
edit_url = make_link([("mode", "edit_configvar"),
("varname", varname)])
title = '<a href="%s">%s</a>' % (edit_url,
valuespec.title())
- forms.section(title)
+
+ if varname in current_settings:
+ to_text = valuespec.value_to_text(current_settings[varname])
+ else:
+ to_text = valuespec.value_to_text(defaultvalue)
+ simple = isinstance(valuespec, Checkbox) or "\n" not in to_text
+ forms.section(title, simple=simple)
toggle_url = make_action_link([("mode", "globalvars"),
("_action", "toggle"), ("_varname",
varname)])
@@ -5197,16 +5204,14 @@ def mode_globalvars(phase):
# "snapin_greyswitch_" + (current_settings[varname] and
"on" or "off"))
"snapin_switch_" + (current_settings[varname] and
"on" or "off"))
else:
- html.write('<a href="%s">%s</a>' %
- (edit_url, valuespec.value_to_text(current_settings[varname])))
+ html.write('<a href="%s">%s</a>' %
(edit_url, to_text))
else:
if isinstance(valuespec, Checkbox):
html.icon_button(toggle_url, _("Immediately toggle this
setting"),
# "snapin_greyswitch_" + (defaultvalue and "on"
or "off"))
"snapin_switch_" + (defaultvalue and "on" or
"off"))
else:
- html.write('<a href="%s">%s</a>' %
- (edit_url, valuespec.value_to_text(defaultvalue)))
+ html.write('<a href="%s">%s</a>' %
(edit_url, to_text))
forms.end()
html.write('</div>')
@@ -5496,7 +5501,7 @@ def mode_edit_group(phase, what):
html.begin_form("group")
forms.header(_("Properties"))
- forms.section(_("Name"))
+ forms.section(_("Name"), simple = not new)
html.help(_("The name of the group is used as an internal key. It cannot be
"
"changed later. It is also visible in the status GUI."))
if new:
@@ -5885,7 +5890,7 @@ def mode_edit_timeperiod(phase):
forms.header(_("Timeperiod"))
# Name
- forms.section(_("Internal name"))
+ forms.section(_("Internal name"), simple = not new)
if new:
html.text_input("name")
html.set_focus("name")
@@ -6399,7 +6404,7 @@ def mode_edit_site(phase):
# ID
forms.header(_("Basic settings"))
- forms.section(_("Site ID"))
+ forms.section(_("Site ID"), simple = not new)
if new:
html.text_input("id", siteid)
html.set_focus("id")
@@ -6414,7 +6419,7 @@ def mode_edit_site(phase):
html.help(_("An alias or description of the site"))
# Disabled
- forms.section(_("Disable"))
+ forms.section(_("Disable"), simple=True)
html.checkbox("disabled", site.get("disabled", False), label =
_("Disable this connection"))
html.help( _("If you disable a connection, then it will not be shown in the
"
"status display and no replication will be done."))
@@ -6445,7 +6450,7 @@ def mode_edit_site(phase):
"performed."))
# Persistent connections
- forms.section(_("Persistent Connection"))
+ forms.section(_("Persistent Connection"), simple=True)
html.checkbox("persist", site.get("persist", False),
label=_("Use persistent connections"))
html.help(_("If you enable persistent connections then Multisite will try to
keep open "
"the connection to the remote sites. This brings a great speed up in
high-latency "
@@ -6514,7 +6519,7 @@ def mode_edit_site(phase):
"that URL will be fetched by the Apache server of the local
"
"site itself, whilst the URL-Prefix is used by your local
Browser."))
- forms.section(_("SSL"))
+ forms.section(_("SSL"), simple=True)
html.checkbox("insecure", site.get("insecure", False), label =
_('Ignore SSL certificate errors'))
html.help( _('This might be needed to make the synchronization accept problems
with '
'SSL certificates when using an SSL secured connection.'))
@@ -7514,7 +7519,7 @@ def mode_edit_user(phase):
forms.header(_("Identity"))
# ID
- forms.section(_("Username"))
+ forms.section(_("Username"), simple = not new)
if new:
html.text_input("userid", userid)
html.set_focus("userid")
@@ -7570,7 +7575,7 @@ def mode_edit_user(phase):
"a webservice without any further configuration."))
# Locking
- forms.section(_("Disable password"))
+ forms.section(_("Disable password"), simple=True)
html.checkbox("locked", user.get("locked", False), label =
_("disable the login to this account"))
html.help(_("Disabling the password will prevent a user from logging in while
"
"retaining the original password. Notifications are not affected
"
@@ -7617,7 +7622,7 @@ def mode_edit_user(phase):
forms.header(_("Notifications"), isopen=False)
- forms.section(_("Enabling"))
+ forms.section(_("Enabling"), simple=True)
html.checkbox("notifications_enabled",
user.get("notifications_enabled", True),
label = _("enable notifications"))
html.help(_("Notifications are sent out "
@@ -8078,7 +8083,7 @@ def mode_edit_role(phase):
# ID
forms.header(_("Basic Properties"))
- forms.section(_("Internal ID"))
+ forms.section(_("Internal ID"), simple = "builtin" in role)
if role.get("builtin"):
html.write("%s (%s)" % (id, _("builtin role")))
html.hidden_field("id", id)
@@ -10257,7 +10262,7 @@ def page_user_profile():
html.write('<div class=wato>')
forms.header(_("Personal Settings"))
- forms.section(_("Name"))
+ forms.section(_("Name"), simple=True)
html.write(config.user_id)
if config.may('edit_profile'):