From c2e2902b0b4aba0b10dea9a3c2c9e9fab07cf294 Mon Sep 17 00:00:00 2001 From: raulmateos Date: Sat, 26 Sep 2009 17:05:46 +0000 Subject: [PATCH] 2009-09-26 Raul Mateos * include/config_process.php: Update build after last changes. * operation/agentes/alerts_status.php, operation/agentes/sla_view.php: Unify titles improving integrity of appearance. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1982 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/include/config_process.php | 2 +- .../operation/agentes/alerts_status.php | 18 +++++++++++++++--- pandora_console/operation/agentes/sla_view.php | 2 +- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 776d820a89..ffd29186d2 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2009-09-26 Raul Mateos + + * include/config_process.php: Update build after last changes. + + * operation/agentes/alerts_status.php, operation/agentes/sla_view.php: + Unify titles improving integrity of appearance. + 2009-09-25 Miguel de Dios * include/javascript/pandora_modules.js: fix the js and add more entities diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index f3209b6a31..7b156e5413 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC090914'; +$build_version = 'PC090926'; $pandora_version = 'v3.0-dev'; $config['start_time'] = microtime (true); diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index d74215b93d..c6b0c4284a 100644 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -72,6 +72,7 @@ if (isset ($_GET["id_agente"])) { $alerts_simple = get_agent_alerts_simple ($id_agent, $filter); $alerts_combined = get_agent_alerts_compound ($id_agent, $filter); $print_agent = false; + $inside_main = 1; } else { if (!give_acl ($config["id_user"], 0, "AR")) { audit_db ($config["id_user"], $config["remote_addr"], "ACL Violation","Trying to access alert view"); @@ -93,16 +94,27 @@ if (isset ($_GET["id_agente"])) { } $print_agent = true; + $inside_main = 0; } + $tab = get_parameter_get ("tab"); if ($tab != '') { $url = $url.'&tab='.$tab; } -echo "

".__('Pandora agents')." » ".__('Alerts'); -echo print_help_icon ('alert_validation', true); -echo "

"; + +if ($inside_main == 1 && $tab != 'alert') { + echo "

"; + echo __('Alerts'); + echo "

"; + +} else { + echo "

"; + echo __('Pandora agents'). " » ".__('Alerts'); + echo print_help_icon ('alert_validation', true); + echo "

"; +} echo '
'; diff --git a/pandora_console/operation/agentes/sla_view.php b/pandora_console/operation/agentes/sla_view.php index dc952706cb..f409afc3ae 100644 --- a/pandora_console/operation/agentes/sla_view.php +++ b/pandora_console/operation/agentes/sla_view.php @@ -27,7 +27,7 @@ if (! give_acl ($config['id_user'], 0, "AR") && ! give_acl ($config['id_user'], exit; } -echo "

".__('SLA view')."

"; +echo "

".__('Pandora agents'). " » ".__('SLA view')."

"; $id_agent = get_parameter ("id_agente", 0); $interval = get_agent_interval ($id_agent); $modules = get_agent_modules ($id_agent, '*',