diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index ce6e58f379..d6155b104e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ +2010-07-26 Dario Rodriguez + + * include/styles/pandora.css: Added css classes for separator. + * include/functions_ui.php: Added suport to add a separator betwenn tabs + in print_page_header. + * operation/agentes/ver_agente.php: Fixed some problems with alt tag in + images and added separator to tabs + * godmode/agentes/configurar_agente.php: Fixed some problems with alt tag + in images and added separator to tabs + + 2010-07-23 Raúl Mateos * godmode/alerts/alert_list.list.php: Added code to show title if page diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 2a8673837b..f925484184 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -265,7 +265,7 @@ if ($id_agente) { /* Group tab */ $grouptab['text'] = '' - . print_image ("images/agents_group.png", true, array( "title=" => __('Group'))) + . print_image ("images/agents_group.png", true, array( "title" => __('Group'))) . ''; $grouptab['active'] = false; @@ -285,7 +285,7 @@ if ($id_agente) { $gistab['active'] = false; } - $onheader = array('view' => $viewtab, 'main' => $maintab, 'module' => $moduletab, 'alert' => $alerttab, 'template' => $templatetab, 'inventory' => $inventorytab, 'collection'=> $collectiontab, 'group' => $grouptab, 'gis' => $gistab); + $onheader = array('view' => $viewtab, 'separator' => "", 'main' => $maintab, 'module' => $moduletab, 'alert' => $alerttab, 'template' => $templatetab, 'inventory' => $inventorytab, 'collection'=> $collectiontab, 'group' => $grouptab, 'gis' => $gistab); print_page_header (__('Agent configuration').' - '.mb_substr(get_agent_name ($id_agente), 0, 21), "images/setup.png", false, "", true, $onheader); diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 9a5fa6c6c3..bfa540d999 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1439,11 +1439,13 @@ function print_page_header ($title, $icon = "", $return = false, $help = "", $go if ($godmode == true){ $type = "nomn"; - $type2 = "menu_tab_frame"; + $type2 = "menu_tab_frame"; + $separator_class = "separator"; } else { $type = "view"; $type2 = "menu_tab_frame_view"; + $separator_class = "separator_view"; } @@ -1458,21 +1460,25 @@ function print_page_header ($title, $icon = "", $return = false, $help = "", $go if (is_array($options)) { $buffer .= ''; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index da28caae3a..5e3cd1064f 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -531,6 +531,18 @@ div.title_line { font-weight: bold; line-height: 18px; } + +#menu_tab li.separator_view { + background: #66AA44; + padding: 4px; +} + +#menu_tab li.separator { + background: #ce5c00; + padding: 4px; +} + + #menu_tab li.nomn_high a { background: #799E48; color: #fff; diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index 32c61e9734..3283b31291 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -30,8 +30,6 @@ if (is_ajax ()) { $get_agent_json = (bool) get_parameter ('get_agent_json'); $get_agent_modules_json = (bool) get_parameter ('get_agent_modules_json'); $get_agent_status_tooltip = (bool) get_parameter ("get_agent_status_tooltip"); - $get_agentmodule_status_tooltip = (bool) get_parameter ("get_agentmodule_status_tooltip"); - $get_group_status_tooltip = (bool) get_parameter ("get_group_status_tooltip"); $get_agents_group_json = (bool) get_parameter ("get_agents_group_json"); $get_agent_modules_json_for_multiple_agents = (bool) get_parameter("get_agent_modules_json_for_multiple_agents"); $get_agent_modules_json_for_multiple_agents_id = (bool) get_parameter("get_agent_modules_json_for_multiple_agents_id"); @@ -120,9 +118,7 @@ if (is_ajax ()) { if ($get_agent_status_tooltip) { $id_agent = (int) get_parameter ('id_agent'); $agent = get_db_row ('tagente', 'id_agente', $id_agent); - echo '

'; - echo ' '; - echo printTruncateText($agent['nombre'],25,false,true,false).'

'; + echo '

'.$agent['nombre'].'

'; echo ''.__('Main IP').': '.$agent['direccion'].'
'; echo ''.__('Group').': '; echo ' '; @@ -206,60 +202,6 @@ if (is_ajax ()) { return; } - if ($get_agentmodule_status_tooltip) { - $id_module = (int) get_parameter ('id_module'); - $module = get_db_row ('tagente_modulo', 'id_agente_modulo', $id_module); - echo '

'; - echo ' '; - echo printTruncateText($module['nombre'],25,false,true,false).'

'; - echo ''.__('Type').': '; - $agentmoduletype = get_agentmodule_type ($module['id_agente_modulo']); - echo get_moduletype_name ($agentmoduletype).' '; - echo '
'; - echo ''.__('Module group').': '; - $modulegroup = get_modulegroup_name (get_agentmodule_modulegroup ($module['id_agente_modulo'])); - if($modulegroup === false){ - echo __('None').'
'; - } - else{ - echo $modulegroup.'
'; - } - echo ''.__('Agent').': '; - echo printTruncateText(get_agentmodule_agent_name ($module['id_agente_modulo']),25,false,true,false).'
'; - - return; - } - - if ($get_group_status_tooltip) { - $id_group = (int) get_parameter ('id_group'); - $group = get_db_row ('tgrupo', 'id_grupo', $id_group); - echo '

'; - echo printTruncateText($group['nombre'],25,false,true,false).'

'; - echo ''.__('Parent').': '; - if($group['parent'] == 0) { - echo __('None').'
'; - } - else { - $group_parent = get_db_row ('tgrupo', 'id_grupo', $group['parent']); - echo ' '; - echo $group_parent['nombre'].'
'; - } - echo ''.__('Sons').': '; - $groups_sons = get_db_all_fields_in_table ('tgrupo', 'parent', $group['id_grupo']); - if($groups_sons === false){ - echo __('None').'
'; - } - else{ - echo '

'; - foreach($groups_sons as $group_son) { - echo ' '; - echo $group_son['nombre'].'
'; - } - } - - return; - } - return; } @@ -309,7 +251,7 @@ $managetab = ""; if (give_acl ($config['id_user'],$id_grupo, "AW")) { $managetab['text'] ='' - . print_image("images/setup.png", true, array("title=" => __('Manage'))) + . print_image("images/setup.png", true, array ("title" => __('Manage'))) . ''; if ($tab == 'manage') @@ -320,7 +262,7 @@ if (give_acl ($config['id_user'],$id_grupo, "AW")) { /* Main tab */ $maintab['text'] = '' - . print_image("images/monitor.png", true, array("title=" => __('Main'))) + . print_image("images/monitor.png", true, array("title" => __('Main'))) . ''; if ($tab == 'main') @@ -330,7 +272,7 @@ else /* Data */ $datatab['text']= '' - . print_image("images/lightbulb.png", true, array("title=" => __('Data'))) + . print_image("images/lightbulb.png", true, array("title" => __('Data'))) . ''; if (($tab == 'data') OR ($tab == 'data_view')) @@ -340,7 +282,7 @@ else /* Alert tab */ $alerttab['text'] = '' - . print_image("images/bell.png", true, array("title=" => __('Alerts'))) + . print_image("images/bell.png", true, array("title" => __('Alerts'))) . ''; if ($tab == 'alert') @@ -350,7 +292,7 @@ else /* SLA view */ $slatab['text']= '' - . print_image("images/images.png", true, array("title=" => __('S.L.A.'))) + . print_image("images/images.png", true, array("title" => __('S.L.A.'))) . ''; if ($tab == 'sla') { @@ -374,7 +316,7 @@ if ($collectiontab == -1) /* Group tab */ $grouptab['text']= '' - . print_image("images/agents_group.png", true, array( "title=" => __('Group'))) + . print_image("images/agents_group.png", true, array( "title" => __('Group'))) . ''; $grouptab['active']=false; @@ -384,7 +326,7 @@ $gistab=""; if ($config['activate_gis']) { $gistab['text'] = '' - .print_image("images/world.png", true, array( "title=" => __('GIS data'))) + .print_image("images/world.png", true, array( "title" => __('GIS data'))) .''; if ($tab == 'gis') @@ -393,7 +335,7 @@ if ($config['activate_gis']) { $gistab['active'] = false; } -$onheader = array('manage' => $managetab, 'main' => $maintab, 'data' => $datatab, 'alert' => $alerttab, 'sla' => $slatab, 'inventory' => $inventorytab, 'collection' => $collectiontab, 'group' => $grouptab, 'gis' => $gistab); +$onheader = array('manage' => $managetab, 'separator' => "", 'main' => $maintab, 'data' => $datatab, 'alert' => $alerttab, 'sla' => $slatab, 'inventory' => $inventorytab, 'collection' => $collectiontab, 'group' => $grouptab, 'gis' => $gistab); print_page_header (__('Agent').' - '.mb_substr(get_agent_name($id_agente),0,25), $icon, false, "", false, $onheader);