diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-10-25 22:27:20 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-10-25 22:27:20 -0500 |
| commit | 772d594f6071fd8d21ac9e7f222c31650de4e55e (patch) | |
| tree | 59a826cff9cd869928bf073610a0335e8c722bdb | |
| parent | dea1f29f898bcb96cf6432ada4b368880a8e1c77 (diff) | |
| parent | 6b1b69a8fdc9cf29e4a53a854b7c0e2df35c2882 (diff) | |
| download | pfsense-772d594f6071fd8d21ac9e7f222c31650de4e55e.zip pfsense-772d594f6071fd8d21ac9e7f222c31650de4e55e.tar.gz | |
Merge pull request #1983 from phil-davis/patch-3
| -rw-r--r-- | src/usr/local/www/pkg_mgr_install.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php index 69b90f4..e090259 100644 --- a/src/usr/local/www/pkg_mgr_install.php +++ b/src/usr/local/www/pkg_mgr_install.php @@ -319,7 +319,7 @@ display_top_tabs($tab_array); if ($_POST['mode'] == 'delete') { $modetxt = gettext("removal"); -} else if ($_POST['mode'] == 'reinstallpkg') { +} else if (($_POST['mode'] == 'reinstallpkg') || ($_POST['mode'] == 'reinstallall')) { $modetxt = gettext("reinstallation"); } else { $modetxt = gettext("installation"); @@ -462,15 +462,22 @@ function show_success() { // Display a failure banner function show_failure() { $('#final').addClass("alert-danger"); - $('#final').html("<?=$pkgid?>" + " " + "<?=$modetxt?>" + " " + "<?=gettext(' failed!')?>"); + if("<?=$_POST['mode']?>" != "reinstallall") + $('#final').html("<?=$pkgid?>" + " " + "<?=$modetxt?>" + " " + "<?=gettext(' failed!')?>"); + else + $('#final').html("<?=gettext('Reinstallation of all packages failed')?>"); $('#final').show(); } // Ask the user to wait a bit function show_info() { $('#final').addClass("alert-info"); - $('#final').html("Please wait while the " + "<?=$modetxt?>" + " of " + "<?=$pkgid?>" + " " + "completes." + "<br />" + - "<?=gettext("(Some packages may take several minutes!)")?>"); + if("<?=$_POST['mode']?>" != "reinstallall") + $('#final').html("Please wait while the " + "<?=$modetxt?>" + " of " + "<?=$pkgid?>" + " " + "completes." + "<br />" + + "<?=gettext("(Some packages may take several minutes!)")?>"); + else + $('#final').html("Please wait while the reinstallation of all packages completes." + "<br />" + + "<?=gettext("(Some packages may take several minutes!)")?>"); $('#final').show(); } |
