From bc5981680e92129a99020f024814275739ba0ea0 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Mon, 20 Jan 2014 10:11:19 -0600
Subject: [PATCH] Drop Oscar and large text from client templates

---
 .../templates/email/message.autoresp.yaml     |  6 +-
 .../email/ticket.activity.notice.yaml         | 12 +--
 .../templates/email/ticket.autoreply.yaml     | 28 ++----
 .../templates/email/ticket.autoresp.yaml      | 87 ++++++-------------
 .../en_US/templates/email/ticket.notice.yaml  | 23 +----
 .../templates/email/ticket.overlimit.yaml     | 16 +---
 .../en_US/templates/email/ticket.reply.yaml   | 13 +--
 7 files changed, 43 insertions(+), 142 deletions(-)

diff --git a/include/i18n/en_US/templates/email/message.autoresp.yaml b/include/i18n/en_US/templates/email/message.autoresp.yaml
index 61905d57f..ec8c6fb52 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/ticket.activity.notice.yaml b/include/i18n/en_US/templates/email/ticket.activity.notice.yaml
index ee3023175..01622cd65 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.autoreply.yaml b/include/i18n/en_US/templates/email/ticket.autoreply.yaml
index eb7a50c5a..5cb448b1b 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 47e05b599..41a8733a7 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 55d0bb0d2..5503b91d6 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.overlimit.yaml b/include/i18n/en_US/templates/email/ticket.overlimit.yaml
index 384f329cc..724e3a8e0 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 80774c737..50e5078ac 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>
-- 
GitLab