From cec59e7ea0dd3101031fbe916f6e207d212793b4 Mon Sep 17 00:00:00 2001
From: "Nicole C. Engard" <nengard@bywatersolutions.com>
Date: Thu, 5 May 2011 12:25:29 -0400
Subject: [PATCH] Bug 6312: Remove references to login being OPAC only

This patch changes the 'opac login' label to read 'username'
since it can be used in the staff client and the opac

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 6 +++---
 .../intranet-tmpl/prog/en/modules/members/moremember.tt     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 497b9acdc3..a4361cd678 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -117,7 +117,7 @@
 			<p>The following fields are wrong. Please fix them.</p>
 			<ul>
 			[% IF ( ERROR_login_exist ) %]
-				<li id="ERROR_login_exist">Login/password already exists.</li>
+				<li id="ERROR_login_exist">Username/password already exists.</li>
 			[% END %]
 			[% IF ( ERROR_cardnumber ) %]
 				<li id="ERROR_cardnumber">Cardnumber already in use.</li>
@@ -890,14 +890,14 @@
 		</ol>
 	</fieldset>
 	<fieldset class="rows" id="memberentry_userid">
-		<legend>OPAC login</legend><ol>
+		<legend>OPAC/Staff Login</legend><ol>
 		<li>
 			[% IF ( mandatoryuserid ) %]
 			<label for="userid" class="required">
 			[% ELSE %]
 			<label for="userid">
 			[% END %]
-			OPAC Login: </label>
+			Username: </label>
 
 [% IF ( NoUpdateLogin ) %]
 <input type="text" id="userid" name="userid" size="20" disabled="disabled" value="[% IF ( opduplicate ) %][% ELSE %][% userid %][% END %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index f8073bb82d..8384dfb274 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -339,8 +339,8 @@ function validate1(date) {
     </li>[% END %]
     [% IF ( sort1 ) %]<li><span class="label">Sort field 1:</span>[% lib1 %]</li>[% END %]
     [% IF ( sort2 ) %]<li><span class="label">Sort field 2:</span>[% lib2 %]</li>[% END %]
-    <li><span class="label">OPAC login: </span>[% userid %]</li>
-    <li><span class="label">OPAC password: </span>
+    <li><span class="label">Username: </span>[% userid %]</li>
+    <li><span class="label">Password: </span>
     [% IF ( password ) %]
         *******
     [% ELSE %]
-- 
2.39.5