From fda3463d7ce456448dc671a30692ea2b879755d3 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 13 Feb 2012 17:56:50 +0000 Subject: [PATCH] 2012-02-13 Miguel de Dios * 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 --- pandora_console/ChangeLog | 7 ++ .../visual_console_builder.editor.js | 88 ++++++++++--------- 2 files changed, 53 insertions(+), 42 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2a3fbc47e8..7205ad7992 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2012-02-13 Miguel de Dios + + * godmode/reporting/visual_console_builder.editor.js: fixed the resize + background. + + Fixes: #3483645 + 2012-02-13 Miguel de Dios * include/functions_reporting.php: cleaned source code style, and fixed the diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index df97b7a12d..567ce80002 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -486,18 +486,18 @@ function loadFieldsFromDB(item) { function setOriginalSizeBackground() { $.ajax({ - type: "POST", - url: "ajax.php", - data: "page=godmode/reporting/visual_console_builder.editor&get_original_size_background=1&background=" + $("#background_img").attr('src'), - async:false, - dataType: "json", - success: function(data){ + type: "POST", + url: "ajax.php", + data: "page=godmode/reporting/visual_console_builder.editor&get_original_size_background=1&background=" + $("#background_img").attr('src'), + async: false, + dataType: "json", + success: function(data) { var values = {}; values['width'] = data[0]; values['height'] = data[1]; updateDB('background', 0, values); - } + } }); actionClick(); @@ -505,32 +505,32 @@ function setOriginalSizeBackground() { function setAspectRatioBackground(side) { $.ajax({ - type: "POST", - url: "ajax.php", - data: "page=godmode/reporting/visual_console_builder.editor&get_original_size_background=1&background=" + $("#background_img").attr('src'), - async:false, - dataType: "json", - success: function(data){ - old_width = parseInt($("#background").css('width').replace('px', '')); - old_height = parseInt($("#background").css('height').replace('px', '')); + type: "POST", + url: "ajax.php", + data: "page=godmode/reporting/visual_console_builder.editor&get_original_size_background=1&background=" + $("#background_img").attr('src'), + async: false, + dataType: "json", + success: function(data){ + old_width = parseInt($("#background").css('width').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 = {}; values['width'] = width; values['height'] = height; @@ -538,7 +538,7 @@ function setAspectRatioBackground(side) { updateDB('background', 0, values); - } + } }); actionClick(); @@ -660,7 +660,7 @@ function getModuleGraph(id_data) { period = data['period']; } }); - + //Cleaned array parameter = Array(); @@ -899,14 +899,14 @@ function createItem(type, values, id_data) { var sizeStyle = 'width: ' + values['width'] + 'px; height: ' + values['height'] + 'px;'; var imageSize = 'width="' + values['width'] + '" height="' + values['height'] + '"'; } - + var img_src= null; var parameter = Array(); parameter.push ({name: "page", value: "include/ajax/skins.ajax"}); parameter.push ({name: "get_image_path", value: "1"}); parameter.push ({name: "img_src", value: getImageElement(id_data)}); parameter.push ({name: "only_src", value: "1"}); - + jQuery.ajax ({ type: 'POST', url: action="ajax.php", @@ -917,7 +917,7 @@ function createItem(type, values, id_data) { img_src = data; } }); - + var item = $('
' + '
' + '
' @@ -979,6 +979,9 @@ function updateDB(type, idElement , values, event) { //Check if the event parameter in function is passed in the call. if (event != null) { switch (event) { + case 'resizestop': + //Force to move action when resize a background, for to avoid + //lost the label. case 'dragstop': action = "move"; break; @@ -1287,7 +1290,8 @@ function move_elements_resize(original_width, original_height, width, height) { jQuery.each($(".item"), function(key, value) { item = value; 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_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_top'] = new_height; - updateDB(classItem, idItem, values); + updateDB(classItem, idItem, values, "resizestop"); }); } @@ -1427,13 +1431,13 @@ function showPreviewStaticGraph(staticGraph) { if (staticGraph != '') { imgBase = "images/console/icons/" + staticGraph; - + var img_src= null; var parameter = Array(); parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"}); parameter.push ({name: "get_image_path_status", value: "1"}); parameter.push ({name: "img_src", value: imgBase }); - + jQuery.ajax ({ type: 'POST', url: action="ajax.php", @@ -1456,7 +1460,7 @@ function showPreviewIcon(icon) { if (icon != '') { imgBase = "images/console/icons/" + icon; - + var params = []; params.push("get_image_path=1"); params.push("img_src=" + imgBase + ".png");