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

Fixed colocation error with some items in visual console (Pandora 5). Ticket#2742

Browse Source
This commit is contained in:
Arturo Gonzalez Diaz 2015-09-29 12:20:01 +02:00
parent 87d32d3e50
commit db222005af
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_visual_map.php
View File

@ -1236,8 +1236,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
echo '<div style="left: 0px; top: 0px; text-align: center; z-index: '.$z_index.'; '.($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '').' position: absolute; margin-left: '.((integer)($proportion * $layout_data['pos_x'])).'px; margin-top:'.((integer)($proportion * $layout_data['pos_y'])).'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">'; echo '<div style="left: 0px; top: 0px; text-align: center; z-index: '.$z_index.'; '.($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '').' position: absolute; margin-left: '.((integer)($proportion * $layout_data['pos_x'])).'px; margin-top:'.((integer)($proportion * $layout_data['pos_y'])).'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
else else
echo '<div style="left: 0px; top: 0px; text-align: center; z-index: '.$z_index.'; '.($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '').' position: absolute; margin-left: '.$layout_data['pos_x'].'px; margin-top:'.$layout_data['pos_y'].'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">'; echo '<div style="left: 0px; top: 0px; text-align: center; z-index: '.$z_index.'; '.($layout_data['label_color'][0] == '#' ? 'color: '.$layout_data['label_color'].';' : '').' position: absolute; margin-left: '.$layout_data['pos_x'].'px; margin-top:'.$layout_data['pos_y'].'px;" id="layout-data-'.$layout_data['id'].'" class="layout-data">';
echo "<div style='width:150px'>";
if ($show_links) { if ($show_links) {
if ((!empty($layout_data['id_agent']) if ((!empty($layout_data['id_agent'])
&& empty($layout_data['id_layout_linked'])) && empty($layout_data['id_layout_linked']))
@ -1411,8 +1410,6 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
echo "<br />"; echo "<br />";
echo io_safe_output($layout_data['label']); echo io_safe_output($layout_data['label']);
} }
echo "</div>";
echo "</a> </div>"; echo "</a> </div>";
break; break;
@ -1440,7 +1437,6 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
} }
} }
if ($layout_data['label_color'][0] == '#') { if ($layout_data['label_color'][0] == '#') {
echo "<br />";
echo io_safe_output($layout_data['label']); echo io_safe_output($layout_data['label']);
} }
if ($endTagA) echo "</a>"; if ($endTagA) echo "</a>";