Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Jan Steemann 2013-03-18 20:18:08 +01:00
parent d17a034d59 15399b0840
commit 0b8c2ac23d
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/css/documentsView.css
View File

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

3
frontend/js/arango/arango.js
View File

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

BIN
frontend/js/views/.DS_Store vendored
View File

Binary file not shown.

3
frontend/js/views/documentView.js
View File

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

9
frontend/js/views/documentsView.js
View File

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