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

2013-06-24 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* include/functions_visual_map.php: added more changes for to make
	more easy the merges from the branch.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8389 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-06-25 09:34:12 +00:00
parent fd94ce7699
commit e744f8c1ef
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php: added more changes for to make
more easy the merges from the branch.
2013-06-24 Miguel de Dios <miguel.dedios@artica.es> 2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php: fixed the links of module * include/functions_visual_map.php: fixed the links of module

22
pandora_console/include/functions_visual_map.php
View File

@ -70,6 +70,7 @@ function visual_map_print_item($layoutData) {
$text = '<span id="text_' . $id . '" class="text">' . $label . '</span>'; $text = '<span id="text_' . $id . '" class="text">' . $label . '</span>';
$status = visual_map_get_status_element($layoutData); $status = visual_map_get_status_element($layoutData);
switch ($status) { switch ($status) {
case VISUAL_MAP_STATUS_CRITICAL_BAD: case VISUAL_MAP_STATUS_CRITICAL_BAD:
//Critical (BAD) //Critical (BAD)
@ -548,6 +549,7 @@ function visual_map_process_wizard_add_modules ($id_modules, $image, $id_layout,
break; break;
} }
$values = array ('type' => $value_type, $values = array ('type' => $value_type,
'id_layout' => $id_layout, 'id_layout' => $id_layout,
'pos_x' => $pos_x, 'pos_x' => $pos_x,
@ -883,6 +885,11 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
$layout = db_get_row ('tlayout', 'id', $id_layout); $layout = db_get_row ('tlayout', 'id', $id_layout);
if (empty($layout)) {
ui_print_error_message(__('Cannot load the visualmap'));
return;
}
$resizedMap = false; $resizedMap = false;
$proportion = 1; $proportion = 1;
if (!is_null($width)) { if (!is_null($width)) {
@ -951,6 +958,8 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
// Get parent status (Could be an agent, module, map, // Get parent status (Could be an agent, module, map,
// others doesnt have parent info) // others doesnt have parent info)
// ************************************************************* // *************************************************************
if ($layout_data["parent_item"] != 0) { if ($layout_data["parent_item"] != 0) {
$layout_data_parent = db_get_row_filter('tlayout_data', $layout_data_parent = db_get_row_filter('tlayout_data',
array('id' => $layout_data["parent_item"])); array('id' => $layout_data["parent_item"]));
@ -1212,7 +1221,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
if (!empty ($layout_data["width"])) { if (!empty ($layout_data["width"])) {
$img_style["width"] = $layout_data["width"]; $img_style["width"] = $layout_data["width"];
} }
if (!empty ($layout_data["height"])) { if (!empty ($layout_data["height"])) {
$img_style["height"] = $layout_data["height"]; $img_style["height"] = $layout_data["height"];
} }
@ -1300,8 +1309,10 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
$id_service . '&offset=0">'; $id_service . '&offset=0">';
$endTagA = true; $endTagA = true;
} }
} }
elseif ($layout_data['id_layout_linked'] > 0) { elseif ($layout_data['id_layout_linked'] > 0) {
// Link to a map // Link to a map
if (empty($layout_data['id_metaconsole'])) { if (empty($layout_data['id_metaconsole'])) {
echo '<a href="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data["id_layout_linked"].'">'; echo '<a href="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data["id_layout_linked"].'">';
@ -1453,6 +1464,8 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
break; break;
case PERCENTILE_BAR: case PERCENTILE_BAR:
case PERCENTILE_BUBBLE: case PERCENTILE_BUBBLE:
if ($resizedMap) if ($resizedMap)
echo '<div style="left: 0px; top: 0px; text-align: center; z-index: 1; 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: 1; 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
@ -1518,7 +1531,6 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
$id_service . '&offset=0">'; $id_service . '&offset=0">';
$endTagA = true; $endTagA = true;
} }
else if ($layout_data['id_agente_modulo'] != 0) { else if ($layout_data['id_agente_modulo'] != 0) {
// Link to an module // Link to an module
echo '<a href="'.$config['homeurl'].'/index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;id_module=' . $layout_data['id_agente_modulo'] . '">'; echo '<a href="'.$config['homeurl'].'/index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;id_module=' . $layout_data['id_agente_modulo'] . '">';
@ -1711,11 +1723,17 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
echo "</div>"; echo "</div>";
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
echo "</div>"; echo "</div>";
} }
} }
//End function
//Start function
/** /**
* Get a list with the layouts for a user. * Get a list with the layouts for a user.
* *