Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2012-09-17 13:32:36 +02:00
parent f4adf94748 a213856b2e
commit 6fa5f0fdc1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/admin/css/layout.css
View File

@ -79,7 +79,7 @@ img.externalLink {
.placeholderBox, .placeholderBoxSettings {
margin-left: 7px;
margin-right: 7px;
margin-right: 20px;
margin-top: 7px;
margin-bottom: 20px;
font-size: 0.8em;

5
html/admin/js/master.js
View File

@ -2531,6 +2531,7 @@ function drawConnections (placeholder, granularity) {
},
xaxis: {
mode: "time",
timeformat: "%h:%M",
twelveHourClock: false
},
//crosshair: { mode: "x" },
@ -2617,7 +2618,7 @@ function drawRequests (placeholder, granularity) {
arraySent.push([data.start[i]*1000,data.bytesSent.mean[i]]);
arrayReceived.push([data.start[i]*1000,data.bytesReceived.mean[i]]);
}
var stack = 0, bars = true, lines = true, steps = true;
var stack = 0, bars = false, lines = false, steps = false;
var options = {
legend: {
show: true,
@ -2626,7 +2627,6 @@ function drawRequests (placeholder, granularity) {
backgroundOpacity: 0.4
},
series: {
stack: stack,
lines: { show: true,
steps: false,
fill: true,
@ -2636,6 +2636,7 @@ function drawRequests (placeholder, granularity) {
},
xaxis: {
mode: "time",
timeformat: "%h:%M",
twelveHourClock: false
},
//crosshair: { mode: "x" },