From 05718a63db60390305d92b6c2641fa0899cba054 Mon Sep 17 00:00:00 2001 From: Adeel Khan Date: Tue, 30 Jul 2019 13:34:44 +0500 Subject: [PATCH] Fix xss-linter directives from edx-ace templates PROD-508 --- .../templates/student/edx_ace/accountrecovery/email/body.html | 2 +- common/templates/student/edx_ace/emailchange/email/body.html | 2 +- common/templates/student/edx_ace/passwordreset/email/body.html | 2 +- lms/templates/instructor/edx_ace/allowedenroll/email/body.html | 2 +- .../templates/schedules/edx_ace/courseupdate/email/body.html | 2 +- .../schedules/edx_ace/recurringnudge_day10/email/body.html | 2 +- .../schedules/edx_ace/recurringnudge_day3/email/body.html | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/templates/student/edx_ace/accountrecovery/email/body.html b/common/templates/student/edx_ace/accountrecovery/email/body.html index c6ebe8a644..5896ed446d 100644 --- a/common/templates/student/edx_ace/accountrecovery/email/body.html +++ b/common/templates/student/edx_ace/accountrecovery/email/body.html @@ -34,7 +34,7 @@ {% trans "If you didn't request this change, you can disregard this email - we have not yet reset your password." as tmsg %}{{ tmsg | force_escape }}

- ## xss-lint: disable=django-trans-missing-escape + {# xss-lint: disable=django-trans-missing-escape #} {% trans "Create Password" as course_cta_text %} {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=reset_link %} diff --git a/common/templates/student/edx_ace/emailchange/email/body.html b/common/templates/student/edx_ace/emailchange/email/body.html index f99a68169b..68ac4237b9 100644 --- a/common/templates/student/edx_ace/emailchange/email/body.html +++ b/common/templates/student/edx_ace/emailchange/email/body.html @@ -15,7 +15,7 @@ {% endfilter %}

- ## xss-lint: disable=django-trans-missing-escape + {# xss-lint: disable=django-trans-missing-escape #} {% trans "Confirm Email Change" as course_cta_text %} {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=confirm_link %} diff --git a/common/templates/student/edx_ace/passwordreset/email/body.html b/common/templates/student/edx_ace/passwordreset/email/body.html index 8cf177aa68..5312041d85 100644 --- a/common/templates/student/edx_ace/passwordreset/email/body.html +++ b/common/templates/student/edx_ace/passwordreset/email/body.html @@ -33,7 +33,7 @@ {% trans "If you didn't request this change, you can disregard this email - we have not yet reset your password." as tmsg %}{{ tmsg | force_escape }}

- ## xss-lint: disable=django-trans-missing-escape + {# xss-lint: disable=django-trans-missing-escape #} {% trans "Change my Password" as course_cta_text %} {# email client support for style sheets is pretty spotty, so we have to inline all of these styles #} diff --git a/lms/templates/instructor/edx_ace/allowedenroll/email/body.html b/lms/templates/instructor/edx_ace/allowedenroll/email/body.html index c4aa9f011f..6c97f57e4a 100644 --- a/lms/templates/instructor/edx_ace/allowedenroll/email/body.html +++ b/lms/templates/instructor/edx_ace/allowedenroll/email/body.html @@ -46,7 +46,7 @@ {% endfilter %}

- ## xss-lint: disable=django-trans-missing-escape + {# xss-lint: disable=django-trans-missing-escape #} {% trans "Finish Your Registration" as button_cta_text %} {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=button_cta_text course_cta_url=registration_url %} 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 bae28373ad..c17360558e 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 @@ -35,7 +35,7 @@ {% endblocktrans %} {% endfilter %}

- ## xss-lint: disable=django-trans-missing-escape + {# xss-lint: disable=django-trans-missing-escape #} {% trans "Resume your course now" as course_cta_text %} {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text%} 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 60ab43b6cc..eb33c53d8a 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 @@ -42,7 +42,7 @@ {% interpolate_html tmsg start_strong=''|safe end_strong=''|safe %} {% endif %}

- ## xss-lint: disable=django-trans-missing-escape + {# xss-lint: disable=django-trans-missing-escape #} {% trans "Keep learning" as course_cta_text %} {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text%} 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 745e6fa6d2..1457dcc710 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 @@ -41,7 +41,7 @@ {% interpolate_html tmsg start_strong=''|safe end_strong=''|safe %} {% endif %}

- ## xss-lint: disable=django-trans-missing-escape + {# xss-lint: disable=django-trans-missing-escape #} {% trans "Start learning now" as course_cta_text %} {% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text%}