Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #11910 from edx/ned/safe-templates-1

Browse Source 
Safe templates for static_templates
This commit is contained in:
Ned Batchelder
2016-03-23 20:36:43 -04:00
parent 40ef82d513 e53e5d9d03
commit 69339390c7
18 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/templates/static_templates/404.html
View File

@@ -1,12 +1,18 @@
<%page expression_filter="h"/>
<%namespace name='static' file='../static_content.html'/>
<%! from django.utils.translation import ugettext as _ %>
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
%>
<%inherit file="../main.html" />
<%block name="pagetitle">${_("Page Not Found")}</%block>
<section class="outside-app">
<h1>${_("Page not found")}</h1>
<p>${_('The page that you were looking for was not found. Go back to the {link_start}homepage{link_end} or let us know about any pages that may have been moved at {email}.').format(
link_start='<a href="/">', link_end='</a>', email='<a href="mailto:{email}">{email}</a>'.format(email=static.get_tech_support_email_address())
<p>${Text(_('The page that you were looking for was not found. Go back to the {link_start}homepage{link_end} or let us know about any pages that may have been moved at {email}.')).format(
link_start=HTML('<a href="/">'),
link_end=HTML('</a>'),
email=HTML('<a href="mailto:{email}">{email}</a>').format(email=Text(static.get_tech_support_email_address()))
)}</p>
</section>

1
lms/templates/static_templates/about.html
View File

@@ -1,3 +1,4 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%inherit file="../main.html" />

1
lms/templates/static_templates/blog.html
View File

@@ -1,3 +1,4 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%inherit file="../main.html" />

1
lms/templates/static_templates/contact.html
View File

@@ -1,3 +1,4 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%inherit file="../main.html" />

1
lms/templates/static_templates/donate.html
View File

@@ -1,3 +1,4 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%inherit file="../main.html" />

12
lms/templates/static_templates/embargo.html
View File

@@ -1,16 +1,20 @@
<%! from django.utils.translation import ugettext as _ %>
<%page expression_filter="h"/>
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
%>
<%inherit file="../main.html" />
<%block name="pagetitle">${_("This Course Unavailable In Your Country")}</%block>
<section class="outside-app">
<p>
${_("Our system indicates that you are trying to access this {platform_name} "
${Text(_("Our system indicates that you are trying to access this {platform_name} "
"course from a country or region currently subject to U.S. economic and trade "
"sanctions. Unfortunately, at this time {platform_name} must comply with "
"export controls, and we cannot allow you to access this course."
).format(
platform_name=settings.PLATFORM_NAME,
)).format(
platform_name=Text(settings.PLATFORM_NAME),
)}
</p>
</section>

1
lms/templates/static_templates/faq.html
View File

@@ -1,3 +1,4 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%inherit file="../main.html" />

1
lms/templates/static_templates/help.html
View File

@@ -1,3 +1,4 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%inherit file="../main.html" />

1
lms/templates/static_templates/honor.html
View File

@@ -1,3 +1,4 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%inherit file="../main.html" />

1
lms/templates/static_templates/jobs.html
View File

@@ -1,3 +1,4 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%inherit file="../main.html" />

1
lms/templates/static_templates/media-kit.html
View File

@@ -1,3 +1,4 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%inherit file="../main.html" />

1
lms/templates/static_templates/news.html
View File

@@ -1,3 +1,4 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%inherit file="../main.html" />

1
lms/templates/static_templates/press.html
View File

@@ -1,3 +1,4 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%inherit file="../main.html" />

1
lms/templates/static_templates/privacy.html
View File

@@ -1,3 +1,4 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%inherit file="../main.html" />

16
lms/templates/static_templates/server-down.html
View File

@@ -1,15 +1,19 @@
<%! from django.utils.translation import ugettext as _ %>
<%page expression_filter="h"/>
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
%>
<%inherit file="../main.html" />
<section class="outside-app">
<h1>
${_("Currently the {platform_name} servers are down").format(
platform_name=u"<em>{}</em>".format(settings.PLATFORM_NAME)
${Text(_("Currently the {platform_name} servers are down")).format(
platform_name=HTML(u"<em>{}</em>").format(Text(settings.PLATFORM_NAME))
)}
</h1>
<p>
${_("Our staff is currently working to get the site back up as soon as possible. "
"Please email us at {tech_support_email} to report any problems or downtime.").format(
tech_support_email=u"<a href=\"mailto:{0}\">{0}</a>".format(settings.TECH_SUPPORT_EMAIL)
${Text(_("Our staff is currently working to get the site back up as soon as possible. "
"Please email us at {tech_support_email} to report any problems or downtime.")).format(
tech_support_email=HTML('<a href="mailto:{0}">{0}</a>').format(Text(settings.TECH_SUPPORT_EMAIL))
)}</p>
</section>

16
lms/templates/static_templates/server-error.html
View File

@@ -1,17 +1,21 @@
<%page expression_filter="h"/>
<%namespace name='static' file='../static_content.html'/>
<%! from django.utils.translation import ugettext as _ %>
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
%>
<%inherit file="../main.html" />
<section class="outside-app">
<h1>
${_(u"There has been a 500 error on the {platform_name} servers").format(
platform_name=u"<em>{platform_name}</em>".format(platform_name=static.get_platform_name())
${Text(_(u"There has been a 500 error on the {platform_name} servers")).format(
platform_name=HTML("<em>{platform_name}</em>").format(platform_name=Text(static.get_platform_name()))
)}
</h1>
<p>
${_(u'Please wait a few seconds and then reload the page. If the problem persists, please email us at {email}.').format(
email=u'<a href="mailto:{email}">{email}</a>'.format(
email=static.get_tech_support_email_address()
${Text(_('Please wait a few seconds and then reload the page. If the problem persists, please email us at {email}.')).format(
email=HTML('<a href="mailto:{email}">{email}</a>').format(
email=Text(static.get_tech_support_email_address())
)
)}
</p>

16
lms/templates/static_templates/server-overloaded.html
View File

@@ -1,16 +1,20 @@
<%! from django.utils.translation import ugettext as _ %>
<%page expression_filter="h"/>
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
%>
<%inherit file="../main.html" />
<section class="outside-app">
<h1>
${_("Currently the {platform_name} servers are overloaded").format(
platform_name=u"<em>{}</em>".format(platform_name=settings.PLATFORM_NAME)
${Text(_("Currently the {platform_name} servers are overloaded")).format(
platform_name=HTML("<em>{}</em>").format(platform_name=Text(settings.PLATFORM_NAME))
)}
</h1>
<p>
${_("Our staff is currently working to get the site back up as soon as possible. "
"Please email us at {tech_support_email} to report any problems or downtime.").format(
tech_support_email=u"<a href=\"mailto:{0}\">{0}</a>".format(tech_support_email=settings.TECH_SUPPORT_EMAIL)
${Text(_("Our staff is currently working to get the site back up as soon as possible. "
"Please email us at {tech_support_email} to report any problems or downtime.")).format(
tech_support_email=HTML('<a href="mailto:{0}">{0}</a>').format(tech_support_email=Text(settings.TECH_SUPPORT_EMAIL))
)}
</p>
</section>

1
lms/templates/static_templates/tos.html
View File

@@ -1,3 +1,4 @@
<%page expression_filter="h"/>
<%! from django.utils.translation import ugettext as _ %>
<%inherit file="../main.html" />