ported 3274:3290 from 1.1.2 (Eugene)

 - improved macro variables substitution in message body/subject (Eugene)
 - minor fix of static linkage (Eugene)
 - fixed support of PostgreSQL (Eugene)
 - fixed DBinsert_id function for oracle (Eugene)
 - fixed autoregistration in oracle system (Eugene)
 - updated postgresql cheme, added start value for sequencers (Eugene)
 - fixed limitation of return value of some items (Eugene)
 - added color selection for trigger severity 'warning' and 'information' (Eugene)



git-svn-id: svn://svn.zabbix.com/trunk@3291 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 13 insertions, 1 deletions

diff --git a/frontends/php/css.css b/frontends/php/css.css
index cf63ce3b..fc5dbd68 100644
--- a/frontends/php/css.css
+++ b/frontends/php/css.css
@@ -347,6 +347,10 @@ table.tableinfo tr td.high		{	background-color: #FF8888;	}
 table.tableinfo tr:hover td.high	{	background-color: #FF8888;	}
 table.tableinfo tr td.average		{	background-color: #DDAAAA;	}
 table.tableinfo tr:hover td.average	{	background-color: #DDAAAA;	}
+table.tableinfo tr td.warning		{	background-color: #EFEFCC;	}
+table.tableinfo tr:hover td.warning	{	background-color: #E5E5CC;	}
+table.tableinfo tr td.information	{	background-color: #CCE2CC;	}
+table.tableinfo tr:hover td.information	{	background-color: #CCE2CC;	}
 table.tableinfo tr td.unknown_trigger	{	background-color: #BCBCBC;	}
 table.tableinfo tr:hover td.unknown_trigger{	background-color: #BCBCBC;	}
 table.tableinfo tr td.normal		{	background-color: #AADDAA;	}
@@ -550,7 +554,7 @@ table.triggers_info td {
 	background-color: #CCCCCC;
 }
 table.triggers_info td.trok {
-	background-color: #99F099;
+	background-color: #00FF33;
 }
 table.triggers_info td.dis {
 	background-color: #FF0000;
@@ -561,6 +565,12 @@ table.triggers_info td.high {
 table.triggers_info td.avg {
 	background-color: #DDAAAA;
 }
+table.triggers_info tr td.warn	{
+	background-color: #EFEFCC;
+}
+table.triggers_info tr td.info	{
+	background-color: #CCE5CC;
+}
 
 /**************** HOSTS INFORMATION MODULE ****************/
 table.hosts_info {
@@ -686,6 +696,8 @@ A.action:active 	{	color:#3C3089;	text-decoration: underline;}
 .disaster	{	background-color: #FF0000;	}
 .high		{	background-color: #FF8888;	}
 .average	{	background-color: #DDAAAA;	}
+.warning	{	background-color: #EFEFCC;	}
+.information	{	background-color: #CCE5CC;	}
 .unknown_trigger{	background-color: #BCBCBC;	}
 .normal		{	background-color: #AADDAA;	}