Attachment 4057 Details for Bug 6312 – Signed-off patch

[patch] Signed-off patch

bug_6312.patch (text/plain), 2.72 KB, created by Jared Camins-Esakov on 2011-05-07 15:00:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jared Camins-Esakov

Created: 2011-05-07 15:00:38 UTC

Size: 2.72 KB

patch

obsolete

>From 9ffce11a305438cb1a593f19861c4a67bbf1d487 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
>Content-Type: text/plain; charset="UTF-8"
>
>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>
>---
> .../prog/en/modules/members/memberentrygen.tt | 6 +++---
> .../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 497b9ac..a4361cd 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 @@
> 			The following fields are wrong. Please fix them.
> 			<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 f8073bb..8384dfb 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>Sort field 1:[% lib1 %]</li>[% END %]
> [% IF ( sort2 ) %]<li>Sort field 2:[% lib2 %]</li>[% END %]
>- <li>OPAC login: [% userid %]</li>
>- <li>OPAC password: 
>+ <li>Username: [% userid %]</li>
>+ <li>Password: 
> [% IF ( password ) %]
> *******
> [% ELSE %]
>-- 
>1.7.2.3
>

Actions: View | Diff | Splinter Review

Attachments on bug 6312: 4057