tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2010-05-24 Raul Mateos <raulofpandora@gmail.com> 

* 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
This commit is contained in:
raulmateos 2010-05-24 16:17:21 +00:00
parent 04cf3b8c8c
commit 7bc18ca807
7 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2010-05-24 Raúl Mateos <raulofpandora@gmail.com>
* 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 <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.php: fixed fall map in

4
pandora_console/godmode/agentes/agent_conf_gis.php
View File

@ -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 "<br /><div class='nf'>" . __("There is no default map.") . "</div>";
}
if ($agentData === false) {
echo "<p>" . __("There is no GIS data for this agent, so it's positioned in default position of map.") . "</p>";
}

4
pandora_console/include/config_process.php
View File

@ -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;

6
pandora_console/include/styles/menu.css
View File

@ -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

13
pandora_console/include/styles/pandora.css
View File

@ -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%;

6
pandora_console/operation/agentes/sla_view.php
View File

@ -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 "<h2>".__('Pandora agents'). " &raquo; ".__('SLA view')."</h2>";
echo "<h3>".__('Pandora agents'). " &raquo; ".__('SLA view')."</h3>";
$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 "<div class='nf'>".__("There are no modules to evaluate the S.L.A. from")."</div>";
return;
}

4
pandora_console/operation/agentes/ver_agente.php
View File

@ -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 "<div id='menu_tab_frame_view'>";
if ($agent["icon_path"]) {
$icon = get_agent_icon_map($agent["id_agente"], true);
$icon = get_agent_icon_map($agent["id_agente"], true);
}
else {
$icon = 'images/bricks.png';