From a952db84d4e293380e03f2d48ae328a81cd251f0 Mon Sep 17 00:00:00 2001
From: Paul Poulain <paul.poulain@biblibre.com>
Date: Fri, 18 Mar 2011 15:30:05 +0100
Subject: [PATCH] Bug 5892 : opac-user: minor spelling/html changes

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 01b6e7a6ddfbaaca59215f7a88d8aa1010053217)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl       | 5 +++--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
index 001d947855..6f7c9a4fda 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
@@ -379,7 +379,7 @@ $.tablesorter.addParser({
                     <!-- TMPL_IF NAME="wait" -->
                         <!-- TMPL_IF NAME="atdestination" -->
                             <!-- TMPL_IF NAME="found" -->
-                            Item waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b>
+                            Item waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b><!-- TMPL_IF NAME="formattedwaitingdate" --> until <!-- TMPL_VAR NAME="formattedwaitingdate" --><!-- /TMPL_IF -->
                             <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcd" -->" />
                             <!-- TMPL_ELSE -->
                             Item waiting to be pulled from <b> <!-- TMPL_VAR NAME="wbrname" --></b>
@@ -400,7 +400,8 @@ $.tablesorter.addParser({
 		<!-- TMPL_IF NAME="cancelable" -->
 			<form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
 			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-			<input type="submit" name="submit" class="icon delete cancel" value="Cancel" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);" /></form>
+		<input type="hidden" name="reservenumber" value="<!-- TMPL_VAR NAME="reservenumber" -->" />
+			<input type="submit" name="submit" class="icon delete cancel" value="Cancel" onclick="return confirmDelete('Are you sure you want to cancel this hold?');" /></form>
 		<!-- TMPL_ELSE -->
 			&nbsp;
 		<!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
index f8067541e1..d9c7ecfb03 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
@@ -37,8 +37,8 @@
 <li><label for="mobile">Mobile Phone:</label> <input id="mobile" type="text" value="<!-- TMPL_VAR name="mobile" -->"  name="mobile" /></li>
 <li><label for="phonepro">Work phone:</label> <input id="phonepro"  type="text" value="<!-- TMPL_VAR name="phonepro" -->"  name="phonepro" /></li>
 <li><label for="fax">Fax:</label> <input id="fax" type="text" value="<!-- TMPL_VAR name="fax" -->"  name="fax" /></li>
-<li><label for="emailaddress">Email:</label> <input id="emailaddress" type="text" value="<!-- TMPL_VAR name="email" -->"  name="email" /></li>
-<li><label for="emailpro">Work Email:</label> <input id="emailpro" type="text" value="<!-- TMPL_VAR name="emailpro" -->"  name="emailpro" /></li>
+<li><label for="emailaddress">Primary Email:</label> <input id="emailaddress" type="text" value="<!-- TMPL_VAR name="email" -->"  name="emailaddress" /></li>
+<li><label for="emailpro">Secondary Email:</label> <input id="emailpro" type="text" value="<!-- TMPL_VAR name="emailpro" -->"  name="emailpro" /></li>
 </ol>
 </fieldset>
 
@@ -114,8 +114,8 @@
 <li><span class="label">Mobile Phone:</span>  <!-- TMPL_VAR name="mobile" --></li>
 <li><span class="label">Work phone:</span>  <!-- TMPL_VAR name="phonepro" --></li>
 <li><span class="label">Fax:</span>  <!-- TMPL_VAR name="fax" --></li>
-<li><span class="label">Email:</span>  <!-- TMPL_VAR name="email" --></li>
-<li><span class="label">Work Email:</span>  <!-- TMPL_VAR name="emailpro" --></li>
+<li><span class="label">Primary Email:</span>  <!-- TMPL_VAR name="email" --></li>
+<li><span class="label">Secondary Email:</span>  <!-- TMPL_VAR name="emailpro" --></li>
 </ol>
 </fieldset>
 
-- 
2.39.5