diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index ca36693ddc..2824ba7d97 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2006-12-08 Raul Mateos + + * include/config.php: Changed build + + * images/info.gif: New file + + * include/styles/pandora.css: Created new style and modified others + + * operation/agentes/*.php, operation/servers/*.php, godmode/agentes/*.php, + godmode/servers/*.php,: Close some HTML tags. Changed style for not + found items. + 2006-12-07 Raul Mateos * include/config.php: Changed build diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 919e9b57f3..e8b3b85411 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -764,7 +764,7 @@ if ( $creacion_agente != 1) { } echo "
"; } else - echo "No modules"; + echo "
No modules
"; ?> @@ -830,9 +830,9 @@ $result=mysql_query($sql1); echo $string; echo "
"; } - else echo "".$lang_label["no_alerts"].""; + else echo "
".$lang_label["no_alerts"]."
"; } - else echo "".$lang_label["no_modules"].""; + else echo "
".$lang_label["no_modules"]."
"; ?>
@@ -857,7 +857,9 @@ else { } } ?> -

 

+

+ + 

@@ -867,7 +869,7 @@ else { "; - echo "".$lang_label["no_change_field"].""; + echo "".$lang_label["no_change_field"].""; } else { echo '
"; echo "
"; echo ""; - echo "
"; + echo ""; echo ""; } else { - echo ''.$lang_label["no_agent_def"].'

'; + echo "
".$lang_label["no_agent_def"]."
"; echo "
"; echo ""; echo "
"; diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index 2ccccc7928..3296a0296f 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -69,7 +69,7 @@ if (comprueba_login() == 0) { echo "".$lang_label['description']."'.$lang_label["no_server"].''; + echo "
".$lang_label["no_server"]."
"; } echo '
'; echo ''; @@ -159,7 +159,7 @@ if (comprueba_login() == 0) { echo '
'; } else { - echo ''.$lang_label["no_server"].''; + echo "
".$lang_label["no_server"]."
"; } } diff --git a/pandora_console/images/info.gif b/pandora_console/images/info.gif new file mode 100644 index 0000000000..aea6b80d81 Binary files /dev/null and b/pandora_console/images/info.gif differ diff --git a/pandora_console/include/config.php b/pandora_console/include/config.php index f4a9b8a790..5a199faa35 100644 --- a/pandora_console/include/config.php +++ b/pandora_console/include/config.php @@ -20,7 +20,7 @@ // This is the base config file //Pandora Version -$build_version="PC061207"; //PCyymmdd +$build_version="PC061208"; //PCyymmdd $pandora_version="v1.3 Beta 1"; // Database configuration diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 0bd1309891..fc253b5235 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -249,7 +249,7 @@ td.datos_jus, td.datos2_jus { .f9, .f9i, .f9b, td.f9, td.f9i, td.datosf9, td.datos2f9, td.datosf9i, td.datos2f9i { font-size: 9px; } -.f9i { +.f9i, .redi { font-style: italic; } .f9l20 { @@ -276,7 +276,7 @@ td.datos_jus, td.datos2_jus { background: url(../../images/error.gif) no-repeat; padding: 4px 1px 6px 30px; } -.red , .redb, .error, div.nf { +.red , .redb, .redi, .error { color: #ff0000; } .sep { @@ -410,5 +410,8 @@ div.imgr>img { right: 1; } div.nf { + background: url(../../images/info.gif) no-repeat; + color: #9a2f0a; margin-left: 7px; + padding: 2px 1px 6px 25px; } \ No newline at end of file diff --git a/pandora_console/operation/agentes/estado_grupo.php b/pandora_console/operation/agentes/estado_grupo.php index cc6bcbd5a3..c96fc3c1d2 100644 --- a/pandora_console/operation/agentes/estado_grupo.php +++ b/pandora_console/operation/agentes/estado_grupo.php @@ -114,61 +114,64 @@ if (comprueba_login() == 0) $array_index++; } } - if ($contador_agente==0) {echo "".$lang_label["no_agent_def"]."";} - $ancho = ceil(sqrt($array_index+1)); - $real_count =0; // Puedo tener una tabla con mas items en ella que los que realmente debo mostrar, real count cuenta los que voy poniendo hasta llegar a array_index que son los que hay en el array $grupo. - echo ""; - for ($table=0;$table < $ancho;$table++){ - echo ""; - for ($table_row=0;$table_row < $ancho;$table_row++){ - if ($real_count < $array_index){ - $group_name = $grupo[$real_count]["group"]; - $icono_grupo = $grupo[$real_count]["icon"]; - $icono_type=""; - if ($grupo[$real_count]["down"]>0) { - $icono_type=""; + if ($contador_agente!=0) { + $ancho = ceil(sqrt($array_index+1)); + $real_count =0; + echo "
"; + for ($table=0;$table < $ancho;$table++){ + echo ""; + for ($table_row=0;$table_row < $ancho;$table_row++){ + if ($real_count < $array_index){ + $group_name = $grupo[$real_count]["group"]; + $icono_grupo = $grupo[$real_count]["icon"]; + $icono_type=""; + if ($grupo[$real_count]["down"]>0) { + $icono_type=""; + } + if ($grupo[$real_count]["bad"]>0) { + $icono_type=$icono_type.""; + } + if ($grupo[$real_count]["ok"]>0) { + $icono_type=$icono_type.""; + } + if ($grupo[$real_count]["data"]>0) { + $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.""; + } + // TOOLTIP. + $celda = ""; + } + echo "
  + + + +
".$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 = $celda . "

".$icono_type."

".$group_name.""; + echo $celda; } - if ($grupo[$real_count]["bad"]>0) { - $icono_type=$icono_type.""; - } - if ($grupo[$real_count]["ok"]>0) { - $icono_type=$icono_type.""; - } - if ($grupo[$real_count]["data"]>0) { - $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.""; - } - // TOOLTIP. - $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"]."
"; - // 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 = $celda . "

".$icono_type."

".$group_name.""; - echo $celda; + $real_count++; } - $real_count++; + echo "
"; + } else { + echo "
".$lang_label["no_agent_def"]."
"; } - echo ""; - } - echo ""; } else { - echo ''.$lang_label["no_agent"].''; + echo "
".$lang_label["no_agent"]."
"; } } else { diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 248445da73..07e0e604d2 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -65,32 +65,37 @@ if (comprueba_login() == 0) { else $agent_down = 0; - echo "".$est_tipo; - echo "".$est_modulo; - echo "".substr($est_description,0,32); + echo "".$est_tipo.""; + echo "".$est_modulo.""; + echo "" + .substr($est_description,0,32).""; // echo "".$row3["datos"]; if ($agent_down == 1) - echo ""; + echo " + "; else if ($est_estado == 1) if ($est_cambio ==1) - echo ""; + echo " + "; else - echo ""; + echo " + "; else - echo ""; + echo " + "; echo ""; - echo $temp_interval; + echo $temp_interval.""; echo ""; - if ($agent_down == 1) // Si el agente esta down, lo mostramos en negrita y en rojo - echo ""; - - echo $row_t["timestamp"]; + if ($agent_down == 1) { // If agent down, it's shown red and bold + echo ""; + } + echo $row_t["timestamp"].""; } } echo '
'; } else - echo "".$lang_label["no_monitors"].""; + echo "
".$lang_label["no_monitors"]."
"; } ?> \ No newline at end of file diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php index d324672331..5ff146a42b 100644 --- a/pandora_console/operation/agentes/estado_ultimopaquete.php +++ b/pandora_console/operation/agentes/estado_ultimopaquete.php @@ -191,6 +191,8 @@ if (comprueba_login() == 0) { } echo '
'; } -else echo "".$lang_label["no_modules"].""; -} +else { + echo "
".$lang_label["no_modules"]."
"; +} + } ?>