diff options
author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-01-02 13:40:47 +0000 |
---|---|---|
committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-01-02 13:40:47 +0000 |
commit | fbd8c8f7f9bb54f49803475d03948f37cd728c50 (patch) | |
tree | 2c827aa83c41d1e66972a5cb1b7a7a477ea3ab11 /frontends/php/screens.php | |
parent | a617bc24f4900ce0554b003c3269a4613bb2fde6 (diff) | |
download | zabbix-fbd8c8f7f9bb54f49803475d03948f37cd728c50.tar.gz zabbix-fbd8c8f7f9bb54f49803475d03948f37cd728c50.tar.xz zabbix-fbd8c8f7f9bb54f49803475d03948f37cd728c50.zip |
- fixed span handling for screens (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@2478 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/screens.php')
-rw-r--r-- | frontends/php/screens.php | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/frontends/php/screens.php b/frontends/php/screens.php index 9fa11428..28ebac10 100644 --- a/frontends/php/screens.php +++ b/frontends/php/screens.php @@ -108,12 +108,41 @@ $map="<a href=\"screens.php?screenid=".$_REQUEST["screenid"]."&fullscreen=1\">".$row["name"]."</a>"; } show_table_header($map);*/ - echo "<TABLE BORDER=1 COLS=".$row["cols"]." align=center WIDTH=100% BGCOLOR=\"#FFFFFF\">"; + for($r=0;$r<$row["rows"];$r++) + { + for($c=0;$c<$row["cols"];$c++) + { + $spancheck[$r][$c]=1; + } + } + for($r=0;$r<$row["rows"];$r++) + { + for($c=0;$c<$row["cols"];$c++) + { + $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); + $colspan=$irow["colspan"]; + $rowspan=$irow["rowspan"]; + } + for($i=0;$i<$rowspan;$i++) + for($j=0;$j<$colspan;$j++) + if(($i!=0)||($j!=0)) $spancheck[$r+$i][$c+$j]=0; + + } + } + + echo "<TABLE BORDER=1 COLS=".$row["cols"]." align=center WIDTH=100% BGCOLOR=\"#FFFFFF\">\n"; for($r=0;$r<$row["rows"];$r++) { - echo "<TR>"; + echo "<TR>\n"; for($c=0;$c<$row["cols"];$c++) { + if($spancheck[$r][$c]==0) continue; $sql="select * from screens_items where screenid=$screenid and x=$c and y=$r"; $iresult=DBSelect($sql); @@ -171,11 +200,11 @@ { echo " "; } - echo "</TD>"; + echo "</TD>\n"; } echo "</TR>\n"; } - echo "</TABLE>"; + echo "</TABLE>\n"; navigation_bar("screens.php"); } else |