Skip to content

E
edx-platform
Commit 3deba900 by Calen Pennington
Options

Move vendor javascript into common/static/js/vendor, so that they can be shared… 

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware
parent d9643a4c
Showing with 3 additions and 5 deletions

Too many changes to show.
Plain diff Email patch

To preserve performance only 1000 of 1000+ files are displayed.

cms/envs/common.py
...@@ -61,6 +61,7 @@ MAKO_MODULE_DIR = tempfile.mkdtemp('mako') ...@@ -61,6 +61,7 @@ MAKO_MODULE_DIR = tempfile.mkdtemp('mako')
MAKO_TEMPLATES = {} MAKO_TEMPLATES = {}
MAKO_TEMPLATES['main'] = [ MAKO_TEMPLATES['main'] = [
PROJECT_ROOT / 'templates', PROJECT_ROOT / 'templates',
COMMON_ROOT / 'templates',
COMMON_ROOT / 'djangoapps' / 'pipeline_mako' / 'templates' COMMON_ROOT / 'djangoapps' / 'pipeline_mako' / 'templates'
] ]
...@@ -147,9 +148,8 @@ STATIC_URL = '/static/' ...@@ -147,9 +148,8 @@ STATIC_URL = '/static/'
ADMIN_MEDIA_PREFIX = '/static/admin/' ADMIN_MEDIA_PREFIX = '/static/admin/'
STATIC_ROOT = ENV_ROOT / "staticfiles" STATIC_ROOT = ENV_ROOT / "staticfiles"
# FIXME: We should iterate through the courses we have, adding the static
# contents for each of them. (Right now we just use symlinks.)
STATICFILES_DIRS = [ STATICFILES_DIRS = [
('js/vendor', COMMON_ROOT / "static" / "js" / "vendor"),
PROJECT_ROOT / "static", PROJECT_ROOT / "static",
# This is how you would use the textbook images locally # This is how you would use the textbook images locally
......
cms/templates/base.html
...@@ -18,10 +18,8 @@ ...@@ -18,10 +18,8 @@
<body> <body>
<%include file="widgets/header.html"/> <%include file="widgets/header.html"/>
<%include file="courseware_vendor_js.html"/>
<script type="text/javascript" src="${static.url('js/vendor/jquery.min.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/jquery-ui.min.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/jquery.qtip.min.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/json2.js')}"></script> <script type="text/javascript" src="${static.url('js/vendor/json2.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/underscore-min.js')}"></script> <script type="text/javascript" src="${static.url('js/vendor/underscore-min.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/backbone-min.js')}"></script> <script type="text/javascript" src="${static.url('js/vendor/backbone-min.js')}"></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment