From 8a361300ecd5ac8360a3e541348c42dd3c83c8b9 Mon Sep 17 00:00:00 2001 From: Uman Shahzad Date: Wed, 29 Nov 2017 23:50:31 +0500 Subject: [PATCH 1/2] Fix some mako-missing-default xsslint issues in test files. --- common/test/templates/theme-footer.html | 1 + common/test/templates/theme-google-analytics.html | 1 + common/test/templates/theme-head-extra.html | 1 + common/test/templates/theme-header.html | 1 + common/test/test-theme/lms/templates/dashboard.html | 1 + .../test_sites/test_site/templates/courseware/syllabus.html | 1 + .../test/test_sites/test_site/templates/courseware/tabs.html | 1 + .../test_site/templates/courseware/test_absolute_path.html | 1 + .../test_site/templates/courseware/test_relative_path.html | 1 + common/test/test_sites/test_site/templates/footer.html | 1 + common/test/test_sites/test_site/templates/head-extra.html | 1 + common/test/test_sites/test_site/templates/login-sidebar.html | 3 ++- .../test/test_sites/test_site/templates/register-sidebar.html | 3 ++- .../test_sites/test_site/templates/static_templates/about.html | 1 + .../test_site/templates/static_templates/contact.html | 1 + .../test_site/templates/static_templates/copyright.html | 1 + .../test_sites/test_site/templates/static_templates/faq.html | 1 + .../test_sites/test_site/templates/static_templates/tos.html | 1 + lms/templates/shoppingcart/test/fake_payment_error.html | 1 + lms/templates/shoppingcart/test/fake_payment_page.html | 1 + 20 files changed, 22 insertions(+), 2 deletions(-) diff --git a/common/test/templates/theme-footer.html b/common/test/templates/theme-footer.html index 94456aba2b..32e9f38b0d 100644 --- a/common/test/templates/theme-footer.html +++ b/common/test/templates/theme-footer.html @@ -1 +1,2 @@ +<%page expression_filter="h"/> # intentionally left blank diff --git a/common/test/templates/theme-google-analytics.html b/common/test/templates/theme-google-analytics.html index 94456aba2b..32e9f38b0d 100644 --- a/common/test/templates/theme-google-analytics.html +++ b/common/test/templates/theme-google-analytics.html @@ -1 +1,2 @@ +<%page expression_filter="h"/> # intentionally left blank diff --git a/common/test/templates/theme-head-extra.html b/common/test/templates/theme-head-extra.html index 94456aba2b..32e9f38b0d 100644 --- a/common/test/templates/theme-head-extra.html +++ b/common/test/templates/theme-head-extra.html @@ -1 +1,2 @@ +<%page expression_filter="h"/> # intentionally left blank diff --git a/common/test/templates/theme-header.html b/common/test/templates/theme-header.html index 94456aba2b..32e9f38b0d 100644 --- a/common/test/templates/theme-header.html +++ b/common/test/templates/theme-header.html @@ -1 +1,2 @@ +<%page expression_filter="h"/> # intentionally left blank diff --git a/common/test/test-theme/lms/templates/dashboard.html b/common/test/test-theme/lms/templates/dashboard.html index eaef8fba6c..4ecd552a9b 100644 --- a/common/test/test-theme/lms/templates/dashboard.html +++ b/common/test/test-theme/lms/templates/dashboard.html @@ -1,3 +1,4 @@ +<%page expression_filter="h"/> <%inherit file="dashboard.html" /> <%block name="pagetitle">Overridden Title! ${parent.body()} diff --git a/common/test/test_sites/test_site/templates/courseware/syllabus.html b/common/test/test_sites/test_site/templates/courseware/syllabus.html index 284f5e8a05..d0cf0cf3cf 100644 --- a/common/test/test_sites/test_site/templates/courseware/syllabus.html +++ b/common/test/test_sites/test_site/templates/courseware/syllabus.html @@ -1,4 +1,5 @@ ## mako +<%page expression_filter="h"/> <%namespace name='static' file='/static_content.html'/> <%include file="${static.get_template_path('courseware/test_relative_path.html')}" /> <%include file="${static.get_template_path('/courseware/test_absolute_path.html')}" /> diff --git a/common/test/test_sites/test_site/templates/courseware/tabs.html b/common/test/test_sites/test_site/templates/courseware/tabs.html index 2c0a2d27de..ea2970c8a2 100644 --- a/common/test/test_sites/test_site/templates/courseware/tabs.html +++ b/common/test/test_sites/test_site/templates/courseware/tabs.html @@ -1,4 +1,5 @@ ## mako +<%page expression_filter="h"/> <%namespace name='static' file='/static_content.html'/> <%! from django.utils.translation import ugettext as _ diff --git a/common/test/test_sites/test_site/templates/courseware/test_absolute_path.html b/common/test/test_sites/test_site/templates/courseware/test_absolute_path.html index 710c751e79..9cb9d30da5 100644 --- a/common/test/test_sites/test_site/templates/courseware/test_absolute_path.html +++ b/common/test/test_sites/test_site/templates/courseware/test_absolute_path.html @@ -1,3 +1,4 @@ ## mako +<%page expression_filter="h"/> <%namespace name='static' file='/static_content.html'/>
Microsite absolute path template contents
\ No newline at end of file diff --git a/common/test/test_sites/test_site/templates/courseware/test_relative_path.html b/common/test/test_sites/test_site/templates/courseware/test_relative_path.html index d010ef3f97..7ed32120a6 100644 --- a/common/test/test_sites/test_site/templates/courseware/test_relative_path.html +++ b/common/test/test_sites/test_site/templates/courseware/test_relative_path.html @@ -1,3 +1,4 @@ ## mako +<%page expression_filter="h"/> <%namespace name='static' file='/static_content.html'/>
Microsite relative path template contents
\ No newline at end of file diff --git a/common/test/test_sites/test_site/templates/footer.html b/common/test/test_sites/test_site/templates/footer.html index 6cf8edfcb4..06c4072c77 100644 --- a/common/test/test_sites/test_site/templates/footer.html +++ b/common/test/test_sites/test_site/templates/footer.html @@ -1,4 +1,5 @@ ## mako +<%page expression_filter="h"/> <%namespace name='static' file='static_content.html'/> <%! from django.core.urlresolvers import reverse diff --git a/common/test/test_sites/test_site/templates/head-extra.html b/common/test/test_sites/test_site/templates/head-extra.html index 197662ceab..ae1242bb49 100644 --- a/common/test/test_sites/test_site/templates/head-extra.html +++ b/common/test/test_sites/test_site/templates/head-extra.html @@ -1,3 +1,4 @@ +<%page expression_filter="h"/> <%namespace name='static' file='../../static_content.html'/> <% style_overrides_file = static.get_value('css_overrides_file') %> diff --git a/common/test/test_sites/test_site/templates/login-sidebar.html b/common/test/test_sites/test_site/templates/login-sidebar.html index 79ebfa76a3..dcee7d3810 100644 --- a/common/test/test_sites/test_site/templates/login-sidebar.html +++ b/common/test/test_sites/test_site/templates/login-sidebar.html @@ -1,4 +1,5 @@ -<%! +<%page expression_filter="h"/> +<%! from django.utils.translation import ugettext as _ from django.core.urlresolvers import reverse %> diff --git a/common/test/test_sites/test_site/templates/register-sidebar.html b/common/test/test_sites/test_site/templates/register-sidebar.html index cbfb28dc1a..b8edbd2ba5 100644 --- a/common/test/test_sites/test_site/templates/register-sidebar.html +++ b/common/test/test_sites/test_site/templates/register-sidebar.html @@ -1,4 +1,5 @@ -<%! +<%page expression_filter="h"/> +<%! from django.utils.translation import ugettext as _ from django.core.urlresolvers import reverse %> diff --git a/common/test/test_sites/test_site/templates/static_templates/about.html b/common/test/test_sites/test_site/templates/static_templates/about.html index b23ad14f38..5dfbfaf7ad 100644 --- a/common/test/test_sites/test_site/templates/static_templates/about.html +++ b/common/test/test_sites/test_site/templates/static_templates/about.html @@ -1,3 +1,4 @@ +<%page expression_filter="h"/> <%! from django.core.urlresolvers import reverse %> <%namespace name='static' file='../../../static_content.html'/> diff --git a/common/test/test_sites/test_site/templates/static_templates/contact.html b/common/test/test_sites/test_site/templates/static_templates/contact.html index 749e9b8848..b5ea1dfa02 100644 --- a/common/test/test_sites/test_site/templates/static_templates/contact.html +++ b/common/test/test_sites/test_site/templates/static_templates/contact.html @@ -1,3 +1,4 @@ +<%page expression_filter="h"/> <%inherit file="../main.html" /> <%namespace name='static' file='../static_content.html'/> <%! diff --git a/common/test/test_sites/test_site/templates/static_templates/copyright.html b/common/test/test_sites/test_site/templates/static_templates/copyright.html index 6f68955d62..7b42e773ce 100755 --- a/common/test/test_sites/test_site/templates/static_templates/copyright.html +++ b/common/test/test_sites/test_site/templates/static_templates/copyright.html @@ -1 +1,2 @@ +<%page expression_filter="h"/> This is a copyright page for an Open edX site. diff --git a/common/test/test_sites/test_site/templates/static_templates/faq.html b/common/test/test_sites/test_site/templates/static_templates/faq.html index fd1b0724df..c5eeca291b 100644 --- a/common/test/test_sites/test_site/templates/static_templates/faq.html +++ b/common/test/test_sites/test_site/templates/static_templates/faq.html @@ -1,3 +1,4 @@ +<%page expression_filter="h"/> <%inherit file="../main.html" /> <%namespace name='static' file='../static_content.html'/> <%! diff --git a/common/test/test_sites/test_site/templates/static_templates/tos.html b/common/test/test_sites/test_site/templates/static_templates/tos.html index 52a4ee2849..1d918c2085 100644 --- a/common/test/test_sites/test_site/templates/static_templates/tos.html +++ b/common/test/test_sites/test_site/templates/static_templates/tos.html @@ -1,3 +1,4 @@ +<%page expression_filter="h"/> <%inherit file="../main.html" /> <%namespace name='static' file='../static_content.html'/> <%! diff --git a/lms/templates/shoppingcart/test/fake_payment_error.html b/lms/templates/shoppingcart/test/fake_payment_error.html index fcfe21ed15..2082faf3f0 100644 --- a/lms/templates/shoppingcart/test/fake_payment_error.html +++ b/lms/templates/shoppingcart/test/fake_payment_error.html @@ -1,3 +1,4 @@ +<%page expression_filter="h"/> Payment Error diff --git a/lms/templates/shoppingcart/test/fake_payment_page.html b/lms/templates/shoppingcart/test/fake_payment_page.html index 8b870e4a09..e3a237a7c1 100644 --- a/lms/templates/shoppingcart/test/fake_payment_page.html +++ b/lms/templates/shoppingcart/test/fake_payment_page.html @@ -1,3 +1,4 @@ +<%page expression_filter="h"/> Payment Form From 1ab92ee9f24286115e720af06e2f8fa7a65e7aeb Mon Sep 17 00:00:00 2001 From: Uman Shahzad Date: Thu, 30 Nov 2017 04:55:11 +0500 Subject: [PATCH 2/2] Fix an introduced xsslint issue. --- .../test/test_sites/test_site/templates/courseware/tabs.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/test/test_sites/test_site/templates/courseware/tabs.html b/common/test/test_sites/test_site/templates/courseware/tabs.html index ea2970c8a2..cdcc96b1ee 100644 --- a/common/test/test_sites/test_site/templates/courseware/tabs.html +++ b/common/test/test_sites/test_site/templates/courseware/tabs.html @@ -1,11 +1,10 @@ ## mako -<%page expression_filter="h"/> <%namespace name='static' file='/static_content.html'/> <%! from django.utils.translation import ugettext as _ from django.core.urlresolvers import reverse %> -<%page args="tab_list, active_page, default_tab, tab_image" /> +<%page args="tab_list, active_page, default_tab, tab_image" expression_filter="h" /> <% def url_class(is_active):