1
0
Fork 0

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

This commit is contained in:
Jan Steemann 2015-12-21 18:20:59 +01:00
commit 626efd9666
22 changed files with 193 additions and 93 deletions

View File

@ -2339,8 +2339,11 @@ window.StatisticsCollection = Backbone.Collection.extend({
}
}
var origin = window.location.href.split("/"),
preUrl = origin[0] + '//' + origin[2] + '/' + origin[3] + '/_system/' + origin[5] + '/' + origin[6] + '/';
$.ajax(
url + urlParams,
preUrl + url + urlParams,
{async: true}
).done(
function (d) {
@ -2926,6 +2929,27 @@ window.StatisticsCollection = Backbone.Collection.extend({
this.delegateEvents();
}
if ($('#accordion2')) {
$('#accordion2').bind("click", function() {
if ($('#collapseOne').is(":visible")) {
$('#collapseOne').hide();
setTimeout(function() {
$('.accordion-toggle').addClass('collapsed');
}, 100);
}
else {
$('#collapseOne').show();
setTimeout(function() {
$('.accordion-toggle').removeClass('collapsed');
}, 100);
}
});
$('#collapseOne').hide();
setTimeout(function() {
$('.accordion-toggle').addClass('collapsed');
}, 100);
}
$("#modal-dialog").modal("show");
//enable modal hotkeys after rendering is complete

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2957,6 +2957,7 @@ div .tile, div .bigtile {
height: 50px;
margin-left: 90px;
margin-top: 10px;
position: absolute;
width: 50px; }
div .tile .tile-icon, div .bigtile .tile-icon {
color: #686766;
@ -3203,7 +3204,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -114px;
width: 248px; }
width: 248px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -3388,7 +3389,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -234px;
width: 488px; }
width: 488px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -3573,7 +3574,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -354px;
width: 728px; }
width: 728px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -3756,7 +3757,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -474px;
width: 968px; }
width: 968px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -3936,7 +3937,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -594px;
width: 1208px; }
width: 1208px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -4116,7 +4117,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -714px;
width: 1448px; }
width: 1448px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -4296,7 +4297,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -834px;
width: 1688px; }
width: 1688px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -4476,7 +4477,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -954px;
width: 1928px; }
width: 1928px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -4656,7 +4657,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -1074px;
width: 2168px; }
width: 2168px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -4836,7 +4837,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -1194px;
width: 2408px; }
width: 2408px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -5016,7 +5017,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -1314px;
width: 2648px; }
width: 2648px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -5490,6 +5491,9 @@ div.headerBar {
.modal-header .close:hover, .modal-dashboard-header .close:hover {
opacity: 1; }
.select2-drop-active {
z-index: 9999999; }
.modal-body {
color: #736b68;
font-family: 'Open Sans', sans-serif !important;
@ -5961,6 +5965,7 @@ div .tile, div .bigtile {
height: 50px;
margin-left: 90px;
margin-top: 10px;
position: absolute;
width: 50px; }
div .tile .tile-icon, div .bigtile .tile-icon {
color: #686766;
@ -6433,7 +6438,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -114px;
width: 248px; }
width: 248px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -6618,7 +6623,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -234px;
width: 488px; }
width: 488px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -6803,7 +6808,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -354px;
width: 728px; }
width: 728px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -6986,7 +6991,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -474px;
width: 968px; }
width: 968px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -7166,7 +7171,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -594px;
width: 1208px; }
width: 1208px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -7346,7 +7351,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -714px;
width: 1448px; }
width: 1448px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -7526,7 +7531,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -834px;
width: 1688px; }
width: 1688px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -7706,7 +7711,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -954px;
width: 1928px; }
width: 1928px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -7886,7 +7891,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -1074px;
width: 2168px; }
width: 2168px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -8066,7 +8071,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -1194px;
width: 2408px; }
width: 2408px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -8246,7 +8251,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -1314px;
width: 2648px; }
width: 2648px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -4972,7 +4972,7 @@ ArangoDatabase.prototype._create = function (name, properties, type) {
if (properties !== undefined) {
[ "waitForSync", "journalSize", "isSystem", "isVolatile",
"doCompact", "keyOptions", "shardKeys", "numberOfShards",
"distributeShardsLike", "indexBuckets" ].forEach(function(p) {
"distributeShardsLike", "indexBuckets", "id" ].forEach(function(p) {
if (properties.hasOwnProperty(p)) {
body[p] = properties[p];
}
@ -5786,6 +5786,13 @@ ArangoQueryCursor.prototype.toString = function () {
result += ", hasMore: " + (this.hasNext() ? "true" : "false");
if (this.data.hasOwnProperty("extra") &&
this.data.extra.hasOwnProperty("warnings")) {
for (var j = 0; j < this.data.extra.warnings.length; j++) {
result += ", warning: " + this.data.extra.warnings[j].code +
" - " + this.data.extra.warnings[j].message;
}
}
result += "]";
if (!isCaptureModeActive) {
@ -8277,9 +8284,9 @@ function processQuery (query, explain) {
return variable("#" + node.name);
}
}
catch(x) {
catch (x) {
print(node);
throw(x);
throw x;
}
if (collectionVariables.hasOwnProperty(node.id)) {
@ -8319,6 +8326,10 @@ function processQuery (query, explain) {
return value(JSON.stringify(node.value));
case "object":
if (node.hasOwnProperty("subNodes")) {
if (node.subNodes.length > 20) {
// print only the first 20 values from the objects
return "{ " + node.subNodes.slice(0, 20).map(buildExpression).join(", ") + ", ... }";
}
return "{ " + node.subNodes.map(buildExpression).join(", ") + " }";
}
return "{ }";
@ -8436,7 +8447,7 @@ function processQuery (query, explain) {
}
rc += "[" + value(indexNo) + "] -> ";
rc += buildExpression(item.varAccess);
rc += " " + item.comparisonType + " ";
rc += " " + item.comparisonTypeStr + " ";
rc += buildExpression(item.compareTo);
}
}
@ -8554,9 +8565,17 @@ function processQuery (query, explain) {
}
rc += " " +
keyword("IN") + " " +
value(node.minMaxDepth) + " " + annotation("/* min..maxPathDepth */") + " " +
keyword("OUTBOUND") +
" '" + value(node.vertexId) + "' " + annotation("/* startnode */") + " ";
value(node.minMaxDepth) + " " + annotation("/* min..maxPathDepth */") + " ";
var translate = ["ANY", "INBOUND", "OUTBOUND"];
rc += keyword(translate[node.direction]);
if (node.hasOwnProperty("vertexId")) {
rc += " '" + value(node.vertexId) + "' ";
}
else {
rc += " " + variableName(node.inVariable) + " ";
}
rc += annotation("/* startnode */") + " ";
if (Array.isArray(node.graph)) {
rc += node.graph.map(function(g) { return collection(g); }).join(", ");
@ -18992,7 +19011,16 @@ GeneralArrayCursor.prototype.execute = function () {
GeneralArrayCursor.prototype._PRINT = function (context) {
var text;
text = "GeneralArrayCursor([.. " + this._documents.length + " docs .., cached: " + String(this._cached) + "])";
text = "GeneralArrayCursor([.. " + this._documents.length + " docs .., cached: " + String(this._cached);
if (this.hasOwnProperty("_extra") &&
this._extra.hasOwnProperty("warnings")) {
for (var j = 0; j < this._extra.warnings.length; j++) {
text += ", WARNING: " + this._extra.warnings[j].code +
" - " + this._extra.warnings[j].message;
}
}
text += "])";
if (this._skip !== null && this._skip !== 0) {
text += ".skip(" + this._skip + ")";

View File

@ -1,3 +1,3 @@
<script src="sharedLibs.js?version=1450195112449"></script>
<script src="libs.js?version=1450195112449"></script>
<script src="app.js?version=1450195112449"></script>
<script src="sharedLibs.js?version=1450717209249"></script>
<script src="libs.js?version=1450717209249"></script>
<script src="app.js?version=1450717209249"></script>

View File

@ -635,7 +635,7 @@
<div class="contentDiv" id="arangoCollectionsContainer">
<div id="userManagementThumbnailsIn" class="tileList">
<div class="tileList">
<div class="tile">
<div class="fullBorderBox">
<a href="#" id="createDatabase" class="add">
@ -2755,4 +2755,4 @@ var cutByResolution = function (str) {
<% }); %>
</ul>
</div>
<% } %></script></head><body><nav class="navbar"><div class="resizecontainer"><div class="navlogo"><a class="logo" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></a></div><div id="progressPlaceholderIcon"></div><div class="statmenu" id="statisticBar"></div><div class="usermenu" id="userBar" style="float:right"></div><div class="notificationmenu" id="notificationBar" style="float:right"></div><div class="navmenu" id="navigationBar"></div></div></nav><div class="centralRow resizecontainer"><div id="content" class="centralContent"></div></div><div id="modalPlaceholder"></div><div id="progressPlaceholder" style="display:none"></div><footer class="footer"><div class="resizecontainer" id="footerBar"></div></footer><div class="arangoFrame" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="sharedLibs.js?version=1450195112449"></script><script src="libs.js?version=1450195112449"></script><script src="app.js?version=1450195112449"></script></body></html>
<% } %></script></head><body><nav class="navbar"><div class="resizecontainer"><div class="navlogo"><a class="logo" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></a></div><div id="progressPlaceholderIcon"></div><div class="statmenu" id="statisticBar"></div><div class="usermenu" id="userBar" style="float:right"></div><div class="notificationmenu" id="notificationBar" style="float:right"></div><div class="navmenu" id="navigationBar"></div></div></nav><div class="centralRow resizecontainer"><div id="content" class="centralContent"></div></div><div id="modalPlaceholder"></div><div id="progressPlaceholder" style="display:none"></div><footer class="footer"><div class="resizecontainer" id="footerBar"></div></footer><div class="arangoFrame" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="sharedLibs.js?version=1450717209249"></script><script src="libs.js?version=1450717209249"></script><script src="app.js?version=1450717209249"></script></body></html>

View File

@ -684,7 +684,7 @@
<div class="contentDiv" id="arangoCollectionsContainer">
<div id="userManagementThumbnailsIn" class="tileList">
<div class="tileList">
<div class="tile">
<div class="fullBorderBox">
<a href="#" id="createDatabase" class="add">
@ -3011,9 +3011,9 @@ var cutByResolution = function (str) {
</div>
</div>
<script src="sharedLibs.js?version=1450195112449"></script>
<script src="libs.js?version=1450195112449"></script>
<script src="app.js?version=1450195112449"></script>
<script src="sharedLibs.js?version=1450717209249"></script>
<script src="libs.js?version=1450717209249"></script>
<script src="app.js?version=1450717209249"></script>
</body>
</html>

File diff suppressed because one or more lines are too long

View File

@ -2947,6 +2947,7 @@ div .tile, div .bigtile {
height: 50px;
margin-left: 90px;
margin-top: 10px;
position: absolute;
width: 50px; }
div .tile .tile-icon, div .bigtile .tile-icon {
color: #686766;
@ -3193,7 +3194,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -114px;
width: 248px; }
width: 248px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -3378,7 +3379,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -234px;
width: 488px; }
width: 488px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -3563,7 +3564,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -354px;
width: 728px; }
width: 728px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -3746,7 +3747,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -474px;
width: 968px; }
width: 968px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -3926,7 +3927,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -594px;
width: 1208px; }
width: 1208px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -4106,7 +4107,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -714px;
width: 1448px; }
width: 1448px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -4286,7 +4287,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -834px;
width: 1688px; }
width: 1688px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -4466,7 +4467,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -954px;
width: 1928px; }
width: 1928px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -4646,7 +4647,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -1074px;
width: 2168px; }
width: 2168px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -4826,7 +4827,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -1194px;
width: 2408px; }
width: 2408px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -5006,7 +5007,7 @@ div .bigtile {
bottom: 12.1% !important;
left: 50%;
margin-left: -1314px;
width: 2648px; }
width: 2648px !important; }
.modal-chart-detail .modal-body {
height: 95%;
max-height: none;
@ -5480,6 +5481,9 @@ div.headerBar {
.modal-header .close:hover, .modal-dashboard-header .close:hover {
opacity: 1; }
.select2-drop-active {
z-index: 9999999; }
.modal-body {
color: #736b68;
font-family: 'Open Sans', sans-serif !important;
@ -6831,6 +6835,9 @@ toolbar {
.accordion-group {
border: 0; }
.accordion-body {
height: auto !important; }
.accordion-heading a {
border: 1px solid #ccc;
color: #000;