From 86de96df72980822169a9928fd67d9a18b933c8e Mon Sep 17 00:00:00 2001 From: raulmateos Date: Wed, 12 Jul 2006 13:43:41 +0000 Subject: [PATCH] (Pandora Console) * datos_agente.php. Add new text about authors. Add a line between table and button. Add different colors between rows (cosmetic changes). Add Help. * user.php. Add new text about authors. Clean code. * menu.php. Add highlight when datos_agente selected. * pandora.css. Add new text about authors. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@132 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/CHANGELOG | 8 +++ pandora_console/include/styles/pandora.css | 21 +++++-- .../operation/agentes/datos_agente.php | 55 ++++++++++++------- pandora_console/operation/menu.php | 5 +- pandora_console/operation/users/user.php | 26 ++++++--- 5 files changed, 81 insertions(+), 34 deletions(-) diff --git a/pandora_console/CHANGELOG b/pandora_console/CHANGELOG index 5d864369df..21c49b7ce2 100644 --- a/pandora_console/CHANGELOG +++ b/pandora_console/CHANGELOG @@ -1,5 +1,13 @@ 2006-07-12 Raul Mateos + * datos_agente.php. Add new text about authors. Add a line between table and button. Add different colors between rows (cosmetic changes). Add Help. + + * user.php. Add new text about authors. Clean code. + + * menu.php. Add highlight when datos_agente selected. + + * pandora.css. Add new text about authors. + * changed name from pandora_info_es.html to pandora_info_es_es.html and pandora_info_bb.html to pandora_info_ast_es.html * pandora_info_it.html. New file, GPL license in italian diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index cc9b914092..ed8beb2dd9 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -1,9 +1,20 @@ /* -Pandora - The Free Source Monitoring System -This code is protected by GPL license. -Este c�igo esta protegido por la licencia GPL. -Sancho Lerena , 2003-2006 -Ral Mateos , 2004-2006 +// Pandora - the Free monitoring system +// ==================================== +// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com +// Copyright (c) 2005-2006 Artica Soluciones Tecnológicas S.L, info@artica.es +// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @import url(op.css); diff --git a/pandora_console/operation/agentes/datos_agente.php b/pandora_console/operation/agentes/datos_agente.php index 83e1042cda..fa9081f19f 100644 --- a/pandora_console/operation/agentes/datos_agente.php +++ b/pandora_console/operation/agentes/datos_agente.php @@ -1,21 +1,30 @@ , 2003-2006 -// Raul Mateos , 2005-2006 -// Cargamos variables globales +// Pandora - the Free monitoring system +// ==================================== +// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com +// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es +// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +// Load global vars require("include/config.php"); -//require("include/functions.php"); -//require("include/functions_db.php"); function datos_raw($id_agente_modulo, $periodo){ - // Conecto con la BBDD require("include/config.php"); require("include/languages/language_".$language_code.".php"); - // Fecha 24 horas + // 24 hours date $yesterday_year = date("Y", time()-86400); $yesterday_month = date("m", time()-86400); $yesterday_day = date ("d", time()-86400); @@ -23,14 +32,14 @@ function datos_raw($id_agente_modulo, $periodo){ $dia = $yesterday_year."-".$yesterday_month."-".$yesterday_day." ".$yesterday_hour.":00:00"; - // Fecha 24x7 Horas (una semana) + // 24x7 hours (one week) $week_year = date("Y", time()-604800); $week_month = date("m", time()-604800); $week_day = date ("d", time()-604800); $week_hour = date ("H", time()-604800); $week = $week_year."-".$week_month."-".$week_day." ".$week_hour.":00:00"; - // Fecha de hace 24x7x30 Horas (un mes) + // 24x7x30 Hours (one month) $month_year = date("Y", time()-2592000); $month_month = date("m", time()-2592000); $month_day = date ("d", time()-2592000); @@ -68,19 +77,27 @@ function datos_raw($id_agente_modulo, $periodo){ $nombre_modulo = dame_nombre_modulo_agentemodulo($id_agente_modulo); echo "

".$lang_label["data_received"]." '$nombre_agente' / '$nombre_modulo'

"; - echo "
$et
"; - echo "
"; + echo "

$et  ".$lang_label["help"]."

"; if (mysql_num_rows($result)){ - echo ""; + echo "
"; + $color=1; echo ""; echo ""; while ($row=mysql_fetch_array($result)){ + if ($color == 1){ + $tdcolor = "datos"; + $color = 0; + } + else { + $tdcolor = "datos2"; + $color = 1; + } echo ""; - echo ""; echo "
".$lang_label["timestamp"]."".$lang_label["data"]."
".$row["timestamp"]; - echo "".salida_limpia($row["datos"]); + echo "".$row["timestamp"]; + echo "".salida_limpia($row["datos"]); } + echo "
"; - echo ""; // I dont know why but there is an unclosed table in somewhere :-? } else { echo "no_data"; @@ -101,4 +118,4 @@ if (comprueba_login() == 0) { datos_raw($id,$tipo); } -?> +?> \ No newline at end of file diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 9e720ff6e4..5f796adf9f 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -1,4 +1,5 @@ -
  • '.$lang_label["view_agents"].'
    • '; if (isset($_GET["sec"]) && $_GET["sec"] == "estado"){ - if(isset($_GET["sec2"]) && ($_GET["sec2"] == "operation/agentes/estado_agente" || $_GET["sec2"] == "operation/agentes/ver_agente")) { + if(isset($_GET["sec2"]) && ($_GET["sec2"] == "operation/agentes/estado_agente" || $_GET["sec2"] == "operation/agentes/ver_agente" || $_GET["sec2"] == "operation/agentes/datos_agente")) { echo "
    "; } else echo "
    "; diff --git a/pandora_console/operation/users/user.php b/pandora_console/operation/users/user.php index c5f83b5f2a..68014af37e 100644 --- a/pandora_console/operation/users/user.php +++ b/pandora_console/operation/users/user.php @@ -1,20 +1,30 @@ , 2003-2006 -// Raul Mateos , 2005-2006 +// Pandora - the Free monitoring system +// ==================================== +// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com +// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es +// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Load global vars require("include/config.php"); -//require("include/functions.php"); -//require("include/functions_db.php"); + if (comprueba_login() == 0) { ?> -

    +