From 338e85582a9181df93e59eda877da32a4b5c77e9 Mon Sep 17 00:00:00 2001
From: Joshua Ferraro <jmf@liblime.com>
Date: Thu, 27 Dec 2007 13:18:37 -0500
Subject: [PATCH] Improvements to nomenclature re: authority tag, making .tip
 global

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css   |  2 +-
 .../intranet-tmpl/prog/en/modules/admin/authtypes.tmpl | 10 ++++++----
 .../prog/en/modules/members/memberentrygen.tmpl        |  8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 8fdcb4ac92..8ad79812ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -305,7 +305,7 @@ div#reserves,div#checkouts {
 	padding : 1em;
 }
 
-div#header_search .tip {
+.tip {
 	font-size: 93%;
 	color : Gray;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
index 7bd3c6c7c9..3a95d533bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
@@ -91,9 +91,11 @@ function Check(f) {
 		<li><label for="authtypetext">Description: </label><input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" ESCAPE="HTML" -->" /></li>
 		<li><label for="summary">Summary: </label><textarea id="summary" name="summary" cols="55" rows="7"><!-- TMPL_VAR NAME="summary" --></textarea></li>
 		<li>
-		<p>Enter here the number of the tag that will be reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 200 to report every 200 subfield in the 70x biblio</p>
-		<label for="auth_tag_to_report">Report tag: </label><input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" /></li></ol>
-	<input type="hidden" name="op" value="add_validate" /></fieldset>
+		<p class="tip">Note: for 'Authority field to copy', enter the authority field that should be copied from the authority record to the bibliographic record. E.g., in MARC21, field 100 in the authority record should be copied to field 100 in the bibliographic record</p>
+		<label for="auth_tag_to_report">Authority field to copy: </label><input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" />
+		<input type="hidden" name="op" value="add_validate" />
+	</li></ol>
+	</fieldset>
 	<fieldset class="action"><input type="submit" value="Submit" onclick="Check(this.form); return false;" /><a class="cancel" href="/cgi-bin/koha/admin/authtypes.pl">Cancel</a></fieldset>
 	</form>
 <!-- /TMPL_IF -->
@@ -136,7 +138,7 @@ function Check(f) {
 		<th>Code</th>
 		<th>Description</th>
 		<th>Summary</th>
-		<th>Tag reported</th>
+		<th>Auth field copied</th>
 		<th>&nbsp;</th>
 		<th>Edit</th>
 		<th>Delete</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index 2d5630c201..82bcba354d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -85,17 +85,17 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
 			<p>The following fields are wrong. Please fix them.</p>
 			<ul>
 			<!-- TMPL_IF NAME="ERROR_login_exist" -->
-				<li id="ERROR_login_exist">login/password already exists.</li>
+				<li id="ERROR_login_exist">Login/password already exists.</li>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF NAME="ERROR_cardnumber" -->
 				<li id="ERROR_cardnumber">Cardnumber already in use.</li>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF NAME="ERROR_age_limitations" -->
-				<li id="ERROR_age_limitations">Patron is too young or too old for their category.  
+				<li id="ERROR_age_limitations">Patron's age is incorrect for their category.  
 					Ages allowed are <!-- TMPL_VAR NAME="ERROR_age_limitations"-->.</li>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF NAME="ERROR_branch" -->
-				<li id="ERROR_branch">Branch selected not allowed.</li>
+				<li id="ERROR_branch">Library is invalid.</li>
 			<!-- /TMPL_IF -->   
 			<!-- TMPL_IF NAME="ERROR_dateofbirth" -->
 				<li id="ERROR_dateofbirth">Date of birth is invalid.</li>
@@ -568,7 +568,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
       <!--TMPL_ELSE-->
         <label for="branchcode">
       <!-- /TMPL_IF-->
-      Branch: </label>
+      Library: </label>
       <!-- TMPL_VAR NAME="CGIbranch" -->
 	  <!-- TMPL_IF NAME="mandatorybranchcode" --><span class="required">Required</span><!-- /TMPL_IF -->
     </li>
-- 
2.20.1