From e78d2c2bbcdaf615d394623b6678274b48ba57aa Mon Sep 17 00:00:00 2001 From: slerena Date: Mon, 1 Sep 2008 08:51:04 +0000 Subject: [PATCH] 2008-09-01 Sancho Lerena * pandora_logo.png: White background for IE6 users. * index.php: Updated version and develop bypass. * header.php, pandora.css: Better view in IE6. * estado_ultimopaquete.php: Fixes bad render for big numbers. * snmp_view.php: Fixes problems with IE6 render. Better view of custom OID (shortened and as tooltip). * stat_win.php: Fixed problem with slicer in IE6. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1053 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 15 ++++ pandora_console/general/header.php | 2 +- pandora_console/images/pandora_logo.png | Bin 14016 -> 13827 bytes pandora_console/include/styles/pandora.css | 18 +++-- pandora_console/index.php | 6 +- .../agentes/estado_ultimopaquete.php | 7 +- .../operation/snmpconsole/snmp_view.php | 68 +++++++++--------- pandora_console/reporting/stat_win.php | 2 +- 8 files changed, 61 insertions(+), 57 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index dcb31dbbee..0d85133fc7 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,18 @@ +2008-09-01 Sancho Lerena + + * pandora_logo.png: White background for IE6 users. + + * index.php: Updated version and develop bypass. + + * header.php, pandora.css: Better view in IE6. + + * estado_ultimopaquete.php: Fixes bad render for big numbers. + + * snmp_view.php: Fixes problems with IE6 render. Better view + of custom OID (shortened and as tooltip). + + * stat_win.php: Fixed problem with slicer in IE6. + 2008-09-01 Raul Mateos * operation/snmp/smp_console/snmp_view.php: Show substring in custom value, when the mouse is diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 726f9f0f3f..06966473ba 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -23,7 +23,7 @@ if(!isset ($_SESSION["id_usuario"])) { echo ""; return; } -$table->width=520; +$table->width=480; $table->border=0; $table->cellpadding=3; $table->size=array("30%"); diff --git a/pandora_console/images/pandora_logo.png b/pandora_console/images/pandora_logo.png index 79ad33260b0496b5d2a1e70e8635fe449b59c5e2..40b9a8e7b75c2e00451f3f9ccb8ddce488eda9b6 100644 GIT binary patch literal 13827 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 -// Additions to Pandora FMS 1.2 graph code and new XML reporting template management -// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas, info@artica.es +// Copyright (c) 2005-2008 Artica Soluciones Tecnologicas, info@artica.es // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -628,8 +625,9 @@ span.rmess, span.nrmess { #head_m { position: absolute; padding-top: 6px; - padding-left: 200px; + padding-left: 12em; } + span#logo_text1 { font: bolder 3em Arial, Sans-serif; letter-spacing: -2px; diff --git a/pandora_console/index.php b/pandora_console/index.php index 8d2bcd7d93..746ffdef56 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -20,13 +20,13 @@ // Silk icon set 1.3 (cc) Mark James, http://www.famfamfam.com/lab/icons/silk/ // Pandora FMS uses Pear Image::Graph code -$build_version="PC080822"; -$pandora_version="v2.0Beta1"; +$build_version="PC080901"; +$pandora_version="v2.0Beta1 "; global $build_version; global $pandora_version; // Set to 1 to do not check for installer or config file (for development!). -$develop_bypass = 1; +$develop_bypass = 0; if ($develop_bypass != 1){ // If no config file, automatically try to install diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php index 945a934803..926f737c5f 100644 --- a/pandora_console/operation/agentes/estado_ultimopaquete.php +++ b/pandora_console/operation/agentes/estado_ultimopaquete.php @@ -157,12 +157,7 @@ if (mysql_num_rows ($result3)) { // Kind of data if (is_numeric($row3["datos"])) { - $mytempdata = fmod($row3["datos"], 1); - if ($mytempdata == 0) - $myvalue = intval($row3["datos"]); - else - $myvalue = $row3["datos"]; - echo format_for_graph($myvalue ); + echo format_for_graph($row3["datos"] ); } else echo substr(salida_limpia($row3["datos"]),0,42); diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php index 7a717a1fec..285874f1c3 100644 --- a/pandora_console/operation/snmpconsole/snmp_view.php +++ b/pandora_console/operation/snmpconsole/snmp_view.php @@ -136,7 +136,7 @@ $sql2="SELECT * FROM ttrap ORDER BY timestamp DESC"; $result2=mysql_query($sql2); if (mysql_num_rows($result2)){ - echo ""; + echo "
"; echo "
"; echo " - ".__('Validated event'); echo "
"; @@ -161,30 +161,7 @@ if (mysql_num_rows($result2)){ $total_traps = count($trap_list); pagination($total_traps, "index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view", $offset); -/* -if ($total_eventos > $config["block_size"]){ - // If existes more registers tha$row["id_usuario"]n i can put in a page, calculate index markers - $index_counter = ceil($total_eventos/$config["block_size"]); - for ($i = 1; $i <= $index_counter; $i++) { - $inicio_bloque = ($i * $config["block_size"] - $config["block_size"]); - $final_bloque = $i * $config["block_size"]; - if ($total_eventos < $final_bloque) - $final_bloque = $total_eventos; - echo ''; - $inicio_bloque_fake = $inicio_bloque + 1; - if ($inicio_bloque == $offset) - echo '[ '.$inicio_bloque_fake.' - '.$final_bloque.' ]'; - else - echo '[ '.$inicio_bloque_fake.' - '.$final_bloque.' ]'; - echo ' '; - } - echo "

