diff options
| -rw-r--r-- | htdocs/cropper/smokeping-zoom.js | 17 | ||||
| -rw-r--r-- | lib/Smokeping.pm | 14 |
2 files changed, 16 insertions, 15 deletions
diff --git a/htdocs/cropper/smokeping-zoom.js b/htdocs/cropper/smokeping-zoom.js index 70a460c..5947a01 100644 --- a/htdocs/cropper/smokeping-zoom.js +++ b/htdocs/cropper/smokeping-zoom.js @@ -71,14 +71,15 @@ var EndDateString = 0; function changeRRDImage(coords,dimensions){ - var RRDLeftDiff = 50; // difference between left border of RRD image and content - var RRDRightDiff = 30; // difference between right border of RRD image and content - var RRDImgWidth = 697; // Width of the Smokeping RRD Graphik - var RRDImgUsable = 596; // 598 = 697 - 68 - 33; var mySelectLeft = coords.x1; var mySelectRight = coords.x2; if (mySelectLeft == mySelectRight) return; // abort if nothing is selected. + var RRDLeft = 67; // difference between left border of RRD image and content + var RRDRight = 26; // difference between right border of RRD image and content + var RRDImgWidth = $('zoom').getDimensions().width; // Width of the Smokeping RRD Graphik + var RRDImgUsable = RRDImgWidth - RRDRight - RRDLeft; + myURLObj = new urlObj(document.URL); // parse start and stop parameter from URL @@ -99,8 +100,8 @@ function changeRRDImage(coords,dimensions){ var mySerial = mySerialDate.getTime(); // Generate Selected Range in Unix Timestamps - var genStart = myParsedStartEpoch + (((mySelectLeft - RRDLeftDiff) / RRDImgUsable ) * myParsedDivEpoch); - var genStop = myParsedStartEpoch + (((mySelectRight - RRDLeftDiff) / RRDImgUsable ) * myParsedDivEpoch); + var genStart = myParsedStartEpoch + (((mySelectLeft - RRDLeft) / RRDImgUsable ) * myParsedDivEpoch); + var genStop = myParsedStartEpoch + (((mySelectRight - RRDLeft) / RRDImgUsable ) * myParsedDivEpoch); var floorGenStart = Math.floor(genStart); var floorGenStop = Math.floor(genStop); @@ -127,8 +128,8 @@ Event.observe( myCropper = new Cropper.Img( 'zoom', { - minHeight: 321, - maxHeight: 321, + minHeight: $('zoom').getDimensions().height, + maxHeight: $('zoom').getDimensions().height, onEndCrop: changeRRDImage } ) diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm index 3e66ce5..ab1ab5e 100644 --- a/lib/Smokeping.pm +++ b/lib/Smokeping.pm @@ -672,12 +672,12 @@ sub get_overview ($$$$){ keys %$tree) { my @slaves = (""); - if ($tree->{$prop}{slaves}){ - push @slaves, split /\s+/,$tree->{$prop}{slaves}; - } - elsif ($tree->{$prop}{host} =~ m|^/|){ # multi host syntax + if ($tree->{$prop}{host} =~ m|^/|){ # multi host syntax @slaves = split /\s+/, $tree->{$prop}{host}; } + elsif ($tree->{$prop}{slaves}){ + push @slaves, split /\s+/,$tree->{$prop}{slaves}; + } my @G; #Graph 'script' my $max = $cfg->{Presentation}{overview}{max_rtt} || "100000"; @@ -710,7 +710,7 @@ sub get_overview ($$$$){ $rrd = $cfg->{General}{datadir}.$dir.'/'.$prop.$s.'.rrd'; $medc = $slave ? $cfg->{Slaves}{$slave}{color} : ($cfg->{Presentation}{overview}{median_color} || shift @colors); if ($#slaves > 0){ - $label = sprintf("%-20s","median RTT from ".($slave ? $cfg->{Slaves}{$slave}{display_name} : $cfg->{General}{display_name} || hostname)); + $label = sprintf("%-25s","median RTT from ".($slave ? $cfg->{Slaves}{$slave}{display_name} : $cfg->{General}{display_name} || hostname)); } else { $label = "med RTT" @@ -868,7 +868,7 @@ sub get_detail ($$$$;$){ return "" unless $tree->{host}; my @dirs = @{$open}; - my $file = (split(/~/, pop @dirs))[0]; + my $file = $mode eq 'c' ? (split(/~/, pop @dirs))[0] : pop @dirs; my $dir = ""; return "<div>ERROR: ".(join ".", @dirs)." has no probe defined</div>" @@ -1395,7 +1395,7 @@ sub display_webpage($$){ title => $charts ? "" : $tree->{title}, remark => $charts ? "" : ($tree->{remark} || ''), - overview => $charts ? get_charts($cfg,$q,$open) : get_overview( $cfg,$q,$tree,$open ), + overview => $charts ? get_charts($cfg,$q,$open) : get_overview( $cfg,$q,$tree,$open), body => $charts ? "" : get_detail( $cfg,$q,$tree,$open_orig ), target_ip => $charts ? "" : ($tree->{host} || ''), owner => $cfg->{General}{owner}, |