From 8e591f63239beaa12c861a3575590c05b3dee8ae Mon Sep 17 00:00:00 2001
From: Nimisha Asthagiri <nasthagiri@edx.org>
Date: Fri, 8 Apr 2016 14:33:38 -0400
Subject: [PATCH 1/2] Fix Safe template issues (again)

---
 .../dashboard/_dashboard_course_listing.html    | 17 ++++++++++++-----
 lms/templates/unsubscribe.html                  |  4 ++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html
index de9e3184af..92ae61d505 100644
--- a/lms/templates/dashboard/_dashboard_course_listing.html
+++ b/lms/templates/dashboard/_dashboard_course_listing.html
@@ -8,6 +8,7 @@ from django.utils.translation import ungettext
 from django.core.urlresolvers import reverse
 from course_modes.models import CourseMode
 from course_modes.helpers import enrollment_mode_display
+from openedx.core.djangolib.js_utils import dump_js_escaped_json
 from openedx.core.djangolib.markup import Text, HTML
 from student.helpers import (
   VERIFY_STATUS_NEED_TO_VERIFY,
@@ -317,7 +318,13 @@ from student.helpers import (
             <h4 class="message-title">${_('Your verification will expire soon!')}</h4>
             ## Translators: start_link and end_link will be replaced with HTML tags;
             ## please do not translate these.
-            <p class="message-copy">${Text(_('Your current verification will expire before the verification deadline for this course. {start_link}Re-verify your identity now{end_link} using a webcam and a government-issued ID.')).format(start_link=HTML('<a href="{href}">'.format(href=reverse('verify_student_reverify'))), end_link=HTML('</a>'))}</p>
+            <p class="message-copy">${Text(_('Your current verification will expire before the verification deadline '
+              'for this course. {start_link}Re-verify your identity now{end_link} using a webcam and a '
+              'government-issued ID.')).format(
+                start_link=HTML('<a href="{href}">').format(href=reverse('verify_student_reverify')),
+                end_link=HTML('</a>')
+              )}
+            </p>
           % endif
         </div>
         % endif
@@ -334,10 +341,10 @@ from student.helpers import (
                         "It's a proven motivator to complete the course. {line_break}"
                         "{link_start}Learn more about the verified {cert_name_long}{link_end}.")).format(
                           line_break=HTML('<br>'),
-                          link_start=HTML('<a href="{}" class="verified-info" data-course-key="{}">'.format(
+                          link_start=HTML('<a href="{}" class="verified-info" data-course-key="{}">').format(
                             marketing_link('WHAT_IS_VERIFIED_CERT'),
                             enrollment.course_id
-                          )),
+                          ),
                           link_end=HTML('</a>'),
                           cert_name_long=cert_name_long
                         )}
@@ -394,7 +401,7 @@ from student.helpers import (
         <li class="prerequisites">
           <p class="tip">
             ${Text(_("You must successfully complete {link_start}{prc_display}{link_end} before you begin this course.")).format(
-                link_start=HTML('<a href="{}">'.format(prc_target)),
+                link_start=HTML('<a href="{}">').format(prc_target),
                 link_end=HTML('</a>'),
                 prc_display=course_requirements['courses'][0]['display'],
               )}
@@ -409,7 +416,7 @@ from student.helpers import (
 <script>
            $( document ).ready(function() {
 
-               if("${is_course_blocked}" == "True"){
+               if("${is_course_blocked | n, dump_js_escaped_json}" == 'true'){
                    $( "#unregister_block_course" ).click(function() {
                        $('.disable-look-unregister').click();
                    });
diff --git a/lms/templates/unsubscribe.html b/lms/templates/unsubscribe.html
index 71258caa3a..0460572263 100644
--- a/lms/templates/unsubscribe.html
+++ b/lms/templates/unsubscribe.html
@@ -22,8 +22,8 @@ from django.conf import settings
           "If you did not mean to do this, {undo_link_start}you can re-subscribe{link_end}."
         )).format(
             platform_name=settings.PLATFORM_NAME,
-            dashboard_link_start=HTML("<a href='{}'>".format(reverse('dashboard'))),
-            undo_link_start=HTML("<a id='resub_link' href='{}'>".format(reverse('resubscribe_forum_update', args=[token]))),
+            dashboard_link_start=HTML("<a href='{}'>").format(reverse('dashboard')),
+            undo_link_start=HTML("<a id='resub_link' href='{}'>").format(reverse('resubscribe_forum_update', args=[token])),
             link_end=HTML("</a>"),
         )}
     </p>

From 59b8bb54e39a3e0587120a6a4d326e7f727a4e95 Mon Sep 17 00:00:00 2001
From: Nimisha Asthagiri <nasthagiri@edx.org>
Date: Mon, 11 Apr 2016 12:23:22 -0400
Subject: [PATCH 2/2] Fix Dashboard safe template.

---
 lms/templates/dashboard.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 0550c5c0d5..fa54c3e540 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -8,6 +8,7 @@ from django.template import RequestContext
 import third_party_auth
 from third_party_auth import pipeline
 from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string
+from openedx.core.djangolib.markup import Text, HTML
 %>
 
 <%
@@ -200,7 +201,7 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str
 
     <header>
       <h2 id="email-settings-title">
-        ${_("Email Settings for {course_number}").format(course_number='<span id="email_settings_course_number"></span>')}
+        ${Text(_("Email Settings for {course_number}")).format(course_number=HTML('<span id="email_settings_course_number"></span>'))}
         <span class="sr">,
           ## Translators: this text gives status on if the modal interface (a menu or piece of UI that takes the full focus of the screen) is open or not
           ${_("window open")}