tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-02-13 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/reporting/visual_console_builder.editor.js: fixed the resize
	background.
	
	Fixes: #3483645



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5580 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-02-13 17:56:50 +00:00
parent da8134b0a0
commit 34ee7aeac0
2 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-02-13 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.js: fixed the resize
background.
Fixes: #3483645
2012-02-13 Miguel de Dios <miguel.dedios@artica.es> 2012-02-13 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php: cleaned source code style, and fixed the * include/functions_reporting.php: cleaned source code style, and fixed the

88
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -486,18 +486,18 @@ function loadFieldsFromDB(item) {
function setOriginalSizeBackground() { function setOriginalSizeBackground() {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "ajax.php", url: "ajax.php",
data: "page=godmode/reporting/visual_console_builder.editor&get_original_size_background=1&background=" + $("#background_img").attr('src'), data: "page=godmode/reporting/visual_console_builder.editor&get_original_size_background=1&background=" + $("#background_img").attr('src'),
async:false, async: false,
dataType: "json", dataType: "json",
success: function(data){ success: function(data) {
var values = {}; var values = {};
values['width'] = data[0]; values['width'] = data[0];
values['height'] = data[1]; values['height'] = data[1];
updateDB('background', 0, values); updateDB('background', 0, values);
} }
}); });
actionClick(); actionClick();
@ -505,32 +505,32 @@ function setOriginalSizeBackground() {
function setAspectRatioBackground(side) { function setAspectRatioBackground(side) {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "ajax.php", url: "ajax.php",
data: "page=godmode/reporting/visual_console_builder.editor&get_original_size_background=1&background=" + $("#background_img").attr('src'), data: "page=godmode/reporting/visual_console_builder.editor&get_original_size_background=1&background=" + $("#background_img").attr('src'),
async:false, async: false,
dataType: "json", dataType: "json",
success: function(data){ success: function(data){
old_width = parseInt($("#background").css('width').replace('px', '')); old_width = parseInt($("#background").css('width').replace('px', ''));
old_height = parseInt($("#background").css('height').replace('px', '')); old_height = parseInt($("#background").css('height').replace('px', ''));
img_width = data[0];
img_height = data[1];
if (side == 'width') {
ratio = old_width / img_width;
width = old_width;
height = img_height * ratio;
}
else if (side == 'height') {
ratio = old_height / img_height;
width = img_width * ratio;
height = old_height;
}
img_width = data[0];
img_height = data[1];
if (side == 'width') {
ratio = old_width / img_width;
width = old_width;
height = img_height * ratio;
}
else if (side == 'height') {
ratio = old_height / img_height;
width = img_width * ratio;
height = old_height;
}
var values = {}; var values = {};
values['width'] = width; values['width'] = width;
values['height'] = height; values['height'] = height;
@ -538,7 +538,7 @@ function setAspectRatioBackground(side) {
updateDB('background', 0, values); updateDB('background', 0, values);
} }
}); });
actionClick(); actionClick();
@ -660,7 +660,7 @@ function getModuleGraph(id_data) {
period = data['period']; period = data['period'];
} }
}); });
//Cleaned array //Cleaned array
parameter = Array(); parameter = Array();
@ -899,14 +899,14 @@ function createItem(type, values, id_data) {
var sizeStyle = 'width: ' + values['width'] + 'px; height: ' + values['height'] + 'px;'; var sizeStyle = 'width: ' + values['width'] + 'px; height: ' + values['height'] + 'px;';
var imageSize = 'width="' + values['width'] + '" height="' + values['height'] + '"'; var imageSize = 'width="' + values['width'] + '" height="' + values['height'] + '"';
} }
var img_src= null; var img_src= null;
var parameter = Array(); var parameter = Array();
parameter.push ({name: "page", value: "include/ajax/skins.ajax"}); parameter.push ({name: "page", value: "include/ajax/skins.ajax"});
parameter.push ({name: "get_image_path", value: "1"}); parameter.push ({name: "get_image_path", value: "1"});
parameter.push ({name: "img_src", value: getImageElement(id_data)}); parameter.push ({name: "img_src", value: getImageElement(id_data)});
parameter.push ({name: "only_src", value: "1"}); parameter.push ({name: "only_src", value: "1"});
jQuery.ajax ({ jQuery.ajax ({
type: 'POST', type: 'POST',
url: action="ajax.php", url: action="ajax.php",
@ -917,7 +917,7 @@ function createItem(type, values, id_data) {
img_src = data; img_src = data;
} }
}); });
var item = $('<div id="' + id_data + '" class="item icon" style="left: 0px; top: 0px; color: ' + values['label_color'] + '; text-align: center; position: absolute; ' + sizeStyle + ' margin-top: ' + values['top'] + 'px; margin-left: ' + values['left'] + 'px;">' + var item = $('<div id="' + id_data + '" class="item icon" style="left: 0px; top: 0px; color: ' + values['label_color'] + '; text-align: center; position: absolute; ' + sizeStyle + ' margin-top: ' + values['top'] + 'px; margin-left: ' + values['left'] + 'px;">' +
'<img id="image_' + id_data + '" class="image" src="' + img_src + '" ' + imageSize + ' /><br />' + '<img id="image_' + id_data + '" class="image" src="' + img_src + '" ' + imageSize + ' /><br />' +
'</div>' '</div>'
@ -979,6 +979,9 @@ function updateDB(type, idElement , values, event) {
//Check if the event parameter in function is passed in the call. //Check if the event parameter in function is passed in the call.
if (event != null) { if (event != null) {
switch (event) { switch (event) {
case 'resizestop':
//Force to move action when resize a background, for to avoid
//lost the label.
case 'dragstop': case 'dragstop':
action = "move"; action = "move";
break; break;
@ -1287,7 +1290,8 @@ function move_elements_resize(original_width, original_height, width, height) {
jQuery.each($(".item"), function(key, value) { jQuery.each($(".item"), function(key, value) {
item = value; item = value;
idItem = $(item).attr('id'); idItem = $(item).attr('id');
classItem = $(item).attr('class').replace('item', '').replace('ui-draggable', '').replace(/^\s+/g,'').replace(/\s+$/g,'') classItem = $(item).attr('class').replace('item', '')
.replace('ui-draggable', '').replace(/^\s+/g,'').replace(/\s+$/g,'')
old_height = parseInt($(item).css('margin-top').replace('px', '')); old_height = parseInt($(item).css('margin-top').replace('px', ''));
old_width = parseInt($(item).css('margin-left').replace('px', '')); old_width = parseInt($(item).css('margin-left').replace('px', ''));
@ -1306,7 +1310,7 @@ function move_elements_resize(original_width, original_height, width, height) {
values['absolute_left'] = new_width; values['absolute_left'] = new_width;
values['absolute_top'] = new_height; values['absolute_top'] = new_height;
updateDB(classItem, idItem, values); updateDB(classItem, idItem, values, "resizestop");
}); });
} }
@ -1427,13 +1431,13 @@ function showPreviewStaticGraph(staticGraph) {
if (staticGraph != '') { if (staticGraph != '') {
imgBase = "images/console/icons/" + staticGraph; imgBase = "images/console/icons/" + staticGraph;
var img_src= null; var img_src= null;
var parameter = Array(); var parameter = Array();
parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"}); parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
parameter.push ({name: "get_image_path_status", value: "1"}); parameter.push ({name: "get_image_path_status", value: "1"});
parameter.push ({name: "img_src", value: imgBase }); parameter.push ({name: "img_src", value: imgBase });
jQuery.ajax ({ jQuery.ajax ({
type: 'POST', type: 'POST',
url: action="ajax.php", url: action="ajax.php",
@ -1456,7 +1460,7 @@ function showPreviewIcon(icon) {
if (icon != '') { if (icon != '') {
imgBase = "images/console/icons/" + icon; imgBase = "images/console/icons/" + icon;
var params = []; var params = [];
params.push("get_image_path=1"); params.push("get_image_path=1");
params.push("img_src=" + imgBase + ".png"); params.push("img_src=" + imgBase + ".png");