Module: check_mk
Branch: master
Commit: 3a97f1f4a4c4b655180e3f2f9b9cdcae8faf6b96
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a97f1f4a4c4b6…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Jul 23 18:11:53 2012 +0200
New URL field for rules
---
ChangeLog | 5 +++--
web/htdocs/images/button_url_hi.png | Bin 0 -> 4467 bytes
web/htdocs/images/button_url_lo.png | Bin 0 -> 5597 bytes
web/htdocs/wato.py | 19 +++++++++++++++++--
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0bac8de..114b83c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,8 +26,9 @@
permissions of roles
* FIX: remove line about number of rules in rule set overview
(that garbled the logical layout)
- * Rules now have an optional comment and can be disabled without
- deleting them.
+ * Rules now have an optional comment and an URL for linking to
+ documntation
+ * Rule now can be disabled without deleting them.
* Added new hook "sites-saved"
* Allow @ in user names (needed for some Kerberos setups)
* Implemented new option in WATO attributes: editable
diff --git a/web/htdocs/images/button_url_hi.png b/web/htdocs/images/button_url_hi.png
new file mode 100644
index 0000000..6fe94ac
Binary files /dev/null and b/web/htdocs/images/button_url_hi.png differ
diff --git a/web/htdocs/images/button_url_lo.png b/web/htdocs/images/button_url_lo.png
new file mode 100644
index 0000000..b5f28c4
Binary files /dev/null and b/web/htdocs/images/button_url_lo.png differ
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 3adb100..1050e3f 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -9286,9 +9286,19 @@ vs_rule_options = Dictionary(
title = _("Comment"),
help = _("An optional comment that helps you documenting the purpose of
"
"this rule"),
- size = 64,
+ size = 80,
)
),
+ ( "docu_url",
+ TextAscii(
+ title = _("Docu-URL"),
+ help = _("An optional URL pointing to documentation or any other page.
This will be displayed "
+ "as an icon <img class=icon
src='images/icon_url.png'> and open a new page when clicked. "
+ "You can use either global URLs (beginning with
<tt>http://</tt>), absolute local urls "
+ "(beginning with <tt>/</tt>) or relative URLs (that
are relative to <tt>check_mk/</tt>)."),
+ size = 80,
+ ),
+ ),
( "disabled",
Checkbox(
title = _("Rule activation"),
@@ -9739,7 +9749,12 @@ def mode_edit_ruleset(phase):
html.write("</td>")
# Comment
- html.write('<td>%s</td>' %
rule_options.get("comment", ""))
+ html.write('<td>')
+ url = rule_options.get("docu_url")
+ if url:
+ html.icon_button(url, _("Context information about this rule"),
"url", target="_blank")
+ html.write(rule_options.get("comment", ""))
+ html.write('</td>')
# Folder