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

frontend/css/documentsView.css

@@ -28,6 +28,13 @@ table.dataTable td {
   padding-bottom: 15px;
 }
 
+#totalDocuments{
+  float: left;
+  color: black;
+  padding-left: 20px;
+  margin-top: -65px !important;
+}
+
 #documentsStatus {
   padding-top: 10px;
   float:left;

frontend/js/arango/arango.js

@@ -17,7 +17,8 @@ arangoHelper = {
   arangoNotification: function (message) {
     $.gritter.add({
       title: "Notification:",
-      text: message
+      text: message,
+      time: 800
     });
   },
   arangoError: function (message) {

frontend/js/views/documentView.js

@@ -338,7 +338,8 @@ var documentView = Backbone.View.extend({
       cancelcssclass: 'btn btn-danger pull-right',
       cancel: '<button class="cancelButton btn btn-danger pull-right">Cancel</button">',
       submit: 'Save',
-      onblur: 'cancel',
+      onblur: 'ignore',
+      //onblur: 'cancel',
       autogrow: {lineHeight: 16, minHeight: 30}
       //style: 'display: inline',
     });

frontend/js/views/documentsView.js

@@ -191,6 +191,7 @@ var documentsView = Backbone.View.extend({
       "aaSorting": [[ 1, "asc" ]],
       "bFilter": false,
       "bPaginate":false,
+      "bRetrieve": true,
       "bSortable": false,
       "bSort": false,
       "bLengthChange": false,
@@ -198,9 +199,9 @@ var documentsView = Backbone.View.extend({
       "iDisplayLength": -1,
       "bJQueryUI": false,
       "aoColumns": [
-        { "sClass":"read_only leftCell docleftico", "bSortable": false, "sWidth":"30px"},
-        { "sClass":"read_only arangoTooltip","bSortable": false},
-        { "bSortable": false, "sClass": "cuttedContent rightCell"}
+        { "sClass":"", "bSortable": false, "sWidth":"30px"},
+        { "sClass":"","bSortable": false},
+        { "bSortable": false, "sClass": ""}
       ],
       "oLanguage": { "sEmptyTable": "No documents"}
     });
@@ -283,7 +284,7 @@ var documentsView = Backbone.View.extend({
     target.pagination(options);
     $('#documentsToolbarF').prepend('<ul class="prePagi"><li><a id="documents_first"><i class="icon icon-step-backward"></i></a></li></ul>');
     $('#documentsToolbarF').append('<ul class="lasPagi"><li><a id="documents_last"><i class="icon icon-step-forward"></i></a></li></ul>');
-    //$('#documentsToolbarF2').append('<a>Total: ' + this.documentsCount + ' documents</a>');
+    $('#documentsToolbarFL').append('<a id="totalDocuments">Total: ' + this.documentsCount + ' documents </a>');
   },
   breadcrumb: function () {
     var name = window.location.hash.split("/")[1];