tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '412-consola-visual-Módulo-imagen-2-size' into 'develop'

Browse Source 
Fix restore element width when press double click over data image simple_value - #412

See merge request !681
This commit is contained in:
vgilc 2017-07-20 09:42:31 +02:00
commit 8971560f5d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -576,8 +576,10 @@ function readFields() {
} }
values['width'] = $("input[name=width]").val(); values['width'] = $("input[name=width]").val();
values['width_data_image'] = $("#data_image_width").val(); values['width_data_image'] = $("#data_image_width").val();
if(values['width_data_image'] != 0){ if(selectedItem == 'simple_value' || creationItem == 'simple_value'){
values['width'] = values['width_data_image']; if(values['width_data_image'] != 0){
values['width'] = values['width_data_image'];
}
} }
values['height'] = $("input[name=height]").val(); values['height'] = $("input[name=height]").val();
values['parent'] = $("select[name=parent]").val(); values['parent'] = $("select[name=parent]").val();
@ -2989,7 +2991,7 @@ function eventsItems(drag) {
} }
if(selectedItem == 'simple_value'){ if(selectedItem == 'simple_value'){
$('#data_image_width').val(event.currentTarget.clientWidth);
var found = $('#'+idItem).find("img"); var found = $('#'+idItem).find("img");
if(found.length > 0){ if(found.length > 0){
@ -3344,6 +3346,7 @@ function click_button_toolbox(id) {
$("#period_row." + id).css('display', 'none'); $("#period_row." + id).css('display', 'none');
break; break;
case 'label': case 'label':
$("#data_image_width").val(100);
toolbuttonActive = creationItem = 'label'; toolbuttonActive = creationItem = 'label';
toggle_item_palette(); toggle_item_palette();
break; break;

2
pandora_console/include/functions_visual_map_editor.php
View File

@ -314,7 +314,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
$form_items['module_row']['html'] = '<td align="left">' . $form_items['module_row']['html'] = '<td align="left">' .
__('Module') . '</td> __('Module') . '</td>
<td align="left">' . <td align="left">' .
html_print_select(array(), 'module', '', '', __('Any'), 0, true). '<div id="data_image_container" style="display:none;"><span id="data_image_check_label" style="margin-left:20px;">'.__("Data image").': </span><span id="data_image_check">Off</span><span id="data_image_width_label"> - Width: </span><input style="margin-left:5px;width:40px;" type="number" id="data_image_width" value="100"></input></div> html_print_select(array(), 'module', '', '', __('Any'), 0, true). '<div id="data_image_container" style="display:none;"><span id="data_image_check_label" style="margin-left:20px;">'.__("Data image").': </span><span id="data_image_check">Off</span><span id="data_image_width_label"> - Width: </span><input style="margin-left:5px;width:40px;" type="number" min="0" id="data_image_width" value="100"></input></div>
</td>'; </td>';