- added configurable number of plain text elements for screens (Alexei)

 - added screens_items.elements (Alexei)


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

3 files changed, 9 insertions, 8 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 2a62a268..ecad6837 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1218,21 +1218,21 @@ echo "</head>";
 	}
 
 	# Show screen cell containing plain text values
-	function	show_screen_plaintext($itemid)
+	function	show_screen_plaintext($itemid,$elements)
 	{
 		$item=get_item_by_itemid($itemid);
 		if($item["value_type"]==0)
 		{
-			$sql="select clock,value from history where itemid=$itemid order by clock desc limit 25";
+			$sql="select clock,value from history where itemid=$itemid order by clock desc limit $elements";
 		}
 		else
 		{
-			$sql="select clock,value from history_str where itemid=$itemid order by clock desc limit 25";
+			$sql="select clock,value from history_str where itemid=$itemid order by clock desc limit $elements";
 		}
                 $result=DBselect($sql);
 
 		table_begin();
-		table_header(array(S_CLOCK,$item["description"]));
+		table_header(array(S_TIMESTAMP,$item["description"]));
 		$col=0;
 		while($row=DBfetch($result))
 		{
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 5165d30c..c127d88d 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -602,6 +602,7 @@
 	"S_PLAIN_TEXT"=>			"Plain text",
 	"S_COLUMN_SPAN"=>			"Column span",
 	"S_ROW_SPAN"=>				"Row span",
+	"S_SHOW_LINES"=>			"Show lines",
 
 //	screens.php
 	"S_CUSTOM_SCREENS"=>			"Custom screens",
diff --git a/frontends/php/include/screens.inc.php b/frontends/php/include/screens.inc.php
index bc771c32..1e21e396 100644
--- a/frontends/php/include/screens.inc.php
+++ b/frontends/php/include/screens.inc.php
@@ -55,17 +55,17 @@
                 return  DBexecute($sql);
         }
 
-        function add_screen_item($resource,$screenid,$x,$y,$resourceid,$width,$height,$colspan,$rowspan)
+        function add_screen_item($resource,$screenid,$x,$y,$resourceid,$width,$height,$colspan,$rowspan,$elements)
         {
                 $sql="delete from screens_items where screenid=$screenid and x=$x and y=$y";
                 DBexecute($sql);
-                $sql="insert into screens_items (resource,screenid,x,y,resourceid,width,height,colspan,rowspan) values ($resource,$screenid,$x,$y,$resourceid,$width,$height,$colspan,$rowspan)";
+                $sql="insert into screens_items (resource,screenid,x,y,resourceid,width,height,colspan,rowspan,elements) values ($resource,$screenid,$x,$y,$resourceid,$width,$height,$colspan,$rowspan,$elements)";
                 return  DBexecute($sql);
         }
 
-        function update_screen_item($screenitemid,$resource,$resourceid,$width,$height,$colspan,$rowspan)
+        function update_screen_item($screenitemid,$resource,$resourceid,$width,$height,$colspan,$rowspan,$elements)
         {
-                $sql="update screens_items set resource=$resource,resourceid=$resourceid,width=$width,height=$height,colspan=$colspan,rowspan=$rowspan where screenitemid=$screenitemid";
+                $sql="update screens_items set resource=$resource,resourceid=$resourceid,width=$width,height=$height,colspan=$colspan,rowspan=$rowspan,elements=$elements where screenitemid=$screenitemid";
                 return  DBexecute($sql);
         }