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

Merge remote-tracking branch 'origin/1.1' into devel 

Conflicts:
	html/admin/css/layout.css
	html/admin/js/master.js
This commit is contained in:
Frank Celler 2012-08-18 09:09:44 +02:00
parent fa41864b7a bff3727e19
commit dc858ce842
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/admin/js/master.js
View File

@ -2790,7 +2790,6 @@ $.fn.isVisible = function() {
}; };
function stateSaving () { function stateSaving () {
$.each(existingCharts, function(v, i ) { $.each(existingCharts, function(v, i ) {
// position statesaving // position statesaving
var tempcss = $("#chartBox"+this.id).position(); var tempcss = $("#chartBox"+this.id).position();
@ -2948,7 +2947,6 @@ var templeft = 20;
function createSingleBox (id, val, question) { function createSingleBox (id, val, question) {
var boxCount = id; var boxCount = id;
$("#graphBox").append('<div id="chartBox'+boxCount+'" class="chartContainer resizable draggable"/>'); $("#graphBox").append('<div id="chartBox'+boxCount+'" class="chartContainer resizable draggable"/>');
$("#chartBox"+boxCount).css({top: temptop, left: templeft}); $("#chartBox"+boxCount).css({top: temptop, left: templeft});