mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

More combinedfields and usecolspan2 fixes

Browse Source 
Actually the "tr" tag needs to be a single tag-pair that encloses all of the set of fields with combinedfields specified - combinedfields=begin is where the "tr" tag starts and combinedfields=end is where the "tr" tag ends, enclosing a whole set of combined fields.
That allows usecolspan2 to work.
In the previous change I had made it enclose every field in its own "tr" tag-pair That caused usecolspan2 to be ineffective at spreading the combined fields across the display.
Also colspan needs to be initialised each time around the loop - it was getting applied to all fields further down the page after the first one it was used in.
This is the version for 2.2.*
This commit is contained in:
Phil Davis 2015-05-20 23:47:28 +05:45
parent e5db68d279
commit f601422867
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr/local/www/pkg_edit.php
View File

@ -469,9 +469,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']))
$colspan="colspan='2'";
@ -489,7 +492,9 @@ if ($pkg['tabs'] <> "") {
if (isset($pkga['required']))
$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}\">";
@ -903,13 +908,16 @@ if ($pkg['tabs'] <> "") {
#check typehint value
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 />";
}