From 5d0209992af6f07a12d2e0bd5f8d362180820c4b Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Mon, 21 Apr 2014 15:04:08 -0500
Subject: [PATCH] Ensure initial templates have surrounding <div>s
---
include/i18n/en_US/templates/page/access-link.yaml | 2 ++
include/i18n/en_US/templates/page/pwreset-client.yaml | 4 +++-
include/i18n/en_US/templates/page/pwreset-staff.yaml | 2 ++
.../en_US/templates/page/registration-client.yaml | 11 +++++++----
.../en_US/templates/page/registration-confirm.yaml | 6 +++---
.../i18n/en_US/templates/page/registration-staff.yaml | 6 ++++--
.../en_US/templates/page/registration-thanks.yaml | 2 ++
7 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/include/i18n/en_US/templates/page/access-link.yaml b/include/i18n/en_US/templates/page/access-link.yaml
index 977e11b72..9f7cd1f99 100644
--- a/include/i18n/en_US/templates/page/access-link.yaml
+++ b/include/i18n/en_US/templates/page/access-link.yaml
@@ -12,6 +12,7 @@ notes: >
name: "Ticket [#%{ticket.number}] Access Link"
body: >
<h3><strong>Hi %{recipient.name.first},</strong></h3>
+ <div>
An access link request for ticket #%{ticket.number} has been submitted
on your behalf for the helpdesk at %{url}.<br />
<br />
@@ -27,3 +28,4 @@ body: >
<br />
--<br />
%{company.name}
+ </div>
diff --git a/include/i18n/en_US/templates/page/pwreset-client.yaml b/include/i18n/en_US/templates/page/pwreset-client.yaml
index ad839de8e..36025c8b7 100644
--- a/include/i18n/en_US/templates/page/pwreset-client.yaml
+++ b/include/i18n/en_US/templates/page/pwreset-client.yaml
@@ -5,11 +5,12 @@
# link on the login page
---
notes: >
- This template defines the email sent to Clients who select the <strong>Forgot My
+ This template defines the email sent to Clients who select the <strong>Forgot My
Password</strong> link on the Client Log In page.
name: "%{company.name} Help Desk Access"
body: >
<h3><strong>Hi %{user.name.first},</strong></h3>
+ <div>
A password reset request has been submitted on your behalf for the
helpdesk at %{url}.<br />
<br />
@@ -26,3 +27,4 @@ body: >
<em style="font-size: small">Your friendly Customer Support System
<br />
%{company.name}</em>
+ </div>
diff --git a/include/i18n/en_US/templates/page/pwreset-staff.yaml b/include/i18n/en_US/templates/page/pwreset-staff.yaml
index 1b39661fd..bba06e878 100644
--- a/include/i18n/en_US/templates/page/pwreset-staff.yaml
+++ b/include/i18n/en_US/templates/page/pwreset-staff.yaml
@@ -10,6 +10,7 @@ notes: >
name: "osTicket Staff Password Reset"
body: >
<h3><strong>Hi %{staff.name.first},</strong></h3>
+ <div>
A password reset request has been submitted on your behalf for the
helpdesk at %{url}.<br />
<br />
@@ -27,3 +28,4 @@ body: >
<br />
<img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" alt="Powered by
osTicket" width="126" height="19" style="width: 126px" />
+ </div>
diff --git a/include/i18n/en_US/templates/page/registration-client.yaml b/include/i18n/en_US/templates/page/registration-client.yaml
index 35f986ca6..cf2339700 100644
--- a/include/i18n/en_US/templates/page/registration-client.yaml
+++ b/include/i18n/en_US/templates/page/registration-client.yaml
@@ -12,13 +12,16 @@ notes: >
an email address verification. Please use %{link} somewhere in the body.
name: "Welcome to %{company.name}"
body: >
- <h3><strong>Hi %{recipient.name.first},</strong></h3> We've created an
- account for you at our help desk at %{url}.<br />
+ <h3><strong>Hi %{recipient.name.first},</strong></h3>
+ <div>
+ We've created an account for you at our help desk at %{url}.<br />
<br />
Please follow the link below to confirm your account and gain access to
your tickets.<br />
<br />
<a href="%{link}">%{link}</a><br />
<br />
- <em style="font-size: small">Your friendly Customer Support System<br
- />%{company.name}</em>
+ <em style="font-size: small">Your friendly Customer Support System
+ <br />
+ %{company.name}</em>
+ </div>
diff --git a/include/i18n/en_US/templates/page/registration-confirm.yaml b/include/i18n/en_US/templates/page/registration-confirm.yaml
index 293f9ba13..c7d16f1a4 100644
--- a/include/i18n/en_US/templates/page/registration-confirm.yaml
+++ b/include/i18n/en_US/templates/page/registration-confirm.yaml
@@ -14,9 +14,9 @@ notes: >
process.
name: "Account registration"
body: >
- <p><strong>Thanks for registering for an account.</strong></p>
- <br /><p>
+ <div><strong>Thanks for registering for an account.</strong><br/>
+ <br />
We've just sent you an email to the address you entered. Please follow
the link in the email to confirm your account and gain access to your
tickets.
- </p>
+ </div>
diff --git a/include/i18n/en_US/templates/page/registration-staff.yaml b/include/i18n/en_US/templates/page/registration-staff.yaml
index 4b3239708..dfd94091b 100644
--- a/include/i18n/en_US/templates/page/registration-staff.yaml
+++ b/include/i18n/en_US/templates/page/registration-staff.yaml
@@ -11,6 +11,7 @@ notes: >
name: "Welcome to osTicket"
body: >
<h3><strong>Hi %{recipient.name.first},</strong></h3>
+ <div>
We've created an account for you at our help desk at %{url}.<br />
<br />
Please follow the link below to confirm your account and gain access to
@@ -18,5 +19,6 @@ body: >
<br />
<a href="%{link}">%{link}</a><br />
<br />
- <em style="font-size: small">Your friendly Customer Support System
- <br />%{company.name}</em>
+ <em style="font-size: small">Your friendly Customer Support System<br />
+ %{company.name}</em>
+ </div>
diff --git a/include/i18n/en_US/templates/page/registration-thanks.yaml b/include/i18n/en_US/templates/page/registration-thanks.yaml
index 0cb5e16a9..bd5089bbe 100644
--- a/include/i18n/en_US/templates/page/registration-thanks.yaml
+++ b/include/i18n/en_US/templates/page/registration-thanks.yaml
@@ -13,6 +13,7 @@ notes: >
or access existing tickets.
name: "Account Confirmed!"
body: >
+ <div>
<strong>Thanks for registering for an account.</strong><br />
<br />
You've confirmed your email address and successfully activated your
@@ -20,3 +21,4 @@ body: >
<br />
<em>Your friendly support center</em><br />
%{company.name}
+ </div>
--
GitLab