From 0d17c8032654d3573517b34a081f14ddf0c714b2 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@inf.org>
Date: Thu, 15 Oct 2015 13:27:11 +0545
Subject: Tidy some text in package install code

1) The "Beginning package removal" "Beginning package installation"... heading above the text box that displays the progress text output is never updated along the way, so it always says "Beginning...". It seems easy to just remove the word "Beginning" - the detailed progress is in the text box below, and the "please wait"/"completed"/"failed" appears below the text box already.
2) Replace remaining occurrences of add/delete with install/remove to make the words used on the UI consistent.
3) Make a custom sentence for the "reinstallall" case. (Note: I am just fixing text UI stuff with this PR. After pressing "Confirm" to reinstallall, actually nothing happened. So that needs looking at also.)
---
 src/usr/local/www/pkg_mgr_install.php | 16 +++++++++++++---
 1 file 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">
-- 
cgit v1.1