diff --git a/static/css/style-munstrap.css b/static/css/style-munstrap.css index 474ac39..ab8690a 100644 --- a/static/css/style-munstrap.css +++ b/static/css/style-munstrap.css @@ -23,11 +23,12 @@ img#zoom_image{ margin-bottom: 15px; } -.link-domain { + +.link-domain a.link-domain:link a.link-domain:visited a.link-domain:hover a.link-domain:focus { font-size: 1.4em; color: #660066; } -.link-host { +.link-host a.link-host:link a.link-host:visited a.link-host:hover a.link-host:focus { font-size: 1.1em; color: #800080; } @@ -42,3 +43,52 @@ ul.groupview, ul.groupview ul { display: block; float: left; } + +#category-period { + padding-right: 4px; + padding-left: 4px; +} + +.tab-title { + text-transform: capitalize; +} + +.comparison { + text-transform: capitalize; +} + +.badge-error { + background-color: #b94a48; +} +.badge-error:hover { + background-color: #953b39; +} +.badge-warning { + background-color: #f89406; +} +.badge-warning:hover { + background-color: #c67605; +} +.badge-success { + background-color: #468847; +} +.badge-success:hover { + background-color: #356635; +} +.badge-info { + background-color: #3a87ad; +} +.badge-info:hover { + background-color: #2d6987; +} +.badge-inverse { + background-color: #333333; +} +.badge-inverse:hover { + background-color: #1a1a1a; +} + +.div-home-badges { + display:inline; + white-space: nowrap; +} diff --git a/static/js/dynazoom.js b/static/js/dynazoom.js index 53ed91f..d8250aa 100644 --- a/static/js/dynazoom.js +++ b/static/js/dynazoom.js @@ -1,31 +1,49 @@ -function refreshZoom(query, form, image, divOverlay) { - //INIT - var qs = new Querystring(query); - init(); - - var scale = refreshImg(); - var start_epoch = (+qs.get("rst_start_epoch", form.start_epoch.value)); - var stop_epoch = (+qs.get("rst_stop_epoch", form.stop_epoch.value)); - var initial_left; - var initial_top; - - //form.btnMaj.onclick = majDates; - form.plugin_name.onblur = refreshImg; - form.start_iso8601.onblur = majDates; - form.stop_iso8601.onblur = majDates; - form.start_epoch.onblur = refreshImg; - form.stop_epoch.onblur = refreshImg; - form.lower_limit.onblur = refreshImg; - form.upper_limit.onblur = refreshImg; - form.size_x.onblur = refreshImg; - form.size_y.onblur = refreshImg; - form.btnReset.onclick = reset; - - // Sets the onClick handler - image.onclick = click; - var clickCounter = 0; +function popupGraph(img) { + + var query = img.attr('data-href'); + var qs = new Querystring(query); + + var form = document.getElementById("zoom_form"); + var image = document.getElementById("zoom_image"); + + var start_epoch = (+qs.get("rst_start_epoch", form.start_epoch.value)); + var stop_epoch = (+qs.get("rst_stop_epoch", form.stop_epoch.value)); + + var scale; + + var initial_left; + var initial_top; + + var clickCounter = 0; + + // Sets the onBlur handler + form.plugin_name.onblur = refreshImg; + form.start_iso8601.onblur = majDates; + form.stop_iso8601.onblur = majDates; + form.start_epoch.onblur = refreshImg; + form.stop_epoch.onblur = refreshImg; + form.lower_limit.onblur = refreshImg; + form.upper_limit.onblur = refreshImg; + form.size_x.onblur = refreshImg; + form.size_y.onblur = refreshImg; + form.btnReset.onclick = reset; + + // Sets the onClick handler + image.onclick = click; + + refreshZoom(query, form, image); + + var reset_start_epoch = form.start_epoch.value; + var reset_stop_epoch = form.stop_epoch.value; + + $('#zoom').modal('show'); + + //FUNCTIONS + + + function init(){ form.plugin_name.value = qs.get("plugin_name", "localdomain/localhost.localdomain/if_eth0"); form.start_epoch.value = qs.get("start_epoch", "1236561663"); @@ -34,16 +52,33 @@ function refreshZoom(query, form, image, divOverlay) { form.upper_limit.value = qs.get("upper_limit", ""); form.size_x.value = qs.get("size_x", ""); form.size_y.value = qs.get("size_y", ""); - + updateStartStop(); } + + function refreshZoom(query, form, image) { + qs = new Querystring(query); + + init(); + + start_epoch = +form.start_epoch.value; + stop_epoch = +form.stop_epoch.value; + scale = refreshImg(); + + clickCounter = 0; + } + function reset(event){ init(); //Can be not the initial ones in case of manual refresh - form.start_epoch.value = start_epoch; - form.stop_epoch.value = stop_epoch; + form.start_epoch.value = reset_start_epoch; + form.stop_epoch.value = reset_stop_epoch; + + start_epoch = (+qs.get("rst_start_epoch", form.start_epoch.value)); + stop_epoch = (+qs.get("rst_stop_epoch", form.stop_epoch.value)); + updateStartStop(); //Redraw @@ -123,6 +158,24 @@ 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 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", form.start_epoch.value) + + "&rst_stop_epoch=" + qs.get("stop_epoch", form.stop_epoch.value) + + "&lower_limit=" + form.lower_limit.value + + "&upper_limit=" + form.upper_limit.value + + "&size_x=" + form.size_x.value + + "&size_y=" + form.size_y.value + ; + refreshZoom(src, form, image); } function fillDate(date, default_date) { @@ -158,7 +211,7 @@ function refreshZoom(query, form, image, divOverlay) { break; case 1: endZoom(event); - break; + break; } } @@ -195,4 +248,4 @@ function refreshZoom(query, form, image, divOverlay) { posY = posY - imgPos[1]; return [ posX, posY ]; } -}; +}; \ No newline at end of file diff --git a/templates/munin-comparison-day.tmpl b/templates/munin-comparison-day.tmpl index 99fae00..8704e25 100644 --- a/templates/munin-comparison-day.tmpl +++ b/templates/munin-comparison-day.tmpl @@ -1,32 +1,61 @@

