[seam-commits] Seam SVN: r7493 - in trunk/examples/wiki/view/themes: inrelationto/mailtemplates and 1 other directories.

[seam-commits at lists.jboss.org]

Author: christian.bauer at jboss.com
Date: 2008-02-28 03:48:25 -0500 (Thu, 28 Feb 2008)
New Revision: 7493

Modified:
   trunk/examples/wiki/view/themes/default/mailtemplates/resetPassword.xhtml
   trunk/examples/wiki/view/themes/inrelationto/mailtemplates/resetPassword.xhtml
   trunk/examples/wiki/view/themes/sfwkorg/mailtemplates/resetPassword.xhtml
Log:
JBSEAM-2687, activate inactive account on password reset

Modified: trunk/examples/wiki/view/themes/default/mailtemplates/resetPassword.xhtml
===================================================================
--- trunk/examples/wiki/view/themes/default/mailtemplates/resetPassword.xhtml	2008-02-28 08:43:43 UTC (rev 7492)
+++ trunk/examples/wiki/view/themes/default/mailtemplates/resetPassword.xhtml	2008-02-28 08:48:25 UTC (rev 7493)
@@ -20,7 +20,7 @@
 
             <p>
                 If you did not request a password reset, or if you do not reset your password, your account will still be active
-                with your old password.
+                with your old password. If your account is currently not activated, you can use the link above to activated it.
             </p>
 
             <p>
@@ -39,7 +39,8 @@
 #{preferences.get('Wiki').baseUrl}/resetPassword.seam?activationCode=#{resetPasswordOfUser.activationCode}
 
 If you did not request a password reset, or if you do not reset your password, your account will still
-be active with your old password.
+be active with your old password. If your account is currently not activated, you can use the link above
+to activated it.
 
 Regards,
 LaceWiki

Modified: trunk/examples/wiki/view/themes/inrelationto/mailtemplates/resetPassword.xhtml
===================================================================
--- trunk/examples/wiki/view/themes/inrelationto/mailtemplates/resetPassword.xhtml	2008-02-28 08:43:43 UTC (rev 7492)
+++ trunk/examples/wiki/view/themes/inrelationto/mailtemplates/resetPassword.xhtml	2008-02-28 08:48:25 UTC (rev 7493)
@@ -20,7 +20,7 @@
 
             <p>
                 If you did not request a password reset, or if you do not reset your password, your account will still be active
-                with your old password.
+                with your old password. If your account is currently not activated, you can use the link above to activated it.
             </p>
 
             <p>
@@ -39,7 +39,8 @@
 #{preferences.get('Wiki').baseUrl}/resetPassword.seam?activationCode=#{resetPasswordOfUser.activationCode}
 
 If you did not request a password reset, or if you do not reset your password, your account will still
-be active with your old password.
+be active with your old password.  If your account is currently not activated, you can use the link above
+to activated it.
 
 Regards,
 LaceWiki

Modified: trunk/examples/wiki/view/themes/sfwkorg/mailtemplates/resetPassword.xhtml
===================================================================
--- trunk/examples/wiki/view/themes/sfwkorg/mailtemplates/resetPassword.xhtml	2008-02-28 08:43:43 UTC (rev 7492)
+++ trunk/examples/wiki/view/themes/sfwkorg/mailtemplates/resetPassword.xhtml	2008-02-28 08:48:25 UTC (rev 7493)
@@ -20,7 +20,7 @@
 
             <p>
                 If you did not request a password reset, or if you do not reset your password, your account will still be active
-                with your old password.
+                with your old password.  If your account is currently not activated, you can use the link above to activated it.
             </p>
             </body>
         </html>
@@ -34,7 +34,8 @@
 #{preferences.get('Wiki').baseUrl}/resetPassword.seam?activationCode=#{resetPasswordOfUser.activationCode}
 
 If you did not request a password reset, or if you do not reset your password, your account will still
-be active with your old password.
+be active with your old password. If your account is currently not activated, you can use the link above
+to activated it.
             </h:outputText>
         </f:facet>
     </m:body>