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

Consolidate code used for disabling USE_DJANGO_PIPELINE feature

Browse Source
This commit is contained in:
Calen Pennington
2012-07-23 10:40:13 -04:00
parent 5dd4e19c0b
commit 5915532a57
4 changed files with 20 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lms/templates/courseware.html
View File

@@ -24,16 +24,7 @@
<script type="text/javascript" src="${static.url('js/schematic.js')}"></script>
% if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
<%static:js group='courseware'/>
% endif
% if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
% for jsfn in [ '/static/%s' % x.replace('.coffee','.js') for x in settings.PIPELINE_JS['courseware']['source_filenames'] ]:
<script type="text/javascript" src="${jsfn}"></script>
% endfor
% endif
<%include file="mathjax_include.html" />
</%block>

21
lms/templates/main.html
View File

@@ -8,34 +8,13 @@
<link href='http://fonts.googleapis.com/css?family=Open+Sans:800italic,400,800' rel='stylesheet' type='text/css'>
% if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
<%static:css group='application'/>
<!--[if lt IE 9]>
<%static:css group='ie-fixes'/>
<![endif]-->
% endif
% if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
<link rel="stylesheet" href="/static/sass/application.css" type="text/css" media="all" / >
<!--[if lt IE 9]>
<link rel="stylesheet" href="/static/sass/ie.css" type="text/css" media="all" / >
<![endif]-->
% endif
% if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
<%static:js group='main_vendor'/>
<%static:js group='application'/>
% endif
% if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
% for jsfn in [ '/static/%s' % x.replace('.coffee','.js') for x in settings.PIPELINE_JS['main_vendor']['source_filenames'] ]:
<script type="text/javascript" src="${jsfn}"></script>
% endfor
% for jsfn in [ '/static/%s' % x.replace('.coffee','.js') for x in settings.PIPELINE_JS['application']['source_filenames'] ]:
<script type="text/javascript" src="${jsfn}"></script>
% endfor
% endif
<!--[if lt IE 9]>
<script src="${static.url('js/html5shiv.js')}"></script>