Module: check_mk
Branch: master
Commit: 97bdf9b1e3f19e3e53aaa6a9ff0cfabab745be22
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97bdf9b1e3f19e…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Mon Dec 12 12:30:07 2011 +0100
MobileUI: Making filters work
---
web/htdocs/js/mobile.js | 5 +++--
web/htdocs/mobile.py | 14 ++++++++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/web/htdocs/js/mobile.js b/web/htdocs/js/mobile.js
index 6f9442e..17107cd 100644
--- a/web/htdocs/js/mobile.js
+++ b/web/htdocs/js/mobile.js
@@ -24,11 +24,12 @@
/* Disable data-ajax per default, as it makes problems in most
of our cases */
-$( function () {
+
+$(document).ready(function() {
$("a").attr("data-ajax", "false");
$("form").attr("data-ajax", "false");
$("div.error").addClass("ui-shadow");
$("div.success").addClass("ui-shadow");
$("div.really").addClass("ui-shadow");
$("div.warning").addClass("ui-shadow");
-})
+});
\ No newline at end of file
diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py
index de0e758..172797c 100755
--- a/web/htdocs/mobile.py
+++ b/web/htdocs/mobile.py
@@ -202,6 +202,7 @@ def render_view(view, rows, datasource, group_painters, painters,
# Page: data rows of view
jqm_page_header(title, left_button=home,
right_button=("javascript:document.location.reload();", _("Reload"),
"refresh"), id="data")
+ html.write('<div id="view_results">')
if len(rows) == 0:
html.write(_("No hosts/services found."))
else:
@@ -212,6 +213,7 @@ def render_view(view, rows, datasource, group_painters, painters,
show_checkboxes and not html.do_actions())
except Exception, e:
html.write(_("Error showing view: %s" % e))
+ html.write("</div>")
jqm_page_navfooter(navbar, '#data', page_id)
# Page: Commands
@@ -264,10 +266,18 @@ def show_filter_form(show_filters):
# remove the ancor in href. Otherwise jQuery will do some magic
# itself and first switch to that page...
html.javascript("""
- $('#results_button').live('click',function(e){
+ $(document).ready(function() {
+ $('#results_button').live('click', function(e) {
e.preventDefault();
- $('form[name="filter"]').submit();
+ var view_div = $("#view_results");
+ view_div.empty();
+
$.get('view.py',$('#form_filter').serialize()+"&mobile=1&display_options=htbfcodezr",function(antwort){
+ view_div.html(antwort);
+ $.mobile.changePage( "#data" );
+ $('#data').trigger('create');
+ });
});
+ });
""")
def show_command_form(view, datasource, rows):