- added column screens_items.rowspan (Alexei)

 - support of rowspan in screens (Alexei)


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

2 files changed, 6 insertions, 5 deletions

diff --git a/frontends/php/include/local_en.inc.php b/frontends/php/include/local_en.inc.php
index 87efa7f8..bf97429f 100644
--- a/frontends/php/include/local_en.inc.php
+++ b/frontends/php/include/local_en.inc.php
@@ -517,7 +517,8 @@
 //	screenedit.php
 	define("S_MAP",					"Map");
 	define("S_PLAIN_TEXT",				"Plain text");
-	define("S_COLSPAN",				"Colspan");
+	define("S_COLUMN_SPAN",				"Column span");
+	define("S_ROW_SPAN",				"Row span");
 
 //	screens.php
 	define("S_CUSTOM_SCREENS",			"Custom screens");
diff --git a/frontends/php/include/screens.inc.php b/frontends/php/include/screens.inc.php
index 6f2f955c..bc771c32 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)
+        function add_screen_item($resource,$screenid,$x,$y,$resourceid,$width,$height,$colspan,$rowspan)
         {
                 $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) values ($resource,$screenid,$x,$y,$resourceid,$width,$height,$colspan)";
+                $sql="insert into screens_items (resource,screenid,x,y,resourceid,width,height,colspan,rowspan) values ($resource,$screenid,$x,$y,$resourceid,$width,$height,$colspan,$rowspan)";
                 return  DBexecute($sql);
         }
 
-        function update_screen_item($screenitemid,$resource,$resourceid,$width,$height,$colspan)
+        function update_screen_item($screenitemid,$resource,$resourceid,$width,$height,$colspan,$rowspan)
         {
-                $sql="update screens_items set resource=$resource,resourceid=$resourceid,width=$width,height=$height,colspan=$colspan where screenitemid=$screenitemid";
+                $sql="update screens_items set resource=$resource,resourceid=$resourceid,width=$width,height=$height,colspan=$colspan,rowspan=$rowspan where screenitemid=$screenitemid";
                 return  DBexecute($sql);
         }