[Koha-patches] [PATCH] Standardizing opac/circulation note terminology; Adding hint to opac/circulation note entry

[Owen Leonard]

---
 .../prog/en/modules/members/member.tmpl            |    2 +-
 .../prog/en/modules/members/memberentrygen.tmpl    |    4 +++-
 .../prog/en/modules/members/moremember.tmpl        |    4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index a0d3b33..5173717 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -61,7 +61,7 @@
     <th>Expires on</th>
     <th>OD/Issues</th>
     <th>Fines</th>
-    <th>Notes</th>
+    <th>Circ note</th>
 	<th>&nbsp;</th>
     </tr>
     <!-- TMPL_LOOP NAME="resultsloop" -->
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 3bdc342..f4447b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -771,6 +771,7 @@
 			<!-- /TMPL_IF-->	
 			OPAC note: </label>
 			<textarea id="opacnote" name="opacnote" cols="55" rows="5"><!-- TMPL_VAR NAME="opacnote" --></textarea>
+			<div class="hint">This message appears on this patron's user page in the OPAC</div>
 	  <!-- TMPL_IF NAME="mandatoryopacnote" --><span class="required">Required</span><!-- /TMPL_IF -->
 		</li>
 		<li>
@@ -779,8 +780,9 @@
 			<!--TMPL_ELSE-->
 				<label for="borrowernotes">
 			<!-- /TMPL_IF-->
-			Library note: </label>
+			Circulation note: </label>
 			<textarea id="borrowernotes" name="borrowernotes" cols="55" rows="5"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
+			<div class="hint">This message displays when checking out to this patron</div>
 	  <!-- TMPL_IF NAME="mandatoryborrowernotes" --><span class="required">Required</span><!-- /TMPL_IF -->
 		</li>
 		</ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 35bca7b..fe5f3ad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -285,8 +285,8 @@ if (nodename =="barcodes[]"){
    <!--TMPL_ELSE -->
   <li><span class="label">OPAC password: </span><span class="problem"><a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Undefined</a></span></li> 
    <!--/TMPL_IF --> 
-  <!-- TMPL_IF NAME="borrowernotes" --><li><span class="label">Circulation notes: </span><!-- TMPL_VAR name="borrowernotes" --></li><!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="opacnote" --><li><span class="label">Message to Patron:</span><!-- TMPL_VAR NAME="opacnote" --></li><!-- /TMPL_IF -->
+  <!-- TMPL_IF NAME="borrowernotes" --><li><span class="label">Circulation note: </span><!-- TMPL_VAR name="borrowernotes" --></li><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="opacnote" --><li><span class="label">OPAC note:</span><!-- TMPL_VAR NAME="opacnote" --></li><!-- /TMPL_IF -->
 	</ol>
 	</div>
  </div>
-- 
1.5.5.GIT