diff options
author | Renato Botelho <garga@FreeBSD.org> | 2015-05-20 15:34:08 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2015-05-20 15:34:08 -0300 |
commit | 51c2680872c9652882fa4a42b56547bcc94d2af6 (patch) | |
tree | 45bee527eb22a62dc57e8c29b63c76945f9d36df | |
parent | 67e7ae85f4913a6fb02dfcd70a1df6e9ed959e84 (diff) | |
parent | 26d785bb9320a113619e48b55f496372f3fc92a3 (diff) | |
download | pfsense-51c2680872c9652882fa4a42b56547bcc94d2af6.zip pfsense-51c2680872c9652882fa4a42b56547bcc94d2af6.tar.gz |
Merge pull request #1671 from phil-davis/patch-2
-rw-r--r-- | usr/local/www/pkg_edit.php | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index 0628e04..ec834aa 100644 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -507,9 +507,12 @@ if ($pkg['tabs'] <> "") { } $size = ""; + $colspan=""; if (isset($pkga['dontdisplayname'])) { $input=""; - if ($pkga['combinefields'] != "begin") { + // We do not want a separate tr tag pair for each field in a set of combined fields. + // The case of putting the first tr tag at the beginning of a combine-fields set is already handled above. + if (!isset($pkga['combinefields'])) { $input .= "<tr valign='top' id='tr_{$pkga['fieldname']}'>"; } if (isset($pkga['usecolspan2'])) { @@ -529,7 +532,9 @@ if ($pkg['tabs'] <> "") { $req = 'req'; } $input=""; - if ($pkga['combinefields'] != "begin") { + // We do not want a separate tr tag pair for each field in a set of combined fields. + // The case of putting the first tr tag at the beginning of a combine-fields set is already handled above. + if (!isset($pkga['combinefields'])) { $input .= "<tr>"; } $input .= "<td valign='top' width=\"22%\" class=\"vncell{$req}\">"; @@ -1001,13 +1006,16 @@ if ($pkg['tabs'] <> "") { if ($pkga['typehint']) { echo " " . $pkga['typehint']; } - $input = "</td></tr>"; #check combinefields options if (isset($pkga['combinefields'])) { + // At the end of each combined-fields field we just want to end a td tag. + $input = "</td>"; + // The tr tag and... ends are only used to end the whole set of combined fields. if ($pkga['combinefields']=="end") { - $input.="</table></td></tr>"; + $input.="</tr></table></td></tr>"; } } else { + $input = "</td></tr>"; if ($pkga['usecolspan2']) { $input.= "</tr><br />"; } |