[open-ils-commits] [GIT] Evergreen ILS branch master updated. 1b5b41377692e56976bcce019cb2908bab48559a

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  1b5b41377692e56976bcce019cb2908bab48559a (commit)
      from  eef093193ef5d5a0bf21972dca4147c0d0c573be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1b5b41377692e56976bcce019cb2908bab48559a
Author: Dan Scott <dscott at laurentian.ca>
Date:   Fri Sep 16 23:45:53 2011 -0400

    TPAC: Enable password resets - crude, for now
    
    Use the existing crude password reset form to enable password resets.
    Slightly longer term, we need to destroy the existing form and pull it
    into TPAC proper (including such good stuff as real localization and
    getting rid of Dojo / Dijit), but this works for now.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/templates/opac/login.tt2 b/Open-ILS/src/templates/opac/login.tt2
index b5741e2..4be13bb 100644
--- a/Open-ILS/src/templates/opac/login.tt2
+++ b/Open-ILS/src/templates/opac/login.tt2
@@ -1,4 +1,5 @@
 [%  PROCESS "opac/parts/header.tt2";
+    PROCESS "opac/parts/config.tt2";
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Account Login") %]
@@ -11,7 +12,7 @@
             [% INCLUDE "opac/parts/login/form.tt2" %]
             <div class="clear-both very-big-height"></div>	
             <script type="text/javascript">
-                /* Note: when common browsers suppor HTML5 "autofocus", we can remove this */
+                /* Note: when common browsers support HTML5 "autofocus", we can remove this */
                 var _onload = window.onload;
                 window.onload = function() {
                     try {
diff --git a/Open-ILS/src/templates/opac/parts/config.tt2 b/Open-ILS/src/templates/opac/parts/config.tt2
index ab61c23..e110472 100644
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@ -42,6 +42,11 @@ google_analytics.enabled = 'false';
 google_analytics.code = 'UA-9999999-99';
 
 ##############################################################################
+# Enable "Forgot your password?" prompt at login
+##############################################################################
+reset_password = 'true';
+
+##############################################################################
 # Misc. UI Settings
 ##############################################################################
 
diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2
index b38906c..7e200ab 100644
--- a/Open-ILS/src/templates/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/form.tt2
@@ -6,15 +6,6 @@
 	</div>
 	<br/>
 </div>
-<div class="hide_me" id="forget_pw">
-    <h1>Password Reset</h1>
-	Username or Barcode<br />
-	<input type="text" id="forget_pw_user" /><br /><br />
-	Email Address on account<br />
-	<input type="text" id="forget_pw_email" /><br />
-    <a href="#">Submit</a> &nbsp;
-    <a href="#">Cancel</a>
-</div>
 <table id='change_pw_table' class='data_grid hide_me' style='margin-left: 20px;' width='95%'>
 	<thead>
         <tr><td colspan='2' align='center'><b>[% l("Password") %]</b></td></tr>
@@ -137,12 +128,11 @@
                                 </div>
                                 <div style="padding-top:14px;">
                                     <input type="submit" value="[% l('Log in') %]" alt="[% l('Log in') %]" class="opac-button" />
-                                    <!-- TODO
-                                    <a href="reset_password"
-                                        style="position:relative;top:-13px;left:2px;font-size:10px;">Forgot your PIN?</a>
-                                    -->
+                                    [% IF reset_password; loc = ctx.locale.replace('_', '-'); %]
+                                    <a href='/opac/password/[% loc %]/'>[% l('Forgot your password?') %]</a>
+                                    [% END %]
                                 </div>
-	                        </td>
+                            </td>
                         </tr>
                     </table>
                     <br /><br />

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/opac/login.tt2            |    3 ++-
 Open-ILS/src/templates/opac/parts/config.tt2     |    5 +++++
 Open-ILS/src/templates/opac/parts/login/form.tt2 |   18 ++++--------------
 3 files changed, 11 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
Evergreen ILS