diff --git a/include/i18n/en_US/templates/email/assigned.alert.yaml b/include/i18n/en_US/templates/email/assigned.alert.yaml
index 08e002411c48a0cceccfb0b2e62b51ee613a1b1f..40087d4cd25fcbd5e9b989caec1cd7cab517bbd1 100644
--- a/include/i18n/en_US/templates/email/assigned.alert.yaml
+++ b/include/i18n/en_US/templates/email/assigned.alert.yaml
@@ -14,11 +14,11 @@ notes: |
subject: |
Ticket Assigned to you
body: |
- <h3><strong>Hi %{assignee},</strong></h3>
- <p>
- Ticket <a href="%{ticket.staff_link}">#%{ticket.number}</a> has been
- assigned to you by %{assigner}
- </p>
+ <h3><strong>Hi %{assignee.name.first},</strong></h3>
+ Ticket <a href="%{ticket.staff_link}">#%{ticket.number}</a> has been
+ assigned to you by %{assigner.name.short}
+ <br>
+ <br>
<table>
<tbody>
<tr>
@@ -39,20 +39,16 @@ body: |
</tr>
</tbody>
</table>
- <p>
- %{comments}
- </p>
+ <br>
+ %{comments}
+ <br>
+ <br>
<hr>
- <p>
- <span style="color: rgb(127, 127, 127); font-size: small; ">To
- view/respond to the ticket, please <a
- href="%{ticket.staff_link}"><span style="color: rgb(84, 141, 212);"
- >login</span></a> to the support ticket system</span>
- </p>
- <p>
- <em>Your friendly Customer Support System</em>
- </p>
- <p>
- <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc"
- alt="Powered by osTicket" width="126" height="19" style="width: 126px;">
- </p>
+ <div>To view/respond to the ticket, please <a
+ href="%{ticket.staff_link}"><span style="color: rgb(84, 141, 212);"
+ >login</span></a> to the support ticket system</div>
+ <em style="font-size: small; ">Your friendly Customer Support
+ System</em>
+ <br>
+ <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc"
+ alt="Powered by osTicket" width="126" height="19" style="width: 126px;">
diff --git a/include/i18n/en_US/templates/email/message.alert.yaml b/include/i18n/en_US/templates/email/message.alert.yaml
index e2d67c4d634fe88aa48ab175562534bda81819ce..b3fb1686f3717144c5c956d2676d9bbd31d90502 100644
--- a/include/i18n/en_US/templates/email/message.alert.yaml
+++ b/include/i18n/en_US/templates/email/message.alert.yaml
@@ -15,10 +15,10 @@ subject: |
New Message Alert
body: |
<h3><strong>Hi %{recipient},</strong></h3>
- <p>
- New message appended to ticket <a
- href="%{ticket.staff_link}">#%{ticket.number}</a>
- </p>
+ New message appended to ticket <a
+ href="%{ticket.staff_link}">#%{ticket.number}</a>
+ <br>
+ <br>
<table>
<tbody>
<tr>
@@ -39,20 +39,15 @@ body: |
</tr>
</tbody>
</table>
- <p>
- %{message}
- </p>
+ <br>
+ %{message}
+ <br>
+ <br>
<hr>
- <p>
- <span style="color: rgb(127, 127, 127); font-size: small">To
- view/respond to the ticket, please <a
- href="%{ticket.staff_link}"><span style="color: rgb(84, 141, 212);"
- >login</span></a> to the support ticket system</span>
- </p>
- <p>
- <em>Your friendly Customer Support System</em>
- </p>
- <p>
- <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc"
- alt="Powered by osTicket" width="126" height="19" style="width: 126px;">
- </p>
+ <div>To view or respond to the ticket, please <a
+ href="%{ticket.staff_link}"><span style="color: rgb(84, 141, 212);"
+ >login</span></a> to the support ticket system</div>
+ <em style="color: rgb(127,127,127); font-size: small; ">Your friendly
+ Customer Support System</em><br>
+ <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc"
+ alt="Powered by osTicket" width="126" height="19" style="width: 126px;">
diff --git a/include/i18n/en_US/templates/email/message.autoresp.yaml b/include/i18n/en_US/templates/email/message.autoresp.yaml
index ab70756b4c322d02a52739903436ddf0fcdfed5d..a4603bb2a89970b95ba3843a0ee9c6d5d82d046f 100644
--- a/include/i18n/en_US/templates/email/message.autoresp.yaml
+++ b/include/i18n/en_US/templates/email/message.autoresp.yaml
@@ -14,21 +14,19 @@ notes: |
subject: |
Message Confirmation
body: |
- <h3><strong>Dear %{ticket.name},</strong></h3>
- <p>
- Your reply to support request <a
- href="%{ticket.client_link}">#%{ticket.number}</a> has been noted
- </p>
- <p>
- %{signature}
- </p>
+ <h3><strong>Dear %{ticket.name.first},</strong></h3>
+ Your reply to support request <a
+ href="%{ticket.client_link}">#%{ticket.number}</a> has been noted
+ <br>
+ <br>
+ <div style="color: rgb(127, 127, 127); ">
+ Your Company Name Team,<br>
+ %{signature}
+ </div>
<hr>
- <p>
- <span style="color: rgb(127, 127, 127); font-size: small">You can
- view this support request's progress <a
- href="%{ticket.client_link}">online here</a></span>
- </p>
- <p>
- <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc"
- alt="Powered by osTicket" width="126" height="19" style="width: 126px;">
- </p>
+ <div style="color: rgb(127, 127, 127); font-size: small; text-align:
+ center"><em>You can view the support request progress <a
+ href="%{ticket.client_link}">online here</a></em><br>
+ <a href="http://osticket.com/"><img
+ src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" alt="Powered by osTicket"
+ width="126" height="19" style="width: 126px;"></a></div>
diff --git a/include/i18n/en_US/templates/email/note.alert.yaml b/include/i18n/en_US/templates/email/note.alert.yaml
index 84267019937f114ac3f331b170e74d2816303c02..32ccf501836349be9c8ee8a08c6495a87b095056 100644
--- a/include/i18n/en_US/templates/email/note.alert.yaml
+++ b/include/i18n/en_US/templates/email/note.alert.yaml
@@ -13,10 +13,10 @@ subject: |
New Internal Note Alert
body: |
<h3><strong>Hi %{recipient},</strong></h3>
- <p>
- An internal note has been appended to ticket <a
- href="%{ticket.staff_link}">#%{ticket.number}</a>
- </p>
+ An internal note has been appended to ticket <a
+ href="%{ticket.staff_link}">#%{ticket.number}</a>
+ <br>
+ <br>
<table>
<tbody>
<tr>
@@ -37,18 +37,17 @@ body: |
</tr>
</tbody>
</table>
- <p>
- %{note.message}
- </p>
+ <br>
+ %{note.message}
+ <br>
+ <br>
<hr>
- <p>
- To view/respond to the ticket, please <a
- href="%{ticket.staff_link}">login</a> to the support ticket system
- </p>
- <p>
- <em>Your friendly Customer Support System</em>
- </p>
- <p style="text-align: center;">
- <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc"
- alt="Powered by osTicket" width="126" height="19" style="width: 126px;">
- </p>
+ To view/respond to the ticket, please <a
+ href="%{ticket.staff_link}">login</a> to the support ticket system
+ <br>
+ <br>
+ <em style="font-size: small; ">Your friendly Customer Support
+ System</em>
+ <br>
+ <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc"
+ alt="Powered by osTicket" width="126" height="19" style="width: 126px;">
diff --git a/include/i18n/en_US/templates/email/staff.pwreset.yaml b/include/i18n/en_US/templates/email/staff.pwreset.yaml
index 343142aee0440367645adde698567047f45eb32a..12f6fd0f3d1268fc29a30281d6019b6c1ab0b3bf 100644
--- a/include/i18n/en_US/templates/email/staff.pwreset.yaml
+++ b/include/i18n/en_US/templates/email/staff.pwreset.yaml
@@ -12,25 +12,25 @@ notes: |
subject: |
osTicket Staff Password Reset
body: |
- <h3><strong>Hi %{staff.name},</strong></h3>
- <p>
- You or perhaps somebody you know has submitted a password reset
- request on your behalf for the helpdesk at %{url}.
- </p>
- <p>
- If you feel that this has been done in error. Delete and disregard
- this email. Your account is still secure and no one has been given
- access to it. It is not locked and your password has not been
- reset. Someone could have mistakenly entered your email address.
- </p>
- <p>
- Follow the link below to login to the help desk and change your
- password.
- </p>
- <p>
- %{reset_link}
- </p>
- <p style="text-align: center;">
- <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" alt="Powered by osTicket"
- width="126" height="19" style="width: 126px;">
- </p>
+ <h3><strong>Hi %{staff.name.first},</strong></h3>
+ A password reset request has been submitted on your behalf for the
+ helpdesk at %{url}.
+ <br>
+ <br>
+ If you feel that this has been done in error, delete and disregard this
+ email. Your account is still secure and no one has been given access to
+ it. It is not locked and your password has not been reset. Someone could
+ have mistakenly entered your email address.
+ <br>
+ <br>
+ Follow the link below to login to the help desk and change your
+ password.
+ <br>
+ <br>
+ <a href="%{reset_link}">%{reset_link}</a>
+ <br>
+ <br>
+ <em style="font-size: small">Your friendly Customer Support System</em>
+ <br>
+ <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" alt="Powered by osTicket"
+ width="126" height="19" style="width: 126px;">
diff --git a/include/i18n/en_US/templates/email/ticket.alert.yaml b/include/i18n/en_US/templates/email/ticket.alert.yaml
index 40dcdfcd68cb254fd9471444ecb1af78d4b2d981..497064134e9bd520a188c9cad46849b21dcbf0a9 100644
--- a/include/i18n/en_US/templates/email/ticket.alert.yaml
+++ b/include/i18n/en_US/templates/email/ticket.alert.yaml
@@ -13,9 +13,9 @@ subject: |
New Ticket Alert
body: |
<h2>Hi %{recipient},</h2>
- <p>
- New ticket #%{ticket.number} created
- </p>
+ New ticket #%{ticket.number} created
+ <br>
+ <br>
<table>
<tbody>
<tr>
@@ -36,18 +36,15 @@ body: |
</tr>
</tbody>
</table>
- <p>
- %{message}
- </p>
+ <br>
+ %{message}
+ <br>
+ <br>
<hr>
- <p>
- To view/respond to the ticket, please <a href="%{ticket.staff_link}">login</a>
- to the support ticket system
- </p>
- <p>
- <em>Your friendly Customer Support System
- <br/>
- <a href="http://osticket.com/"><img width="126" height="19"
- style="width: 126px; " alt="Powered By osTicket"
- src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc"/></a>
- </p>
+ <div>To view or respond to the ticket, please <a
+ href="%{ticket.staff_link}">login</a> to the support ticket system</div>
+ <em style="font-size: small">Your friendly Customer Support System</em>
+ <br>
+ <a href="http://osticket.com/"><img width="126" height="19"
+ style="width: 126px; " alt="Powered By osTicket"
+ src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc"/></a>
diff --git a/include/i18n/en_US/templates/email/ticket.autoreply.yaml b/include/i18n/en_US/templates/email/ticket.autoreply.yaml
index c77c06df14c45fd0ed530aa1933700bcd9b8d3c7..c4817b8b91200d93a6b578d78ba32210eadc79cd 100644
--- a/include/i18n/en_US/templates/email/ticket.autoreply.yaml
+++ b/include/i18n/en_US/templates/email/ticket.autoreply.yaml
@@ -14,44 +14,40 @@ notes: |
subject: |
Support Ticket Opened
body: |
- <p>
- <span style="color: rgb(127, 127, 127); font-family: Georgia;
- font-size: 28pt; font-weight: normal;">We Hear You</span><img
- src="cid:6fe1efdea357534d238b86e7860a7c5a" width="96"
- alt="osTicket Logo (kangaroo)" height="54" style="width: 96px;
- float: right; margin: 0px 0px 10px 10px;">
- </p>
- <p>
- <strong>Dear %{ticket.name},</strong>
- </p>
- <p>
- A request for support has been created and assigned ticket <a
- href="%{ticket.client_link}">#%{ticket.number}</a> with the
- following automatic reply
- </p>
- <p>
- Topic: <strong>%{ticket.topic.name}</strong>
- </p>
- <p>
- Subject: <strong>%{ticket.subject}</strong>
- </p>
- <p>
- %{response}
- </p>
- <p>
- Your Company Name Team,<br>
- %{signature}
- </p>
+ <span style="color: rgb(127, 127, 127); font-family: Georgia;
+ font-size: 28pt; font-weight: normal;">We Hear You</span><img
+ src="cid:6fe1efdea357534d238b86e7860a7c5a" width="96"
+ alt="osTicket Logo (kangaroo)" height="54" style="width: 96px;
+ float: right; margin: 0px 0px 10px 10px;">
+ <br>
+ <br>
+ <strong>Dear %{ticket.name.first},</strong>
+ <br>
+ <br>
+ A request for support has been created and assigned ticket <a
+ href="%{ticket.client_link}">#%{ticket.number}</a> with the following
+ automatic reply
+ <br>
+ <br>
+ Topic: <strong>%{ticket.topic.name}</strong>
+ <br>
+ Subject: <strong>%{ticket.subject}</strong>
+ <br>
+ <br>
+ %{response}
+ <br>
+ <br>
+ <div style="color: rgb(127, 127, 127);">Your Company Name Team,<br>
+ %{signature}</div>
<hr>
- <p>
- <span style="color: rgb(127, 127, 127);">We hope this response has
- sufficiently answered your questions. If not, please do not send
- another email. Instead, reply to this email or <a
- href="%{ticket.client_link}"><span style="color: rgb(84, 141, 212);"
- >login to your account</span></a> for a complete archive of
- all your support requests and responses.</span>
- </p>
- <p style="text-align: center;">
- <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" width="126"
- alt="Powered by osTicket" height="19" style="width: 126px;"/>
- </p>
+ <div style="color: rgb(127, 127, 127); font-size: small; text-align:
+ center;"><em>We hope this response has sufficiently answered your questions.
+ If not, please do not send another email. Instead, reply to this email
+ or <a href="%{ticket.client_link}"><span style="color: rgb(84, 141,
+ 212);" >login to your account</span></a> for a complete archive of all
+ your support requests and responses.</em></div>
+ <div style="text-align: center;">
+ <a href="http://osticket.com/"><img
+ src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" width="126" alt="Powered
+ by osTicket" height="19" style="width: 126px;"/></a>
+ </div>
diff --git a/include/i18n/en_US/templates/email/ticket.autoresp.yaml b/include/i18n/en_US/templates/email/ticket.autoresp.yaml
index 1f3a11d7f8bd73d1f934df3a7b064075d31658bc..98e48c1248663acea6d6e2d7370bd16b39f56f0d 100644
--- a/include/i18n/en_US/templates/email/ticket.autoresp.yaml
+++ b/include/i18n/en_US/templates/email/ticket.autoresp.yaml
@@ -25,54 +25,49 @@ body: |
</tr>
<tr>
<td style="width:67%; padding-top: 12pt; padding-right: 12pt">
- <p>
- Dear %{ticket.name},
- </p>
- <p>
+ Dear %{ticket.name.first},
+ <br>
+ <br>
We received your request and assigned ticket #%{ticket.number}
- </p>
- <p>
+ <br>
+ <br>
Topic: <strong>%{ticket.topic.name}</strong>
- </p>
- <p>
+ <br>
Subject: <strong>%{ticket.subject}</strong>
- </p>
- <p>
+ <br>
Submitted: <strong>%{ticket.create_date}</strong>
- </p>
- <p>
- A representative will follow-up with you as soon as possible. You
- can <a href="%{ticket.client_link}">view this ticket's progress
- online</a>.
- </p>
- <p>
+ <br>
+ <br>
+ A representative will follow-up with you as soon as possible.
+ You can <a href="%{ticket.client_link}">view this ticket's
+ progress online</a>.
+ <br>
+ <br>
Your Company Name Team,<br>
%{signature}
- </p>
</td>
<td style="vertical-align: top; padding-top: 12pt;">
- <p>
<span style="color: rgb(127, 127, 127); ">Company Name<br/>
%{signature}</span>
- </p>
- <p>
- <span style="color: rgb(127, 127, 127); ">
- If you wish to send additional comments or information regarding
- this issue, please don't open a new ticket. Simply</span> <a
- href="%{ticket.client_link}"><span style="color: rgb(84, 141, 212); "
- >login</span></a> <span
- style="color: rgb(127, 127, 127); ">and update the ticket.</span>
- </p>
- <p>
+ <br>
+ <br>
+ <span style="color: rgb(127, 127, 127); "> If you wish to send
+ additional comments or information regarding this issue, please
+ don't open a new ticket. Simply</span> <a
+ href="%{ticket.client_link}"><span style="color: rgb(84, 141, 212);"
+ >login</span></a> <span style="color: rgb(127, 127, 127);"
+ >and update the ticket.</span>
+ <br>
+ <br>
<span style="color: rgb(127, 127, 127); ">Visit our</span> <a
href="%{url}/kb"><span style="color: rgb(84, 141, 212);
">knowledgebase</span></a>
- </p>
</td>
</tr>
</tbody>
</table>
- <p style="text-align: center;">
- <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" width="126"
- height="19" style="width: 126px; " alt="Powered by osTicket">
- </p>
+ <div style="text-align: center;">
+ <a href="http://osticket.com/"><img
+ src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" width="126" height="19"
+ style="width: 126px; " alt="Powered by osTicket"></a>
+ </div>
diff --git a/include/i18n/en_US/templates/email/ticket.notice.yaml b/include/i18n/en_US/templates/email/ticket.notice.yaml
index 59f850ae59d54cf3d5d72625cd78373908f14510..ba460d3aadb3148a6fe3a502e2de05a7e713c1f2 100644
--- a/include/i18n/en_US/templates/email/ticket.notice.yaml
+++ b/include/i18n/en_US/templates/email/ticket.notice.yaml
@@ -12,49 +12,46 @@ notes: |
subject: |
%{ticket.subject}
body: |
- <p>
- <span style="color: rgb(127, 127, 127); font-family: Georgia;
- font-size: 28pt; font-weight: normal;">We're Here For
- You</span><img src="cid:6fe1efdea357534d238b86e7860a7c5a"
- width="96" alt="osTicket Logo (kangaroo)" height="54" style="width: 96px;
- float: right; margin: 0px 0px 10px 10px;">
- </p>
- <p>
- <strong>Dear %{ticket.name},</strong>
- </p>
- <p>
- Our customer care team has created a ticket, <a
- href="%{ticket.client_link}">#%{ticket.number}</a> on your behalf,
- with the following details and summary:
- </p>
- <p>
- Topic: <strong>%{ticket.topic.name}</strong>
- </p>
- <p>
- Subject: <strong>%{ticket.subject}</strong>
- </p>
- <p>
- %{message}
- </p>
- <p>
- If need be, representative will follow-up with you as soon as
- possible. You can also <a href="%{ticket.client_link}">view this
- ticket's progress online</a>.
- </p>
- <p>
- Your Company Name Team,<br>
- %{signature}
- </p>
+ <span style="color: rgb(127, 127, 127); font-family: Georgia;
+ font-size: 28pt; font-weight: normal;">We're Here For
+ You</span><img src="cid:6fe1efdea357534d238b86e7860a7c5a"
+ width="96" alt="osTicket Logo (kangaroo)" height="54" style="width: 96px;
+ float: right; margin: 0px 0px 10px 10px;">
+ <br>
+ <br>
+ <strong>Dear %{ticket.name.first},</strong>
+ <br>
+ <br>
+ Our customer care team has created a ticket, <a
+ href="%{ticket.client_link}">#%{ticket.number}</a> on your behalf, with
+ the following details and summary:
+ <br>
+ <br>
+ Topic: <strong>%{ticket.topic.name}</strong>
+ <br>
+ Subject: <strong>%{ticket.subject}</strong>
+ <br>
+ <br>
+ %{message}
+ <br>
+ <br>
+ If need be, a representative will follow-up with you as soon as
+ possible. You can also <a href="%{ticket.client_link}">view this
+ ticket's progress online</a>.
+ <br>
+ <br>
+ <div style="color: rgb(127, 127, 127);">
+ Your Company Name Team,<br>
+ %{signature}</div>
<hr>
- <p>
- <span style="color: rgb(127, 127, 127);">If you wish to provide
- additional comments or information regarding the issue, please do
- not send another email. Instead, reply to this email or <a
- href="%{ticket.client_link}"><span style="color: rgb(84, 141, 212);"
- >login to your account</span></a> for a complete archive of all your
- support requests and responses.</span>
- </p>
- <p style="text-align: center;">
+ <div style="color: rgb(127, 127, 127); font-size: small; "><em>If you
+ wish to provide additional comments or information regarding the issue,
+ please do not send another email. Instead, reply to this email or <a
+ href="%{ticket.client_link}"><span style="color: rgb(84, 141, 212);"
+ >login to your account</span></a> for a complete archive of all your
+ support requests and responses.</em></div>
+ <br>
+ <div style="text-align: center;">
<img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" width="126"
alt="Powered by osTicket" height="19" style="width: 126px;">
- </p>
+ </div>
diff --git a/include/i18n/en_US/templates/email/ticket.overdue.yaml b/include/i18n/en_US/templates/email/ticket.overdue.yaml
index 5c36eafd528d73fa136be4c60bd5d727029e2107..d0a84da1caed8d6d297e512f7e803558765f0f8d 100644
--- a/include/i18n/en_US/templates/email/ticket.overdue.yaml
+++ b/include/i18n/en_US/templates/email/ticket.overdue.yaml
@@ -15,32 +15,24 @@ subject: |
Stale Ticket Alert
body: |
<h3><strong>Hi %{recipient}</strong>,</h3>
- <p>
- A ticket, <a href="%{ticket.staff_link}">#%{ticket.number}</a> is
- seriously overdue.
- </p>
- <p>
- We should all work hard to guarantee that all tickets are being
- addressed in a timely manner.
- </p>
- <p>
- Signed, %{ticket.dept.manager.name}
- </p>
- <p>
- <em>Your friendly
- <span style="font-size: small">(although with limited patience)</span><br>
- </em><em>Support Ticket System</em>
- </p>
+ A ticket, <a href="%{ticket.staff_link}">#%{ticket.number}</a> is
+ seriously overdue.
+ <br>
+ <br>
+ We should all work hard to guarantee that all tickets are being
+ addressed in a timely manner.
+ <br>
+ <br>
+ Signed,<br>
+ %{ticket.dept.manager.name}
<hr>
- <p>
- <span style="color: rgb(127, 127, 127); font-size: small;">To
- view/respond to the ticket, please <a
- href="%{ticket.staff_link}"><span style="color: rgb(84, 141, 212);"
- >login</span></a> to the support ticket system. You're receiving
- this notice because the ticket is assigned to you either directly or
- to a team or department of which you're a member.</span>
- </p>
- <p>
- <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" height="19"
- alt="Powered by osTicket" width="126" style="width: 126px;">
- </p>
+ <div>To view or respond to the ticket, please <a
+ href="%{ticket.staff_link}"><span style="color: rgb(84, 141, 212);"
+ >login</span></a> to the support ticket system. You're receiving this
+ notice because the ticket is assigned directly to you or to a team or
+ department of which you're a member.</div>
+ <em style="font-size: small">Your friendly <span style="font-size: smaller"
+ >(although with limited patience)</span> Customer Support
+ System</em><br>
+ <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" height="19"
+ alt="Powered by osTicket" width="126" style="width: 126px;">
diff --git a/include/i18n/en_US/templates/email/ticket.overlimit.yaml b/include/i18n/en_US/templates/email/ticket.overlimit.yaml
index 6be3196698b37cf7130a49ed569cc9da181b36b7..384f329cc6b997982bf6eef26e0da3357ef13e3c 100644
--- a/include/i18n/en_US/templates/email/ticket.overlimit.yaml
+++ b/include/i18n/en_US/templates/email/ticket.overlimit.yaml
@@ -12,29 +12,28 @@ notes: |
of tickets open by a particular email address.
subject: |
- Open Tickets Limit Reached
+ Open Tickets Limit Reached
body: |
- <p>
- <span style="font-family: Georgia; color: rgb(127, 127, 127); font-size: 30pt;">
- We Hear You</span>
- <img src="cid:6fe1efdea357534d238b86e7860a7c5a" alt="osTicket Logo (kangaroo)"
- width="99" height="56" style="float: right; width: 99px; margin: 0px 0px 10px 10px;">
- </p>
- <p>
- <strong>Dear %{ticket.name},</strong>
- </p>
- <p>
- You have reached the maximum number of open tickets allowed. To be
- able to open another ticket, one of your pending tickets must be
- closed. To update or add comments to an open ticket simply <a
- href="%{url}/tickets.php?e=%{ticket.email}">login to our
- helpdesk</a>.
- </p>
- <p>
- Thank you<br/>
- Support Ticket System
- </p>
- <p style="text-align: center;">
+ <span style="font-family: Georgia; color: rgb(127, 127, 127); font-size: 30pt;">
+ We Hear You</span>
+ <img src="cid:6fe1efdea357534d238b86e7860a7c5a" alt="osTicket Logo (kangaroo)"
+ width="99" height="56" style="float: right; width: 99px; margin: 0px 0px 10px 10px;">
+ <br>
+ <br>
+ <strong>Dear %{ticket.name.first},</strong>
+ <br>
+ <br>
+ You have reached the maximum number of open tickets allowed. To be able
+ to open another ticket, one of your pending tickets must be closed. To
+ update or add comments to an open ticket simply <a
+ href="%{url}/tickets.php?e=%{ticket.email}">login to our helpdesk</a>.
+ <br>
+ <br>
+ Thank you,<br/>
+ Support Ticket System
+ <br>
+ <br>
+ <div style="text-align: center;">
<img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc"
alt="Powered by osTicket" width="126" height="19" style="width: 126px;">
- </p>
+ </div>
diff --git a/include/i18n/en_US/templates/email/ticket.reply.yaml b/include/i18n/en_US/templates/email/ticket.reply.yaml
index ea7cb210056c1177bec6351cb1a95618690d6d4d..d32259c8b39b5063dd083131d684c1244af5e1a0 100644
--- a/include/i18n/en_US/templates/email/ticket.reply.yaml
+++ b/include/i18n/en_US/templates/email/ticket.reply.yaml
@@ -15,25 +15,25 @@ body: |
width="113" height="64" style="float: right; width: 113px; margin: 0px 0px 10px 10px;">
<h3><span style="color: rgb(127, 127, 127); font-weight: normal;
font-family: Georgia; font-size: 30pt">We're Here For You</span></h3>
- <p>
- <strong>Dear %{ticket.name},</strong>
- </p>
- <p>
- %{response}
- </p>
- <p>
- %{signature}
- </p>
+ <strong>Dear %{ticket.name},</strong>
+ <br>
+ <br>
+ %{response}
+ <br>
+ <br>
+ <div style="color: rgb(127, 127, 127);">
+ Your Company Name Team,<br>
+ %{signature}
+ </div>
<hr>
- <p>
- <span style="color: rgb(127, 127, 127); font-size: small;">
- We hope this response has sufficiently answered your questions. If
- not, please do not send another email. Instead, reply to this email
- or <a href="%{ticket.client_link}" style="color: rgb(84, 141,
- 212);">login to your account</a> for a complete archive of all your
- support requests and responses.</span>
- </p>
- <p style="text-align: center;">
- <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" alt="Powered by osTicket"
- width="126" height="19" style="width: 126px;">
- </p>
+ <div style="color: rgb(127, 127, 127); font-size: small; text-align: center;"
+ ><em>We hope this response has sufficiently answered your questions. If
+ not, please do not send another email. Instead, reply to this email or
+ <a href="%{ticket.client_link}" style="color: rgb(84, 141, 212);" >login
+ to your account</a> for a complete archive of all your support requests
+ and responses.</em></div>
+ <div style="text-align: center;">
+ <a href="http://osticket.com/"><img
+ src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" alt="Powered by osTicket"
+ width="126" height="19" style="width: 126px;"></a>
+ </div>
diff --git a/include/i18n/en_US/templates/email/transfer.alert.yaml b/include/i18n/en_US/templates/email/transfer.alert.yaml
index 014f6da56b7717e92b0f84e5daf3207ea55c6ae2..4772aefd19adb51ab76aad258024518965792fd2 100644
--- a/include/i18n/en_US/templates/email/transfer.alert.yaml
+++ b/include/i18n/en_US/templates/email/transfer.alert.yaml
@@ -12,23 +12,21 @@ subject: |
Ticket #%{ticket.number} transfer - %{ticket.dept.name}
body: |
<h3>Hi %{recipient},</h3>
- <p>
- Ticket <a href="%{ticket.staff_link}">#%{ticket.number}</a> has
- been transferred to the %{ticket.dept.name} department by
- <strong>%{staff.name}</strong>
- </p>
+ Ticket <a href="%{ticket.staff_link}">#%{ticket.number}</a> has been
+ transferred to the %{ticket.dept.name} department by
+ <strong>%{staff.name.short}</strong>
+ <br>
+ <br>
<blockquote>
%{comments}
</blockquote>
<hr>
- <p style="font-size:small">
- To view/respond to the ticket, please <a
- href="%{ticket.staff_link}">login</a> to the support ticket system.
- </p>
- <p>
- <em>Your friendly Customer Support System
- <br/>
- <a href="http://osticket.com/"><img width="126" height="19"
- alt="Powered By osTicket" style="width: 126px;"
- src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc"/></a>
- </p>
+ <div>To view or respond to the ticket, please <a
+ href="%{ticket.staff_link}">login</a> to the support ticket system.
+ </div>
+ <em style="font-size: small; ">Your friendly Customer Support
+ System</em>
+ <br>
+ <a href="http://osticket.com/"><img width="126" height="19"
+ alt="Powered By osTicket" style="width: 126px;"
+ src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc"/></a>
diff --git a/include/i18n/en_US/templates/page/thank-you.yaml b/include/i18n/en_US/templates/page/thank-you.yaml
index 27365b340d82c7df2876792bee96aee2fb021c94..aef423945287b7e38bb82b7745538794602ada32 100644
--- a/include/i18n/en_US/templates/page/thank-you.yaml
+++ b/include/i18n/en_US/templates/page/thank-you.yaml
@@ -11,9 +11,15 @@ notes: |
name: Thank You
body: |
- <div>%{ticket.name},<br />
- <p>Thank you for contacting us.</p>
- <p>A support ticket request #%{ticket.number} has been created and a
- representative will be getting back to you shortly if necessary.</p>
- <p>Support Team</p>
+ <div>%{ticket.name},
+ <br>
+ <br>
+ Thank you for contacting us.
+ <br>
+ <br>
+ A support ticket request has been created and a representative will be
+ getting back to you shortly if necessary.</p>
+ <br>
+ <br>
+ Support Team
</div>