diff options
author | Chris Buechler <cmb@pfsense.org> | 2016-06-29 23:57:55 -0500 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2016-06-29 23:57:55 -0500 |
commit | bb5d3a43f9c7beca6b9aa89696dbaae9a916a409 (patch) | |
tree | 25ab7d4c1bca09f6ab3d6ec5f0f78888c8c7e85d /src | |
parent | f48034878df5acd2d6e744105db99153b0dc19a8 (diff) | |
parent | 6bc8621f84196c4528b8db6ae157631af7727b07 (diff) | |
download | pfsense-bb5d3a43f9c7beca6b9aa89696dbaae9a916a409.zip pfsense-bb5d3a43f9c7beca6b9aa89696dbaae9a916a409.tar.gz |
Merge pull request #3030 from phil-davis/patch-1
Diffstat (limited to 'src')
-rw-r--r-- | src/usr/local/www/pkg_mgr_install.php | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php index 6d266d4..b080943 100644 --- a/src/usr/local/www/pkg_mgr_install.php +++ b/src/usr/local/www/pkg_mgr_install.php @@ -401,7 +401,12 @@ if ($_POST) { } } -if ($pkgmode == 'delete') { +if ($firmwareupdate) { + $panel_heading_txt = gettext("Updating System"); + $pkg_success_txt = gettext('System update successfully completed.'); + $pkg_fail_txt = gettext('System update failed!'); + $pkg_wait_txt = gettext('Please wait while the system update completes.'); +} else if ($pkgmode == 'delete') { $panel_heading_txt = gettext("Package Removal"); $pkg_success_txt = sprintf(gettext('<b>%1$s</b> removal successfully completed.'), $pkgname); $pkg_fail_txt = sprintf(gettext('<b>%1$s</b> removal failed!'), $pkgname); @@ -445,17 +450,7 @@ if ($confirmed): <br /> <div class="panel panel-default"> <div class="panel-heading"> -<?php - if ($firmwareupdate): -?> - <h2 class="panel-title" id="status"><?=gettext("Updating System")?></h2> -<?php - else: -?> <h2 class="panel-title" id="status"><?=$panel_heading_txt?></h2> -<?php - endif; -?> </div> <div class="panel-body"> @@ -554,11 +549,7 @@ function setProgress(barName, percent, transition) { function show_success() { $('#final').removeClass("alert-info").addClass("alert-success"); if ("<?=$pkgmode?>" != "reinstallall") { - if ("<?=$firmwareupdate?>") { - $('#final').html("<?=gettext('System update successfully completed.')?>"); - } else { - $('#final').html("<?=$pkg_success_txt?>"); - } + $('#final').html("<?=$pkg_success_txt?>"); } else { $('#final').html("<?=gettext('Reinstallation of all packages successfully completed.')?>"); } |