From 3e7a742177232c78932c75240a4fdf5bd942a9b5 Mon Sep 17 00:00:00 2001
From: Tyler Hallada <thallada@edx.org>
Date: Tue, 6 Feb 2018 10:56:05 -0500
Subject: [PATCH] Fix integration of accessibility policy page
---
cms/templates/accessibility.html | 9 ++++++++-
cms/templates/asset_index.html | 2 +-
.../pipeline_mako/templates/static_content.html | 7 ++++---
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/cms/templates/accessibility.html b/cms/templates/accessibility.html
index ce495876d58..6270a52bb05 100644
--- a/cms/templates/accessibility.html
+++ b/cms/templates/accessibility.html
@@ -12,13 +12,20 @@
<%namespace name='static' file='static_content.html'/>
+<%block name="header_extras">
+ % if not settings.STUDIO_FRONTEND_CONTAINER_URL:
+ <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/vendor.min.css')}" />
+ <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/accessibilityPolicy.min.css')}" />
+ % endif
+</%block>
+
<%block name="content">
<div class="wrapper-content wrapper">
<div class="content">
<div class="content-primary">
<div id="root"></div>
- <%static:studiofrontend page="AccessibilityPage">
+ <%static:studiofrontend entry="accessibilityPolicy">
{
"lang": "${language_code | n, js_escaped_string}",
}
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 179f6e0102e..79550059548 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -65,7 +65,7 @@
<div class="content">
<%static:optional_include_mako file="asset_index_content_header.html" />
% if waffle_flag_enabled:
- <%static:studiofrontend page="AssetsPage">
+ <%static:studiofrontend entry="assets">
{
"lang": "${language_code | n, js_escaped_string}",
"course": {
diff --git a/common/djangoapps/pipeline_mako/templates/static_content.html b/common/djangoapps/pipeline_mako/templates/static_content.html
index 182565e3adb..0638d899c18 100644
--- a/common/djangoapps/pipeline_mako/templates/static_content.html
+++ b/common/djangoapps/pipeline_mako/templates/static_content.html
@@ -89,7 +89,8 @@ engine = Engine(dirs=settings.DEFAULT_TEMPLATE_ENGINE['DIRS'])
source, template_path = Loader(engine).load_template_source(path)
%>${source | n, decode.utf8}</%def>
-<%def name="studiofrontend(page)">
+<%def name="studiofrontend(entry)">
+>>>>>>> 2b8c5a14e8... Fix integration of accessibility policy page
<%doc>
Loads a studio-frontend page, with the necessary context. Context is expected
as a dictionary in the body of this tag.
@@ -107,11 +108,11 @@ source, template_path = Loader(engine).load_template_source(path)
</script>
<div id="root"></div>
% if settings.STUDIO_FRONTEND_CONTAINER_URL:
- <script type="text/javascript" src="${settings.STUDIO_FRONTEND_CONTAINER_URL}/assets.js"></script>
+ <script type="text/javascript" src="${settings.STUDIO_FRONTEND_CONTAINER_URL}/${entry}.js"></script>
% else:
<script type="text/javascript" src="${url('common/js/vendor/manifest.min.js')}"></script>
<script type="text/javascript" src="${url('common/js/vendor/vendor.min.js')}"></script>
- <script type="text/javascript" src="${url('common/js/vendor/assets.min.js')}"></script>
+ <script type="text/javascript" src="${url('common/js/vendor/{}.min.js'.format(entry))}"></script>
% endif
</%def>
--
GitLab