Clean up user reset pw and register email template

Author: carlbennett

src/templates/Email/User/Register.plain.phtml

@@ -15,9 +15,9 @@ or copy and paste the link below into your web browser to verify your account.
 <?=$url?>
 
 
-Note: This link will only be available for 24 hours after registering. If you
-wait until it expires, you will need to complete a password reset to verify your
-account.
+**Note:** This link will only be available for 24 hours after registering. If
+you wait until it expires, you will need to complete a password reset to verify
+your account.
 
 You may also reply to this email if you believe there is an issue.
 <?php require('./Email/footer.plain.inc.phtml'); ?>

src/templates/Email/User/Register.rich.phtml

@@ -249,7 +249,7 @@ $url = Common::relativeUrlToAbsolute('/user/activate?u=' . rawurlencode($this->g
 <!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding-right: 10px; padding-left: 10px; padding-top: 10px; padding-bottom: 10px; font-family: Arial, sans-serif"><![endif]-->
 <div style="color:#DDD;font-family:Arial, 'Helvetica Neue', Helvetica, sans-serif;line-height:120%;padding-top:10px;padding-right:10px;padding-bottom:10px;padding-left:10px;">
 <div style="font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif; font-size: 12px; line-height: 14px; color: #DDD;">
-<p style="font-size: 12px; line-height: 16px; margin: 0;"><span style="font-size: 14px;"><strong>Note:</strong></span><span style="font-size: 14px; line-height: 16px;"> This link will only be available for 24 hours after registering. If you wait until it expires, you will need to complete a password reset to verify your account.</span></p>
+<p style="font-size: 14px; line-height: 16px; margin: 0;"><span style="font-size: 14px;"><strong>Note:</strong></span><span style="font-size: 14px; line-height: 16px;"> This link will only be available for 24 hours after registering. If you wait until it expires, you will need to complete a password reset to verify your account.</span></p>
 </div>
 </div>
 <!--[if mso]></td></tr></table><![endif]-->

src/templates/Email/User/ResetPassword.plain.phtml

@@ -5,12 +5,16 @@ require('./Email/header.plain.inc.phtml');
 ?>
 Hello <?=$this->getContext()->user->getName()?>,
 
-Someone requested your password to be reset on BNETDocs. If this was you, copy
-and paste the following into your web browser:
+Someone requested your password to be reset on BNETDocs. If this was you, click
+or copy and paste the link below into your web browser to reset your password.
 
 <?=Common::relativeUrlToAbsolute('/user/resetpassword?username=' . rawurlencode($this->getContext()->user->getUsername()) . '&t=' . rawurlencode($this->getContext()->token))?>
 
 
+**Note:** This link will only be available for 24 hours.
+
 If this was not you, then you can safely ignore this email; no action will be
 taken.
+
+You may also reply to this email if you believe there is an issue.
 <?php require('./Email/footer.plain.inc.phtml'); ?>

src/templates/Email/User/ResetPassword.rich.phtml

@@ -246,6 +246,8 @@ $url = Common::relativeUrlToAbsolute('/user/resetpassword?username=' . rawurlenc
 <!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding-right: 10px; padding-left: 10px; padding-top: 10px; padding-bottom: 10px; font-family: Arial, sans-serif"><![endif]-->
 <div style="color:#DDD;font-family:Arial, 'Helvetica Neue', Helvetica, sans-serif;line-height:120%;padding-top:10px;padding-right:10px;padding-bottom:10px;padding-left:10px;">
 <div style="font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif; font-size: 12px; line-height: 14px; color: #DDD;">
+<p style="font-size: 14px; line-height: 16px; margin: 0;"><span style="font-size: 14px; line-height: 16px;"><strong>Note:</strong> This link will only be available for 24 hours.</span></p>
+<p style="font-size: 14px; line-height: 16px; margin: 0;"> </p>
 <p style="font-size: 14px; line-height: 16px; margin: 0;"><span style="font-size: 14px; line-height: 16px;">If this was not you, then you can safely ignore this email; no action will be taken.</span></p>
 </div>
 </div>