- [DEV-118] added dashboard screen to monitoring (Artem)

 - [ZBX-206] merged rev.5367:5370 of 1.4/ (Artem) [fixed case sensitive hosts sorting]
 - [DEV-119] changes how users online are counted (Artem)
 - implemented patch [added y axis calculation type: "Calculated [Min=0]"] (Artem)
 - changes in schema.sql (Artem)
 - fixed JS lib, url class (Artem)
 - some other small fixes (Artem)

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

5 files changed, 265 insertions, 194 deletions

diff --git a/frontends/php/styles/css_bb.css b/frontends/php/styles/css_bb.css
index 20d8dd67..886a2186 100644
--- a/frontends/php/styles/css_bb.css
+++ b/frontends/php/styles/css_bb.css
@@ -17,6 +17,10 @@ body{
 }
 
 
+.enabled	{	color: #0088FF;	}
+.unknown	{	color: #999999;	}
+.off		{	color: #0088FF;	}
+.normal		{	background-color: #AADDDD;	}
 
 /*////////////////	LINKS	////////////////////*/
 
@@ -27,10 +31,10 @@ a.highlight:hover	{	text-decoration:none;	color: #0AF; }
 
 
 
-A.enabled:link		{	color:#00AA00;	text-decoration: none; }
-A.enabled:visited 	{	color:#00AA00;	text-decoration: none; }
-A.enabled:hover 	{	color:#00AA00;	text-decoration: underline; }
-A.enabled:active 	{	color:#00AA00;	text-decoration: underline;}
+A.enabled:link		{	color:#0088FF;	text-decoration: none; }
+A.enabled:visited 	{	color:#0088FF;	text-decoration: none; }
+A.enabled:hover 	{	color:#0088FF;	text-decoration: underline; }
+A.enabled:active 	{	color:#0088FF;	text-decoration: underline;}
 
 A.disabled:link		{	color:#AA0000;	text-decoration: none; }
 A.disabled:visited 	{	color:#AA0000;	text-decoration: none; }
@@ -47,10 +51,10 @@ A.unknown:visited 	{	color:#777777;	text-decoration: none; }
 A.unknown:hover 	{	color:#AAAAAA;	text-decoration: underline; }
 A.unknown:active 	{	color:#777777;	text-decoration: underline;}
 
-A.off:link	{	color:#00AA00;	text-decoration: none; }
-A.off:visited 	{	color:#00AA00;	text-decoration: none; }
-A.off:hover 	{	color:#00AA00;	text-decoration: underline; }
-A.off:active 	{	color:#00AA00;	text-decoration: underline;}
+A.off:link		{	color:#0088FF;	text-decoration: none; }
+A.off:visited 	{	color:#0088FF;	text-decoration: none; }
+A.off:hover 	{	color:#0088FF;	text-decoration: underline; }
+A.off:active 	{	color:#0088FF;	text-decoration: underline;}
 
 A.on:link	{	color:#AA0000;	text-decoration: none; }
 A.on:visited 	{	color:#AA0000;	text-decoration: none; }
@@ -160,6 +164,9 @@ table.tableinfo{
 	background-color: #5A5A5A;
 }
 
+table.tableinfo tr td.normal			{	background-color: #AADDDD;	border: 1px #AADDDD solid; }
+table.tableinfo tr:hover td.normal		{	background-color: #AACCCC;	border: 1px #AAD9DD solid; }
+
 table.tableinfo tr.footer td {
 	background: #5C7099 url('../images/gradients/table_head2_bb.gif') repeat-x top left;
 }
@@ -209,13 +216,6 @@ table.history td.caption{
 	color:#0AF;
 }
 
-table.tableinfo tr td.normal			{	background-color: #AADDDD;	border: 1px #AADDAA solid; }
-table.tableinfo tr:hover td.normal		{	background-color: #AACCCC;	border: 1px #AAD9AA solid; }
-
-table.tableinfo tr td.average			{	background-color: #DDAAAA;	border: 1px #DDAAAA solid; }
-table.tableinfo tr:hover td.average		{	background-color: #DD9999;	border: 1px #D8A5AA solid; }
-
-
 /*////////////////	DIVS	////////////////////*/
 
 div.zabbix_logo{
@@ -225,6 +225,18 @@ div.zabbix_logo{
 	background-repeat: no-repeat;
 }
 
+div.menuplus{
+	background-image: url('../images/general/bttn/plus_bb.png');
+}
+
+div.arrowup{
+	background-image: url('../images/general/bttn/arrowup_bb.png');
+}
+
+div.arrowdown{
+	background-image: url('../images/general/bttn/arrowdown_bb.png');
+}
+
 div#scrolltableft{
 	color: #0CF;
 }
@@ -233,9 +245,13 @@ div#scrolltabright{
 	color: #0CF;
 }
 
+span.green{
+	color:		#0088FF;
+}
+
 /*////////////////	PARAGRAPHS	////////////////////*/
 
-p.msgerror	{	color: #CC0000; }
+p.msgerror	{	color: #FF2222; }
 p.msgok		{	color: #0088FF;	}
 
 
diff --git a/frontends/php/styles/default.css b/frontends/php/styles/default.css
index bfad6714..31932332 100644
--- a/frontends/php/styles/default.css
+++ b/frontends/php/styles/default.css
@@ -1,170 +1,171 @@
-/* CSS Document */

-/*

-** ZABBIX

-** Copyright (C) 2000-2007 SIA Zabbix

-**

-** This program is free software; you can redistribute it and/or modify

-** it under the terms of the GNU General Public License as published by

-** the Free Software Foundation; either version 2 of the License, or

-** (at your option) any later version.

-**

-** This program is distributed in the hope that it will be useful,

-** but WITHOUT ANY WARRANTY; without even the implied warranty of

-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-** GNU General Public License for more details.

-**

-** You should have received a copy of the GNU General Public License

-** along with this program; if not, write to the Free Software

-** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

-**

-*/

-

-body{

-	background-color:#e5e5e5;

-	margin: 0px;

-	padding: 0px;

-	color:black;

-	font-family:verdana, arial, helvetica, sans-serif;

-	font-size:10px;

-	text-decoration: none;

-	line-height:16px;

-}

-

-/**************** MEDIA *****************/

-@media print {

-	div.printless{

-		visibility: hidden;

-		display: none;

-	}

-	div.printonly{

-		display: block;

-		visibility:visible;

-	}

-}

-

-@media screen {

-	div.printless{

-		visibility:visible;

-		display:block;

-	}

-	div.printonly{

-		visibility: hidden;

-		display:none;

-	}

-}

-

-/**************** OTHERS ****************/

-.top		{	vertical-align: top; }

-.footer 	{ 	color:#CCCCCC; }

-

-.enabled	{	color: #00AA00;	}

-.disabled	{	color: #AA0000;	}

-.unknown	{	color: #AAAAAA;	}

-.on		{	color: #AA0000;	}

-.off		{	color: #00AA00;	}

-

-.disaster	{	background-color: #FF0000;	}

-.high		{	background-color: #FF8888;	}

-.average	{	background-color: #DDAAAA;	}

-.warning	{	background-color: #EFEFCC;	}

-.information	{	background-color: #CCE2CC;	}

-.unknown_trigger{	background-color: #BCBCBC;	}

-.normal		{	background-color: #AADDAA;	}

-

-.img 		{	border-color:black;	border-width:1px;	}

-img.top		{	vertical-align:text-top		}

-img.bottom	{	vertical-align:text-bottom	}

-

-.center{

-	width: 100%;

-	text-align: center;

-}

-

-.vert{

-	width:1px;

-	/*writing-mode: tb-rl;*/

-}

-

-.rarr{

-	font-size: 16px;

-}

-

-.bold {

-	font-weight: bold;

-}

-

-.nowrap {

-	white-space: nowrap;

-	word-spacing:	0px;

-}

-

-.delimiter{

-	font-weight:bold;

-	color:#000;

-}

-

-/**************** HINT BOX *****************/

-

-#hint_box {

-	top: 0;

-	z-index: 100;

-	position: absolute;

-	background-color: #FFFFE0;

-	padding: 2px;

-	font-family: Verdana, Arial, Helvetica, sans-serif;

-	font-size: 8pt;

-	line-height:15px;

-	border: 1px solid black;

-	border-left: none;

-	border-top: none;

-	visibility: hidden;

-}

-

-/************** END OF HINT BOX ************/

-

-/************** COLOR PICKER ***************/

-#color_picker {

-	top: 0;

-	z-index: 100;

-	position: absolute;

-	background-color: white;

-	padding: 2px;

-	font-family: Verdana, Arial, Helvetica, sans-serif;

-	font-size: 10px;

-	line-height:15px;

-	border: 1px solid black;

-}

-

-#color_picker table tr td {

-	margin: 0px;

-	padding: 2px;

-}

-	

-#color_picker a {

-	text-decoration: none;

-	font-family: Verdana, Arial, Helvetica, sans-serif;

-	font-size: 10px;

-	padding: 0px;

-	margin: 0px;

-}

-

-/************ END OF COLOR PICKER ***********/

-

-/************** DISCOVERY STATUS ************/

-.dhosts_active {

-	padding: 5px;

-	text-align: center;

-	color: #0FA00F;

-}

-.dhosts_disabled {

-	padding: 5px;

-	text-align: center;

-	color: #A00F0F;

-}

-.dservice_active {

-	background: #0FA00F;

-}

-.dservice_disabled {

-	background: #A00F0F;

-}

-/********** END OF DISCOVERY STATUS *********/

+/* CSS Document */
+/*
+** ZABBIX
+** Copyright (C) 2000-2007 SIA Zabbix
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+**
+*/
+
+body{
+	background-color:#e5e5e5;
+	margin: 0px;
+	padding: 0px;
+	color:black;
+	font-family:verdana, arial, helvetica, sans-serif;
+	font-size:10px;
+	text-decoration: none;
+	line-height:16px;
+}
+
+/**************** MEDIA *****************/
+@media print {
+	div.printless{
+		visibility: hidden;
+		display: none;
+	}
+	div.printonly{
+		display: block;
+		visibility:visible;
+	}
+}
+
+@media screen {
+	div.printless{
+		visibility:visible;
+		display:block;
+	}
+	div.printonly{
+		visibility: hidden;
+		display:none;
+	}
+}
+
+/**************** OTHERS ****************/
+.top		{	vertical-align: top; }
+.footer 	{ 	color:#CCCCCC; }
+
+.enabled	{	color: #00AA00;	}
+.disabled	{	color: #AA0000;	}
+.unknown	{	color: #AAAAAA;	}
+.on		{	color: #AA0000;	}
+.off		{	color: #00AA00;	}
+
+.disaster	{	background-color: #FF0000;	}
+.high		{	background-color: #FF8888;	}
+.average	{	background-color: #DDAAAA;	}
+.warning	{	background-color: #EFEFCC;	}
+.information	{	background-color: #CCE2CC;	}
+.unknown_trigger{	background-color: #BCBCBC;	}
+.normal		{	background-color: #AADDAA;	}
+
+.img 		{	border-color:black;	border-width:1px;	}
+img.top		{	vertical-align:text-top		}
+img.bottom	{	vertical-align:text-bottom	}
+img.borderless	{	border-width: 0px; vertical-align: bottom;	}
+
+.center{
+	width: 100%;
+	text-align: center;
+}
+
+.vert{
+	width:1px;
+	/*writing-mode: tb-rl;*/
+}
+
+.rarr{
+	font-size: 16px;
+}
+
+.bold {
+	font-weight: bold;
+}
+
+.nowrap {
+	white-space: nowrap;
+	word-spacing:	0px;
+}
+
+.delimiter{
+	font-weight:bold;
+	color:#000;
+}
+
+/**************** HINT BOX *****************/
+
+#hint_box {
+	top: 0;
+	z-index: 100;
+	position: absolute;
+	background-color: #FFFFE0;
+	padding: 2px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 8pt;
+	line-height:15px;
+	border: 1px solid black;
+	border-left: none;
+	border-top: none;
+	visibility: hidden;
+}
+
+/************** END OF HINT BOX ************/
+
+/************** COLOR PICKER ***************/
+#color_picker {
+	top: 0;
+	z-index: 100;
+	position: absolute;
+	background-color: white;
+	padding: 2px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	line-height:15px;
+	border: 1px solid black;
+}
+
+#color_picker table tr td {
+	margin: 0px;
+	padding: 2px;
+}
+	
+#color_picker a {
+	text-decoration: none;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	padding: 0px;
+	margin: 0px;
+}
+
+/************ END OF COLOR PICKER ***********/
+
+/************** DISCOVERY STATUS ************/
+.dhosts_active {
+	padding: 5px;
+	text-align: center;
+	color: #0FA00F;
+}
+.dhosts_disabled {
+	padding: 5px;
+	text-align: center;
+	color: #A00F0F;
+}
+.dservice_active {
+	background: #0FA00F;
+}
+.dservice_disabled {
+	background: #A00F0F;
+}
+/********** END OF DISCOVERY STATUS *********/
diff --git a/frontends/php/styles/div.css b/frontends/php/styles/div.css
index 1824b75c..19f412a8 100644
--- a/frontends/php/styles/div.css
+++ b/frontends/php/styles/div.css
@@ -36,6 +36,39 @@ div.zabbix_logo{
 	background: #FFFFFF url('../images/general/zabbix.png') no-repeat;
 }
 
+div.menuplus{
+	height: 18px;
+	width: 18px;
+	background-image: url('../images/general/bttn/plus.png');
+	background-repeat:no-repeat;
+}
+
+div.menuplus:hover{
+	cursor:pointer;
+}
+
+div.arrowup{
+	height: 18px;
+	width: 18px;
+	background-image: url('../images/general/bttn/arrowup.png');
+	background-repeat:no-repeat;
+}
+
+div.arrowup:hover{
+	cursor:pointer;
+}
+
+div.arrowdown{
+	height: 18px;
+	width: 18px;
+	background-image: url('../images/general/bttn/arrowdown.png');
+	background-repeat:no-repeat;
+}
+
+div.arrowdown:hover{
+	cursor:pointer;
+}
+
 span.footer_sign{
 	padding-right: 5px;
 	padding-left: 5px;
@@ -53,16 +86,20 @@ span.ok{
 	color:		#00AA00;
 	font-weight:	bold;
 }
+
 span.fail{
 	color:		#AA0000;
 	font-weight:	bold;
 }
+
 span.green{
 	color:		#00AA00;
 }
+
 span.red{
 	color:		#AA0000;
 }
+
 span.orange{
 	color:		#EE6000;
-}
+}
\ No newline at end of file
diff --git a/frontends/php/styles/sbox.css b/frontends/php/styles/sbox.css
index 0fc636c3..fed2f504 100644
--- a/frontends/php/styles/sbox.css
+++ b/frontends/php/styles/sbox.css
@@ -6,7 +6,6 @@ div#selection_box{
 	
 	filter:alpha(opacity=40);
 	-moz-opacity:.40;
-	-khtml-opacity: 0.4;
 	opacity:.40;
 	background-color:#0000FF;
 	border:1px black solid;
diff --git a/frontends/php/styles/table.css b/frontends/php/styles/table.css
index 2d95161c..05e546dd 100644
--- a/frontends/php/styles/table.css
+++ b/frontends/php/styles/table.css
@@ -519,26 +519,44 @@ table.tableinfo tr.even_row:hover td		{	background-color: #EEEEFE; border: 1px #
 
 table.tableinfo tr td.center			{	vertical-align: middle; text-align: center; }
 
-table.tableinfo tr td.disaster			{	background-color: #FF0000;	border: 1px #FF0000 solid; }
+table.tableinfo tr td.disaster_empty		{	border: 1px #FF0000 solid; }
+table.tableinfo tr:hover td.disaster_empty	{	border: 1px #FF0000 solid; }
+
+table.tableinfo tr td.disaster				{	background-color: #FF0000;	border: 1px #FF0000 solid; }
 table.tableinfo tr:hover td.disaster		{	background-color: #FA0000;	border: 1px #FA0000 solid; }
 
-table.tableinfo tr td.high			{	background-color: #FF8888;	border: 1px #FF8888 solid; }
+table.tableinfo tr td.high_empty			{	border: 1px #FF8888 solid; }
+table.tableinfo tr:hover td.high_empty			{	border: 1px #FF8888 solid; }
+
+table.tableinfo tr td.high				{	background-color: #FF8888;	border: 1px #FF8888 solid; }
 table.tableinfo tr:hover td.high		{	background-color: #FA8388;	border: 1px #FA8388 solid; }
 
+table.tableinfo tr td.average_empty			{	border: 1px #DDAAAA solid; }
+table.tableinfo tr:hover td.average_empty	{	border: 1px #DDAAAA solid; }
+
 table.tableinfo tr td.average			{	background-color: #DDAAAA;	border: 1px #DDAAAA solid; }
 table.tableinfo tr:hover td.average		{	background-color: #D8A5AA;	border: 1px #D8A5AA solid; }
 
+table.tableinfo tr td.warning_empty			{	border: 1px #EFEFCC solid; }
+table.tableinfo tr:hover td.warning_empty	{	border: 1px #EAEACC solid; }
+
 table.tableinfo tr td.warning			{	background-color: #EFEFCC;	border: 1px #EFEFCC solid; }
 table.tableinfo tr:hover td.warning		{	background-color: #EAEACC;	border: 1px #EAEACC solid; }
 
-table.tableinfo tr td.information		{	background-color: #CCE2CC;	border: 1px #CCE2CC solid; }
-table.tableinfo tr:hover td.information		{	background-color: #C7DDCC;	border: 1px #C7DDCC solid; }
+table.tableinfo tr td.information_empty			{	border: 1px #BBE2BB solid; }
+table.tableinfo tr:hover td.information_empty	{	border: 1px #B7DDBB solid; }
+
+table.tableinfo tr td.information		{	background-color: #BBE2BB;	border: 1px #CCE2CC solid; }
+table.tableinfo tr:hover td.information		{	background-color: #B7DDBB;	border: 1px #C7DDCC solid; }
+
+table.tableinfo tr td.unknown_trigger_empty			{	border: 1px #ACACAC solid; }
+table.tableinfo tr:hover td.unknown_trigger_empty	{	border: 1px #ACA7AC solid; }
 
 table.tableinfo tr td.unknown_trigger		{	background-color: #BCBCBC;	border: 1px #BCBCBC solid; }
 table.tableinfo tr:hover td.unknown_trigger	{	background-color: #BCB7BC;	border: 1px #BCB7BC solid; }
 
-table.tableinfo tr td.normal			{	background-color: #AADDAA;	border: 1px #AADDAA solid; }
-table.tableinfo tr:hover td.normal		{	background-color: #AAD9AA;	border: 1px #AAD9AA solid; }
+table.tableinfo tr td.normal			{	background-color: #AAFFAA;	border: 1px #AAFFAA solid; }
+table.tableinfo tr:hover td.normal		{	background-color: #AAF9AA;	border: 1px #AAF9AA solid; }
 
 table.tableinfo tr td.active			{	background-color: #AADDAA;	border: 1px #AADDAA solid; }
 table.tableinfo tr:hover td.active		{	background-color: #AAD9AA;	border: 1px #AAD9AA solid; }