- Frontend improvements (Eugene)

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

3 files changed, 25 insertions, 5 deletions

diff --git a/frontends/php/include/classes/cformtable.inc.php b/frontends/php/include/classes/cformtable.inc.php
index 1adb45d0..d42cbae6 100644
--- a/frontends/php/include/classes/cformtable.inc.php
+++ b/frontends/php/include/classes/cformtable.inc.php
@@ -77,18 +77,25 @@
 		}
 		function SetHelp($value=NULL)
 		{
-			if(is_null($value))
+			if(is_null($value)) {
 				$this->help = new CHelp();
-			elseif(is_a($value,'chelp'))
+				$this->AddOption("name",'form');
+			} elseif(is_a($value,'chelp')) {
 				$this->help = $value;
-			elseif(is_string($value))
+				$this->AddOption("name",'form');
+			} elseif(is_string($value)) {
 				$this->help = new CHelp($value);
-			else
+				$this->AddOption("name",$value);
+			} else
 			{
 				return $this->error("Incorrect value for SetHelp [$value]");
 			}
 			return 0;
 		}
+		function GetName()
+		{
+			return $this->GetOption("name");
+		}
 		function AddVar($name, $value)
 		{
 			$this->AddItemToTopRow(new CVar($name, $value));
diff --git a/frontends/php/include/classes/cimg.inc.php b/frontends/php/include/classes/cimg.inc.php
index 11503faf..cd557489 100644
--- a/frontends/php/include/classes/cimg.inc.php
+++ b/frontends/php/include/classes/cimg.inc.php
@@ -22,14 +22,21 @@
 	class CImg extends CTag
 	{
 /* public */
-		function CImg($src,$alt_text=NULL,$width=NULL,$height=NULL)
+		function CImg($src,$alt_text=NULL,$width=NULL,$height=NULL,$class=NULL)
 		{
 			parent::CTag("img","no");
+
+			$this->tag_start= "";
+			$this->tag_end = "";
+			$this->tag_body_start = "";
+			$this->tag_body_end = "";
+
 			$this->AddOption('border',0);
 			$this->SetAltText($alt_text);
 			$this->SetSrc($src);
 			$this->SetWidth($width);
 			$this->SetHeight($height);
+			$this->SetClass($class);
 		}
 		function SetSrc($value)
 		{
diff --git a/frontends/php/include/classes/clink.inc.php b/frontends/php/include/classes/clink.inc.php
index b99e307d..a4cb49d7 100644
--- a/frontends/php/include/classes/clink.inc.php
+++ b/frontends/php/include/classes/clink.inc.php
@@ -25,6 +25,12 @@
 		function CLink($item="www.zabbix.com",$url="http://www.zabbix.com",$class=NULL)
 		{
 			parent::CTag("a","yes");
+
+			$this->tag_start= "";
+			$this->tag_end = "";
+			$this->tag_body_start = "";
+			$this->tag_body_end = "";
+
 			$this->SetClass($class);
 			$this->AddItem($item);
 			$this->SetUrl($url);