diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 57ae6d2eaa..87cd2aeec6 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2006-12-16 Raul Mateos + + * include/styles/pandora.css, op.css, god.css: Removed more unnecessary + lines and solve some typo errors. + + * operation/agentes/estado_grupo.php: Style correction. Change some + colour names for its HTML RGB code. + 2006-12-15 Raul Mateos * operation/agentes/datos_agente.php: Add no data CSS style. Some diff --git a/pandora_console/include/styles/god.css b/pandora_console/include/styles/god.css index 86d39f39c2..d153699a92 100644 --- a/pandora_console/include/styles/god.css +++ b/pandora_console/include/styles/god.css @@ -4,7 +4,6 @@ text-decoration: none; } #god li { - position: relative; left: 1px; width: 99%; border-bottom: 1px solid #d4d4d4; diff --git a/pandora_console/include/styles/op.css b/pandora_console/include/styles/op.css index 403af3aafb..2969b5e7dd 100644 --- a/pandora_console/include/styles/op.css +++ b/pandora_console/include/styles/op.css @@ -4,7 +4,6 @@ text-decoration: none; } #op li { - position: relative; left: 0px; width: 100%; border-bottom: 1px solid #d4d4d4; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index a32ccf8989..56cead35ab 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -395,7 +395,7 @@ ul.mn { font-weight: bold; } a.mn, .gr { - font-family: Arial, Verdana, sasns-serif, Helvetica; + font-family: Arial, Verdana, sans-serif, Helvetica; } .imgl { position: absolute; diff --git a/pandora_console/operation/agentes/estado_grupo.php b/pandora_console/operation/agentes/estado_grupo.php index 35f1fb4d52..4cdbf657ed 100644 --- a/pandora_console/operation/agentes/estado_grupo.php +++ b/pandora_console/operation/agentes/estado_grupo.php @@ -40,11 +40,13 @@ if (comprueba_login () == 0) { // Check for Network FLAG change request if (isset ($_GET["update_netgroup"])) { if (give_acl ($id_user, $_GET["update_netgroup"], "AW") == 1) { - $sql = "SELECT * FROM tagente WHERE id_grupo = ".$_GET["update_netgroup"]; + $sql = "SELECT * FROM tagente WHERE id_grupo = ". + $_GET["update_netgroup"]; $result = mysql_query ($sql); while ($row = mysql_fetch_array ($result)) { $id_agente = $row["id_agente"]; - $query2 ="UPDATE tagente_modulo SET flag=1 WHERE id_agente = ".$id_agente; + $query2 ="UPDATE tagente_modulo SET flag=1 + WHERE id_agente = ".$id_agente; $res = mysql_query ($query2); } } @@ -67,7 +69,8 @@ if (comprueba_login () == 0) { $grupo[$array_index]["id_grupo"] = $migrupo; $existen_agentes =0; - $sql1 = "SELECT * FROM tagente WHERE disabled=0 AND id_grupo =".$migrupo; + $sql1 = "SELECT * FROM tagente WHERE disabled=0 + AND id_grupo =".$migrupo; if ($result1 = mysql_query ($sql1)) { while ($row1 = mysql_fetch_array ($result1)) { $existen_agentes = 1; @@ -103,7 +106,7 @@ if (comprueba_login () == 0) { $ultimo_contacto_modulo = $row3["timestamp"]; // Defines if module is down (interval x 2 > time last contact) - if ($ultimo_contacto_modulo != "2000-00-00 00:00:00") { + if ($ultimo_contacto_modulo != "0000-00-00 00:00:00") { $seconds = strtotime ($ahora) - strtotime ($ultimo_contacto_modulo); if ($seconds >= ($intervalo_comp * 2)) { $grupo[$array_index]["down"]++; @@ -140,41 +143,94 @@ if (comprueba_login () == 0) { $icono_type = ""; if ($grupo[$real_count]["down"] > 0) { - $icono_type = ""; + $icono_type = " + "; } if ($grupo[$real_count]["bad"] > 0) { - $icono_type = $icono_type.""; + $icono_type = $icono_type." + "; } if ($grupo[$real_count]["ok"] > 0) { - $icono_type = $icono_type.""; + $icono_type = $icono_type." + "; } if ($grupo[$real_count]["data"] > 0) { - $icono_type = $icono_type.""; + $icono_type = $icono_type." + "; } // Show yellow light if there are recent alerts fired for this group if ($grupo[$real_count]["alerts"] > 0 ){ - $icono_type=$icono_type.""; + $icono_type=$icono_type." + "; } /* FIXME: This line is ugly */ // TOOLTIP. - $celda = "  + $celda = " + + +   - - -
".$lang_label["agents"].":
".$grupo[$real_count]["agent"]."
- - - - - - -
".ucfirst($lang_label["monitors"]).":
".$lang_label["ok"].": ".$grupo[$real_count]["ok"]."
".$lang_label["down"].": ".$grupo[$real_count]["down"]."
".$lang_label["fail"].": ".$grupo[$real_count]["bad"]."
".$lang_label["alerts"].": ".$grupo[$real_count]["alerts"]."
"; + + + +
". + $lang_label["agents"].":
". + $grupo[$real_count]["agent"]."
+ + + + + + + + + + + + + + + + + + + + +
". + ucfirst($lang_label["monitors"]).":
+ + ".$lang_label["ok"].": + ".$grupo[$real_count]["ok"]." +
+ + ".$lang_label["down"].": ". + $grupo[$real_count]["down"]."
+ + ".$lang_label["fail"].": ". + $grupo[$real_count]["bad"]."
+ + ".$lang_label["alerts"].": ". + $grupo[$real_count]["alerts"]."
+ "; // Render network exec module button, only when this group is writtable by user if (give_acl ($id_user, $grupo[$real_count]["id_grupo"], "AW") == 1) { - $celda .= ""; + $celda .= " + "; } - $celda .= "

".$icono_type."

".$group_name.""; + $celda .= "

". + $icono_type."

+ ".$group_name.""; echo $celda; } $real_count++; @@ -190,7 +246,8 @@ if (comprueba_login () == 0) { echo "
".$lang_label["no_agent"]."
"; } } else { - audit_db ($id_user, $REMOTE_ADDR, "ACL Violation", "Trying to access Agent view (Grouped)"); + audit_db ($id_user, $REMOTE_ADDR, "ACL Violation", + "Trying to access Agent view (Grouped)"); require ("general/noaccess.php"); } }