tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop

Browse Source
This commit is contained in:
vanessa gil 2017-03-08 13:12:51 +01:00
commit d77ebf9c72
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pandora_console/include/functions_visual_map.php
View File

@ -1182,8 +1182,9 @@ function visual_map_print_item($mode = "read", $layoutData,
else if($layoutData['label_position']=='right'){ else if($layoutData['label_position']=='right'){
$imgpos = 'float:left'; $imgpos = 'float:left';
} }
$varsize = getimagesize($img);
if ($width == 0 || $height == 0) if ($width == 0 || $height == 0) {
if($varsize[0] > 150 || $varsize[1] > 150){
echo html_print_image($img, true, echo html_print_image($img, true,
array("class" => "image", array("class" => "image",
"id" => "image_" . $id, "id" => "image_" . $id,
@ -1192,7 +1193,17 @@ function visual_map_print_item($mode = "read", $layoutData,
"title" => $img_style_title, "title" => $img_style_title,
"style" => $borderStyle.$imgpos), false, "style" => $borderStyle.$imgpos), false,
false, false, $isExternalLink); false, false, $isExternalLink);
else }
else{
echo html_print_image($img, true,
array("class" => "image",
"id" => "image_" . $id,
"title" => $img_style_title,
"style" => $borderStyle.$imgpos), false,
false, false, $isExternalLink);
}
}
else{
echo html_print_image($img, true, echo html_print_image($img, true,
array("class" => "image", array("class" => "image",
"id" => "image_" . $id, "id" => "image_" . $id,
@ -1201,6 +1212,7 @@ function visual_map_print_item($mode = "read", $layoutData,
"title" => $img_style_title, "title" => $img_style_title,
"style" => $borderStyle.$imgpos), false, "style" => $borderStyle.$imgpos), false,
false, false, $isExternalLink); false, false, $isExternalLink);
}
} }
@ -1466,19 +1478,31 @@ function visual_map_print_item($mode = "read", $layoutData,
} }
} }
if (($width != 0) && ($height != 0)) $varsize = getimagesize($img);
if (($width != 0) && ($height != 0)){
echo html_print_image($img, true, echo html_print_image($img, true,
array("class" => "image", array("class" => "image",
"id" => "image_" . $id, "id" => "image_" . $id,
"width" => "$width", "width" => "$width",
"height" => "$height"), false, "height" => "$height"), false,
false, false, $isExternalLink); false, false, $isExternalLink);
else }
else{
if($varsize[0] > 150 || $varsize[0] > 150){
echo html_print_image($img, true, echo html_print_image($img, true,
array("class" => "image", "id" => "image_" . $id,"width" => "70px", array("class" => "image", "id" => "image_" . $id,"width" => "70px",
"70px" => "$height"), "70px" => "$height"),
false, false, false, $isExternalLink); false, false, false, $isExternalLink);
} }
else{
echo html_print_image($img, true,
array("class" => "image",
"id" => "image_" . $id), false,
false, false, $isExternalLink);
}
}
}
break; break;
default: default:
if (!empty($element_enterprise)) { if (!empty($element_enterprise)) {