From 20886f7ec22edc8efb56c9e15f7c23fd7e8e67cc Mon Sep 17 00:00:00 2001 From: Vincent Pietri Date: Wed, 26 Nov 2014 09:54:52 +0100 Subject: [PATCH 1/9] Delete form for dynazoom and submit on 2nd click --- static/js/dynazoom.js | 28 +++++++++++++ templates/munin-serviceview.tmpl | 68 ++++++-------------------------- 2 files changed, 39 insertions(+), 57 deletions(-) diff --git a/static/js/dynazoom.js b/static/js/dynazoom.js index 53ed91f..259c941 100644 --- a/static/js/dynazoom.js +++ b/static/js/dynazoom.js @@ -123,6 +123,34 @@ function refreshZoom(query, form, image, divOverlay) { form.stop_iso8601.disabled = false; form.start_epoch.disabled = false; form.stop_epoch.disabled = false; + endZoomThenSubmit(event); + } + + // Submit catching + function endZoomThenSubmit(event) { + + //var query = $(this).attr('data-href'); + // var form = document.getElementById("zoom_form"); + // var image = document.getElementById("zoom_image"); + + + //var qs = new Querystring(query); + var src = "cgiurl_graph=" + qs.get("cgiurl_graph", "/munin-cgi/munin-cgi-graph") + + "&plugin_name=" + form.plugin_name.value + + "&start_epoch=" + form.start_epoch.value + + "&stop_epoch=" + form.stop_epoch.value + + "&rst_start_epoch=" + qs.get("start_epoch", "") + + "&rst_stop_epoch=" + qs.get("stop_epoch", "") + + "&lower_limit=" + form.lower_limit.value + + "&upper_limit=" + form.upper_limit.value + + "&size_x=" + form.size_x.value + + "&size_y=" + form.size_y.value + ; + + refreshImg(); + + //refreshZoom(src, form, image); + //return false; } function fillDate(date, default_date) { diff --git a/templates/munin-serviceview.tmpl b/templates/munin-serviceview.tmpl index 3998e46..9ba4921 100644 --- a/templates/munin-serviceview.tmpl +++ b/templates/munin-serviceview.tmpl @@ -118,62 +118,18 @@
-
- -
- -
-
-
- -
- -
-
- -
-
-
- -
- -
-
- -
-
-
- -
- -
-
- -
-
-
- -
-
- - px -
-
-
-
- - px -
-
-
-
-
+ + + + + + + + + - - + -
-
@@ -181,13 +137,11 @@
-

Zooming is very easy, it's done in 3 clicks (regular clicks, no drag&drop):

+

Zooming is very easy, it's done in 2 clicks (regular clicks, no drag&drop):

  1. Click to define the start of zoom.
  2. Click to define the ending of zoom.
    3. -
  3. Refresh.
-

You can use the interactive form too.

From dee3a351583c1996aab97f60c67229db2a34fb7b Mon Sep 17 00:00:00 2001 From: Vincent Pietri Date: Wed, 26 Nov 2014 20:15:56 +0100 Subject: [PATCH 2/9] Add select box to switch between rear and day report on the main page --- templates/munin-nodeview.tmpl | 71 +++++++++++++++++++++++++++- templates/munin-serviceview.tmpl | 79 +------------------------------ templates/partial/zoom.tmpl | 80 ++++++++++++++++++++++++++++++++ 3 files changed, 150 insertions(+), 80 deletions(-) create mode 100644 templates/partial/zoom.tmpl diff --git a/templates/munin-nodeview.tmpl b/templates/munin-nodeview.tmpl index e6e95f6..0e68af1 100644 --- a/templates/munin-nodeview.tmpl +++ b/templates/munin-nodeview.tmpl @@ -1,5 +1,14 @@ +
+ +
+