- 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

10 files changed, 41 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 78892322..22c547c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Changes for 1.1alpha11:
 
+ - added column screens_items.rowspan (Alexei)
+ - support of rowspan in screens (Alexei)
  - fixed selection of host in Event History (Alexei)
  - fixed short php tags in PHP frontend (Alexei)
 
diff --git a/TODO b/TODO
index 0df8c83b..878875c0 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
 1.1alpha11:
 
- - add support for row span in screens
  - finish hard-linked templates
  - escalations and repeated notifications
  - add encryption between server and agents
diff --git a/create/mysql/schema.sql b/create/mysql/schema.sql
index 4aba06d1..ee76195e 100644
--- a/create/mysql/schema.sql
+++ b/create/mysql/schema.sql
@@ -546,6 +546,7 @@ CREATE TABLE screens_items (
   x			int(4)		DEFAULT '0' NOT NULL,
   y			int(4)		DEFAULT '0' NOT NULL,
   colspan		int(4)		DEFAULT '0' NOT NULL,
+  rowspan		int(4)		DEFAULT '0' NOT NULL,
   PRIMARY KEY  (screenitemid)
 ) TYPE=InnoDB;
 
diff --git a/create/postgresql/schema.sql b/create/postgresql/schema.sql
index cac5d9ac..e1526873 100644
--- a/create/postgresql/schema.sql
+++ b/create/postgresql/schema.sql
@@ -559,6 +559,7 @@ CREATE TABLE screens_items (
   x			int4		DEFAULT '0' NOT NULL,
   y			int4		DEFAULT '0' NOT NULL,
   colspan		int4		DEFAULT '0' NOT NULL,
+  rowspan		int4		DEFAULT '0' NOT NULL,
   PRIMARY KEY  (screenitemid)
 );
 
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);
         }
 
diff --git a/frontends/php/screenedit.php b/frontends/php/screenedit.php
index f418deef..55318639 100644
--- a/frontends/php/screenedit.php
+++ b/frontends/php/screenedit.php
@@ -49,7 +49,7 @@
 //				delete_screen_item($_GET["screenitemid"]);
 //				unset($_GET["screenitemid"]);
 //			}
-			$result=add_screen_item($_GET["resource"],$_GET["screenid"],$_GET["x"],$_GET["y"],$_GET["resourceid"],$_GET["width"],$_GET["height"],$_GET["colspan"]);
+			$result=add_screen_item($_GET["resource"],$_GET["screenid"],$_GET["x"],$_GET["y"],$_GET["resourceid"],$_GET["width"],$_GET["height"],$_GET["colspan"],$_GET["rowspan"]);
 			unset($_GET["x"]);
 			show_messages($result, S_ITEM_ADDED, S_CANNOT_ADD_ITEM);
 		}
@@ -61,7 +61,7 @@
 		}
                 if($_GET["register"]=="update")
                 {
-                        $result=update_screen_item($_GET["screenitemid"],$_GET["resource"],$_GET["resourceid"],$_GET["width"],$_GET["height"],$_GET["colspan"]);
+                        $result=update_screen_item($_GET["screenitemid"],$_GET["resource"],$_GET["resourceid"],$_GET["width"],$_GET["height"],$_GET["colspan"],$_GET["rowspan"]);
                         show_messages($result, S_ITEM_UPDATED, S_CANNOT_UPDATE_ITEM);
 			unset($_GET["x"]);
                 }
@@ -91,6 +91,7 @@
 			$width=$irow["width"];
 			$height=$irow["height"];
 			$colspan=$irow["colspan"];
+			$rowspan=$irow["rowspan"];
         	}
 		else
 		{
@@ -100,16 +101,20 @@
 			$width=500;
 			$height=100;
 			$colspan=0;
+			$rowspan=0;
 		}
-		if($colspan==0)
+		$tmp="";
+		if($colspan!=0)
 		{
-			echo "<TD align=\"center\" valign=\"top\">\n";
+			$tmp=$tmp." colspan=\"$colspan\" ";
+			$c=$c+$colspan-1;
 		}
