diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-12-14 13:03:11 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-12-14 13:03:11 -0500 |
commit | c2e9390e508be142e2811258c192972938b6b269 (patch) | |
tree | 311c02d8f45aa66984347b742eff2c1e3e9bc015 /src/usr | |
parent | 29125e6c4425fb6fffbe751f0226398e5c00776b (diff) | |
parent | 62cdbf62e52c5338e0b0ea0b3c34320ce6996136 (diff) | |
download | pfsense-c2e9390e508be142e2811258c192972938b6b269.zip pfsense-c2e9390e508be142e2811258c192972938b6b269.tar.gz |
Merge pull request #2161 from heper/patch-1
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/local/www/pkg_edit.php | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php index f9c0f38..7a736ff 100644 --- a/src/usr/local/www/pkg_edit.php +++ b/src/usr/local/www/pkg_edit.php @@ -285,20 +285,6 @@ if ($_POST) { } } -if ($pkg['title'] != "") { - $edit = ($only_edit ? '' : ": " . gettext("Edit")); - $pgtitle = $pkg['title'] . $edit; -} else { - $pgtitle = gettext("Package Editor"); -} - -if ($pkg['custom_php_after_head_command']) { - $closehead = false; - include("head.inc"); - eval($pkg['custom_php_after_head_command']); -} else { - include("head.inc"); -} // Turn an embedded table into a bootstrap class table. This is for backward compatibility. // We remove any table attributes in the XML and replace them with Bootstrap table classes @@ -529,12 +515,17 @@ function parse_package_templates() { } } -// Start of page display -if ($input_errors) - print_input_errors($input_errors); +//breadcrumb +if ($pkg['title'] != "") { + if(!$only_edit) { + $pgtitle = array($pkg['title'], gettext("Edit")); + } else { + $pgtitle = array($pkg['title']); + } +} else { + $pgtitle = array(gettext("Package Editor")); +} -if ($savemsg) - print_info_box($savemsg, 'success'); // Create any required tabs if ($pkg['tabs'] != "") { @@ -548,6 +539,7 @@ if ($pkg['tabs'] != "") { if (isset($tab['active'])) { $active = true; + $pgtitle[] = $tab['text'] ; } else { $active = false; } @@ -586,12 +578,28 @@ if ($pkg['tabs'] != "") { } ksort($tab_array); +} +if ($pkg['custom_php_after_head_command']) { + $closehead = false; + include("head.inc"); + eval($pkg['custom_php_after_head_command']); +} else { + include("head.inc"); +} +if(isset($tab_array)) { foreach ($tab_array as $tabid => $tab) { display_top_tabs($tab); //, $no_drop_down, $tabid); } } +// Start of page display +if ($input_errors) + print_input_errors($input_errors); + +if ($savemsg) + print_info_box($savemsg, 'success'); + $cols = 0; $savevalue = gettext("Save"); if ($pkg['savetext'] != "") { |