updating the username/password hints for the opac

Conflicts:

	Open-ILS/src/templates/opac/parts/login/form.tt2
	Open-ILS/src/templates/opac/parts/login/password_hint.tt2

diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2
index 2861fa0..0e988a3 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/form.tt2
@@ -16,14 +16,15 @@
 <div id='login-form-box' class='login_boxes left_brain' style='float:left'>
     <h1>[% l('Log in to Your Account') %]</h1>
     [% l('Please enter the following information:') %]
+<<<<<<< HEAD
     <form method='post'>
         <div style="float: left; padding-bottom: 10px; margin-right: 40px;">
             <label for='username_field' class="lbl1" >[% l('Library Card Number or Username') %]</label>
             <div class="input_bg">
                 <input type='text' id="username_field" name="username" autofocus />
             </div>
-            <div class="lbl2">[% l('Please include leading zeros and no spaces.') %]</div>
-            <div class="lbl2">[% l('Example: 0026626051') %]</div>
+            <div class="lbl2">[% l('Please type the entire card number with no spaces.') %]</div>
+            <div class="lbl2">[% l('Example: 220110026626051') %]</div>
         </div>
         <div style="float: left;">
             <label for="password_field" class="lbl1" >[% l('PIN Number or Password') %]</label>

diff --git a/Open-ILS/src/templates/opac/parts/login/password_hint.tt2 b/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
index e820317..76b32ef 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
@@ -1,3 +1,3 @@
 <div class="lbl2">
-[%- l('If this is your first time logging in, please enter the last 4 digits of your phone number. Example: 0926'); %]
+[%- l('If this is your first time logging in, please enter the 4 digit PIN you were assigned by library staff. Example: 0926'); %]
 </div>