Module: check_mk
Branch: master
Commit: c2eca2c917a209c228a5b4d3b9fa82d081e3fe99
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2eca2c917a209…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Thu Jan 12 16:09:45 2012 +0100
MobileUI: Fixed links to pnp
---
web/htdocs/mobile.css | 2 +-
web/htdocs/mobile.py | 9 ++++++---
web/plugins/icons/builtin.py | 9 +++++++--
web/plugins/icons/wato.py | 2 +-
web/plugins/views/mobile.py | 13 ++++++-------
5 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/web/htdocs/mobile.css b/web/htdocs/mobile.css
index 3ac57aa..4d87b2f 100644
--- a/web/htdocs/mobile.css
+++ b/web/htdocs/mobile.css
@@ -159,7 +159,7 @@ body.mobile table.data td.perfometer td.inner {
| Styles for hiliting data cells in status displays |
'-------------------------------------------------------------------------*/
.ui-li-aside.state {
- width: 3em;
+ width: 4.5em;
text-align: center;
}
diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py
index 53bdd4e..7fb74cd 100644
--- a/web/htdocs/mobile.py
+++ b/web/htdocs/mobile.py
@@ -131,11 +131,14 @@ def jqm_page_index(title, items):
def jqm_page_index_topic_renderer(topic, items):
- html.write('<p>%s</p><ul data-role="listview"
data-inset="true">\n' % topic)
for top, href, title in items:
if top == topic:
- html.write('<li><a data-ajax="false"
data-transition="flip" href="%s">%s</a></li>\n' %
(href, title))
- html.write('</ul>')
+ html.write('<p>%s</p><ul data-role="listview"
data-inset="true">\n' % topic)
+ for top, href, title in items:
+ if top == topic:
+ html.write('<li><a data-ajax="false"
data-transition="flip" href="%s">%s</a></li>\n' %
(href, title))
+ html.write('</ul>')
+ return
def jqm_page(title, content, foot, id=None):
diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py
index 3f09af7..9b51479 100644
--- a/web/plugins/icons/builtin.py
+++ b/web/plugins/icons/builtin.py
@@ -133,8 +133,13 @@ def pnp_url(row, what, how = 'graph'):
else:
svc = pnp_cleanup(row["service_description"])
site = html.site_status[sitename]["site"]
- url = site["url_prefix"] +
("pnp4nagios/index.php/%s?host=%s&srv=%s" % \
- (how, htmllib.urlencode(host), htmllib.urlencode(svc)))
+ if html.mobile:
+ url = site["url_prefix"] +
("pnp4nagios/index.php?kohana_uri=/mobile/%s/%s/%s" % \
+ (how, htmllib.urlencode(host), htmllib.urlencode(svc)))
+ else:
+ url = site["url_prefix"] +
("pnp4nagios/index.php/%s?host=%s&srv=%s" % \
+ (how, htmllib.urlencode(host), htmllib.urlencode(svc)))
+
if how == 'graph':
url += "&theme=multisite&baseurl=%scheck_mk/" % \
htmllib.urlencode(site["url_prefix"])
diff --git a/web/plugins/icons/wato.py b/web/plugins/icons/wato.py
index a52c4ec..d6b38f1 100644
--- a/web/plugins/icons/wato.py
+++ b/web/plugins/icons/wato.py
@@ -42,7 +42,7 @@ def wato_link(folder, site, hostname, where):
return ""
def paint_wato(what, row, tags, custom_vars):
- if not wato.may_see_hosts():
+ if not wato.may_see_hosts() or html.mobile:
return
filename = row["host_filename"]
diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py
index 750f894..46a80bb 100644
--- a/web/plugins/views/mobile.py
+++ b/web/plugins/views/mobile.py
@@ -94,7 +94,7 @@ multisite_builtin_views.update({
'num_columns': 2,
'owner': '',
'painters': [
- ('service_state_appr', None, ''),
+ ('service_state', None, ''),
('host', 'mobile_hoststatus',
''),
('service_description', 'mobile_service',
''),
('svc_plugin_output', '' ),
@@ -148,7 +148,7 @@ multisite_builtin_views.update({
'name': 'mobile_svcproblems',
'num_columns': 2,
'painters': [
- ('service_state_appr', None, ''),
+ ('service_state', None, ''),
('host', 'mobile_hoststatus', ''),
('service_description', 'mobile_service', ''),
('svc_plugin_output', '' ),
@@ -199,7 +199,7 @@ multisite_builtin_views.update({
'name': 'mobile_svcproblems_unack',
'num_columns': 2,
'painters': [
- ('service_state_appr', None, ''),
+ ('service_state', None, ''),
('host', 'mobile_hoststatus', ''),
('service_description', 'mobile_service', ''),
('svc_plugin_output', '' ),
@@ -234,7 +234,7 @@ multisite_builtin_views.update({
'hidden' : True,
'painters': [
('sitealias', None, ''),
- ('host', 'hoststatus', ''),
+ ('host', 'mobile_host', ''),
('service_description', ''),
('svc_plugin_output', None, ''),
('service_icons', None, ''),
@@ -283,7 +283,7 @@ multisite_builtin_views.update({
'name': 'mobile_svcproblems',
'num_columns': 1,
'painters': [
- ('service_state_appr', None),
+ ('service_state', None),
('service_description', 'mobile_service'),
('svc_plugin_output', None),
('svc_state_age', None),
@@ -309,12 +309,11 @@ multisite_builtin_views.update({
'hidden' : True,
'painters': [
('sitealias', None),
- ('host', 'host'),
+ ('host', 'mobile_host'),
('alias', None),
('host_icons', None),
('host_state', None),
('host_address', None),
- ('host_group_memberlist', None),
('host_parents', None),
('host_childs', None),
('host_contact_groups', None),