"; - // if exists more registers than i can put in a page (defined by $config["block_size"] config parameter) - // get offset for index calculation -} -echo ""; -*/ if (isset($_GET["offset"])){ $offset=entrada_limpia($_GET["offset"]); @@ -192,7 +169,7 @@ if (isset($_GET["offset"])){ $offset=0; } echo "
"; -echo ""; +echo "
"; echo ""; echo ""; echo ""; @@ -207,7 +184,9 @@ echo ""; echo ''; echo ""; + $id_trap = 0; +$color = 0; if ($offset !=0) $offset_limit = $offset +1; else @@ -219,45 +198,62 @@ for ($a=$offset_limit;$a < ($config["block_size"] + $offset + 1);$a++){ $sql="SELECT * FROM ttrap WHERE id_trap = $id_trap"; if ($result=mysql_query($sql)){ $row=mysql_fetch_array($result); + if ($color == 1){ + $tdcolor = "datos"; + $color = 0; + } + else { + $tdcolor = "datos2"; + $color = 1; + } $offset_counter++; echo ""; - echo ""; + + echo ""; } else { - echo ""; + echo ""; } - echo ""; - echo ""; + + echo ""; - echo ""; - echo ""; + + echo ""; - echo ""; - echo ""; } diff --git a/pandora_console/reporting/stat_win.php b/pandora_console/reporting/stat_win.php index 183ae49805..d3d816b03e 100644 --- a/pandora_console/reporting/stat_win.php +++ b/pandora_console/reporting/stat_win.php @@ -128,7 +128,7 @@ if ($start_date != $current){ var defOffset = 2; var defSlideTime = 220; var tnActive = 0; - var visibleMargin = 5; + var visibleMargin = 15; var menuW = 325; var menuH = 310; window.onload = function() {
".__('Status')."".__('OID')."
"; + echo ""; if ($row["status"] == 0){ echo ""; } else { echo ""; } - echo "".$row["oid"]; + echo "".$row["oid"]; $sql="SELECT * FROM tagente WHERE direccion = '".$row["source"]."'"; $result2=mysql_query($sql); // If there's any agent with this IP we show name and link to agent if ($row2=mysql_fetch_array($result2)){ - echo " + echo " ".dame_nombre_agente($row2["id_agente"])."".$row["source"]."".$row["source"]."".substr($row["value_custom"],0,20).""; + $custom = substr($row["value_custom"],0,15); + if (strlen ($row["value_custom"]) > 15) + $custom .= "..."; + echo "".$custom.""; if ($row["status"] <> 0) echo " ".dame_nombre_real($row["id_usuario"])."".substr($row["id_usuario"],0,8).""; echo "".$row["timestamp"].""; + + echo "".$row["timestamp"].""; if ($row["alerted"] != 0 ) echo ""; echo ""; - + + echo ""; if ($row["status"] == 0 && give_acl ($config['id_user'],"0","IW")) echo ""; if (give_acl ($config['id_user'], "0", "IM")) echo ""; echo ""; + + echo ""; echo ""; echo "