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 79ad33260b..40b9a8e7b7 100644 Binary files a/pandora_console/images/pandora_logo.png and b/pandora_console/images/pandora_logo.png differ diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index fe848db9ff..fb224665a3 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -1,15 +1,12 @@ /* -// Pandora FMS - the Free monitoring system -// ======================================== -// Copyright (c) 2004-2007 Sancho Lerena, slerena@gmail.com +// Pandora FMS - the Flexible monitoring system +// ============================================= + +// Copyright (c) 2004-2008 Sancho Lerena, slerena@gmail.com // Main PHP/SQL code development and project architecture and management -// Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com +// Copyright (c) 2004-2008 Raul Mateos Martin, raulofpandora@gmail.com // CSS and some PHP additions -// Copyright (c) 2006-2007 Jonathan Barajas, jonathan.barajas[AT]gmail[DOT]com -// Javascript Active Console code. -// Copyright (c) 2006 Jose Navarro -// 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 "