From eb3e173dc856fc939634e9954fc6bf0adfcacd33 Mon Sep 17 00:00:00 2001
From: Nimisha Asthagiri <nasthagiri@edx.org>
Date: Wed, 25 Oct 2017 10:29:33 -0400
Subject: [PATCH] Schedules: Course Update support bulleted highlights

---
 .../core/djangoapps/schedules/resolvers.py    |  8 ++---
 .../edx_ace/courseupdate/email/body.html      | 31 ++++++-------------
 .../edx_ace/courseupdate/email/body.txt       |  2 ++
 3 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/openedx/core/djangoapps/schedules/resolvers.py b/openedx/core/djangoapps/schedules/resolvers.py
index 340dfbd9b7..f967e6aa1e 100644
--- a/openedx/core/djangoapps/schedules/resolvers.py
+++ b/openedx/core/djangoapps/schedules/resolvers.py
@@ -320,7 +320,7 @@ class CourseUpdateResolver(BinnedSchedulesBaseResolver):
         for schedule in schedules:
             enrollment = schedule.enrollment
             try:
-                week_summary = get_course_week_summary(enrollment.course_id, week_num)
+                week_highlights = get_week_highlights(enrollment.course_id, week_num)
             except CourseUpdateDoesNotExist:
                 continue
 
@@ -333,7 +333,7 @@ class CourseUpdateResolver(BinnedSchedulesBaseResolver):
                     self.site, reverse('course_root', args=[course_id_str])
                 ),
                 'week_num': week_num,
-                'week_summary': week_summary,
+                'week_highlights': week_highlights,
 
                 # This is used by the bulk email optout policy
                 'course_ids': [course_id_str],
@@ -344,9 +344,9 @@ class CourseUpdateResolver(BinnedSchedulesBaseResolver):
 
 
 @request_cached
-def get_course_week_summary(course_id, week_num):
+def get_week_highlights(course_id, week_num):
     if COURSE_UPDATE_WAFFLE_FLAG.is_enabled(course_id):
         course = modulestore().get_course(course_id)
-        return course.week_summary(week_num)
+        return course.highlights_for_week(week_num)
     else:
         raise CourseUpdateDoesNotExist()
diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.html b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.html
index e04f056cc3..50ec6bb539 100644
--- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.html
+++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.html
@@ -20,31 +20,18 @@
             <p>
                 {% blocktrans trimmed %}
                     Here is what you can look forward to learning this week:
-                    <p>{{ week_summary }}</p>
                 {% endblocktrans %}
+                    <ul>
+                        {% for highlight in week_highlights %}
+                            <li>{{ highlight }}</li>
+                        {% endfor %}
+                    </ul>
             </p>
 
-            <p>
-                <!-- email client support for style sheets is pretty spotty, so we have to inline all of these styles -->
-                <a
-                    href="{{ course_url }}"
-                    style="
-                        color: #ffffff;
-                        text-decoration: none;
-                        border-radius: 4px;
-                        -webkit-border-radius: 4px;
-                        -moz-border-radius: 4px;
-                        background-color: #005686;
-                        border-top: 10px solid #005686;
-                        border-bottom: 10px solid #005686;
-                        border-right: 16px solid #005686;
-                        border-left: 16px solid #005686;
-                        display: inline-block;
-                ">
-                    <!-- old email clients require the use of the font tag :( -->
-                    <font color="#ffffff"><b>{% trans "Resume your course now" %}</b></font>
-                </a>
-            </p>
+            {% trans "Resume your course now" as course_cta_text %}
+            {% include "schedules/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text%}
+
+            {% include "schedules/edx_ace/common/upsell_cta.html"%}
         </td>
     </tr>
 </table>
diff --git a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.txt b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.txt
index 3a3109ae7f..e9451139f0 100644
--- a/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.txt
+++ b/openedx/core/djangoapps/schedules/templates/schedules/edx_ace/courseupdate/email/body.txt
@@ -7,3 +7,5 @@ Here is what you can look forward to learning this week:
 {{ week_summary }}
 
 {% endblocktrans %}
+
+{% include "schedules/edx_ace/common/upsell_cta.txt"%}