Frontend improvements.

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

2 files changed, 48 insertions, 191 deletions

diff --git a/frontends/php/charts.php b/frontends/php/charts.php
index ee8a2599..a120e388 100644
--- a/frontends/php/charts.php
+++ b/frontends/php/charts.php
@@ -206,146 +206,7 @@
 
 	if(isset($_REQUEST["graphid"])/*&&(!isset($_REQUEST["fullscreen"]))*/)
 	{
-
 		navigation_bar("charts.php");
-
-// BEGIN - IGMI - just another way of navigation
-/*	echo "<TABLE BORDER=0 align=center COLS=2 WIDTH=100% BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=1>";
-	echo "<TR BGCOLOR=#FFFFFF>";
-	echo "<TD ALIGN=LEFT>";
-
-	echo "<div align=left>";
-	echo "<b>".S_PERIOD.":</b>&nbsp;";
-
-	$hour=3600;
-		
-		$a=array(S_1H=>3600,S_2H=>2*3600,S_4H=>4*3600,S_8H=>8*3600,S_12H=>12*3600,
-			S_24H=>24*3600,S_WEEK_SMALL=>7*24*3600,S_MONTH_SMALL=>31*24*3600,S_YEAR_SMALL=>365*24*3600);
-		foreach($a as $label=>$sec)
-		{
-			echo "[";
-			if($_REQUEST["period"]>$sec)
-			{
-				$tmp=$_REQUEST["period"]-$sec;
-				echo("<A HREF=\"charts.php?period=$tmp".url_param("graphid").url_param("stime").url_param("from").url_param("keep").url_param("fullscreen")."\">-</A>");
-			}
-			else
-			{
-				echo "-";
-			}
-
-			echo("<A HREF=\"charts.php?period=$sec".url_param("graphid").url_param("stime").url_param("from").url_param("keep").url_param("fullscreen")."\">");
-			echo($label."</A>");
-
-			$tmp=$_REQUEST["period"]+$sec;
-			echo("<A HREF=\"charts.php?period=$tmp".url_param("graphid").url_param("stime").url_param("from").url_param("keep").url_param("fullscreen")."\">+</A>");
-
-			echo "]&nbsp;";
-		}
-
-		echo("</div>");
-
-	echo "</TD>";
-	echo "<TD BGCOLOR=#FFFFFF WIDTH=15% ALIGN=RIGHT>";
-	echo "<b>".nbsp(S_KEEP_PERIOD).":</b>&nbsp;";
-		if($_REQUEST["keep"] == 1)
-		{
-			echo("[<A HREF=\"charts.php?keep=0".url_param("graphid").url_param("from").url_param("period").url_param("fullscreen")."\">".S_ON_C."</a>]");
-		}
-		else
-		{
-			echo("[<A HREF=\"charts.php?keep=1".url_param("graphid").url_param("from").url_param("period").url_param("fullscreen")."\">".S_OFF_C."</a>]");
-		}
-	echo "</TD>";
-	echo "</TR>";
-	echo "<TR BGCOLOR=#FFFFFF>";
-	echo "<TD>";
-	if(isset($_REQUEST["stime"]))
-	{
-		echo "<div align=left>" ;
-		echo "<b>".S_MOVE.":</b>&nbsp;" ;
-
-		$day=24;
-// $a already defined
-		$a=array("1h"=>1,"2h"=>2,"4h"=>4,"8h"=>8,"12h"=>12,
-			"24h"=>24,"week"=>7*24,"month"=>31*24,"year"=>365*24);
-		foreach($a as $label=>$hours)
-		{
-			echo "[";
-
-			$stime=$_REQUEST["stime"];
-			$tmp=mktime(substr($stime,8,2),substr($stime,10,2),0,substr($stime,4,2),substr($stime,6,2),substr($stime,0,4));
-			$tmp=$tmp-3600*$hours;
-			$tmp=date("YmdHi",$tmp);
-			echo("<A HREF=\"charts.php?stime=$tmp".url_param("graphid").url_param("period").url_param("keep").url_param("fullscreen")."\">-</A>");
-
-			echo($label);
-
-			$stime=$_REQUEST["stime"];
-			$tmp=mktime(substr($stime,8,2),substr($stime,10,2),0,substr($stime,4,2),substr($stime,6,2),substr($stime,0,4));
-			$tmp=$tmp+3600*$hours;
-			$tmp=date("YmdHi",$tmp);
-			echo("<A HREF=\"charts.php?stime=$tmp".url_param("graphid").url_param("period").url_param("keep").url_param("fullscreen")."\">+</A>");
-
-			echo "]&nbsp;";
-		}
-		echo("</div>");
-	}
-	else
-	{
-		echo "<div align=left>";
-		echo "<b>".S_MOVE.":</b>&nbsp;";
-
-		$day=24;
-// $a already defined
-		$a=array("1h"=>1,"2h"=>2,"4h"=>4,"8h"=>8,"12h"=>12,
-			"24h"=>24,"week"=>7*24,"month"=>31*24,"year"=>365*24);
-		foreach($a as $label=>$hours)
-		{
-			echo "[";
-			$tmp=$_REQUEST["from"]+$hours;
-			echo("<A HREF=\"charts.php?from=$tmp".url_param("graphid").url_param("period").url_param("keep").url_param("fullscreen")."\">-</A>");
-
-			echo($label);
-
-			if($_REQUEST["from"]>=$hours)
-			{
-				$tmp=$_REQUEST["from"]-$hours;
-				echo("<A HREF=\"charts.php?from=$tmp".url_param("graphid").url_param("period").url_param("keep").url_param("fullscreen")."\">+</A>");
-			}
-			else
-			{
-				echo "+";
-			}
-
-			echo "]&nbsp;";
-		}
-		echo("</div>");
-	}
-	echo "</TD>";
-	echo "<TD BGCOLOR=#FFFFFF WIDTH=15% ALIGN=RIGHT>";
-//		echo("<div align=left>");
-		echo "<form method=\"put\" action=\"charts.php\">";
-		echo "<input name=\"graphid\" type=\"hidden\" value=\"".$_REQUEST["graphid"]."\" size=12>";
-		echo "<input name=\"period\" type=\"hidden\" value=\"".(9*3600)."\" size=12>";
-		if(isset($_REQUEST["stime"]))
-		{
-			echo "<input name=\"stime\" class=\"biginput\" value=\"".$_REQUEST["stime"]."\" size=12>";
-		}
-		else
-		{
-			echo "<input name=\"stime\" class=\"biginput\" value=\"yyyymmddhhmm\" size=12>";
-		}
-		echo "&nbsp;";
-		echo "<input class=\"button\" type=\"submit\" name=\"action\" value=\"go\">";
-		echo "</form>";
-//		echo("</div>");
-	echo "</TD>";
-	echo "</TR>";
-	echo "</TABLE>";
-
-// END - IGMI - just another way of navigation
-*/
 	}
 	
 ?>