-		else
+		if($rowspan!=0)
 		{
-			echo "<TD align=\"center\" valign=\"top\" colspan=\"$colspan\">\n";
-			$c=$c+$colspan-1;
+			$tmp=$tmp." rowspan=\"$rowspan\" ";
+#			$r=$r+$rowspan-1;
 		}
+		echo "<TD align=\"center\" valign=\"top\" $tmp>\n";
 		echo "<a name=\"form\"></a>";
 		echo "<form method=\"get\" action=\"screenedit.php\">";
 
@@ -121,6 +126,7 @@
 			$width=@iif(isset($_GET["width"]),$_GET["width"],$width);
 			$height=@iif(isset($_GET["height"]),$_GET["height"],$height);
 			$colspan=@iif(isset($_GET["colspan"]),$_GET["colspan"],$colspan);
+			$rowspan=@iif(isset($_GET["rowspan"]),$_GET["rowspan"],$colspan);
 
         		show_form_begin("screenedit.cell");
         		echo S_SCREEN_CELL_CONFIGURATION;
@@ -235,10 +241,15 @@
 			}
 
 			show_table2_v_delimiter();
-			echo S_COLSPAN;
+			echo S_COLUMN_SPAN;
 			show_table2_h_delimiter();
 			echo "<input class=\"biginput\" name=\"colspan\" size=2 value=\"$colspan\">";
 
+			show_table2_v_delimiter();
+			echo S_ROW_SPAN;
+			show_table2_h_delimiter();
+			echo "<input class=\"biginput\" name=\"rowspan\" size=2 value=\"$rowspan\">";
+
 			show_table2_v_delimiter2();
 			echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"add\">";
 			if($resourceid!=0) 
diff --git a/frontends/php/screens.php b/frontends/php/screens.php
index a93a4dfe..12f7f049 100644
--- a/frontends/php/screens.php
+++ b/frontends/php/screens.php
@@ -108,6 +108,7 @@
 		$sql="select * from screens_items where screenid=$screenid and x=$c and y=$r";
 		$iresult=DBSelect($sql);
 		$colspan=0;
+		$rowspan=0;
 		if(DBnum_rows($iresult)>0)
 		{
 			$irow=DBfetch($iresult);
@@ -117,17 +118,21 @@
 			$width=$irow["width"];
 			$height=$irow["height"];
 			$colspan=$irow["colspan"];
+			$rowspan=$irow["rowspan"];
 		}
 
-		if($colspan==0)
+		$tmp="";
+		if($colspan!=0)
 		{
-               		echo "<TD align=\"center\" valign=\"top\">\n";
+			$tmp=$tmp." colspan=\"$colspan\" ";
+			$c=$c+$colspan-1;
 		}
-		else
+		if($rowspan!=0)
 		{
-               		echo "<TD align=\"center\" valign=\"top\" colspan=\"$colspan\">\n";
-			$c=$c+$colspan-1;
+			$tmp=$tmp." rowspan=\"$rowspan\" ";
+#			$r=$r+$rowspan-1;
 		}
+               	echo "<TD align=\"center\" valign=\"top\" $tmp>\n";
 		if(DBnum_rows($iresult)>0)
 		{
 			if($resource == 0)
diff --git a/upgrades/dbpatches/1.1alpha10_to_1.1alpha11/mysql/patch.sql b/upgrades/dbpatches/1.1alpha10_to_1.1alpha11/mysql/patch.sql
new file mode 100644
index 00000000..6d704c4d
--- /dev/null
+++ b/upgrades/dbpatches/1.1alpha10_to_1.1alpha11/mysql/patch.sql
@@ -0,0 +1 @@
+alter table screens_items add	rowspan		int(4)	DEFAULT '0' NOT NULL;
diff --git a/upgrades/dbpatches/1.1alpha10_to_1.1alpha11/postgresql/patch.sql b/upgrades/dbpatches/1.1alpha10_to_1.1alpha11/postgresql/patch.sql
new file mode 100644
index 00000000..9a29f520
--- /dev/null
+++ b/upgrades/dbpatches/1.1alpha10_to_1.1alpha11/postgresql/patch.sql
@@ -0,0 +1 @@
+alter table screens_items add	rowspan		int4	DEFAULT '0' NOT NULL;