Comparison: day

- -

">

- -
- -
- /index.html"> - - class="warn" - class="crit" href="/"> + + + +
+ + + +
in active" id=""> + + +
+ +
+ /index.html"> + + class="warn" + class="crit" href="/"> + + + + +
+ /"> + " alt="" + class="img-responsive i warn crit" + width="" + height=""/> + - - - -
- /"> - " alt="" - class="img-responsive i warn crit" - width="" - height=""/> - - +
+
+
+ - + +
+ diff --git a/templates/munin-comparison-month.tmpl b/templates/munin-comparison-month.tmpl index 96be02a..613e136 100644 --- a/templates/munin-comparison-month.tmpl +++ b/templates/munin-comparison-month.tmpl @@ -1,32 +1,60 @@

Comparison: month

- -

">

- -
- -
- /index.html"> - - class="warn" - class="crit" href="/"> + + + +
+ + + +
in active" id=""> + + +
+ +
+ /index.html"> + + class="warn" + class="crit" href="/"> + + + + +
+ /"> + " alt="" + class="img-responsive i warn crit" + width="" + height=""/> + - - - -
- /"> - " alt="" - class="img-responsive i warn crit" - width="" - height=""/> - - +
+
+
+ - + +
diff --git a/templates/munin-comparison-week.tmpl b/templates/munin-comparison-week.tmpl index 5fec1b1..6d24696 100644 --- a/templates/munin-comparison-week.tmpl +++ b/templates/munin-comparison-week.tmpl @@ -1,33 +1,61 @@

Comparison: week

- -

">

- -
- -
- /index.html"> - - class="warn" - class="crit" href="/"> + + + +
+ + + +
in active" id=""> + + +
+ +
+ /index.html"> + + class="warn" + class="crit" href="/"> + + + + +
+ /"> + " alt="" + class="img-responsive i warn crit" + width="" + height=""/> + - - - -
- /"> - " alt="" - class="img-responsive i warn crit" - width="" - height=""/> - - +
+
+
+ - + +
diff --git a/templates/munin-comparison-year.tmpl b/templates/munin-comparison-year.tmpl index b0c2daa..8395953 100644 --- a/templates/munin-comparison-year.tmpl +++ b/templates/munin-comparison-year.tmpl @@ -1,32 +1,60 @@

Comparison: week

- -

">

- -
- -
- /index.html"> - - class="warn" - class="crit" href="/"> + + + +
+ + + +
in active" id=""> + + +
+ +
+ /index.html"> + + class="warn" + class="crit" href="/"> + + + + +
+ /"> + " alt="" + class="img-responsive i warn crit" + width="" + height=""/> + - - - -
- /"> - " alt="" - class="img-responsive i warn crit" - width="" - height=""/> - - +
+
+
+ - + +
\ No newline at end of file diff --git a/templates/munin-nodeview.tmpl b/templates/munin-nodeview.tmpl index e6e95f6..b2a461a 100644 --- a/templates/munin-nodeview.tmpl +++ b/templates/munin-nodeview.tmpl @@ -1,6 +1,15 @@ -
+ + + + diff --git a/templates/munin-overview.tmpl b/templates/munin-overview.tmpl index 3e754d5..a29ee49 100644 --- a/templates/munin-overview.tmpl +++ b/templates/munin-overview.tmpl @@ -16,66 +16,82 @@
  • class="last"> - " class="link-domain"> - [ - //comparison-day.html">day - //comparison-week.html">week - //comparison-month.html">month - //comparison-year.html">year ] + " class="btn link-domain"> + +
    + //comparison-day.html" title="Comparison in a day">day + //comparison-week.html" title="Comparison in a week">week + //comparison-month.html" title="Comparison in a month">month + //comparison-year.html" title="Comparison in a year">year +
    - [ - - class="text-warning" class="text-critical" href=""> - ] + +
    + + ">badge-warning badge-error "> + +