2009-11-06 Raul Mateos <raulofpandora@gmail.com>

* 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.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2092 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2009-11-06 20:05:51 +00:00
parent 3fef0ea002
commit ef4a1ec0f1
5 changed files with 34 additions and 23 deletions

View File

@ -1,3 +1,14 @@
2009-11-06 Raul Mateos <raulofpandora@gmail.com>
* 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 <miguel.dedios@artica.es> 2009-11-06 Miguel de Dios <miguel.dedios@artica.es>
* operation/snmpconsole/snmp_view.php: fix and optimize the query to traps * operation/snmpconsole/snmp_view.php: fix and optimize the query to traps

View File

@ -16,7 +16,7 @@
pandora_console_version="3.0.0.rc2" 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 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
if [ $? = 1 ] if [ $? = 1 ]
then then
@ -29,7 +29,7 @@ fi
whereis dh-make-pear | cut -d":" -f2 | grep dh-make-pear > /dev/null whereis dh-make-pear | cut -d":" -f2 | grep dh-make-pear > /dev/null
if [ $? = 1 ] if [ $? = 1 ]
then then
echo "No found \"dh-make-pear\" aplication, please install." echo " \"dh-make-pear\" aplication not found, please install."
exit 1 exit 1
else else
echo "Found \"dh-make-pear\"." echo "Found \"dh-make-pear\"."
@ -38,7 +38,7 @@ fi
whereis fakeroot | cut -d":" -f2 | grep fakeroot > /dev/null whereis fakeroot | cut -d":" -f2 | grep fakeroot > /dev/null
if [ $? = 1 ] if [ $? = 1 ]
then then
echo "No found \"fakeroot\" aplication, please install." echo " \"fakeroot\" aplication not found, please install."
exit 1 exit 1
else else
echo "Found \"fakeroot\"." echo "Found \"fakeroot\"."
@ -47,7 +47,7 @@ fi
whereis dpkg-buildpackage | cut -d":" -f2 | grep dpkg-buildpackage > /dev/null whereis dpkg-buildpackage | cut -d":" -f2 | grep dpkg-buildpackage > /dev/null
if [ $? = 1 ] if [ $? = 1 ]
then then
echo "No found \"dpkg-buildpackage\" aplication, please install." echo " \"dpkg-buildpackage\" aplication not found, please install."
exit 1 exit 1
else else
echo "Found \"dpkg-buildpackage\"." echo "Found \"dpkg-buildpackage\"."
@ -55,7 +55,7 @@ fi
cd .. 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 mkdir -p temp_package/var/www/pandora_console
echo "Make directory system tree for package." echo "Make directory system tree for package."
@ -99,7 +99,7 @@ do
done done
echo "END" 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` for item in `find temp_package`
do do
echo -n "." echo -n "."
@ -133,5 +133,5 @@ mv php-xml-rpc*.deb ..
cd .. cd ..
echo "Delete the \"temp_package\" temp dir for job." echo "Delete the \"temp_package\" temporary dir for job."
rm -rf temp_package rm -rf temp_package

View File

@ -94,22 +94,22 @@ $cells[1]["href"] = "index.php?sec=estado&amp;sec2=operation/agentes/status_moni
$cells[2][0] = __('Monitors critical'); $cells[2][0] = __('Monitors critical');
$cells[2][1] = $data["monitor_critical"]; $cells[2][1] = $data["monitor_critical"];
$cells[2]["color"] = "#f00"; $cells[2]["color"] = "#c00";
$cells[2]["href"] = "index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=60&amp;status=2"; $cells[2]["href"] = "index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=60&amp;status=2";
$cells[3][0] = __('Monitors warning'); $cells[3][0] = __('Monitors warning');
$cells[3][1] = $data["monitor_warning"]; $cells[3][1] = $data["monitor_warning"];
$cells[3]["color"] = "#FFB900"; $cells[3]["color"] = "#ffb900";
$cells[3]["href"] = "index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=60&amp;status=1"; $cells[3]["href"] = "index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=60&amp;status=1";
$cells[4][0] = __('Monitors normal'); $cells[4][0] = __('Monitors normal');
$cells[4][1] = $data["monitor_ok"]; $cells[4][1] = $data["monitor_ok"];
$cells[4]["color"] = "#00ff00"; $cells[4]["color"] = "#8ae234";
$cells[4]["href"] = "index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=60&amp;status=0"; $cells[4]["href"] = "index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=60&amp;status=0";
$cells[5][0] = __('Monitors unknown'); $cells[5][0] = __('Monitors unknown');
$cells[5][1] = $data["monitor_unknown"]; $cells[5][1] = $data["monitor_unknown"];
$cells[5]["color"] = "#aaaaaa"; $cells[5]["color"] = "#aaa";
$cells[5]["href"] = "index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=60&amp;status=3"; $cells[5]["href"] = "index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=60&amp;status=3";
$cells[6][0] = __('Alerts defined'); $cells[6][0] = __('Alerts defined');

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 198 B

View File

@ -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]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=-1"; //All
$cells[0]["color"] = "#000"; $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][0] = __('Monitors critical');
$cells[3][1] = $data["monitor_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]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=2"; //Down
$cells[3]["color"] = "#c00"; $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][0] = __('Monitors unknown');
$cells[4][1] = $data["monitor_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]["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][0] = __('Monitors not init');
$cells[5][1] = $data["monitor_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[5]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&refr=60&status=5"; //Not init
$cells[6][0] = __('Alerts defined'); $cells[6][0] = __('Alerts defined');