diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index db5ec73feb..5526cc5db8 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ +2009-11-06 Raul Mateos + + * operation/agentes/tactical.php, general/logon_ok.php: Use the same + order for summary, use the same colors (some from tango palette) in both + files. + + * images/status_sets/default/server_ok.png: Use the same colour as the + other OK status images (from tango palette). + + * DEBIAN/make_deb_package.sh: Improved english texts. + 2009-11-06 Miguel de Dios * operation/snmpconsole/snmp_view.php: fix and optimize the query to traps diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 2419acaa6b..38b33a0508 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -16,7 +16,7 @@ pandora_console_version="3.0.0.rc2" -echo "Test if you has the tools for to make the packages." +echo "Test if you have all the needed tools to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null if [ $? = 1 ] then @@ -29,7 +29,7 @@ fi whereis dh-make-pear | cut -d":" -f2 | grep dh-make-pear > /dev/null if [ $? = 1 ] then - echo "No found \"dh-make-pear\" aplication, please install." + echo " \"dh-make-pear\" aplication not found, please install." exit 1 else echo "Found \"dh-make-pear\"." @@ -38,7 +38,7 @@ fi whereis fakeroot | cut -d":" -f2 | grep fakeroot > /dev/null if [ $? = 1 ] then - echo "No found \"fakeroot\" aplication, please install." + echo " \"fakeroot\" aplication not found, please install." exit 1 else echo "Found \"fakeroot\"." @@ -47,7 +47,7 @@ fi whereis dpkg-buildpackage | cut -d":" -f2 | grep dpkg-buildpackage > /dev/null if [ $? = 1 ] then - echo "No found \"dpkg-buildpackage\" aplication, please install." + echo " \"dpkg-buildpackage\" aplication not found, please install." exit 1 else echo "Found \"dpkg-buildpackage\"." @@ -55,7 +55,7 @@ fi cd .. -echo "Make a \"temp_package\" temp dir for job." +echo "Make a \"temp_package\" temporary dir for job." mkdir -p temp_package/var/www/pandora_console echo "Make directory system tree for package." @@ -99,7 +99,7 @@ do done echo "END" -echo "Calcule md5sum for md5sums file control of package." +echo "Calculate md5sum for md5sums package control file." for item in `find temp_package` do echo -n "." @@ -133,5 +133,5 @@ mv php-xml-rpc*.deb .. cd .. -echo "Delete the \"temp_package\" temp dir for job." +echo "Delete the \"temp_package\" temporary dir for job." rm -rf temp_package diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index 5d3fbcace2..3076bbe1ac 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -94,22 +94,22 @@ $cells[1]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_moni $cells[2][0] = __('Monitors critical'); $cells[2][1] = $data["monitor_critical"]; -$cells[2]["color"] = "#f00"; +$cells[2]["color"] = "#c00"; $cells[2]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=2"; $cells[3][0] = __('Monitors warning'); $cells[3][1] = $data["monitor_warning"]; -$cells[3]["color"] = "#FFB900"; +$cells[3]["color"] = "#ffb900"; $cells[3]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=1"; $cells[4][0] = __('Monitors normal'); $cells[4][1] = $data["monitor_ok"]; -$cells[4]["color"] = "#00ff00"; +$cells[4]["color"] = "#8ae234"; $cells[4]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=0"; $cells[5][0] = __('Monitors unknown'); $cells[5][1] = $data["monitor_unknown"]; -$cells[5]["color"] = "#aaaaaa"; +$cells[5]["color"] = "#aaa"; $cells[5]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=3"; $cells[6][0] = __('Alerts defined'); diff --git a/pandora_console/images/status_sets/default/server_ok.png b/pandora_console/images/status_sets/default/server_ok.png index 316e6dd1ef..5cefaa1872 100755 Binary files a/pandora_console/images/status_sets/default/server_ok.png and b/pandora_console/images/status_sets/default/server_ok.png differ diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php index a3a2630b75..407945d39c 100644 --- a/pandora_console/operation/agentes/tactical.php +++ b/pandora_console/operation/agentes/tactical.php @@ -93,29 +93,29 @@ $cells[0][1] = $data["monitor_checks"]; $cells[0]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=-1"; //All $cells[0]["color"] = "#000"; -$cells[1][0] = __('Monitors normal'); -$cells[1][1] = $data["monitor_ok"]; -$cells[1]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=0"; //Up -$cells[1]["color"] = "#000"; - -$cells[2][0] = __('Monitors warning'); -$cells[2][1] = $data["monitor_warning"]; -$cells[2]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=1"; //Down -$cells[2]["color"] = "#FFB900"; - $cells[3][0] = __('Monitors critical'); $cells[3][1] = $data["monitor_critical"]; $cells[3]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=2"; //Down $cells[3]["color"] = "#c00"; +$cells[2][0] = __('Monitors warning'); +$cells[2][1] = $data["monitor_warning"]; +$cells[2]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=1"; //Down +$cells[2]["color"] = "#ffb900"; + +$cells[1][0] = __('Monitors normal'); +$cells[1][1] = $data["monitor_ok"]; +$cells[1]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=0"; //Up +$cells[1]["color"] = "#8ae234"; + $cells[4][0] = __('Monitors unknown'); $cells[4][1] = $data["monitor_unknown"]; $cells[4]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=3"; //Unknown -$cells[4]["color"] = "#C0C0C0"; +$cells[4]["color"] = "#aaa"; $cells[5][0] = __('Monitors not init'); $cells[5][1] = $data["monitor_not_init"]; -$cells[5]["color"] = "#c00"; +$cells[5]["color"] = "#ef2929"; $cells[5]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=5"; //Not init $cells[6][0] = __('Alerts defined');