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

Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop

This commit is contained in:
Alejandro Gallardo Escobar 2014-09-29 14:15:50 +02:00
parent 697657ea18 81ad47e751
commit 32c2ff4ff8
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/functions_visual_map.php
View File

@ -312,9 +312,14 @@ function visual_map_print_item($layoutData) {
} }
if (($width != 0) && ($height != 0)) if (($width != 0) && ($height != 0))
echo html_print_image($img, true, array("class" => "image", "id" => "image_" . $id, "width" => "$width", "height" => "$height")); echo html_print_image($img, true,
array("class" => "image",
"id" => "image_" . $id,
"width" => "$width",
"height" => "$height"));
else else
echo html_print_image($img, true, array("class" => "image", "id" => "image_" . $id)); echo html_print_image($img, true,
array("class" => "image", "id" => "image_" . $id));
echo '<br />'; echo '<br />';
} }
echo "</div>"; echo "</div>";
@ -2035,7 +2040,8 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
break; break;
default: default:
enterprise_hook("enterprise_visual_map_print_item", enterprise_hook("enterprise_visual_map_print_item",
array($layout_data, $status, $colorStatus, 'operation')); array($layout_data, $status, $colorStatus,
'operation', $resizedMap, $proportion));
break; break;
} }
} }