grunt build

js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.js

@@ -2765,8 +2765,8 @@ window.StatisticsCollection = Backbone.Collection.extend({
           .showValues(false)
           .showYAxis(false)
           .showXAxis(false)
-          .transitionDuration(100)
+          //.transitionDuration(100)
-          .tooltips(false)
+          //.tooltips(false)
           .showLegend(false)
           .showControls(false)
           .stacked(true);
@@ -2881,8 +2881,8 @@ window.StatisticsCollection = Backbone.Collection.extend({
             .showValues(false)
             .showYAxis(true)
             .showXAxis(true)
-            .transitionDuration(100)
+            //.transitionDuration(100)
-            .tooltips(false)
+            //.tooltips(false)
             .showLegend(false)
             .showControls(false)
             .forceY([0,1]);
@@ -4563,7 +4563,6 @@ window.StatisticsDescriptionCollection = Backbone.Collection.extend({
       var statCollect = new window.ClusterStatisticsCollection();
       var coord = this.coordinators.first();
 
-      console.log(this.dbservers);
       // create statistics collector for DB servers
       this.dbservers.forEach(function (dbserver) {
         if (dbserver.get("status") !== "ok") {return;}

js/apps/system/_admin/aardvark/APP/frontend/build/app.js

@@ -19964,7 +19964,7 @@ window.ArangoUsers = Backbone.Collection.extend({
 
 /*jshint browser: true */
 /*jshint unused: false */
-/*global arangoHelper, Backbone, templateEngine, $, window, _, nv, d3 */
+/*global arangoHelper, prettyBytes, Backbone, templateEngine, $, window, _, nv, d3 */
 (function () {
   "use strict";
 
@@ -20080,7 +20080,6 @@ window.ArangoUsers = Backbone.Collection.extend({
         + coord.get("address")
         + "/_admin/clusterStatistics?DBserver="
         + dbserver.get("name");
-
         self.statCollectDBS.add(stat);
       });
 
@@ -20280,10 +20279,10 @@ window.ArangoUsers = Backbone.Collection.extend({
         nv.addGraph(function() {
           self.charts[c.id] = nv.models.stackedAreaChart()
           .options({
-            transitionDuration: 300,
             useInteractiveGuideline: true,
             showControls: false,
-            noData: 'Fetching data...'
+            noData: 'Fetching data...',
+            duration: 0
           });
 
           self.charts[c.id].xAxis
@@ -20296,14 +20295,14 @@ window.ArangoUsers = Backbone.Collection.extend({
           })
           .staggerLabels(false);
 
-          // TODO UPDATE SINGLE VALUES AFTER UPDATE
           self.charts[c.id].yAxis
           .axisLabel('')
-          .tickFormat(function(d) { //TODO 1k bytes sizes
+          .tickFormat(function(d) {
             if (d === null) {
               return 'N/A';
             }
-            return d3.format(',.2f')(d);
+            var formatted = parseFloat(d3.format(".2f")(d));
+            return prettyBytes(formatted);
           });
 
           var data, lines = self.returnGraphOptions(c.id);
@@ -20319,13 +20318,13 @@ window.ArangoUsers = Backbone.Collection.extend({
 
           self.chartData[c.id] = d3.select(c.id).append('svg')
           .datum(data)
-          .transition().duration(1000)
+          .transition().duration(300)
           .call(self.charts[c.id])
           .each('start', function() {
             window.setTimeout(function() {
               d3.selectAll(c.id + ' *').each(function() {
                 if (this.__transition__) {
-                  this.__transition__.duration = 1;
+                  this.__transition__.duration = 0;
                 }
               });
             }, 0);
@@ -22511,8 +22510,8 @@ window.ArangoUsers = Backbone.Collection.extend({
           .showValues(false)
           .showYAxis(false)
           .showXAxis(false)
-          .transitionDuration(100)
+          //.transitionDuration(100)
-          .tooltips(false)
+          //.tooltips(false)
           .showLegend(false)
           .showControls(false)
           .stacked(true);
@@ -22627,8 +22626,8 @@ window.ArangoUsers = Backbone.Collection.extend({
             .showValues(false)
             .showYAxis(true)
             .showXAxis(true)
-            .transitionDuration(100)
+            //.transitionDuration(100)
-            .tooltips(false)
+            //.tooltips(false)
             .showLegend(false)
             .showControls(false)
             .forceY([0,1]);
@@ -26926,7 +26925,8 @@ window.ArangoUsers = Backbone.Collection.extend({
         },
         {
           name: 'Logs',
-          view: undefined
+          view: undefined,
+          disabled: true
         }
       ],
       node: [
@@ -26994,14 +26994,19 @@ window.ArangoUsers = Backbone.Collection.extend({
         else {
           cssclass = '';
         }
+        if (menu.disabled) {
+          cssclass = 'disabled';
+        }
 
         $(self.subEl +  ' .bottom').append(
           '<li class="subMenuEntry ' + cssclass + '"><a>' + menu.name + '</a></li>'
         );
+        if (!menu.disabled) {
           $(self.subEl + ' .bottom').children().last().bind('click', function(elem) {
             self.activeSubMenu = menu;
             self.renderSubView(menu, elem);
           });
+        }
       });
     },
 
@@ -27507,7 +27512,7 @@ window.ArangoUsers = Backbone.Collection.extend({
       this.convertModelToJSON(true);
 
       window.setInterval(function() {
-        if (window.location.hash === '#query' && window.VISIBLE && self.shouldRender 
+        if (window.location.hash === '#queries' && window.VISIBLE && self.shouldRender 
             && arangoHelper.getCurrentSub().route === 'queryManagement') {
           if (self.active) {
             if ($('#arangoQueryManagementTable').is(':visible')) {
@@ -33116,12 +33121,13 @@ window.ArangoUsers = Backbone.Collection.extend({
       "services": "applications",
       "applications/:mount": "applicationDetail",
       "graphs": "graphManagement",
-      "graph/:name": "showGraph",
+      "graphs/:name": "showGraph",
       "users": "userManagement",
       "userProfile": "userProfile",
       "cluster": "cluster",
       "nodes": "nodes",
       "node/:name": "node",
+      "node/:name/logs": "logs",
       "logs": "logs",
       "test": "test"
     },

js/apps/system/_admin/aardvark/APP/frontend/build/scripts.html.part

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

js/apps/system/_admin/aardvark/APP/frontend/build/standalone-min.html

@@ -2324,7 +2324,9 @@ if (list.length > 0) {
       <a id="services" class="tab" href="#services"><i class="fa fa-cogs"></i>Services</a>
     </li>
     <li class="users-menu"><a id="users" class="tab" href="#manage"><i class="fa fa-users"></i>Users</a></li>
+    <% if (!isCluster) { %>
       <li class="logs-menu"><a id="logs" class="tab" href="#manage"><i class="fa fa-list"></i>Logs</a></li>
+    <% } %>
     <li class="query-menu"><a id="settings" class="tab" href="#settings"><i class="fa fa-cog"></i></a></li>
     <!--
     <li class="navbar-spacer big"></li>
@@ -2336,7 +2338,7 @@ if (list.length > 0) {
           <a id="shell" class="tab" href="#shell">JS Shell</a>
         </li>
 
-        <% if (isCluster) { %>
+        <% if (!isCluster) { %>
           <% if (currentDB.get('isSystem')) { %>
             <li class="dropdown-item">
               <a id="logs" class="tab" href="#logs">Logs</a>
@@ -2728,10 +2730,6 @@ if (list.length > 0) {
     <li class="subMenuEntry pull-left">
       <div class="breadcrumb"></div>
     </li>
-    <li class="subMenuEntry pull-right">
-      <div class="usermenu" id="userBar"></div>
-      <div class="notificationmenu" id="notificationBar"></div>
-    </li>
     <li class="subMenuEntry pull-right">
       <a class="health-info">HEALTH: </a>
       <a class="health-state">GOOD</a>
@@ -2739,6 +2737,10 @@ if (list.length > 0) {
         <i class="fa fa-check-circle"></i>
       </a>
     </li>
+    <li class="subMenuEntry pull-right" style="margin-right: 10px;">
+      <div class="usermenu" id="userBar"></div>
+      <div class="notificationmenu" id="notificationBar"></div>
+    </li>
   </ul>
 
   <ul class="subMenuEntries bottom">
@@ -2950,4 +2952,4 @@ var cutByResolution = function (str) {
   </div>
 
   <div id="workMonitorContent" class="innerContent">
-  </div></script></head><body><nav class="navbar"><div class="primary"><div class="navlogo"><a class="logo" href="#"><img class="arangodbLogo" src="img/DEVLOGO.png"></a></div><div id="progressPlaceholderIcon"></div><div class="statmenu" id="statisticBar"></div><div class="navmenu" id="navigationBar"></div></div></nav><div class="bodyWrapper"><div class="centralRow"><div id="navbar2" class="secondary"><div class="subnavmenu" id="subNavigationBar"></div></div><div class="resizecontainer contentWrapper" style="clear:both"><div id="content" class="centralContent"></div><footer class="footer"><div class="" id="footerBar"></div></footer></div></div></div><div id="modalPlaceholder"></div><div id="progressPlaceholder" style="display:none"></div><div id="spotlightPlaceholder" style="display:none"></div><div class="arangoFrame" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="sharedLibs.js?version=1460392628968"></script><script src="libs.js?version=1460392628968"></script><script src="app.js?version=1460392628968"></script></body></html>
+  </div></script></head><body><nav class="navbar"><div class="primary"><div class="navlogo"><a class="logo" href="#"><img class="arangodbLogo" src="img/DEVLOGO.png"></a></div><div id="progressPlaceholderIcon"></div><div class="statmenu" id="statisticBar"></div><div class="navmenu" id="navigationBar"></div></div></nav><div class="bodyWrapper"><div class="centralRow"><div id="navbar2" class="secondary"><div class="subnavmenu" id="subNavigationBar"></div></div><div class="resizecontainer contentWrapper" style="clear:both"><div id="content" class="centralContent"></div><footer class="footer"><div class="" id="footerBar"></div></footer></div></div></div><div id="modalPlaceholder"></div><div id="progressPlaceholder" style="display:none"></div><div id="spotlightPlaceholder" style="display:none"></div><div class="arangoFrame" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="sharedLibs.js?version=1460456107828"></script><script src="libs.js?version=1460456107828"></script><script src="app.js?version=1460456107828"></script></body></html>

js/apps/system/_admin/aardvark/APP/frontend/build/standalone.html

@@ -2490,7 +2490,9 @@ if (list.length > 0) {
       <a id="services" class="tab" href="#services"><i class="fa fa-cogs"></i>Services</a>
     </li>
     <li class="users-menu"><a id="users" class="tab" href="#manage"><i class="fa fa-users"></i>Users</a></li>
+    <% if (!isCluster) { %>
       <li class="logs-menu"><a id="logs" class="tab" href="#manage"><i class="fa fa-list"></i>Logs</a></li>
+    <% } %>
     <li class="query-menu"><a id="settings" class="tab" href="#settings"><i class="fa fa-cog"></i></a></li>
     <!--
     <li class="navbar-spacer big"></li>
@@ -2502,7 +2504,7 @@ if (list.length > 0) {
           <a id="shell" class="tab" href="#shell">JS Shell</a>
         </li>
 
-        <% if (isCluster) { %>
+        <% if (!isCluster) { %>
           <% if (currentDB.get('isSystem')) { %>
             <li class="dropdown-item">
               <a id="logs" class="tab" href="#logs">Logs</a>
@@ -2961,10 +2963,6 @@ if (list.length > 0) {
     <li class="subMenuEntry pull-left">
       <div class="breadcrumb"></div>
     </li>
-    <li class="subMenuEntry pull-right">
-      <div class="usermenu" id="userBar"></div>
-      <div class="notificationmenu" id="notificationBar"></div>
-    </li>
     <li class="subMenuEntry pull-right">
       <a class="health-info">HEALTH: </a>
       <a class="health-state">GOOD</a>
@@ -2972,6 +2970,10 @@ if (list.length > 0) {
         <i class="fa fa-check-circle"></i>
       </a>
     </li>
+    <li class="subMenuEntry pull-right" style="margin-right: 10px;">
+      <div class="usermenu" id="userBar"></div>
+      <div class="notificationmenu" id="notificationBar"></div>
+    </li>
   </ul>
 
   <ul class="subMenuEntries bottom">
@@ -3263,9 +3265,9 @@ var cutByResolution = function (str) {
     </div>
   </div>
 
-<script src="sharedLibs.js?version=1460392628968"></script>
+<script src="sharedLibs.js?version=1460456107828"></script>
-<script src="libs.js?version=1460392628968"></script>
+<script src="libs.js?version=1460456107828"></script>
-<script src="app.js?version=1460392628968"></script>
+<script src="app.js?version=1460456107828"></script>
 
   </body>
 </html>