From dc39f0332179e576de31d73c6e904cdd6c8cf56c Mon Sep 17 00:00:00 2001 From: raulmateos Date: Mon, 24 May 2010 16:17:21 +0000 Subject: [PATCH] 2010-05-24 Raul Mateos * include/config_process.php: Updated build to new RC2. * operation/agentes/sla_view.php, operation/agentes/ver_agente.php, godmode/agentes/agent_conf_gis.php, include/styles/menu.css, include/styles/pandora.css: Clean code, updated year. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2791 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/godmode/agentes/agent_conf_gis.php | 4 +--- pandora_console/include/config_process.php | 4 ++-- pandora_console/include/styles/menu.css | 6 +++--- pandora_console/include/styles/pandora.css | 13 +++++++------ pandora_console/operation/agentes/sla_view.php | 6 +++--- pandora_console/operation/agentes/ver_agente.php | 4 ++-- 7 files changed, 26 insertions(+), 19 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 1d8829a97d..3e62ede20f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2010-05-24 Raúl Mateos + + * include/config_process.php: Updated build to new RC2. + + * operation/agentes/sla_view.php, operation/agentes/ver_agente.php, + godmode/agentes/agent_conf_gis.php, include/styles/menu.css, + include/styles/pandora.css: Clean code, updated year. + 2010-05-24 Miguel de Dios * godmode/reporting/visual_console_builder.editor.php: fixed fall map in diff --git a/pandora_console/godmode/agentes/agent_conf_gis.php b/pandora_console/godmode/agentes/agent_conf_gis.php index 53b1329994..ce0336bfae 100644 --- a/pandora_console/godmode/agentes/agent_conf_gis.php +++ b/pandora_console/godmode/agentes/agent_conf_gis.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or @@ -36,8 +36,6 @@ if (!getAgentMap($id_agente, "500px", "98%", false)) { echo "
" . __("There is no default map.") . "
"; } - - if ($agentData === false) { echo "

" . __("There is no GIS data for this agent, so it's positioned in default position of map.") . "

"; } diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 61957823e7..6be000f63d 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,8 +22,8 @@ /** * Pandora build version and version */ -$build_version = 'PC100519'; // Remember is YYMMDD -$pandora_version = 'v3.1rc1'; +$build_version = 'PC100524'; // Remember is YYMMDD +$pandora_version = 'v3.1rc2'; /* Help to debug problems. Override global PHP configuration */ if (!isset($develop_bypass)) $develop_bypass = 0; diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index edf464f29d..432c044217 100644 --- a/pandora_console/include/styles/menu.css +++ b/pandora_console/include/styles/menu.css @@ -1,7 +1,7 @@ /* -// Pandora FMS - the Flexible Monitoring System -// ============================================= -// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L +// Pandora FMS - http://pandorafms.com +// ================================================== +// Copyright (c) 2004-2010 Artica Soluciones Tecnológicas S.L // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 1d0087f604..307addd430 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -4,8 +4,9 @@ Author: The Pandora FMS team Name: Default theme Description: The default Pandora FMS theme layout -// Pandora FMS - the Flexible Monitoring System -// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L +// Pandora FMS - http://pandorafms.com +// ========================================================== +// Copyright (c) 2004-2010 Artica Soluciones Tecnológicas S.L // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -379,7 +380,7 @@ tr.rowOdd:hover { position: relative; width: 100%; } -.bg { +.bg { height: 20px; } .bg2, .bg3, .bg4 { @@ -425,10 +426,10 @@ tr.rowOdd:hover { border-bottom: 1px solid #708090; width: 100%; } -.green { +.green { color: #5a8629; } -.yellow { +.yellow { color: #F3C500; } .greenb { @@ -1043,7 +1044,7 @@ span.ac_extra_field strong { div#pandora_logo_header { -/* Put here your company logo (139x60 pixels) like this: */ +/* Put here your company logo (139x60 pixels) like this: */ /* background: url(../../images/MiniLogoArtica.jpg); */ background: url(../../images/pandora_logo_head.png); background-position: 0% 0%; diff --git a/pandora_console/operation/agentes/sla_view.php b/pandora_console/operation/agentes/sla_view.php index 1c63d6ffab..26965f2472 100644 --- a/pandora_console/operation/agentes/sla_view.php +++ b/pandora_console/operation/agentes/sla_view.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or @@ -28,13 +28,13 @@ if (! give_acl ($config['id_user'], 0, "AR") && ! give_acl ($config['id_user'], exit; } -echo "

".__('Pandora agents'). " » ".__('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, '*', array ('disabled' => 0, 'history_data' => 1, 'delete_pending' => 0)); if (empty ($modules)) { - print_error_message (__("There are no modules to evaluate the S.L.A. from")); + echo "
".__("There are no modules to evaluate the S.L.A. from")."
"; return; } diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index ead3e35280..e32561127c 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or @@ -237,7 +237,7 @@ if (isset($_GET["flag_agent"])){ echo "