diff --git a/include/i18n/en_US/templates/email/message.alert.yaml b/include/i18n/en_US/templates/email/message.alert.yaml
index b3fb1686f3717144c5c956d2676d9bbd31d90502..e6e83e5bbd5f076cd85d4a0b2336eaec2a919189 100644
--- a/include/i18n/en_US/templates/email/message.alert.yaml
+++ b/include/i18n/en_US/templates/email/message.alert.yaml
@@ -14,7 +14,7 @@ notes: |
subject: |
New Message Alert
body: |
- <h3><strong>Hi %{recipient},</strong></h3>
+ <h3><strong>Hi %{recipient.name},</strong></h3>
New message appended to ticket <a
href="%{ticket.staff_link}">#%{ticket.number}</a>
<br>
diff --git a/include/i18n/en_US/templates/email/message.autoresp.yaml b/include/i18n/en_US/templates/email/message.autoresp.yaml
index 61905d57f04f06f754f0c30a6f590f3eaca48292..ec8c6fb521c4875c014a0ec4f4707b7bac6f72da 100644
--- a/include/i18n/en_US/templates/email/message.autoresp.yaml
+++ b/include/i18n/en_US/templates/email/message.autoresp.yaml
@@ -26,7 +26,5 @@ body: |
<hr>
<div style="color: rgb(127, 127, 127); font-size: small; text-align:
center"><em>You can view the support request progress <a
- href="%{recipient.ticket_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>
+ href="%{recipient.ticket_link}">online here</a></em>
+ </div>
diff --git a/include/i18n/en_US/templates/email/note.alert.yaml b/include/i18n/en_US/templates/email/note.alert.yaml
index 32ccf501836349be9c8ee8a08c6495a87b095056..a704830d6bb3300607be5b3c7f0c6a55741b4955 100644
--- a/include/i18n/en_US/templates/email/note.alert.yaml
+++ b/include/i18n/en_US/templates/email/note.alert.yaml
@@ -12,7 +12,7 @@ notes: |
subject: |
New Internal Note Alert
body: |
- <h3><strong>Hi %{recipient},</strong></h3>
+ <h3><strong>Hi %{recipient.name},</strong></h3>
An internal note has been appended to ticket <a
href="%{ticket.staff_link}">#%{ticket.number}</a>
<br>
diff --git a/include/i18n/en_US/templates/email/ticket.activity.notice.yaml b/include/i18n/en_US/templates/email/ticket.activity.notice.yaml
index ee3023175914465493c0e808456bee1f7f858ce9..01622cd656ecb5175ef2f41376eff814a68c590e 100644
--- a/include/i18n/en_US/templates/email/ticket.activity.notice.yaml
+++ b/include/i18n/en_US/templates/email/ticket.activity.notice.yaml
@@ -9,14 +9,7 @@ notes: |
subject: "Re: %{ticket.subject}"
body: |
- <img src="cid:6fe1efdea357534d238b86e7860a7c5a" alt="osTicket Logo (kangaroo)" 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"
- >Stay in the loop</span></h3> <strong><br>
- Dear %{recipient.name.first},
- </strong>
- <br>
- <br>
+ <h3><strong>Dear %{recipient.name.first},</strong></h3>
<div>
<em>%{poster.name}</em> just logged a message to a ticket in which you participate.
</div>
@@ -32,6 +25,3 @@ body: |
or <a href="%{recipient.ticket_link}" style="color: rgb(84, 141, 212);"
>click here</a> for a complete archive of the ticket thread.</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/ticket.alert.yaml b/include/i18n/en_US/templates/email/ticket.alert.yaml
index 497064134e9bd520a188c9cad46849b21dcbf0a9..764a27bea07e85fc386c7508f9abfaae5633591c 100644
--- a/include/i18n/en_US/templates/email/ticket.alert.yaml
+++ b/include/i18n/en_US/templates/email/ticket.alert.yaml
@@ -12,7 +12,7 @@ notes: |
subject: |
New Ticket Alert
body: |
- <h2>Hi %{recipient},</h2>
+ <h2>Hi %{recipient.name},</h2>
New ticket #%{ticket.number} created
<br>
<br>
diff --git a/include/i18n/en_US/templates/email/ticket.autoreply.yaml b/include/i18n/en_US/templates/email/ticket.autoreply.yaml
index eb7a50c5a6e3852d636a89214a36c03967c327cd..5cb448b1bfb3d231378aab2546b2758aed5bafd1 100644
--- a/include/i18n/en_US/templates/email/ticket.autoreply.yaml
+++ b/include/i18n/en_US/templates/email/ticket.autoreply.yaml
@@ -14,16 +14,7 @@ notes: |
subject: |
Support Ticket Opened
body: |
- <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 %{recipient.name.first},</strong>
- <br>
- <br>
+ <h3><strong>Dear %{recipient.name.first},</strong></h3>
A request for support has been created and assigned ticket <a
href="%{recipient.ticket_link}">#%{ticket.number}</a> with the following
automatic reply
@@ -40,14 +31,9 @@ body: |
<div style="color: rgb(127, 127, 127);">Your %{company.name} Team,<br>
%{signature}</div>
<hr>
- <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="%{recipient.ticket_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>
+ <div style="color: rgb(127, 127, 127); font-size: small;"><em>We hope
+ this response has sufficiently answered your questions. If you wish to
+ provide additional comments or informatione, please reply to this email
+ or <a href="%{recipient.ticket_link}"><span
+ style="color: rgb(84, 141, 212);" >login to your account</span></a> for
+ a complete archive of your support requests.</em></div>
diff --git a/include/i18n/en_US/templates/email/ticket.autoresp.yaml b/include/i18n/en_US/templates/email/ticket.autoresp.yaml
index 47e05b5995ab8e918f33ff58292e8eb67ef8631b..41a8733a7dc0e0ba06c320d0ee5eef9e92876103 100644
--- a/include/i18n/en_US/templates/email/ticket.autoresp.yaml
+++ b/include/i18n/en_US/templates/email/ticket.autoresp.yaml
@@ -10,64 +10,31 @@ notes: |
subject: |
Support Ticket Opened
body: |
- <table cellspacing="0">
- <tbody>
- <tr>
- <td style="vertical-align: middle; border-bottom: 1px solid #ddd; height: 48pt">
- <span style="color: rgb(127, 127, 127); font-family: Georgia;
- font-size: 28pt; font-weight: normal; ">We Hear You</span>
- </td>
- <td style="border-bottom: 1px solid #ddd;">
- <img src="cid:6fe1efdea357534d238b86e7860a7c5a" width="94"
- alt="osTicket Logo (kangaroo)" style="width: 94px; float: right;
- vertical-align: bottom; " height="53">
- </td>
- </tr>
- <tr>
- <td style="width:67%; padding-top: 12pt; padding-right: 12pt">
- Dear %{recipient.name.first},
- <br>
- <br>
- We received your request and assigned ticket #%{ticket.number}
- <br>
- <br>
- Topic: <strong>%{ticket.topic.name}</strong>
- <br>
- Subject: <strong>%{ticket.subject}</strong>
- <br>
- Submitted: <strong>%{ticket.create_date}</strong>
- <br>
- <br>
- A representative will follow-up with you as soon as possible.
- You can <a href="%{recipient.ticket_link}">view this ticket's
- progress online</a>.
- <br>
- <br>
- Your %{company.name} Team,<br>
- %{signature}
- </td>
- <td style="vertical-align: top; padding-top: 12pt;">
- <span style="color: rgb(127, 127, 127); ">%{company.name}<br/>
- %{signature}</span>
- <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="%{recipient.ticket_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>
- </td>
- </tr>
- </tbody>
- </table>
- <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>
+ <h3><strong>Dear %{recipient.name.first},</strong></h3>
+ Our customer care team has created a ticket,
+ <a href="%{recipient.ticket_link}">#%{ticket.number}</a> on your behalf,
+ with the following details and summary: <br>
+ <br>
+ Subject: <strong>%{ticket.subject}</strong><br>
+ Submitted:<strong> <strong>%{ticket.create_date}</strong></strong>
+ <br>
+ <br>
+ %{message}
+ <br>
+ <br>
+ A representative will follow-up with you as soon as possible. You can
+ <a href="%{recipient.ticket_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>
+ <div style="color: rgb(127, 127, 127); font-size: small; "><em>If you
+ wish to provide additional comments or information regarding the issue,
+ please reply to this email or <a href="%{recipient.ticket_link}"><span
+ style="color: rgb(84, 141, 212);" >login to your account</span></a> for
+ a complete archive of your support requests.</em></div>
diff --git a/include/i18n/en_US/templates/email/ticket.notice.yaml b/include/i18n/en_US/templates/email/ticket.notice.yaml
index 55d0bb0d218acd01e22bffbd20f8a342ce496a06..5503b91d647bdb394aca8a63e4474ec8a12a4821 100644
--- a/include/i18n/en_US/templates/email/ticket.notice.yaml
+++ b/include/i18n/en_US/templates/email/ticket.notice.yaml
@@ -12,16 +12,7 @@ notes: |
subject: |
%{ticket.subject}
body: |
- <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 %{recipient.name.first},</strong>
- <br>
- <br>
+ <h3><strong>Dear %{recipient.name.first},</strong></h3>
Our customer care team has created a ticket, <a
href="%{recipient.ticket_link}">#%{ticket.number}</a> on your behalf, with
the following details and summary:
@@ -46,12 +37,6 @@ body: |
<hr>
<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="%{recipient.ticket_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;">
- </div>
+ please reply to this email or <a href="%{recipient.ticket_link}"><span
+ style="color: rgb(84, 141, 212);" >login to your account</span></a> for
+ a complete archive of your support requests.</em></div>
diff --git a/include/i18n/en_US/templates/email/ticket.overdue.yaml b/include/i18n/en_US/templates/email/ticket.overdue.yaml
index d0a84da1caed8d6d297e512f7e803558765f0f8d..5f165fa739ab2bebbbe4bb0ad35e7546780183e8 100644
--- a/include/i18n/en_US/templates/email/ticket.overdue.yaml
+++ b/include/i18n/en_US/templates/email/ticket.overdue.yaml
@@ -14,7 +14,7 @@ notes: |
subject: |
Stale Ticket Alert
body: |
- <h3><strong>Hi %{recipient}</strong>,</h3>
+ <h3><strong>Hi %{recipient.name}</strong>,</h3>
A ticket, <a href="%{ticket.staff_link}">#%{ticket.number}</a> is
seriously overdue.
<br>
diff --git a/include/i18n/en_US/templates/email/ticket.overlimit.yaml b/include/i18n/en_US/templates/email/ticket.overlimit.yaml
index 384f329cc6b997982bf6eef26e0da3357ef13e3c..724e3a8e0b41b4f22835c56d8ebd60494f18507e 100644
--- a/include/i18n/en_US/templates/email/ticket.overlimit.yaml
+++ b/include/i18n/en_US/templates/email/ticket.overlimit.yaml
@@ -14,15 +14,7 @@ notes: |
subject: |
Open Tickets Limit Reached
body: |
- <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>
+ <h3><strong>Dear %{ticket.name.first},</strong></h3>
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
@@ -31,9 +23,3 @@ body: |
<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;">
- </div>
diff --git a/include/i18n/en_US/templates/email/ticket.reply.yaml b/include/i18n/en_US/templates/email/ticket.reply.yaml
index 80774c737635171d069cb4f9fa9e3f4dac8b2989..50e5078acbe33d113db8ca5a41513413455d418a 100644
--- a/include/i18n/en_US/templates/email/ticket.reply.yaml
+++ b/include/i18n/en_US/templates/email/ticket.reply.yaml
@@ -11,13 +11,7 @@ notes: |
subject: "Re: %{ticket.subject}"
body: |
- <img src="cid:6fe1efdea357534d238b86e7860a7c5a" alt="osTicket Logo (kangaroo)"
- 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>
- <strong>Dear %%{recipient.name},</strong>
- <br>
- <br>
+ <h3><strong>Dear %{recipient.name},</strong></h3>
%{response}
<br>
<br>
@@ -32,8 +26,3 @@ body: |
<a href="%{recipient.ticket_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 4772aefd19adb51ab76aad258024518965792fd2..9bdec78bdda6fb235610827ec38a0ce33daa1f0e 100644
--- a/include/i18n/en_US/templates/email/transfer.alert.yaml
+++ b/include/i18n/en_US/templates/email/transfer.alert.yaml
@@ -11,7 +11,7 @@ notes: |
subject: |
Ticket #%{ticket.number} transfer - %{ticket.dept.name}
body: |
- <h3>Hi %{recipient},</h3>
+ <h3>Hi %{recipient.name},</h3>
Ticket <a href="%{ticket.staff_link}">#%{ticket.number}</a> has been
transferred to the %{ticket.dept.name} department by
<strong>%{staff.name.short}</strong>