[open-ils-commits] [GIT] Evergreen ILS branch master updated. 445d8b184e562dcb72f28ce8dcfbded30067e418
Evergreen Git
git at git.evergreen-ils.org
Thu May 23 14:08:49 EDT 2013
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 445d8b184e562dcb72f28ce8dcfbded30067e418 (commit)
via 97d1c4f8010f1b040f860fe2a207bea1631a87f5 (commit)
from ae55f787643032be2765fc54447b3316742da4ff (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 445d8b184e562dcb72f28ce8dcfbded30067e418
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu May 23 12:09:55 2013 -0400
Avoid additional whitespace in password messages
Trivial enhancements to avoid extra linefeeds in generated HTML, as well
as including a linefeed at the end of the new password_reset_msg.tt2
file. Good old DOS vs. UNIX :)
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/myopac/update_password.tt2 b/Open-ILS/src/templates/opac/myopac/update_password.tt2
index 8da1666..a728217 100644
--- a/Open-ILS/src/templates/opac/myopac/update_password.tt2
+++ b/Open-ILS/src/templates/opac/myopac/update_password.tt2
@@ -9,8 +9,8 @@
<span class="float-left">[% l('Update Password') %]</span>
</div>
-[% INCLUDE "opac/myopac/update_password_msg.tt2" %]
-
+[%- INCLUDE "opac/myopac/update_password_msg.tt2" -%]
+
[% IF ctx.password_invalid %]
<div id='account-update-email-error'> <!-- borrow css from update-email page -->
[% |l %] New password is invalid. Please try a different password. [% END %]
diff --git a/Open-ILS/src/templates/opac/password_reset.tt2 b/Open-ILS/src/templates/opac/password_reset.tt2
index 959cd32..08577d5 100644
--- a/Open-ILS/src/templates/opac/password_reset.tt2
+++ b/Open-ILS/src/templates/opac/password_reset.tt2
@@ -48,7 +48,7 @@
[% END %]
[% ELSIF !ctx.pwreset.status %]
<h2>[% l('Please enter your user name or barcode to identify your library account and request a password reset') %]</h2>
- [% INCLUDE "opac/password_reset_msg.tt2" %]
+ [%- INCLUDE "opac/password_reset_msg.tt2" %]
<form method="post">
<table>
<tr>
diff --git a/Open-ILS/src/templates/opac/password_reset_msg.tt2 b/Open-ILS/src/templates/opac/password_reset_msg.tt2
index 0d03289..c453768 100644
--- a/Open-ILS/src/templates/opac/password_reset_msg.tt2
+++ b/Open-ILS/src/templates/opac/password_reset_msg.tt2
@@ -1,3 +1,3 @@
<div class="password_message">
[% l('Note: You must have a valid email address associated with your library account. If not, please contact your local library for further assistance.'); %]
-</div>
\ No newline at end of file
+</div>
commit 97d1c4f8010f1b040f860fe2a207bea1631a87f5
Author: Melissa Lefebvre <mlefebvre at biblio.org>
Date: Fri May 10 15:19:09 2013 -0400
TPAC - Password Messages
In jspac a message appeared when the patron went to change their
password stating the requirements. This same message is missing
in TPAC. The wording from jspac has been added to a separate
file, update_password_msg.tt2, that can later be easily edited
and the original update_password.tt2 has been edited with an
INCLUDE statement pointing to the newly created file.
Also improved is the message when requesting a forgotten password.
Patrons are unaware that a valid email address needs to be in
their record until after they try to send a reset. Text has been
added to a new file, password_reset_msg.tt2, to explain the need
for an email address. Password_reset.tt2 has been edited with
an INCLUDE statement pointing to the newly created file.
Style.css.tt2 was also updated to remove extra padding on
#account-update-email table to raise the table on
update_password.tt2. This value is also used on
update_username.tt2 and update_email.tt2 without considerable
impact to the look of those pages.
Signed-off-by: Melissa Lefebvre <mlefebvre at biblio.org>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 959609d..06897f6 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1103,7 +1103,7 @@ div.facet_sidebar {
.no-dec:hover { text-decoration: none; }
.pending-addr td { background-color: [% css_colors.background_alert %] !important; border: 0 !important; }
-#account-update-email table { text-align: center; padding: 20px; margin-top: 30px; border-collapse: collapse; }
+#account-update-email table { text-align: center; padding: 20px; margin-top: 18px; border-collapse: collapse; }
#account-update-email table td { padding: 5px 15px 5px 15px; border-bottom: 1px solid [% css_colors.accent_lighter %]; text-align: left;}
#account-update-email-error { font-size: [% css_fonts.size_biggest %]; padding: 10px; border:1px solid [% css_colors.border_standard %];}
a.dash-link:hover { text-decoration: underline !important; }
@@ -1515,3 +1515,9 @@ a.preflib_change {
.record_author {
font-style: italic;
}
+
+.password_message {
+ padding-top: 1em;
+ padding-bottom: 0.5em;
+ font-style: italic;
+}
\ No newline at end of file
diff --git a/Open-ILS/src/templates/opac/myopac/update_password.tt2 b/Open-ILS/src/templates/opac/myopac/update_password.tt2
index d9a427d..8da1666 100644
--- a/Open-ILS/src/templates/opac/myopac/update_password.tt2
+++ b/Open-ILS/src/templates/opac/myopac/update_password.tt2
@@ -8,6 +8,8 @@
<div class="header_middle">
<span class="float-left">[% l('Update Password') %]</span>
</div>
+
+[% INCLUDE "opac/myopac/update_password_msg.tt2" %]
[% IF ctx.password_invalid %]
<div id='account-update-email-error'> <!-- borrow css from update-email page -->
diff --git a/Open-ILS/src/templates/opac/myopac/update_password_msg.tt2 b/Open-ILS/src/templates/opac/myopac/update_password_msg.tt2
new file mode 100644
index 0000000..23d5914
--- /dev/null
+++ b/Open-ILS/src/templates/opac/myopac/update_password_msg.tt2
@@ -0,0 +1,3 @@
+<div class="password_message">
+[% l('Note: The password must be at least 7 characters in length, contain at least one letter (a-z/A-Z), and contain at least one number.'); %]
+</div>
\ No newline at end of file
diff --git a/Open-ILS/src/templates/opac/password_reset.tt2 b/Open-ILS/src/templates/opac/password_reset.tt2
index 27f079e..959cd32 100644
--- a/Open-ILS/src/templates/opac/password_reset.tt2
+++ b/Open-ILS/src/templates/opac/password_reset.tt2
@@ -48,6 +48,7 @@
[% END %]
[% ELSIF !ctx.pwreset.status %]
<h2>[% l('Please enter your user name or barcode to identify your library account and request a password reset') %]</h2>
+ [% INCLUDE "opac/password_reset_msg.tt2" %]
<form method="post">
<table>
<tr>
diff --git a/Open-ILS/src/templates/opac/password_reset_msg.tt2 b/Open-ILS/src/templates/opac/password_reset_msg.tt2
new file mode 100644
index 0000000..0d03289
--- /dev/null
+++ b/Open-ILS/src/templates/opac/password_reset_msg.tt2
@@ -0,0 +1,3 @@
+<div class="password_message">
+[% l('Note: You must have a valid email address associated with your library account. If not, please contact your local library for further assistance.'); %]
+</div>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/css/style.css.tt2 | 8 +++++++-
.../src/templates/opac/myopac/update_password.tt2 | 4 +++-
.../templates/opac/myopac/update_password_msg.tt2 | 3 +++
Open-ILS/src/templates/opac/password_reset.tt2 | 1 +
Open-ILS/src/templates/opac/password_reset_msg.tt2 | 3 +++
5 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 Open-ILS/src/templates/opac/myopac/update_password_msg.tt2
create mode 100644 Open-ILS/src/templates/opac/password_reset_msg.tt2
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list