From 445d8b184e562dcb72f28ce8dcfbded30067e418 Mon Sep 17 00:00:00 2001
From: Dan Scott <dscott@laurentian.ca>
Date: Thu, 23 May 2013 12:09:55 -0400
Subject: [PATCH] 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@laurentian.ca>
---
 Open-ILS/src/templates/opac/myopac/update_password.tt2 | 4 ++--
 Open-ILS/src/templates/opac/password_reset.tt2         | 2 +-
 Open-ILS/src/templates/opac/password_reset_msg.tt2     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/src/templates/opac/myopac/update_password.tt2 b/Open-ILS/src/templates/opac/myopac/update_password.tt2
index 8da1666206..a728217e21 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 959cd32f25..08577d5667 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 0d03289d1c..c453768111 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>
-- 
2.11.0