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

frontend/css/logsView.css

@@ -11,7 +11,7 @@
 }
 
 .tab-content {
-  min-height: 290px;
+  min-height: 390px;
 }
 
 .dataTables_info {
@@ -79,7 +79,7 @@
   background-color: rgba(255, 255, 255, 0.8) !important;
 }
 
-#logTableID td {
+#logTableID td, #infoTableID td, #debugTableID td, #critTableID td, #warnTableID td {
   padding-top: 8px;
   padding-bottom: 8px;
 }

frontend/js/collections/arangoLogs.js

@@ -20,6 +20,9 @@ window.arangoLogs = Backbone.Collection.extend({
   clearLocalStorage: function () {
     window.arangoLogsStore.reset();
   },
+  returnElements: function () {
+    console.log(this.models.length);
+  },
   fillLocalStorage: function (table, offset, size) {
     var self = this;
     this.clearLocalStorage();

frontend/js/views/logsView.js

@@ -128,11 +128,19 @@ var logsView = Backbone.View.extend({
   },
   drawTable: function () {
     var self = this;
+
     $.each(window.arangoLogsStore.models, function(key, value) {
       var convertedLog = self.convertLogStatus(value.attributes.level);
       $('#'+self.table).dataTable().fnAddData([convertedLog, value.attributes.text]);
     });
-    $('#logPages').html('Showing Page: '+this.page+' of '+this.totalPages);
+    try {
+      this.totalAmount = this.collection.models[0].attributes.totalAmount;
+      this.totalPages = Math.ceil(this.totalAmount / this.size);
+      $('#logPages').html('Showing Page: '+this.page+' of '+this.totalPages);
+    }
+    catch (e) {
+      $('#logPages').html('No logfiles available');
+    }
   },
   clearTable: function () {
     $('#'+this.table).dataTable().fnClearTable();