From 7ab0f39df07703772277fa5682e9d55329a35f38 Mon Sep 17 00:00:00 2001
From: Gabe Mulley <gabe@edx.org>
Date: Mon, 16 Oct 2017 22:22:22 -0400
Subject: [PATCH 1/2] include upsell messaging in the 10 day nudge emails

---
 .../recurringnudge_day10/email/body.html      | 48 +++++++++++++++----
 .../recurringnudge_day10/email/body.txt       |  8 ++++
 .../edx_ace/upgradereminder/email/body.html   |  6 +--
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.html
index de78d32c26..0799af8c58 100644
--- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.html
+++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.html
@@ -34,8 +34,9 @@
                     {% endblocktrans %}
                 {% endif %}
             </p>
+
             <p>
-                <!-- email client support for style sheets is pretty spotty, so we have to inline all of these styles -->
+                {# email client support for style sheets is pretty spotty, so we have to inline all of these styles #}
                 <a
                 {% if course_ids|length > 1 %}
                     href="{{ dashboard_url }}"
@@ -45,20 +46,49 @@
                 style="
                     color: #ffffff;
                     text-decoration: none;
-                    border-radius: 4px;
-                    -webkit-border-radius: 4px;
-                    -moz-border-radius: 4px;
+                    border-radius: .3rem;
+                    -webkit-border-radius: .3rem;
+                    -moz-border-radius: .3rem;
                     background-color: #005686;
-                    border-top: 10px solid #005686;
-                    border-bottom: 10px solid #005686;
-                    border-right: 16px solid #005686;
-                    border-left: 16px solid #005686;
+                    border-top: .15rem solid #005686;
+                    border-bottom: .15rem solid #005686;
+                    border-right: .15rem solid #005686;
+                    border-left: .15rem solid #005686;
                     display: inline-block;
+                    padding: 1rem 5rem;
                 ">
-                    <!-- old email clients require the use of the font tag :( -->
+                    {# old email clients require the use of the font tag :( #}
                     <font color="#ffffff"><b>{% trans "Keep learning" %}</b></font>
                 </a>
             </p>
+
+            {% if show_upsell %}
+                <p>
+                    {% blocktrans trimmed %}
+                        Don't miss the opportunity to highlight your new knowledge and skills by earning a verified
+                        certificate. Upgrade by {{ user_schedule_upgrade_deadline_time }}.
+                    {% endblocktrans %}
+                </p>
+                <p>
+                    <a href="{{ upsell_link }}"
+                       style="
+                        color: #1e8142;
+                        text-decoration: none;
+                        border-radius: .3rem;
+                        -webkit-border-radius: .3rem;
+                        -moz-border-radius: .3rem;
+                        background-color: #FFFFFF;
+                        border-top: .15rem solid #1e8142;
+                        border-bottom: .15rem solid #1e8142;
+                        border-right: .15rem solid #1e8142;
+                        border-left: .15rem solid #1e8142;
+                        display: inline-block;
+                        padding: 1rem 6.1rem;
+                        ">
+                        <font color="#1e8142"><b>{% trans "Upgrade Now" %}</b></font>
+                    </a>
+                </p>
+            {% endif %}
         </td>
     </tr>
 </table>
diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.txt b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.txt
index bbc5f29dc6..96dceea942 100644
--- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.txt
+++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.txt
@@ -12,3 +12,11 @@
     {% endblocktrans %}
     {% trans "Keep learning" %} <{{course_url}}>
 {% endif %}
+{% if show_upsell %}
+{% blocktrans trimmed %}
+    Don't miss the opportunity to highlight your new knowledge and skills by earning a verified
+    certificate. Upgrade by {{ user_schedule_upgrade_deadline_time }}.
+
+    Upgrade Now! <{{ upsell_link }}>
+{% endblocktrans %}
+{% endif %}
diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html
index 68a1bd2fe9..5c21e314e8 100644
--- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html
+++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html
@@ -33,7 +33,7 @@
             <a href="{{ upsell_link }}">
                 <img
                     src="{{ cert_image }}"
-                    alt="{% blocktrans %}Example print-out of a verified certificate{% endblocktrans %}"
+                    alt="{% trans 'Example print-out of a verified certificate' %}"
                     style="
                         display: block;
                         margin-right: auto;
@@ -48,7 +48,7 @@
             </a>
 
             <p>
-                <!-- email client support for style sheets is pretty spotty, so we have to inline all of these styles -->
+                {# email client support for style sheets is pretty spotty, so we have to inline all of these styles #}
                 <a
                     href="{{ upsell_link }}"
                     style="
@@ -64,7 +64,7 @@
                         border-left: 16px solid #005686;
                         display: inline-block;
                 ">
-                    <!-- old email clients require the use of the font tag :( -->
+                    {# old email clients require the use of the font tag :( #}
                     <font color="#ffffff"><b>{% trans "Upgrade now" %}</b></font>
                 </a>
             </p>

From 71a62f827cf8009c7e55c2dd04575e1834c50c51 Mon Sep 17 00:00:00 2001
From: Gabe Mulley <gabe@edx.org>
Date: Mon, 16 Oct 2017 22:33:23 -0400
Subject: [PATCH 2/2] use pixel measurements

---
 .../recurringnudge_day10/email/body.html      | 28 ++++++++-----------
 .../recurringnudge_day3/email/body.html       | 28 ++++++++-----------
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.html
index 0799af8c58..5d103285b4 100644
--- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.html
+++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day10/email/body.html
@@ -46,16 +46,15 @@
                 style="
                     color: #ffffff;
                     text-decoration: none;
-                    border-radius: .3rem;
-                    -webkit-border-radius: .3rem;
-                    -moz-border-radius: .3rem;
+                    border-radius: 4px;
+                    -webkit-border-radius: 4px;
+                    -moz-border-radius: 4px;
                     background-color: #005686;
-                    border-top: .15rem solid #005686;
-                    border-bottom: .15rem solid #005686;
-                    border-right: .15rem solid #005686;
-                    border-left: .15rem solid #005686;
+                    border-top: 12px solid #005686;
+                    border-bottom: 12px solid #005686;
+                    border-right: 50px solid #005686;
+                    border-left: 50px solid #005686;
                     display: inline-block;
-                    padding: 1rem 5rem;
                 ">
                     {# old email clients require the use of the font tag :( #}
                     <font color="#ffffff"><b>{% trans "Keep learning" %}</b></font>
@@ -74,16 +73,13 @@
                        style="
                         color: #1e8142;
                         text-decoration: none;
-                        border-radius: .3rem;
-                        -webkit-border-radius: .3rem;
-                        -moz-border-radius: .3rem;
+                        border-radius: 4px;
+                        -webkit-border-radius: 4px;
+                        -moz-border-radius: 4px;
                         background-color: #FFFFFF;
-                        border-top: .15rem solid #1e8142;
-                        border-bottom: .15rem solid #1e8142;
-                        border-right: .15rem solid #1e8142;
-                        border-left: .15rem solid #1e8142;
+                        border: 3px solid #1e8142;
                         display: inline-block;
-                        padding: 1rem 6.1rem;
+                        padding: 8px 65px;
                         ">
                         <font color="#1e8142"><b>{% trans "Upgrade Now" %}</b></font>
                     </a>
diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/body.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/body.html
index bee7b4e05a..40122bb22b 100644
--- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/body.html
+++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/recurringnudge_day3/email/body.html
@@ -46,16 +46,15 @@
                 style="
                     color: #ffffff;
                     text-decoration: none;
-                    border-radius: .3rem;
-                    -webkit-border-radius: .3rem;
-                    -moz-border-radius: .3rem;
+                    border-radius: 4px;
+                    -webkit-border-radius: 4px;
+                    -moz-border-radius: 4px;
                     background-color: #005686;
-                    border-top: .15rem solid #005686;
-                    border-bottom: .15rem solid #005686;
-                    border-right: .15rem solid #005686;
-                    border-left: .15rem solid #005686;
+                    border-top: 12px solid #005686;
+                    border-bottom: 12px solid #005686;
+                    border-right: 50px solid #005686;
+                    border-left: 50px solid #005686;
                     display: inline-block;
-                    padding: 1rem 5rem;
                 ">
                     {# old email clients require the use of the font tag :( #}
                     <font color="#ffffff"><b>{% trans "Start learning now" %}</b></font>
@@ -73,16 +72,13 @@
                        style="
                         color: #1e8142;
                         text-decoration: none;
-                        border-radius: .3rem;
-                        -webkit-border-radius: .3rem;
-                        -moz-border-radius: .3rem;
+                        border-radius: 4px;
+                        -webkit-border-radius: 4px;
+                        -moz-border-radius: 4px;
                         background-color: #FFFFFF;
-                        border-top: .15rem solid #1e8142;
-                        border-bottom: .15rem solid #1e8142;
-                        border-right: .15rem solid #1e8142;
-                        border-left: .15rem solid #1e8142;
+                        border: 3px solid #1e8142;
                         display: inline-block;
-                        padding: 1rem 6.1rem;
+                        padding: 8px 65px;
                         ">
                         <font color="#1e8142"><b>{% trans "Upgrade Now" %}</b></font>
                     </a>