Module: check_mk
Branch: master
Commit: a8bbd22c2915f11be259aa20c15106b1de73a4fd
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8bbd22c2915f1…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sat Jun 2 11:17:34 2012 +0200
WATO: New conveniance snapin for accessing WATO
---
web/htdocs/images/button_auditlog_hi.png | Bin 0 -> 3861 bytes
web/htdocs/images/button_auditlog_lo.png | Bin 0 -> 3836 bytes
web/htdocs/images/button_backup_hi.png | Bin 0 -> 3316 bytes
web/htdocs/images/button_backup_lo.png | Bin 0 -> 3986 bytes
web/htdocs/images/button_configuration_hi.png | Bin 0 -> 4064 bytes
web/htdocs/images/button_configuration_lo.png | Bin 0 -> 4401 bytes
web/htdocs/images/button_contactgroups_hi.png | Bin 0 -> 4105 bytes
web/htdocs/images/button_contactgroups_lo.png | Bin 0 -> 4963 bytes
web/htdocs/images/button_folder_hi.png | Bin 0 -> 3034 bytes
web/htdocs/images/button_folder_lo.png | Bin 0 -> 3806 bytes
web/htdocs/images/button_home_hi.png | Bin 0 -> 3373 bytes
web/htdocs/images/button_home_lo.png | Bin 0 -> 3261 bytes
web/htdocs/images/button_hostgroups_hi.png | Bin 0 -> 4005 bytes
web/htdocs/images/button_hostgroups_lo.png | Bin 0 -> 4708 bytes
web/htdocs/images/button_hosttag_hi.png | Bin 0 -> 2766 bytes
web/htdocs/images/button_hosttag_lo.png | Bin 0 -> 3395 bytes
web/htdocs/images/button_roles_hi.png | Bin 0 -> 3702 bytes
web/htdocs/images/button_roles_lo.png | Bin 0 -> 4550 bytes
web/htdocs/images/button_rulesets_hi.png | Bin 0 -> 3673 bytes
web/htdocs/images/button_rulesets_lo.png | Bin 0 -> 4217 bytes
web/htdocs/images/button_servicegroups_hi.png | Bin 0 -> 4005 bytes
web/htdocs/images/button_servicegroups_lo.png | Bin 0 -> 4708 bytes
web/htdocs/images/button_sites_hi.png | Bin 0 -> 4542 bytes
web/htdocs/images/button_sites_lo.png | Bin 0 -> 5597 bytes
web/htdocs/images/button_timeperiods_hi.png | Bin 0 -> 3863 bytes
web/htdocs/images/button_timeperiods_lo.png | Bin 0 -> 4812 bytes
web/htdocs/images/button_users_hi.png | Bin 0 -> 4511 bytes
web/htdocs/images/button_users_lo.png | Bin 0 -> 5593 bytes
web/plugins/sidebar/wato.py | 40 ++++++++++++++++++++++--
29 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/web/htdocs/images/button_auditlog_hi.png
b/web/htdocs/images/button_auditlog_hi.png
new file mode 100644
index 0000000..85fb30b
Binary files /dev/null and b/web/htdocs/images/button_auditlog_hi.png differ
diff --git a/web/htdocs/images/button_auditlog_lo.png
b/web/htdocs/images/button_auditlog_lo.png
new file mode 100644
index 0000000..7f9d3ef
Binary files /dev/null and b/web/htdocs/images/button_auditlog_lo.png differ
diff --git a/web/htdocs/images/button_backup_hi.png
b/web/htdocs/images/button_backup_hi.png
new file mode 100644
index 0000000..62a6c62
Binary files /dev/null and b/web/htdocs/images/button_backup_hi.png differ
diff --git a/web/htdocs/images/button_backup_lo.png
b/web/htdocs/images/button_backup_lo.png
new file mode 100644
index 0000000..4164108
Binary files /dev/null and b/web/htdocs/images/button_backup_lo.png differ
diff --git a/web/htdocs/images/button_configuration_hi.png
b/web/htdocs/images/button_configuration_hi.png
new file mode 100644
index 0000000..cd27661
Binary files /dev/null and b/web/htdocs/images/button_configuration_hi.png differ
diff --git a/web/htdocs/images/button_configuration_lo.png
b/web/htdocs/images/button_configuration_lo.png
new file mode 100644
index 0000000..6d3b2ce
Binary files /dev/null and b/web/htdocs/images/button_configuration_lo.png differ
diff --git a/web/htdocs/images/button_contactgroups_hi.png
b/web/htdocs/images/button_contactgroups_hi.png
new file mode 100644
index 0000000..f67f685
Binary files /dev/null and b/web/htdocs/images/button_contactgroups_hi.png differ
diff --git a/web/htdocs/images/button_contactgroups_lo.png
b/web/htdocs/images/button_contactgroups_lo.png
new file mode 100644
index 0000000..87fafd9
Binary files /dev/null and b/web/htdocs/images/button_contactgroups_lo.png differ
diff --git a/web/htdocs/images/button_folder_hi.png
b/web/htdocs/images/button_folder_hi.png
new file mode 100644
index 0000000..e46268a
Binary files /dev/null and b/web/htdocs/images/button_folder_hi.png differ
diff --git a/web/htdocs/images/button_folder_lo.png
b/web/htdocs/images/button_folder_lo.png
new file mode 100644
index 0000000..f7314b3
Binary files /dev/null and b/web/htdocs/images/button_folder_lo.png differ
diff --git a/web/htdocs/images/button_home_hi.png b/web/htdocs/images/button_home_hi.png
new file mode 100644
index 0000000..4e7d5db
Binary files /dev/null and b/web/htdocs/images/button_home_hi.png differ
diff --git a/web/htdocs/images/button_home_lo.png b/web/htdocs/images/button_home_lo.png
new file mode 100644
index 0000000..05fbf05
Binary files /dev/null and b/web/htdocs/images/button_home_lo.png differ
diff --git a/web/htdocs/images/button_hostgroups_hi.png
b/web/htdocs/images/button_hostgroups_hi.png
new file mode 100644
index 0000000..e3b7593
Binary files /dev/null and b/web/htdocs/images/button_hostgroups_hi.png differ
diff --git a/web/htdocs/images/button_hostgroups_lo.png
b/web/htdocs/images/button_hostgroups_lo.png
new file mode 100644
index 0000000..40f1169
Binary files /dev/null and b/web/htdocs/images/button_hostgroups_lo.png differ
diff --git a/web/htdocs/images/button_hosttag_hi.png
b/web/htdocs/images/button_hosttag_hi.png
new file mode 100644
index 0000000..2e9852e
Binary files /dev/null and b/web/htdocs/images/button_hosttag_hi.png differ
diff --git a/web/htdocs/images/button_hosttag_lo.png
b/web/htdocs/images/button_hosttag_lo.png
new file mode 100644
index 0000000..5b8f1ac
Binary files /dev/null and b/web/htdocs/images/button_hosttag_lo.png differ
diff --git a/web/htdocs/images/button_roles_hi.png
b/web/htdocs/images/button_roles_hi.png
new file mode 100644
index 0000000..b461088
Binary files /dev/null and b/web/htdocs/images/button_roles_hi.png differ
diff --git a/web/htdocs/images/button_roles_lo.png
b/web/htdocs/images/button_roles_lo.png
new file mode 100644
index 0000000..5eae512
Binary files /dev/null and b/web/htdocs/images/button_roles_lo.png differ
diff --git a/web/htdocs/images/button_rulesets_hi.png
b/web/htdocs/images/button_rulesets_hi.png
new file mode 100644
index 0000000..59712c8
Binary files /dev/null and b/web/htdocs/images/button_rulesets_hi.png differ
diff --git a/web/htdocs/images/button_rulesets_lo.png
b/web/htdocs/images/button_rulesets_lo.png
new file mode 100644
index 0000000..baac6ad
Binary files /dev/null and b/web/htdocs/images/button_rulesets_lo.png differ
diff --git a/web/htdocs/images/button_servicegroups_hi.png
b/web/htdocs/images/button_servicegroups_hi.png
new file mode 100644
index 0000000..42d4326
Binary files /dev/null and b/web/htdocs/images/button_servicegroups_hi.png differ
diff --git a/web/htdocs/images/button_servicegroups_lo.png
b/web/htdocs/images/button_servicegroups_lo.png
new file mode 100644
index 0000000..40f1169
Binary files /dev/null and b/web/htdocs/images/button_servicegroups_lo.png differ
diff --git a/web/htdocs/images/button_sites_hi.png
b/web/htdocs/images/button_sites_hi.png
new file mode 100644
index 0000000..6fd0583
Binary files /dev/null and b/web/htdocs/images/button_sites_hi.png differ
diff --git a/web/htdocs/images/button_sites_lo.png
b/web/htdocs/images/button_sites_lo.png
new file mode 100644
index 0000000..b5f28c4
Binary files /dev/null and b/web/htdocs/images/button_sites_lo.png differ
diff --git a/web/htdocs/images/button_timeperiods_hi.png
b/web/htdocs/images/button_timeperiods_hi.png
new file mode 100644
index 0000000..1a6f7ef
Binary files /dev/null and b/web/htdocs/images/button_timeperiods_hi.png differ
diff --git a/web/htdocs/images/button_timeperiods_lo.png
b/web/htdocs/images/button_timeperiods_lo.png
new file mode 100644
index 0000000..3b77e47
Binary files /dev/null and b/web/htdocs/images/button_timeperiods_lo.png differ
diff --git a/web/htdocs/images/button_users_hi.png
b/web/htdocs/images/button_users_hi.png
new file mode 100644
index 0000000..cb4d4fc
Binary files /dev/null and b/web/htdocs/images/button_users_hi.png differ
diff --git a/web/htdocs/images/button_users_lo.png
b/web/htdocs/images/button_users_lo.png
new file mode 100644
index 0000000..681ed2d
Binary files /dev/null and b/web/htdocs/images/button_users_lo.png differ
diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py
index be085a2..ff0ff77 100644
--- a/web/plugins/sidebar/wato.py
+++ b/web/plugins/sidebar/wato.py
@@ -34,19 +34,26 @@ import config, wato
# | \_/\_/_/ \_\_| \___/ |
# | |
# +----------------------------------------------------------------------+
-def render_wato():
+def render_wato(mini):
if not config.wato_enabled:
html.write(_("WATO is disabled in
<tt>multisite.mk</tt>."))
elif not config.may("wato.use"):
html.write(_("You are not allowed to use Check_MK's web configuration
GUI."))
return False
- iconlink(_("Main Menu"), "wato.py", "home")
+ if mini:
+ html.icon_button("wato.py", _("Main Menu"), "home",
target="main")
+ else:
+ iconlink(_("Main Menu"), "wato.py", "home")
for mode, title, icon, permission, help in wato.modules:
if "." not in permission:
permission = "wato." + permission
if config.may(permission) or config.may("wato.seeall"):
- iconlink(title, "wato.py?mode=%s" % mode, icon)
+ url = "wato.py?mode=%s" % mode
+ if mini:
+ html.icon_button(url, title, icon, target="main")
+ else:
+ iconlink(title, url, icon)
num_pending = wato.api.num_pending_changes()
if num_pending:
@@ -56,9 +63,34 @@ def render_wato():
sidebar_snapins["admin"] = {
"title" : _("WATO · Configuration"),
"description" : _("Direct access to WATO - the web administration GUI
of Check_MK"),
- "render" : render_wato,
+ "render" : lambda: render_wato(False),
+ "refresh" : 60, # refresh pending changes, if other user modifies
something
+ "allowed" : [ "admin", "user" ],
+}
+
+sidebar_snapins["admin_mini"] = {
+ "title" : _("WATO · Quickaccess"),
+ "description" : _("Access to WATO modules with only icons (saves
space)"),
+ "render" : lambda: render_wato(True),
"refresh" : 60, # refresh pending changes, if other user modifies
something
"allowed" : [ "admin", "user" ],
+ "styles": """
+#snapin_admin_mini {
+ padding-top: 6px;
+}
+#snapin_admin_mini img {
+ margin-right: 3.9px;
+ margin-bottom: 4px;
+ width: 18px;
+ height: 18px;
+ position: relative;
+ left: 3px;
+}
+
+#snapin_admin_mini div.footnotelink {
+ margin-top: -14px;
+}
+""",
}