- cosmetic changes for IT Services screen (Alexei)

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

3 files changed, 14 insertions, 6 deletions

diff --git a/frontends/php/css.css b/frontends/php/css.css
index 22596580..9bc352cb 100644
--- a/frontends/php/css.css
+++ b/frontends/php/css.css
@@ -126,3 +126,9 @@ img.bottom
 	background-color: white;
 	margin-right:5px;
 }
+
+ul
+{
+	margin-left: 0;
+	padding-left: 1em;
+}
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 4103151c..8edaff91 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -458,15 +458,15 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 		}
 		elseif($status==4)
 		{
-			$desc="<font color=\"#FF8888\">Serious problem</a>";
+			$desc="<font color=\"#FF8888\">Serious&nbsp;problem</a>";
 		}
 		elseif($status==3)
 		{
-			$desc="<font color=\"#AA0000\">Average problem</a>";
+			$desc="<font color=\"#AA0000\">Average&nbsp;problem</a>";
 		}
 		elseif($status==2)
 		{
-			$desc="<font color=\"#AA5555\">Minor problem</a>";
+			$desc="<font color=\"#AA5555\">Minor&nbsp;problem</a>";
 		}
 		elseif($status==1)
 		{
diff --git a/frontends/php/srv_status.php b/frontends/php/srv_status.php
index 48b0525c..295561ac 100644
--- a/frontends/php/srv_status.php
+++ b/frontends/php/srv_status.php
@@ -127,7 +127,7 @@
 			$description=$trigger["description"];
 			if( strstr($description,"%s"))
 			{
-				$description=expand_trigger_description($row["triggerid"]);
+				$description=nbsp(expand_trigger_description($row["triggerid"]));
 			}
 			$description="[<a href=\"alarms.php?triggerid=".$row["triggerid"]."\">TRIGGER</a>] $description";
 		}
@@ -166,6 +166,7 @@
 		else
 		{
 			echo "<td>";
+			echo "<ul>";
 			$sql="select s.triggerid,s.serviceid from services s, triggers t where s.status>0 and s.triggerid is not NULL and t.triggerid=s.triggerid order by s.status desc,t.description";
 			$result2=DBselect($sql);
 			while($row2=DBfetch($result2))
@@ -176,11 +177,12 @@
 					$description=$trigger["description"];
 					if( strstr($description,"%s"))
 					{
-						$description=expand_trigger_description($row2["triggerid"]);
+						$description=nbsp(expand_trigger_description($row2["triggerid"]));
 					}
-					echo "<li><a href=\"alarms.php?triggerid=".$row2["triggerid"]."\">$description</a></li>";
+					echo "<li class=\"itservices\"><a href=\"alarms.php?triggerid=".$row2["triggerid"]."\">$description</a></li>";
 				}
 			}
+			echo "</ul>";
 			echo "</td>";
 		}