diff options
| -rwxr-xr-x | usr/local/www/javascript/row_helper_dynamic.js | 8 | ||||
| -rwxr-xr-x | usr/local/www/pkg_edit.php | 23 |
2 files changed, 24 insertions, 7 deletions
diff --git a/usr/local/www/javascript/row_helper_dynamic.js b/usr/local/www/javascript/row_helper_dynamic.js index 47c5140..778f182 100755 --- a/usr/local/www/javascript/row_helper_dynamic.js +++ b/usr/local/www/javascript/row_helper_dynamic.js @@ -17,22 +17,24 @@ var is_streaming_progress_bar = 0; var temp_streaming_text = ""; var addRowTo = (function() { - return (function (tableId) { + return (function (tableId, objectSize) { var d, tbody, tr, td, bgc, i, ii, j; d = document; tbody = d.getElementById(tableId).getElementsByTagName("tbody").item(0); tr = d.createElement("tr"); totalrows++; + if (!objectSize) + objectSize = rowsize[i]; for (i = 0; i < field_counter_js; i++) { td = d.createElement("td"); if(rowtype[i] == 'textbox') { - td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input size='" + rowsize[i] + "' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> "; + td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input size='" + objectSize + "' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> "; } else if(rowtype[i] == 'select') { td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'>" + newrow[i] + "</select> "; } else if(rowtype[i] == 'checkbox') { td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input type='checkbox'name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> "; } else if(rowtype[i] == 'input') { - td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input class='formfld unknown' size='" + rowsize[i] + "' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> "; + td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input class='formfld unknown' size='" + objectSize + "' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> "; } else if(rowtype[i] == 'password') { td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input class='formfld pwd' type='password' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> "; } diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index 30673ef..6113d1d 100755 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -525,9 +525,12 @@ if ($pkg['tabs'] <> "") { $options = ""; $type = $rowhelper['type']; $fieldname = $rowhelper['fieldname']; - if($type == "option") $options = &$rowhelper['options']['option']; + if($type == "option") + $options = &$rowhelper['options']['option']; if($rowhelper['size']) $size = $rowhelper['size']; + else if ($pkga['size']) + $size = $pkga['size']; else $size = "8"; display_row($rowcounter, $value, $fieldname, $type, $rowhelper, $size); @@ -561,8 +564,12 @@ if ($pkg['tabs'] <> "") { $type = $rowhelper['type']; $fieldname = $rowhelper['fieldname']; if($type == "option") $options = &$rowhelper['options']['option']; - $size = "8"; - if($rowhelper['size'] <> "") $size = $rowhelper['size']; + if($rowhelper['size'] <> "") + $size = $rowhelper['size']; + else if ($pkga['size']) + $size = $pkga['size']; + else + $size = 8; display_row($rowcounter, $value, $fieldname, $type, $rowhelper, $size); // javascript helpers for row_helper_dynamic.js echo "</td>\n"; @@ -576,13 +583,21 @@ if ($pkg['tabs'] <> "") { } $rowcounter++; + echo "<td>"; + echo "<input type=\"image\" src=\"./themes/".$g['theme']."/images/icons/icon_x.gif\" onclick=\"removeRow(this); return false;\" value=\"" . gettext("Delete") . "\">"; + echo "</td>\n"; + echo "</tr>\n"; } ?> <tbody></tbody> </table> - <br><a onClick="javascript:addRowTo('maintable'); return false;" href="#"><img border="0" src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif"></a> + <?php if ($pkga['size']): ?> + <br><a onClick="javascript:addRowTo('maintable', <?=$pkga['size'];?>); return false;" href="#"><img border="0" src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif"></a> + <?php else: ?> + <br><a onClick="javascript:addRowTo('maintable'); return false;" href="#"><img border="0" src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif"></a> + <?php endif; ?> <script language="JavaScript"> <!-- field_counter_js = <?= $fieldcounter ?>; |
