diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index bc4bf185f5..b76a349f54 100755 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -267,11 +267,14 @@ if ($pkg['custom_php_after_head_command']) + + "") { ?> - - + -
@@ -436,7 +438,7 @@ if ($pkg['tabs'] <> "") { if ($pkga['type'] == "listtopic") { $input = " "; - $input .= "{$pkga['name']}
\n"; + $input .= "{$pkga['name']}
\n"; if(isset($pkga['advancedfield']) && isset($adv_filed_count)) { $advanced .= $input; $adv_filed_count++; @@ -518,7 +520,7 @@ if ($pkg['tabs'] <> "") { case "input": $size = ($pkga['size'] ? " size='{$pkga['size']}' " : ""); $input = "\n"; - $input .= "
" . fixup_string($pkga['description']) . "\n"; + $input .= "
" . fixup_string($pkga['description']) . "\n"; if(isset($pkga['advancedfield']) && isset($adv_filed_count)) { $js_array[] = $pkga['fieldname']; $advanced .= display_advanced_field($pkga['fieldname']).$input ."\n"; @@ -530,7 +532,7 @@ if ($pkg['tabs'] <> "") { case "password": $size = ($pkga['size'] ? " size='{$pkga['size']}' " : ""); $input = "\n"; - $input .= "
" . fixup_string($pkga['description']) . "\n"; + $input .= "
" . fixup_string($pkga['description']) . "\n"; if(isset($pkga['advancedfield']) && isset($adv_filed_count)) { $js_array[] = $pkga['fieldname']; $advanced .= display_advanced_field($pkga['fieldname']).$input ."\n"; @@ -624,7 +626,7 @@ if ($pkg['tabs'] <> "") { $input .= "\t\n"; } $input .= "\n"; - $input .= "
" . fixup_string($pkga['description']) . "\n"; + $input .= "
" . fixup_string($pkga['description']) . "\n"; if(isset($pkga['advancedfield']) && isset($adv_filed_count)) { $js_array[] = $pkga['fieldname']; @@ -641,7 +643,7 @@ if ($pkg['tabs'] <> "") { if (isset($pkga['enablefields']) || isset($pkga['checkenablefields'])) $onclick = ' onclick="javascript:enablechange();"'; $input = "\n"; - $input .= "
" . fixup_string($pkga['description']) . "\n"; + $input .= "
" . fixup_string($pkga['description']) . "\n"; if(isset($pkga['advancedfield']) && isset($adv_filed_count)) { $js_array[] = $pkga['fieldname']; @@ -661,7 +663,7 @@ if ($pkg['tabs'] <> "") { $value = base64_decode($value); $wrap =($pkga['wrap'] == "off" ? 'wrap="off" style="white-space:nowrap;"' : ''); $input = "\n"; - $input .= "
" . fixup_string($pkga['description']) . "\n"; + $input .= "
" . fixup_string($pkga['description']) . "\n"; if(isset($pkga['advancedfield']) && isset($adv_filed_count)) { $js_array[] = $pkga['fieldname']; $advanced .= display_advanced_field($pkga['fieldname']).$input; @@ -701,8 +703,10 @@ if ($pkg['tabs'] <> "") { $input .= fixup_string($pkga['description']) . "\n"; $script = ""; echo $input; @@ -787,15 +791,15 @@ if ($pkg['tabs'] <> "") { if(isset($pkga['placeonbottom'])) $pkg_buttons .= $input; else - echo $input ."\n
" . fixup_string($pkga['description']) . "\n";; + echo $input ."\n
" . fixup_string($pkga['description']) . "\n";; break; case "rowhelper": #$rowhelpername=($fields['fieldname'] ? $fields['fieldname'] : "row"); $rowhelpername="row"; ?> - '> @@ -853,8 +857,8 @@ if ($pkg['tabs'] <> "") { } $rowcounter++; echo "\n"; echo "\n"; } @@ -862,17 +866,17 @@ if ($pkg['tabs'] <> "") {
"; - #echo ""; - echo ""; + #echo "\"remove\""; + echo "delete"; echo "
- -
-
- "") { else{ $input= ""; if($pkga['usecolspan2']) - $input.= "
"; + $input.= "
"; } if(isset($pkga['advancedfield']) && isset($adv_filed_count)) $advanced .= "{$input}\n"; @@ -938,12 +942,14 @@ if ($pkg['tabs'] <> "") { /* JavaScript to handle the advanced fields. */ if ($pkg['advanced_options'] == "enabled") { echo "\n"; } ?> @@ -1104,7 +1110,7 @@ function parse_package_templates() { /* Return html div fields */ function display_advanced_field($fieldname) { $div = "
\n"; - $div .= " - " . gettext("Show advanced option") ."
\n"; + $div .= " - " . gettext("Show advanced option") ."\n"; $div .= "