diff options
| author | james_wells <james_wells@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-04 05:06:06 +0000 |
|---|---|---|
| committer | james_wells <james_wells@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-04 05:06:06 +0000 |
| commit | 188cc097b60423480f4bd578011d32fe6449d88c (patch) | |
| tree | 9b13f390142a2b2149bbd40630b999908fa9ab58 /frontends/php/screenedit.php | |
| parent | d04389e9e64105f5f12f533302c5a58f9a756ab4 (diff) | |
| download | zabbix-188cc097b60423480f4bd578011d32fe6449d88c.tar.gz zabbix-188cc097b60423480f4bd578011d32fe6449d88c.tar.xz zabbix-188cc097b60423480f4bd578011d32fe6449d88c.zip | |
Updated displayed version in UI to 1.1beta3
zabbix/frontends/php/include/locales/de_de.inc.php
zabbix/frontends/php/include/locales/en_gb.inc.php
zabbix/frontends/php/include/locales/fr_fr.inc.php
zabbix/frontends/php/include/locales/it_it.inc.php
zabbix/frontends/php/include/locales/ja_jp.inc.php
zabbix/frontends/php/include/locales/lv_lv.inc.php
zabbix/frontends/php/include/locales/ru_ru.inc.php
zabbix/frontends/php/include/locales/sp_sp.inc.php
Applied span inconsistency patch.
zabbix/ChangeLog zabbix/frontends/php/screenedit.php
zabbix/frontends/php/screens.php
Added dbpatches to support 'User Configurable Refresh'
zabbix/upgrades/dbpatches/1.1beta2_to_1.1beta3/mysql/patch.sql
zabbix/upgrades/dbpatches/1.1beta2_to_1.1beta3/postgresql/patch.sql
git-svn-id: svn://svn.zabbix.com/trunk@2264 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/screenedit.php')
| -rw-r--r-- | frontends/php/screenedit.php | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/frontends/php/screenedit.php b/frontends/php/screenedit.php index bd4cfae9..71efdcb6 100644 --- a/frontends/php/screenedit.php +++ b/frontends/php/screenedit.php @@ -104,16 +104,30 @@ $rowspan=0; } $tmp=""; - if($colspan!=0) + if($colspan>1) + //if($colspan!=0) { $tmp=$tmp." colspan=\"$colspan\" "; + if($rowspan>1) + { + $spancheck[$c][$r]=1; + } + /*if ($colspan=1) + { + $colspan=0; + } + $c=$c+$colspan;*/ $c=$c+$colspan-1; } - if($rowspan!=0) + if($rowspan>1) + //if($rowspan!=0) { $tmp=$tmp." rowspan=\"$rowspan\" "; + $spancheck[$c][$r]=1; # $r=$r+$rowspan-1; } + if ($spancheck[$c][$r-1]!=1) + { echo "<TD align=\"center\" valign=\"top\" $tmp>\n"; echo "<a name=\"form\"></a>"; echo "<form method=\"get\" action=\"screenedit.php\">"; @@ -126,7 +140,7 @@ $width=@iif(isset($_REQUEST["width"]),$_REQUEST["width"],$width); $height=@iif(isset($_REQUEST["height"]),$_REQUEST["height"],$height); $colspan=@iif(isset($_REQUEST["colspan"]),$_REQUEST["colspan"],$colspan); - $rowspan=@iif(isset($_REQUEST["rowspan"]),$_REQUEST["rowspan"],$colspan); + $rowspan=@iif(isset($_REQUEST["rowspan"]),$_REQUEST["rowspan"],$rowspan); show_form_begin("screenedit.cell"); echo S_SCREEN_CELL_CONFIGURATION; @@ -285,6 +299,8 @@ echo "</form>\n"; echo "</TD>"; + } + } echo "</TR>\n"; } |