OPAC customizations including password reset text change.

Signed-off-by: Steven Callender <stevecallender@esilibrary.com>

diff --git a/Open-ILS/src/templates/password-reset/strings.en-US b/Open-ILS/src/templates/password-reset/strings.en-US
index 9b85980..dc04826 100644 (file)
--- a/Open-ILS/src/templates/password-reset/strings.en-US
+++ b/Open-ILS/src/templates/password-reset/strings.en-US
@@ -10,6 +10,6 @@ NO_MATCH=Passwords did not match. Please try again
 NOT_ACTIVE=This was not an active password reset request. Your password has not been reset.
 NOT_STRONG=The password you chose was not considered complex enough to protect your account. Your password has not been reset.
 SUCCESS=Password has been reset.
-TITLE=Library system password reset
+TITLE=Reset your TADL Online account password
 PASSWORD_PROMPT=New password: 
 PASSWORD_PROMPT2=Re-enter new password: 

diff --git a/Open-ILS/web/js/dojo/openils/opac/nls/opac.js b/Open-ILS/web/js/dojo/openils/opac/nls/opac.js
index 9db079d..3525f7b 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/opac/nls/opac.js
+++ b/Open-ILS/web/js/dojo/openils/opac/nls/opac.js
@@ -1,16 +1,16 @@
 {
-    "BARCODE_PROMPT": "Barcode: ",
+    "BARCODE_PROMPT": "Card number: ",
     "USERNAME_PROMPT": "User name: ",
     "CANCEL_BUTTON_LABEL": "Cancel",
     "SUBMIT_BUTTON_LABEL": "Submit",
     "OK": "OK",
     "PWD_RESET_RESPONSE_TITLE": "Password reset response",
-    "PWD_RESET_SUBMIT_SUCCESS": "Your request to begin the password reset process has been processed. If your account has a valid email address, you should soon receive an email containing further instructions for resetting your password.",
+    "PWD_RESET_SUBMIT_SUCCESS": "Your password reset request has been received. We'll send an email shortly to the address associated with your library account containing further instructions for resetting your password.",
     "PWD_RESET_SUBMIT_ERROR": "The system could not process your request for a password reset. Please try again, or contact circulation staff for assistance.",
     "PWD_RESET_SUBMIT_STATUS": "Sending request...",
     "PWD_RESET_FORGOT_PROMPT": "Forgot your password?",
     "PWD_RESET_FORM_TITLE": "Request password reset",
-    "PWD_RESET_SUBMIT_PROMPT": "To begin the password reset process, enter either your barcode or user name in the form below and click 'Submit'",
+    "PWD_RESET_SUBMIT_PROMPT": "To begin the password reset process, enter your library card number, driver's license number, or user name in the appropriate field below and click 'Submit'. If you don't have an email address associated with your library account, this process won't work, so please let us know the next time you visit a library location.",
        "CREATE_MFHD": "Add MFHD Record",
        "CREATED_MFHD_RECORD": "Created MFHD record for ${0}",
        "DELETE_MFHD": "Delete Record",

diff --git a/Open-ILS/web/opac/skin/tadl/js/myopac.js b/Open-ILS/web/opac/skin/tadl/js/myopac.js
index d63e3fb..0e33feb 100644 (file)
--- a/Open-ILS/web/opac/skin/tadl/js/myopac.js
+++ b/Open-ILS/web/opac/skin/tadl/js/myopac.js
@@ -1058,6 +1058,7 @@ function myopacSaveAddress(row, addr, deleteMe) {
 
 function myOPACUpdateUsername() {
        var username = $('myopac_new_username').value;
+       var curpassword = $('myopac_username_current_password').value;
        if(username == null || username == "") {
                alert($('myopac_username_error').innerHTML);
                return;
@@ -1092,7 +1093,7 @@ function myOPACUpdateUsername() {
                return;
        }
 
-       var req = new Request(UPDATE_USERNAME, G.user.session, username );
+       var req = new Request(UPDATE_USERNAME, G.user.session, username, curpassword );
        req.send(true);
        if(req.result()) {
 
@@ -1116,12 +1117,13 @@ function myOPACUpdateUsername() {
 
 function myOPACUpdateEmail() {
        var email = $('myopac_new_email').value;
+       var curpassword = $('myopac_email_current_password').value;
        if(email == null || email == "") {
                alert($('myopac_email_error').innerHTML);
                return;
        }
 
-       var req = new Request(UPDATE_EMAIL, G.user.session, email );
+       var req = new Request(UPDATE_EMAIL, G.user.session, email, curpassword );
        req.send(true);
        if(req.result()) {
                G.user.email(email);

diff --git a/Open-ILS/web/opac/skin/tadl/js/password_reset.js b/Open-ILS/web/opac/skin/tadl/js/password_reset.js
index 83ab76d..685c696 100644 (file)
--- a/Open-ILS/web/opac/skin/tadl/js/password_reset.js
+++ b/Open-ILS/web/opac/skin/tadl/js/password_reset.js
@@ -41,11 +41,11 @@ dojo.addOnLoad(function() {
         }
         var deferred = dojo.xhrPost(xhrArgs);
     });
+/* remove TADL password resets for now
     dojo.place("<tr><td colspan='2' align='center'><a class='classic_link' href='http://www.tadl.org/evergreen/catalog/'>Having trouble logging in?</a></td></tr>", config.ids.login.tbody);
-    /* remove Evergreen password resets for now
+*/
     dojo.place("<tr><td colspan='2' align='center'><a class='classic_link' id='pwResetLink' onClick='dijit.byId(\"pwResetFormDlg\").show();'</a></td></tr>", config.ids.login.tbody);
     dojo.query("#pwResetLink").attr("innerHTML", opac_strings.PWD_RESET_FORGOT_PROMPT);
-    */
 
 });
 

diff --git a/Open-ILS/web/opac/skin/tadl/xml/myopac/myopac_summary.xml b/Open-ILS/web/opac/skin/tadl/xml/myopac/myopac_summary.xml
index 40eda7f..1882808 100644 (file)
--- a/Open-ILS/web/opac/skin/tadl/xml/myopac/myopac_summary.xml
+++ b/Open-ILS/web/opac/skin/tadl/xml/myopac/myopac_summary.xml
@@ -65,20 +65,30 @@
                                        id='myopac_summary_username_change' style='text-decoration: underline;'>&myopac.summary.change;</a></td>
                        </tr>
 
-                       <tr id='myopac_update_username_row' class='hide_me'>
-                               <td class='myopac_update_cell' colspan='3'>
-                                       <span class='myopac_update_span'>&myopac.summary.username.enter; </span>
-                                       <input type='text' size='24' id='myopac_new_username'
-                                               onkeydown='if(userPressedEnter(event)) myOPACUpdateUsername();' />
-                                       <span class='myopac_update_span'>
-                                               <button onclick='myOPACUpdateUsername();'>&common.submit;</button>
-                                       </span>
-                                       <span class='myopac_update_span'>
-                                               <button onclick='hideMe($("myopac_update_username_row"));'>&common.cancel;</button>
-                                       </span>
-                               </td>
-                       </tr>
+                        <tr id='myopac_update_username_row' class='hide_me'>
+                                <td class='myopac_update_cell' colspan='3'>
 
+                                        <table><tbody>
+                                                <tr>
+                                                        <td><span class='myopac_update_span'>&myopac.summary.password.current; </span></td>
+                                                        <td><input type='password' size='24' id='myopac_username_current_password'
+                                                                onkeydown='if(userPressedEnter(event)) myOPACUpdateUsername();' /></td>
+                                                </tr>
+                                                <tr>
+                                                        <td><span class='myopac_update_span'>&myopac.summary.username.enter; </span></td>
+                                                        <td><input type='text' size='24' id='myopac_new_username'
+                                                                onkeydown='if(userPressedEnter(event)) myOPACUpdateUsername();' /></td>
+                                                </tr>
+                                        </tbody></table>
+
+                                        <span class='myopac_update_span'>
+                                                <button onclick='myOPACUpdateUsername();'>&common.submit;</button>
+                                        </span>
+                                        <span class='myopac_update_span'>
+                                                <button onclick='hideMe($("myopac_update_username_row"));'>&common.cancel;</button>
+                                        </span>
+                                </td>
+                        </tr>
 
                        <tr>
                                <td class='color_4 light_border'>&common.password;</td>
@@ -126,19 +136,31 @@
                                        id='myopac_summary_email_change' style='text-decoration: underline;'>&myopac.summary.change;</a></td>
                        </tr>
 
-                       <tr id='myopac_update_email_row' class='hide_me'>
-                               <td class='myopac_update_cell' colspan='3'>
-                                       <span class='myopac_update_span'>&myopac.summary.email.new; </span>
-                                       <input type='text' size='24' id='myopac_new_email'
-                                               onkeydown='if(userPressedEnter(event)) myOPACUpdateEmail();' />
-                                       <span class='myopac_update_span'>
-                                               <button onclick='myOPACUpdateEmail();'>&common.submit;</button>
-                                       </span>
-                                       <span class='myopac_update_span'>
-                                               <button onclick='hideMe($("myopac_update_email_row"));'>&common.cancel;</button>
-                                       </span>
-                               </td>
-                       </tr>
+                        <tr id='myopac_update_email_row' class='hide_me'>
+                                <td class='myopac_update_cell' colspan='3'>
+
+                                        <table><tbody>
+                                                <tr>
+                                                        <td><span class='myopac_update_span'>&myopac.summary.password.current; </span></td>
+                                                        <td><input type='password' size='24' id='myopac_email_current_password'
+                                                                onkeydown='if(userPressedEnter(event)) myOPACUpdateEmail();' /></td>
+                                                </tr>
+                                                <tr>
+                                                        <td><span class='myopac_update_span'>&myopac.summary.email.new; </span></td>
+                                                        <td><input type='text' size='24' id='myopac_new_email'
+                                                                onkeydown='if(userPressedEnter(event)) myOPACUpdateEmail();' /></td>
+                                                </tr>
+                                        </tbody></table>
+
+                                        <span class='myopac_update_span'>
+                                                <button onclick='myOPACUpdateEmail();'>&common.submit;</button>
+                                        </span>
+                                        <span class='myopac_update_span'>
+                                                <button onclick='hideMe($("myopac_update_email_row"));'>&common.cancel;</button>
+                                        </span>
+                                </td>
+                        </tr>
+
 
                        <tr>
                                <td class='color_4 light_border'>&myopac.summary.id.primary;</td>