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

Fixed dasboard items dimension when creates a map made by user. Ticket#2816

This commit is contained in:
Arturo Gonzalez Diaz 2015-10-08 14:58:53 +02:00
parent 9ed6fc2237
commit 7d253d0458
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pandora_console/include/functions_visual_map.php
View File

@ -890,6 +890,23 @@ function visual_map_print_item($mode = "read", $layoutData,
case PERCENTILE_BAR: case PERCENTILE_BAR:
case PERCENTILE_BUBBLE: case PERCENTILE_BUBBLE:
$progress_bar_heigh = 15;
if (!empty($proportion)) {
if ($width != 0) {
$width = (integer)($proportion['proportion_width'] * $width);
}
else {
$width = (integer)($proportion['proportion_width'] * $infoImage[0]);
}
if ($height != 0) {
$height = (integer)($proportion['proportion_height'] * $height);
$progress_bar_heigh = $progress_bar_heigh * $proportion['proportion_height'];
}
else {
$height = (integer)($proportion['proportion_height'] * $infoImage[1]);
}
}
echo io_safe_output($text) . '<br />'; echo io_safe_output($text) . '<br />';
ob_start(); ob_start();
@ -897,7 +914,7 @@ function visual_map_print_item($mode = "read", $layoutData,
echo progress_bubble($percentile, $width, $width, '', 1, $value_text, $colorStatus); echo progress_bubble($percentile, $width, $width, '', 1, $value_text, $colorStatus);
} }
else { else {
echo progress_bar($percentile, $width, 15, '', 1, $value_text, $colorStatus); echo progress_bar($percentile, $width, $progress_bar_heigh, '', 1, $value_text, $colorStatus);
} }
$img = ob_get_clean(); $img = ob_get_clean();
$img = str_replace('>', 'class="image" id="image_' . $id . '" />', $img); $img = str_replace('>', 'class="image" id="image_' . $id . '" />', $img);
@ -961,7 +978,7 @@ function visual_map_print_item($mode = "read", $layoutData,
echo '<a href="' . $label . '">' . '</a>' . '<br />'; echo '<a href="' . $label . '">' . '</a>' . '<br />';
} }
if (empty($proportion)) { if (!empty($proportion)) {
if (is_file($config['homedir'] . '/' . $img)) if (is_file($config['homedir'] . '/' . $img))
$infoImage = getimagesize($config['homedir'] . '/' . $img); $infoImage = getimagesize($config['homedir'] . '/' . $img);