diff options
author | Phil Davis <phil.davis@inf.org> | 2015-10-24 17:12:43 +0545 |
---|---|---|
committer | Phil Davis <phil.davis@inf.org> | 2015-10-24 17:12:43 +0545 |
commit | 6b1b69a8fdc9cf29e4a53a854b7c0e2df35c2882 (patch) | |
tree | 194c4e0eecb3e2b1606c13c7fff2927c9b45ca2e /src | |
parent | 33b170df6d2388b925b2e16413c9e80852a1f6ab (diff) | |
download | pfsense-6b1b69a8fdc9cf29e4a53a854b7c0e2df35c2882.zip pfsense-6b1b69a8fdc9cf29e4a53a854b7c0e2df35c2882.tar.gz |
Fixup status progress messages for reinstallall
When doing reinstall all packages the "Please wait" and similar messages need to be general about "all packages". There is not a particular package name to put in the message.
Diffstat (limited to 'src')
-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(); } |