diff --git a/frontends/php/srv_status.php b/frontends/php/srv_status.php
index b6951b56..f0ec84ab 100644
--- a/frontends/php/srv_status.php
+++ b/frontends/php/srv_status.php
@@ -44,37 +44,33 @@
 
 	if(isset($_REQUEST["serviceid"])&&isset($_REQUEST["showgraph"]))
 	{
-		echo "<TABLE BORDER=0 COLS=4 align=center WIDTH=100% BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=3>";
-		echo "<TR BGCOLOR=#EEEEEE>";
-		echo "<TR BGCOLOR=#DDDDDD>";
-		echo "<TD ALIGN=CENTER>";
-		echo "<IMG SRC=\"chart5.php?serviceid=".$_REQUEST["serviceid"]."\" border=0>";
-		echo "</TD>";
-		echo "</TR>";
-		echo "</TABLE>";
+		$table  = new CTableInfo();
+		$table->AddRow("<IMG SRC=\"chart5.php?serviceid=".$_REQUEST["serviceid"]."\" border=0>");
+		$table->Show();
 		show_page_footer();
 		exit;
 	}
 
 	$now=time();
 	$result=DBselect("select serviceid,name,triggerid,status,showsla,goodsla from services order by sortorder,name");
-	table_begin();
-	table_header(array(S_SERVICE,S_STATUS,S_REASON,S_SLA_LAST_7_DAYS,nbsp(S_PLANNED_CURRENT_SLA),S_GRAPH));
-	$col=0;
+//	table_begin();
+	$table  = new CTableInfo();
+	$table->SetHeader(array(S_SERVICE,S_STATUS,S_REASON,S_SLA_LAST_7_DAYS,nbsp(S_PLANNED_CURRENT_SLA),S_GRAPH));
 	if(isset($_REQUEST["serviceid"]))
 	{
-		echo "<tr bgcolor=#EEEEEE>";
 		$service=get_service_by_serviceid($_REQUEST["serviceid"]);
-		echo "<td><b><a href=\"srv_status.php?serviceid=".$service["serviceid"]."\">".$service["name"]."</a></b></td>";
-		echo "<td>".get_service_status_description($service["status"])."</td>";
-		echo "<td>&nbsp;</td>";
+		$service=new CLink($service["name"],"srv_status.php?serviceid=".$service["serviceid"],"action");
+
+		$status=get_service_status_description($service["status"]);
+
+		$reason="&nbsp;";
 		if($service["showsla"]==1)
 		{
-			echo "<td><img src=\"chart_sla.php?serviceid=".$service["serviceid"]."\"></td>";
+			$sla="<img src=\"chart_sla.php?serviceid=".$service["serviceid"]."\">";
 		}
 		else
 		{
-			echo "<td>-</td>";
+			$sla=new CSpan("-","center");
 		}
 		if($service["showsla"]==1)
 		{
@@ -91,15 +87,21 @@
 			{
 				$color="00AA00";
 			}
-			printf ("<td><font color=\"00AA00\">%.2f%%</font><b>/</b><font color=\"%s\">%.2f%%</font></td>",$service["goodsla"],$color,$stat["ok"]);
+			$sla2=sprintf("<font color=\"00AA00\">%.2f%%</font><b>/</b><font color=\"%s\">%.2f%%</font>",$service["goodsla"],$color,$stat["ok"]);
 		}
 		else
 		{
-			echo "<td>-</td>";
-		}
-		echo "<td><a href=\"srv_status.php?serviceid=".$service["serviceid"]."&showgraph=1\">Show</a></td>";
-		echo "</tr>"; 
-		$col++;
+			$sla2="-";
+		}
+		$actions=new CLink(S_SHOW,"srv_status.php?serviceid=".$service["serviceid"]."&showgraph=1","action");
+		$table->addRow(array(
+			$service,
+			$status,
+			$reason,
+			$sla,
+			$sla2,
+			$actions
+			));
 	}
 	while($row=DBfetch($result))
 	{
@@ -115,15 +117,6 @@
 		{
 			continue;
 		}
-		if(isset($_REQUEST["serviceid"])&&($_REQUEST["serviceid"]==$row["serviceid"]))
-		{
-			echo "<tr bgcolor=#99AABB>";
-		}
-		else
-		{
-			if($col++%2==0)	{ echo "<tr bgcolor=#EEEEEE>"; }
-			else		{ echo "<tr bgcolor=#DDDDDD>"; }
-		}
 		$childs=get_num_of_service_childs($row["serviceid"]);
 		if(isset($row["triggerid"]))
 		{
@@ -139,33 +132,32 @@
 		{
 			if($childs == 0)
 			{
-				echo "<td> - $description</td>";
+				$service="$description";
 			}
 			else
 			{
-				echo "<td> - <a href=\"srv_status.php?serviceid=".$row["serviceid"]."\">$description</a></td>";
+				$service=new CLink($description,"srv_status.php?serviceid=".$row["serviceid"],"action");
 			}
 		}
 		else
 		{
 			if($childs == 0)
 			{
-				echo "<td>$description</td>";
+				$service="$description";
 			}
 			else
 			{
-				echo "<td><a href=\"srv_status.php?serviceid=".$row["serviceid"]."\"> $description</a></td>";
+				$service=new CLink($description,"srv_status.php?serviceid=".$row["serviceid"],"action");
 			}
 		}
-		echo "<td>".get_service_status_description($row["status"])."</td>";
+		$status=get_service_status_description($row["status"]);
 		if($row["status"]==0)
 		{
-			echo "<td>-</td>";
+			$reason="-";
 		}
 		else
 		{
-			echo "<td>";
-			echo "<ul>";
+			$reason="<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))
@@ -173,20 +165,19 @@
 				if(does_service_depend_on_the_service($row["serviceid"],$row2["serviceid"]))
 				{
 					$description=nbsp(expand_trigger_description($row2["triggerid"]));
-					echo "<li class=\"itservices\"><a href=\"alarms.php?triggerid=".$row2["triggerid"]."\">$description</a></li>";
+					$reason=$reason."<li class=\"itservices\"><a href=\"alarms.php?triggerid=".$row2["triggerid"]."\">$description</a></li>";
 				}
 			}
-			echo "</ul>";
-			echo "</td>";
+			$reason=$reason."</ul>";
 		}
 
 		if($row["showsla"]==1)
 		{
-			echo "<td><a href=\"report3.php?serviceid=".$row["serviceid"]."&year=".date("Y")."\"><img src=\"chart_sla.php?serviceid=".$row["serviceid"]."\" border=0></td>";
+			$sla="<a href=\"report3.php?serviceid=".$row["serviceid"]."&year=".date("Y")."\"><img src=\"chart_sla.php?serviceid=".$row["serviceid"]."\" border=0>";
 		}
 		else
 		{
-			echo "<td>-</td>";
+			$sla="-";
 		}
 
 		if($row["showsla"]==1)
@@ -204,19 +195,24 @@
 			{
 				$color="00AA00";
 			}
-			printf ("<td><font color=\"00AA00\">%.2f%%</font><b>/</b><font color=\"%s\">%.2f%%</font></td>",$row["goodsla"],$color,$stat["ok"]);
+			$sla2=sprintf("<font color=\"00AA00\">%.2f%%</font><b>/</b><font color=\"%s\">%.2f%%</font>",$row["goodsla"],$color,$stat["ok"]);
 		}
 		else
 		{
-			echo "<td>-</td>";
+			$sla2="-";
 		}
 
-
-
-		echo "<td><a href=\"srv_status.php?serviceid=".$row["serviceid"]."&showgraph=1\">Show</a></td>";
-		echo "</tr>"; 
+		$actions=new CLink(S_SHOW,"srv_status.php?serviceid=".$row["serviceid"]."&showgraph=1","action");
+		$table->addRow(array(
+			$service,
+			$status,
+			$reason,
+			$sla,
+			$sla2,
+			$actions
+			));
 	}
-	table_end();
+	$table->Show();
 ?>
 
 <?php