1
0
Fork 0

grunt build

This commit is contained in:
hkernbach 2016-05-19 17:44:56 +02:00
parent 4578cd87ec
commit a8ef644792
16 changed files with 200 additions and 340 deletions

View File

@ -10350,7 +10350,7 @@ function GraphViewer(svg, width, height, adapterConfig, config) {
}
/*jshint unused: false */
/*global window, $, document, _ */
/*global window, $, document, _, arangoHelper, frontendConfig */
(function() {
"use strict";
@ -10483,19 +10483,14 @@ function GraphViewer(svg, width, height, adapterConfig, config) {
},
currentDatabase: function (callback) {
$.ajax({
type: "GET",
cache: false,
url: this.databaseUrl("/_api/database/current"),
contentType: "application/json",
processData: false,
success: function(data) {
callback(false, data.result.name);
},
error: function(data) {
callback(true, data);
}
});
if (frontendConfig.db) {
callback(false, frontendConfig.db);
}
else {
callback(true, undefined);
}
console.log(frontendConfig.db);
return frontendConfig.db;
},
allHotkeys: {
@ -10852,6 +10847,7 @@ function GraphViewer(svg, width, height, adapterConfig, config) {
}
},
error: function(data) {
console.log("error");
if (callback) {
callback(true, data);
}
@ -11028,8 +11024,8 @@ function GraphViewer(svg, width, height, adapterConfig, config) {
if (!databaseName) {
databaseName = '_system';
if (window.App && window.currentDB && window.currentDB.name) {
databaseName = window.App.currentDB.name;
if (frontendConfig.db) {
databaseName = frontendConfig.db;
}
}
return this.backendUrl("/_db/" + encodeURIComponent(databaseName) + url);
@ -11398,7 +11394,7 @@ function GraphViewer(svg, width, height, adapterConfig, config) {
$.ajax({
type: "GET",
cache: false,
url: arangoHelper.databaseHelper("/_api/collection/" + this.get("id") + "/figures"),
url: arangoHelper.databaseUrl("/_api/collection/" + this.get("id") + "/figures"),
contentType: "application/json",
processData: false,
success: function(data) {
@ -11606,7 +11602,7 @@ function GraphViewer(svg, width, height, adapterConfig, config) {
});
}());
/*global window, Backbone */
/*global window, Backbone, arangoHelper */
window.DatabaseModel = Backbone.Model.extend({
@ -11673,7 +11669,7 @@ window.arangoDocumentModel = Backbone.Model.extend({
}
});
/*global window, Backbone */
/*global window, Backbone, arangoHelper */
(function () {
'use strict';
window.ArangoQuery = Backbone.Model.extend({
@ -11732,7 +11728,7 @@ window.StatisticsDescription = Backbone.Model.extend({
});
/*jshint strict: false */
/*global Backbone, $, window */
/*global Backbone, $, window, arangoHelper */
window.Users = Backbone.Model.extend({
defaults: {
user: "",
@ -11888,13 +11884,13 @@ window.Users = Backbone.Model.extend({
});
}());
/*global Backbone, window */
/*global Backbone, window, arangoHelper, frontendConfig */
(function() {
"use strict";
window.CurrentDatabase = Backbone.Model.extend({
url: arangoHelper.databaseUrl("/_api/database/current"),
url: arangoHelper.databaseUrl("/_api/database/current", frontendConfig.db),
parse: function(data) {
return data.result;
@ -12057,7 +12053,7 @@ window.Users = Backbone.Model.extend({
});
}());
/*global window, Backbone, $ */
/*global window, Backbone, $, arangoHelper */
(function() {
"use strict";
@ -13249,7 +13245,7 @@ window.arangoDocument = Backbone.Collection.extend({
/*jshint browser: true */
/*jshint unused: false */
/*global window, $, _, databaseUrl */
/*global window, $, _, databaseUrl, arangoHelper */
(function () {
"use strict";
@ -13494,7 +13490,7 @@ window.StatisticsDescriptionCollection = Backbone.Collection.extend({
/*jshint browser: true */
/*jshint strict: false, unused: false */
/*global window, Backbone, $,_, window */
/*global window, Backbone, $,_, window, frontendConfig */
window.ArangoUsers = Backbone.Collection.extend({
model: window.Users,
@ -14026,7 +14022,7 @@ window.ArangoUsers = Backbone.Collection.extend({
/*jshint browser: true */
/*jshint unused: false */
/*global window, Backbone, $, arangoHelper */
/*global window, Backbone, $, arangoHelper, frontendConfig */
(function () {
"use strict";
@ -14090,7 +14086,7 @@ window.ArangoUsers = Backbone.Collection.extend({
/*jshint browser: true */
/*jshint unused: false */
/*global window, Backbone, $ */
/*global window, Backbone, $, frontendConfig */
(function() {
"use strict";
window.QueryManagementActive = Backbone.Collection.extend({
@ -16873,7 +16869,7 @@ window.ArangoUsers = Backbone.Collection.extend({
/*jshint browser: true */
/*jshint unused: false */
/*global Backbone, EJS, $, flush, window, arangoHelper, nv, d3, localStorage*/
/*global document, console, Dygraph, _,templateEngine */
/*global document, console, frontendConfig, Dygraph, _,templateEngine */
(function () {
"use strict";
@ -17829,7 +17825,7 @@ window.ArangoUsers = Backbone.Collection.extend({
$(this.el).html(this.template.render());
}
if (!enabled) {
if (!enabled || frontendConfig.db !== '_system') {
$(this.el).html('');
if (this.server) {
$(this.el).append(
@ -17869,6 +17865,11 @@ window.ArangoUsers = Backbone.Collection.extend({
);
}.bind(this);
if (frontendConfig.db !== '_system') {
errorFunction();
return;
}
var callback2 = function(error, authorized) {
if (!error) {
if (!authorized) {
@ -17880,13 +17881,21 @@ window.ArangoUsers = Backbone.Collection.extend({
}
}.bind(this);
if (window.App.currentDB.get("name") !== '_system') {
errorFunction();
return;
if (window.App.currentDB.get("name") === undefined) {
window.setTimeout(function() {
if (window.App.currentDB.get("name") !== '_system') {
errorFunction();
return;
}
//check if user has _system permission
this.options.database.hasSystemAccess(callback2);
}.bind(this), 300);
}
else {
//check if user has _system permission
this.options.database.hasSystemAccess(callback2);
}
//check if user has _system permission
this.options.database.hasSystemAccess(callback2);
}
});
}());
@ -18665,7 +18674,6 @@ window.ArangoUsers = Backbone.Collection.extend({
breadcrumb: function () {
var name = window.location.hash.split("/");
console.log(name);
$('#subNavigationBar .breadcrumb').html(
'<a href="#collection/' + name[1] + '/documents/1">Collection: ' + name[1] + '</a>' +
'<i class="fa fa-chevron-right"></i>' +
@ -19935,7 +19943,7 @@ window.ArangoUsers = Backbone.Collection.extend({
$.ajax({
type: "GET",
cache: false,
url: arangoHelper.databaseUrl("/_api/database/current?wurst=1"),
url: arangoHelper.databaseUrl("/_api/database/current"),
contentType: "application/json",
processData: false,
async: true,
@ -21774,7 +21782,7 @@ window.ArangoUsers = Backbone.Collection.extend({
/*jshint browser: true */
/*jshint unused: false */
/*global Backbone, document, EJS, _, arangoHelper, window, setTimeout, $, templateEngine*/
/*global Backbone, document, EJS, _, arangoHelper, window, setTimeout, $, templateEngine, frontendConfig*/
(function() {
"use strict";
@ -21794,13 +21802,42 @@ window.ArangoUsers = Backbone.Collection.extend({
template: templateEngine.createTemplate("loginView.ejs"),
render: function() {
render: function(loggedIn) {
var self = this;
$(this.el).html(this.template.render({}));
$(this.el2).hide();
$(this.el3).hide();
$('.bodyWrapper').show();
$('#loginUsername').focus();
if (frontendConfig.authenticationEnabled && loggedIn !== true) {
$('#loginUsername').focus();
}
else {
var url = arangoHelper.databaseUrl("/_api/database/user");
if (frontendConfig.authenticationEnabled === false) {
$('#logout').hide();
$('.login-window #databases').css('height', '90px');
}
$('#loginForm').hide();
$('.login-window #databases').show();
$.ajax(url).success(function(data) {
//enable db select and login button
$('#loginDatabase').html('');
//fill select with allowed dbs
_.each(data.result, function(db) {
$('#loginDatabase').append(
'<option>' + db + '</option>'
);
});
self.renderDBS();
});
}
$('.bodyWrapper').show();
return this;
},
@ -21843,10 +21880,16 @@ window.ArangoUsers = Backbone.Collection.extend({
);
}
else {
var url = arangoHelper.databaseUrl("/_api/database/user", '_system');
if (frontendConfig.authenticationEnabled === false) {
url = arangoHelper.databaseUrl("/_api/database/user");
}
$('.wrong-credentials').hide();
self.loggedIn = true;
//get list of allowed dbs
$.ajax(arangoHelper.databaseUrl("/_api/database/user")).success(function(data) {
$.ajax(url).success(function(data) {
$('#loginForm').hide();
$('#databases').show();
@ -21882,6 +21925,9 @@ window.ArangoUsers = Backbone.Collection.extend({
e.preventDefault();
var username = $('#loginUsername').val();
var database = $('#loginDatabase').val();
console.log(window.App.dbSet);
window.App.dbSet = database;
console.log(window.App.dbSet);
var callback2 = function(error) {
if (error) {
@ -22570,6 +22616,10 @@ window.ArangoUsers = Backbone.Collection.extend({
renderFirst: true,
activeSubMenu: undefined,
changeDB: function() {
window.location.hash = '#login';
},
initialize: function (options) {
var self = this;
@ -22646,6 +22696,10 @@ window.ArangoUsers = Backbone.Collection.extend({
$('.arangodbLogo').on('click', function() {
self.selectMenuItem();
});
$('#dbStatus').on('click', function() {
self.changeDB();
});
}
return this;
@ -28622,7 +28676,7 @@ window.ArangoUsers = Backbone.Collection.extend({
/*jshint browser: true */
/*jshint unused: false */
/*global arangoHelper, Backbone, templateEngine, $, window*/
/*global frontendConfig, arangoHelper, Backbone, templateEngine, $, window*/
(function () {
"use strict";
@ -28633,6 +28687,7 @@ window.ArangoUsers = Backbone.Collection.extend({
"click .tab" : "navigateByTab",
"mouseenter .dropdown" : "showDropdown",
"mouseleave .dropdown" : "hideDropdown",
"click #userLogoutIcon" : "userLogout",
"click #userLogout" : "userLogout"
},
@ -28675,6 +28730,11 @@ window.ArangoUsers = Backbone.Collection.extend({
},
render: function () {
if (frontendConfig.authenticationEnabled === false) {
return;
}
var self = this;
var callback = function(error, username) {
@ -28740,7 +28800,7 @@ window.ArangoUsers = Backbone.Collection.extend({
/*jshint browser: true */
/*jshint unused: false */
/*global _, window, document, Backbone, EJS, SwaggerUi, hljs, $, arangoHelper, templateEngine,
/*global frontendConfig, _, window, document, Backbone, EJS, SwaggerUi, hljs, $, arangoHelper, templateEngine,
CryptoJS, Joi */
(function() {
@ -28777,11 +28837,13 @@ window.ArangoUsers = Backbone.Collection.extend({
initialize: function() {
var self = this,
callback = function(error, user) {
if (error || user === null) {
arangoHelper.arangoError("User", "Could not fetch user data");
}
else {
this.currentUser = this.collection.findWhere({user: user});
if (frontendConfig.authenticationEnabled === true) {
if (error || user === null) {
arangoHelper.arangoError("User", "Could not fetch user data");
}
else {
this.currentUser = this.collection.findWhere({user: user});
}
}
}.bind(this);
@ -29422,7 +29484,7 @@ window.ArangoUsers = Backbone.Collection.extend({
/*jshint unused: false */
/*global window, $, Backbone, document, arangoCollectionModel*/
/*global arangoHelper, btoa, dashboardView, arangoDatabase, _*/
/*global arangoHelper, btoa, dashboardView, arangoDatabase, _, frontendConfig */
(function () {
"use strict";
@ -29476,26 +29538,45 @@ window.ArangoUsers = Backbone.Collection.extend({
},
checkUser: function () {
if (window.location.hash === '#login') {
return;
}
var startInit = function() {
this.initOnce();
//show hidden by default divs
$('.bodyWrapper').show();
$('.navbar').show();
}.bind(this);
var callback = function(error, user) {
if (error || user === null) {
if (window.location.hash !== '#login') {
this.navigate("login", {trigger: true});
if (frontendConfig.authenticationEnabled) {
if (error || user === null) {
if (window.location.hash !== '#login') {
this.navigate("login", {trigger: true});
}
}
else {
startInit();
}
}
else {
this.initOnce();
//show hidden by default divs
$('.bodyWrapper').show();
$('.navbar').show();
startInit();
}
}.bind(this);
this.userCollection.whoAmI(callback);
if (frontendConfig.authenticationEnabled) {
this.userCollection.whoAmI(callback);
}
else {
this.initOnce();
//show hidden by default divs
$('.bodyWrapper').show();
$('.navbar').show();
}
},
waitForInit: function(origin, param1, param2) {
@ -29510,7 +29591,7 @@ window.ArangoUsers = Backbone.Collection.extend({
if (param1 && param2) {
origin(param1, param2, false);
}
}, 250);
}, 350);
} else {
if (!param1) {
origin(true);
@ -29545,7 +29626,7 @@ window.ArangoUsers = Backbone.Collection.extend({
var callback = function(error, isCoordinator) {
self = this;
if (isCoordinator) {
if (isCoordinator === true) {
self.isCluster = true;
self.coordinatorCollection.fetch({
@ -29631,11 +29712,11 @@ window.ArangoUsers = Backbone.Collection.extend({
cluster: function (initialized) {
this.checkUser();
if (!initialized || this.isCluster === undefined) {
if (!initialized) {
this.waitForInit(this.cluster.bind(this));
return;
}
if (this.isCluster === false) {
if (this.isCluster === false || this.isCluster === undefined) {
if (this.currentDB.get("name") === '_system') {
this.routes[""] = 'dashboard';
this.navigate("#dashboard", {trigger: true});
@ -29831,16 +29912,16 @@ window.ArangoUsers = Backbone.Collection.extend({
login: function () {
var callback = function(error, user) {
if (!this.loginView) {
this.loginView = new window.loginView({
collection: this.userCollection
});
}
if (error || user === null) {
if (!this.loginView) {
this.loginView = new window.loginView({
collection: this.userCollection
});
}
this.loginView.render();
}
else {
this.navigate("", {trigger: true});
this.loginView.render(true);
}
}.bind(this);
@ -30250,7 +30331,7 @@ window.ArangoUsers = Backbone.Collection.extend({
}());
/*jshint unused: false */
/*global $, window, navigator, _*/
/*global $, window, navigator, _, arangoHelper*/
(function() {
"use strict";

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -6941,223 +6941,6 @@ disabled look for disabled choices in the results dropdown
}
/*
* Table
*/
table.dataTable {
margin: 0 auto;
clear: both;
width: 100%;
}
table.dataTable thead th {
padding: 3px 18px 3px 10px;
border-bottom: 1px solid black;
font-weight: bold;
cursor: pointer;
}
table.dataTable tfoot th {
padding: 3px 18px 3px 10px;
border-top: 1px solid black;
font-weight: bold;
}
table.dataTable td {
padding: 3px 10px;
}
table.dataTable td.center,
table.dataTable td.dataTables_empty {
text-align: center;
}
table.dataTable tr.odd { background-color: #E2E4FF; }
table.dataTable tr.even { background-color: white; }
table.dataTable tr.odd td.sorting_1 { background-color: #D3D6FF; }
table.dataTable tr.odd td.sorting_2 { background-color: #DADCFF; }
table.dataTable tr.odd td.sorting_3 { background-color: #E0E2FF; }
table.dataTable tr.even td.sorting_1 { background-color: #EAEBFF; }
table.dataTable tr.even td.sorting_2 { background-color: #F2F3FF; }
table.dataTable tr.even td.sorting_3 { background-color: #F9F9FF; }
/*
* Table wrapper
*/
.dataTables_wrapper {
position: relative;
clear: both;
}
/*
* Page length menu
*/
.dataTables_length {
float: left;
}
/*
* Filter
*/
.dataTables_filter {
float: right;
text-align: right;
}
/*
* Table information
*/
.dataTables_info {
clear: both;
float: left;
}
/*
* Pagination
*/
.dataTables_paginate {
float: right;
text-align: right;
}
/* Two button pagination - previous / next */
.paginate_disabled_previous,
.paginate_enabled_previous,
.paginate_disabled_next,
.paginate_enabled_next {
height: 19px;
float: left;
cursor: pointer;
color: #111 !important;
}
.paginate_disabled_previous:hover,
.paginate_enabled_previous:hover,
.paginate_disabled_next:hover,
.paginate_enabled_next:hover {
text-decoration: none !important;
}
.paginate_disabled_previous:active,
.paginate_enabled_previous:active,
.paginate_disabled_next:active,
.paginate_enabled_next:active {
outline: none;
}
.paginate_disabled_previous,
.paginate_disabled_next {
color: #666 !important;
}
.paginate_disabled_previous,
.paginate_enabled_previous {
padding-left: 23px;
}
.paginate_disabled_next,
.paginate_enabled_next {
padding-right: 23px;
margin-left: 10px;
}
.paginate_enabled_previous { background: url('../img/back_enabled.png') no-repeat top left; }
.paginate_enabled_previous:hover { background: url('../img/back_enabled_hover.png') no-repeat top left; }
.paginate_disabled_previous { background: url('../img/back_disabled.png') no-repeat top left; }
.paginate_enabled_next { background: url('../img/forward_enabled.png') no-repeat top right; }
.paginate_enabled_next:hover { background: url('../img/forward_enabled_hover.png') no-repeat top right; }
.paginate_disabled_next { background: url('../img/forward_disabled.png') no-repeat top right; }
/* Full number pagination */
.paging_full_numbers {
height: 22px;
line-height: 22px;
}
.paging_full_numbers a:active {
outline: none
}
.paging_full_numbers a:hover {
text-decoration: none;
}
.paging_full_numbers a.paginate_button,
.paging_full_numbers a.paginate_active {
border: 1px solid #aaa;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
padding: 2px 5px;
margin: 0 3px;
cursor: pointer;
color: #333 !important;
}
.paging_full_numbers a.paginate_button {
background-color: #ddd;
}
.paging_full_numbers a.paginate_button:hover {
background-color: #ccc;
text-decoration: none !important;
}
.paging_full_numbers a.paginate_active {
background-color: #99B3FF;
}
/*
* Processing indicator
*/
.dataTables_processing {
position: absolute;
top: 50%;
left: 50%;
width: 250px;
height: 30px;
margin-left: -125px;
margin-top: -15px;
padding: 14px 0 2px 0;
border: 1px solid #ddd;
text-align: center;
color: #999;
font-size: 14px;
background-color: white;
}
/*
* Sorting
*/
.sorting { background: url('../img/sort_both.png') no-repeat center right; }
.sorting_asc { background: url('../img/sort_asc.png') no-repeat center right; }
.sorting_desc { background: url('../img/sort_desc.png') no-repeat center right; }
.sorting_asc_disabled { background: url('../img/sort_asc_disabled.png') no-repeat center right; }
.sorting_desc_disabled { background: url('../img/sort_desc_disabled.png') no-repeat center right; }
table.dataTable thead th:active,
table.dataTable thead td:active {
outline: none;
}
/*
* Scrolling
*/
.dataTables_scroll {
clear: both;
}
.dataTables_scrollBody {
-webkit-overflow-scrolling: touch;
}
/********************
* HTML CSS
*/

View File

@ -2428,6 +2428,7 @@ if (list.length > 0) {
<% if (coords.length > 0) { %>
<% var disabled = ''; %>
<% var genClass = "pure-u-1-" + Object.keys(coords[0]).length; %>
<% if (type !== 'coordinator') { %>
@ -2441,11 +2442,7 @@ if (list.length > 0) {
<div class="<%= genClass %> mid">Name</div>
<div class="<%= genClass %> mid">Address</div>
<div class="<%= genClass %> mid">Protocol</div>
<% if(type !== 'coordinator' ) { %>
<div class="<%=genClass%> mid">Role</div>
<% } %>
<div class="<%=genClass%> mid">Role</div>
<div class="<%=genClass%> mid">Status</div>
</div>
@ -2460,10 +2457,7 @@ if (list.length > 0) {
<div class="<%= genClass %> mid"><%= node.name %></div>
<div class="<%= genClass %> mid"><%= node.address %></div>
<div class="<%= genClass %> mid"><%= node.protocol %></div>
<% if(type !== 'coordinator' ) { %>
<div class="<%=genClass%> mid"><%= node.role %></div>
<% } %>
<div class="<%=genClass%> mid"><%= node.role %></div>
<% if(node.status === 'ok') { %>
<div class="<%= genClass %> mid"><i class="fa fa-check-circle"></i></div>
@ -2769,22 +2763,21 @@ if (list.length > 0) {
<li class="subMenuEntry pull-left">
<div class="breadcrumb"></div>
</li>
<li id="healthStatus" class="infoEntry subMenuEntry pull-right">
<li id="healthStatus" class="infoEntry subMenuEntry pull-right positive">
<a class="info health-info">HEALTH: </a>
<a class="state health-state">GOOD</a>
<a class="icon health-icon">
<i class="fa fa-check-circle"></i>
</a>
</li>
<li id="dbStatus" class="infoEntry subMenuEntry pull-right">
<li id="dbStatus" class="infoEntry subMenuEntry pull-right positive">
<a class="info">DB:</a>
<a class="info"><%= currentDB.name %> </a>
<a class="state"><span><%= currentDB.name %></span></a>
<a class="icon db-icon default-icon">
<i class="fa fa-refresh"></i>
</a>
</li>
<li id="userBar" class="infoEntry subMenuEntry pull-right" style="margin-right: 10px;">
<!--
<div class="usermenu" id="userBar"></div>
<div class="notificationmenu" id="notificationBar"></div>
-->
</li>
</ul>
@ -2866,10 +2859,11 @@ var cutByResolution = function (str) {
<div id="testContent" class="test-content-id innerContent">
<div id="graph-container"></div>
</div></script><script id="userBarView.ejs" type="text/template"><a class="info">User:
</div></script><script id="userBarView.ejs" type="text/template"><a class="info default-icon">User:
<span class="toggle">
<%=_.escape(username)%>
</span>
<i id="userLogoutIcon" class="fa fa-power-off" aria-hidden="true"></i>
</a>
<ul id="userInfo" class="subBarDropdown">
@ -3038,4 +3032,4 @@ var cutByResolution = function (str) {
</div>
<div id="workMonitorContent" class="innerContent">
</div></script></head><body><nav class="navbar" style="display: none"><div class="primary"><div class="navlogo"><a class="logo big" href="#"><img class="arangodbLogo" src="img/arangodb_logo_big.png"></a> <a class="logo small" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></a> <a class="version"><span>VERSION:</span><span id="currentVersion"></span></a></div><div class="statmenu" id="statisticBar"></div><div class="navmenu" id="navigationBar"></div></div></nav><div id="modalPlaceholder"></div><div class="bodyWrapper" style="display: none"><div class="centralRow"><div id="navbar2" class="navbarWrapper secondary"><div class="subnavmenu" id="subNavigationBar"></div></div><div class="resizecontainer contentWrapper"><div id="loadingScreen" class="loadingScreen" style="display: none"><i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw margin-bottom"></i> <span class="sr-only">Loading...</span></div><div id="content" class="centralContent"></div><footer class="footer"><div id="footerBar"></div></footer></div></div></div><div id="progressPlaceholder" style="display:none"></div><div id="spotlightPlaceholder" style="display:none"></div><div id="offlinePlaceholder" style="display:none"><div class="offline-div"><div class="pure-u"><div class="pure-u-1-4"></div><div class="pure-u-1-2 offline-window"><div class="offline-header"><h3>You have been disconnected from the server</h3></div><div class="offline-body"><p>The connection to the server has been lost. The server may be under heavy load.</p><p>Trying to reconnect in <span id="offlineSeconds">10</span> seconds.</p><p class="animation_state"><span><button class="button-success">Reconnect now</button></span></p></div></div><div class="pure-u-1-4"></div></div></div></div><div class="arangoFrame" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="libs.js?version=__VERSION">wuwuwuw;</script><script src="app.js?version=__VERSION"></script></body></html>
</div></script></head><body><nav class="navbar" style="display: none"><div class="primary"><div class="navlogo"><a class="logo big" href="#"><img class="arangodbLogo" src="img/arangodb_logo_big.png"></a> <a class="logo small" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></a> <a class="version"><span>VERSION:</span><span id="currentVersion"></span></a></div><div class="statmenu" id="statisticBar"></div><div class="navmenu" id="navigationBar"></div></div></nav><div id="modalPlaceholder"></div><div class="bodyWrapper" style="display: none"><div class="centralRow"><div id="navbar2" class="navbarWrapper secondary"><div class="subnavmenu" id="subNavigationBar"></div></div><div class="resizecontainer contentWrapper"><div id="loadingScreen" class="loadingScreen" style="display: none"><i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw margin-bottom"></i> <span class="sr-only">Loading...</span></div><div id="content" class="centralContent"></div><footer class="footer"><div id="footerBar"></div></footer></div></div></div><div id="progressPlaceholder" style="display:none"></div><div id="spotlightPlaceholder" style="display:none"></div><div id="offlinePlaceholder" style="display:none"><div class="offline-div"><div class="pure-u"><div class="pure-u-1-4"></div><div class="pure-u-1-2 offline-window"><div class="offline-header"><h3>You have been disconnected from the server</h3></div><div class="offline-body"><p>The connection to the server has been lost. The server may be under heavy load.</p><p>Trying to reconnect in <span id="offlineSeconds">10</span> seconds.</p><p class="animation_state"><span><button class="button-success">Reconnect now</button></span></p></div></div><div class="pure-u-1-4"></div></div></div></div><div class="arangoFrame" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="libs.js?version=__VERSION"></script><script src="app.js?version=__VERSION"></script></body></html>

View File

@ -2615,6 +2615,7 @@ if (list.length > 0) {
<% if (coords.length > 0) { %>
<% var disabled = ''; %>
<% var genClass = "pure-u-1-" + Object.keys(coords[0]).length; %>
<% if (type !== 'coordinator') { %>
@ -2628,11 +2629,7 @@ if (list.length > 0) {
<div class="<%= genClass %> mid">Name</div>
<div class="<%= genClass %> mid">Address</div>
<div class="<%= genClass %> mid">Protocol</div>
<% if(type !== 'coordinator' ) { %>
<div class="<%=genClass%> mid">Role</div>
<% } %>
<div class="<%=genClass%> mid">Role</div>
<div class="<%=genClass%> mid">Status</div>
</div>
@ -2647,10 +2644,7 @@ if (list.length > 0) {
<div class="<%= genClass %> mid"><%= node.name %></div>
<div class="<%= genClass %> mid"><%= node.address %></div>
<div class="<%= genClass %> mid"><%= node.protocol %></div>
<% if(type !== 'coordinator' ) { %>
<div class="<%=genClass%> mid"><%= node.role %></div>
<% } %>
<div class="<%=genClass%> mid"><%= node.role %></div>
<% if(node.status === 'ok') { %>
<div class="<%= genClass %> mid"><i class="fa fa-check-circle"></i></div>
@ -3012,22 +3006,21 @@ if (list.length > 0) {
<li class="subMenuEntry pull-left">
<div class="breadcrumb"></div>
</li>
<li id="healthStatus" class="infoEntry subMenuEntry pull-right">
<li id="healthStatus" class="infoEntry subMenuEntry pull-right positive">
<a class="info health-info">HEALTH: </a>
<a class="state health-state">GOOD</a>
<a class="icon health-icon">
<i class="fa fa-check-circle"></i>
</a>
</li>
<li id="dbStatus" class="infoEntry subMenuEntry pull-right">
<li id="dbStatus" class="infoEntry subMenuEntry pull-right positive">
<a class="info">DB:</a>
<a class="info"><%= currentDB.name %> </a>
<a class="state"><span><%= currentDB.name %></span></a>
<a class="icon db-icon default-icon">
<i class="fa fa-refresh"></i>
</a>
</li>
<li id="userBar" class="infoEntry subMenuEntry pull-right" style="margin-right: 10px;">
<!--
<div class="usermenu" id="userBar"></div>
<div class="notificationmenu" id="notificationBar"></div>
-->
</li>
</ul>
@ -3124,10 +3117,11 @@ var cutByResolution = function (str) {
<script id="userBarView.ejs" type="text/template">
<a class="info">User:
<a class="info default-icon">User:
<span class="toggle">
<%=_.escape(username)%>
</span>
<i id="userLogoutIcon" class="fa fa-power-off" aria-hidden="true"></i>
</a>
<ul id="userInfo" class="subBarDropdown">
@ -3397,7 +3391,7 @@ var cutByResolution = function (str) {
</div>
</div>
<script src="libs.js?version=__VERSION">wuwuwuw</script>
<script src="libs.js?version=__VERSION"></script>
<script src="app.js?version=__VERSION"></script>
</body>

View File

@ -1,2 +1,2 @@
<script src="libs.js?version=1463559305698"></script>
<script src="app.js?version=1463559305698"></script>
<script src="libs.js?version=1463672358777"></script>
<script src="app.js?version=1463672358777"></script>

File diff suppressed because one or more lines are too long

View File

@ -2167,7 +2167,7 @@ textarea,
.dropdownImport.headerDropdown input[type=checkbox].css-checkbox label.css-label, .search-submit-icon, .gv-search-submit-icon, .fixedDropdown .notificationItem i, .fullNotification:hover, .contentTables tr.contentRowInactive a, .arango-tab a, .arango-tab li, .pagination-line li a, .link > line, .node, .edit-index-table .icon_arangodb_roundminus {
cursor: pointer; }
.arangoToolbar span.clickable:hover, .login-window button, #swagger #jsonLink {
.arangoToolbar span.clickable:hover, .login-window button, #swagger #jsonLink, .subnavmenu .infoEntry a.default-icon i {
-moz-transition: all .2s ease-in;
-o-transition: all .2s ease-in;
-webkit-transition: all .2s ease-in;
@ -8366,6 +8366,7 @@ input.gv-radio-button {
background-color: #fff;
border: 1px solid #d9dbdc;
border-radius: 3px;
margin-bottom: 20px;
padding: 10px 10px 0;
position: relative;
top: 35px;
@ -8420,9 +8421,9 @@ input.gv-radio-button {
background-color: #404a53;
border: 1px solid rgba(140, 138, 137, 0.25);
color: #fff;
font-size: .6em;
font-size: 13px;
font-weight: 300;
padding: 0 8px 2px;
padding: 2px 8px;
position: relative;
top: -3px; }
.application-detail-view section.info .header .header_left .header_line .production {
@ -8872,11 +8873,17 @@ main {
line-height: 45px; }
.subnavmenu .infoEntry a {
margin-right: 5px; }
.subnavmenu .infoEntry a.default-icon i {
color: #fff; }
.subnavmenu .infoEntry a.default-icon i:hover {
color: #2ecc71;
cursor: pointer; }
.subnavmenu .infoEntry:hover {
cursor: default; }
.subnavmenu .infoEntry:hover .info {
color: #fff; }
.subnavmenu .infoEntry.positive .health-state,
.subnavmenu .infoEntry.positive .state,
.subnavmenu .infoEntry.positive .health-icon {
color: #2ecc71; }
.subnavmenu .infoEntry.negative .health-state,