summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2015-10-15 08:09:42 -0400
committerStephen Beaver <sbeaver@netgate.com>2015-10-15 08:09:42 -0400
commitea148bd7b3201b40f1722c51b9429af74eecc7ce (patch)
tree8805d816b332e9b707ce581be134c73fa835ce06
parent83b4d0f99683a23356637606b2f7f962b58eb538 (diff)
parent0d17c8032654d3573517b34a081f14ddf0c714b2 (diff)
downloadpfsense-ea148bd7b3201b40f1722c51b9429af74eecc7ce.zip
pfsense-ea148bd7b3201b40f1722c51b9429af74eecc7ce.tar.gz
Merge pull request #1965 from phil-davis/patch-11
-rw-r--r--src/usr/local/www/pkg_mgr_install.php16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php
index d6aee1f..c482a79 100644
--- a/src/usr/local/www/pkg_mgr_install.php
+++ b/src/usr/local/www/pkg_mgr_install.php
@@ -246,7 +246,7 @@ display_top_tabs($tab_array);
?>
<form action="pkg_mgr_install.php" method="post" class="form-horizontal">
- <h2>Add / remove package</h2>
+ <h2>Install / remove package</h2>
<?php if ((empty($_GET['mode']) && $_GET['id']) || (!empty($_GET['mode']) && (!empty($_GET['pkg']) || $_GET['mode'] == 'reinstallall') && ($_GET['mode'] != 'installedinfo' && $_GET['mode'] != 'showlog'))):
if (empty($_GET['mode']) && $_GET['id']) {
$pkgname = str_replace(array("<", ">", ";", "&", "'", '"', '.', '/'), "", htmlspecialchars_decode($_GET['id'], ENT_QUOTES | ENT_HTML401));
@@ -263,7 +263,7 @@ display_top_tabs($tab_array);
$pkgtxt = 'reinstalled';
break;
case 'delete':
- $pkgtxt = 'deleted';
+ $pkgtxt = 'removed';
break;
default:
$pkgtxt = $pkgmode;
@@ -273,7 +273,17 @@ display_top_tabs($tab_array);
<div class="panel panel-default">
<div class="panel-body">
<div class="content">
+<?php
+ if ($pkgmode == 'reinstallall') {
+?>
+ <p><?=gettext("All packages will be reinstalled.");?></p>
+<?php
+ } else {
+?>
<p>Package: <b><?=$pkgname;?></b> will be <?=$pkgtxt;?>.</p>
+<?php
+ }
+?>
</div>
</div>
<div class="panel-footer">
@@ -308,7 +318,7 @@ if (!empty($_POST['id']) || $_GET['mode'] == 'showlog' || ($_GET['mode'] == 'ins
<br />
<div class="panel panel-default">
<div class="panel-heading">
- <h2 class="panel-title" id="status"><?=gettext("Beginning package ") . $modetxt?>.</h2>
+ <h2 class="panel-title" id="status"><?=gettext("Package") . " " . $modetxt?></h2>
</div>
<div class="panel-body">
OpenPOWER on IntegriCloud