diff options
author | Renato Botelho <garga@FreeBSD.org> | 2015-05-20 10:39:41 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2015-05-20 10:39:41 -0300 |
commit | 67e7ae85f4913a6fb02dfcd70a1df6e9ed959e84 (patch) | |
tree | fbb948d338ead40bf73a38173839a4fb593e0436 | |
parent | 4ed45f24f2aee07b6e21a0ab27bce36503604274 (diff) | |
parent | b021e2c64d096f8c1ac4276e601d7d451b8741d8 (diff) | |
download | pfsense-67e7ae85f4913a6fb02dfcd70a1df6e9ed959e84.zip pfsense-67e7ae85f4913a6fb02dfcd70a1df6e9ed959e84.tar.gz |
Merge pull request #1669 from phil-davis/patch-2
-rw-r--r-- | usr/local/www/pkg_edit.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index dd1d339..0628e04 100644 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -509,7 +509,7 @@ if ($pkg['tabs'] <> "") { $size = ""; if (isset($pkga['dontdisplayname'])) { $input=""; - if (!isset($pkga['combinefields'])) { + if ($pkga['combinefields'] != "begin") { $input .= "<tr valign='top' id='tr_{$pkga['fieldname']}'>"; } if (isset($pkga['usecolspan2'])) { @@ -528,7 +528,11 @@ if ($pkg['tabs'] <> "") { if (isset($pkga['required'])) { $req = 'req'; } - $input= "<tr><td valign='top' width=\"22%\" class=\"vncell{$req}\">"; + $input=""; + if ($pkga['combinefields'] != "begin") { + $input .= "<tr>"; + } + $input .= "<td valign='top' width=\"22%\" class=\"vncell{$req}\">"; $input .= fixup_string($pkga['fielddescr']); $input .= "</td>"; if (isset($pkga['advancedfield']) && isset($adv_filed_count)) { @@ -539,7 +543,7 @@ if ($pkg['tabs'] <> "") { } } if ($pkga['combinefields']=="begin") { - $input="<td class=\"vncell\"><table summary=\"advanced\">"; + $input="<td class=\"vncell\"><table summary=\"advanced\"><tr>"; if (isset($pkga['advancedfield']) && isset($adv_filed_count)) { $advanced .= $input; } else { @@ -997,14 +1001,13 @@ if ($pkg['tabs'] <> "") { if ($pkga['typehint']) { echo " " . $pkga['typehint']; } + $input = "</td></tr>"; #check combinefields options if (isset($pkga['combinefields'])) { - $input="</td>"; if ($pkga['combinefields']=="end") { $input.="</table></td></tr>"; } } else { - $input= "</td></tr>"; if ($pkga['usecolspan2']) { $input.= "</tr><br />"; } |