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-08-19 12:30:14 +02:00
parent 5a99987673 409f861171
commit 869c21f156
11 changed files with 62 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
html/admin/css/collectionsItemView.css
View File

@ -1,8 +1,8 @@
.span3 {
min-height:100px;
width: 237px;
margin-left: 5px !important;
margin-bottom: 5px !important;
width: 230px;
margin-left: 13px !important;
margin-bottom: 13px !important;
border: 0px;
position:relative;
text-align:center;
@ -20,7 +20,7 @@
white-space: nowrap !important;
overflow: hidden !important;
text-overflow: ellipsis !important;
width: 221px;
width: 214px;
color: #fff;
border: 0;
background:#676665;

5
html/admin/css/collectionsView.css
View File

@ -280,4 +280,7 @@ border-top: 0;
margin-bottom: 30px;
}
#collectionsThumbnailsIn {
background-color: none;
margin-left: -7px;
}

13
html/admin/css/dashboardView.css
View File

@ -83,8 +83,8 @@
.statClient {
float: left;
height: 100px;
width: 237px;
margin-left: 5px !important;
width: 230px;
margin-left: 13px !important;
margin-bottom: 5px !important;
background-color: #FFFFFF !important;
}
@ -118,7 +118,7 @@
padding-top: 0 !important;
/*height: 140px;*/
height: 155px;
width: 300px;
width: 305px;
}
.svgDetailClass {
@ -166,7 +166,7 @@ li:hover h6, li.hover h6 {
margin-bottom: 16px;
margin-top: 0px;
margin-right: 5px !important;
margin-left: 5px !important;
margin-left: 12px !important;
padding: 0 !important;
height: 24px !important;
width: auto !important;
@ -488,5 +488,8 @@ li:hover h6, li.hover h6 {
margin-top: 5px;
padding-left: 7px;
font-size: 15px;
}
#dbThumbnailsIn {
margin-left: -7px;
}

5
html/admin/css/documentSourceView.css
View File

@ -19,6 +19,11 @@
margin-right: 0px;
padding-bottom: 20px;
border-top: 1px solid #888;
border-left: 1px solid #C0C0C0;
}
#sourceEditor .ui-resizable-handle {
border-left: 0;
}
#sourceDiv {

1
html/admin/js/templates/collectionsView.ejs
View File

@ -91,5 +91,6 @@
</ul>
<div class="thumbnails">
<div class="containerdivNewLine"/>
<div id="collectionsThumbnailsIn"/>
</div>

1
html/admin/js/templates/dashboardView.ejs
View File

@ -135,5 +135,6 @@
</div>
</li>
</div>
<div id="dbThumbnailsIn"/>
</ul>

8
html/admin/js/views/collectionsView.js
View File

@ -3,7 +3,8 @@
var collectionsView = Backbone.View.extend({
el: '#content',
el2: '.thumbnails',
/*el2: '.thumbnails',*/
el2: '#collectionsThumbnailsIn',
searchTimeout: null,
@ -18,12 +19,13 @@ var collectionsView = Backbone.View.extend({
var searchOptions = this.collection.searchOptions;
$('.thumbnails', this.el).append(
$('#collectionsThumbnailsIn', this.el).append(
'<li class="span3"><a href="#new" class="add"><img id="newCollection"'+
'src="img/plus_icon.png" class="pull-left" />Add Collection</a></li>'
);
this.collection.getFiltered(searchOptions).forEach(function (arango_collection) {
$('.thumbnails', this.el).append(new window.CollectionListItemView({
$('#collectionsThumbnailsIn', this.el).append(new window.CollectionListItemView({
model: arango_collection
}).render().el);
}, this);

2
html/admin/js/views/dashboardView.js
View File

@ -213,7 +213,7 @@ var dashboardView = Backbone.View.extend({
var counter = 1;
$.each(this.options.description.models[0].attributes.groups, function () {
$('.thumbnails').append(
$('#dbThumbnailsIn').append(
'<ul class="statGroups" id="' + this.group + '">' +
'<i class="group-close icon-minus icon-white"></i>' +
'<div id="statsHeaderDiv"><h4 class="statsHeader">' + this.name + '</h4></div>' +

26
html/admin/js/views/documentSourceView.js
View File

@ -6,8 +6,9 @@ var documentSourceView = Backbone.View.extend({
init: function () {
},
events: {
"click #tableView" : "tableView",
"click #saveSourceDoc" : "saveSourceDoc"
"click #tableView" : "tableView",
"click #saveSourceDoc" : "saveSourceDoc",
"keypress #sourceEditor" : "sourceShortcut"
},
template: new EJS({url: 'js/templates/documentSourceView.ejs'}),
@ -16,8 +17,29 @@ var documentSourceView = Backbone.View.extend({
$(this.el).html(this.template.text);
this.breadcrumb();
this.editor();
$('#sourceEditor').resizable({
handles: "s",
ghost: true,
stop: function () {
setTimeout(function () {
var editor = ace.edit("sourceEditor");
editor.resize();
},200);
}
});
return this;
},
sourceShortcut: function (e) {
if (e.ctrlKey && e.keyCode === 13) {
this.saveSourceDoc();
}
else if (e.metaKey && !e.ctrlKey && e.keyCode === 13) {
this.saveSourceDoc();
}
},
typeCheck: function (type) {
this.type = type;
if (type === 'edge') {

9
html/admin/js/views/documentView.js
View File

@ -14,7 +14,6 @@ var documentView = Backbone.View.extend({
events: {
"click #saveDocument" : "saveDocument",
//"click #addDocumentLine" : "addLine",
"click #addDocumentLine" : "addLine",
"click #addRow" : "addLine",
"click #documentTableID #deleteRow" : "deleteLine",
@ -293,11 +292,15 @@ var documentView = Backbone.View.extend({
var i = 0;
$('.writeable', documentEditTable.fnGetNodes() ).each(function () {
var aPos = documentEditTable.fnGetPosition(this);
if (aPos[0] === 0) {
/* if (aPos[0] === 0) {
console.log("i=0");
console.log(this);
$(this).removeClass('writeable');
}
}*/
if ( i === 1) {
$(this).removeClass('writeable');
console.log("i=1");
console.log(this);
i = 0;
}
if (arangoHelper.isSystemAttribute(this.innerHTML)) {

5
html/admin/js/views/navigationView.js
View File

@ -22,10 +22,11 @@ var navigationView = Backbone.View.extend({
handleResize: function () {
var oldWidth = $('#content').width();
var containerWidth = $(window).width() - 70;
var spanWidth = 242;
/*var spanWidth = 242;*/
var spanWidth = 243;
var divider = containerWidth / spanWidth;
var roundDiv = parseInt(divider, 10);
var newWidth = roundDiv*spanWidth+5;
var newWidth = roundDiv*spanWidth;
var marginWidth = ((containerWidth+30) - newWidth)/2;
$('#content').width(newWidth)
.css('margin-left', marginWidth)