From 5915532a5784e8cfd97f1f0c43e11d2d95227d65 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Mon, 23 Jul 2012 10:40:13 -0400
Subject: [PATCH] Consolidate code used for disabling USE_DJANGO_PIPELINE
feature
---
cms/templates/base.html | 9 --------
.../templates/static_content.html | 22 +++++++++++++++++--
lms/templates/courseware.html | 9 --------
lms/templates/main.html | 21 ------------------
4 files changed, 20 insertions(+), 41 deletions(-)
diff --git a/cms/templates/base.html b/cms/templates/base.html
index 935917b11a8..92f37c0a513 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -6,11 +6,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- % if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
<%static:css group='base-style'/>
- % else:
- <link rel="stylesheet" href="${static.url('css/base-style.css')}">
- % endif
<link rel="stylesheet" type="text/css" href="${static.url('js/vendor/markitup/skins/simple/style.css')}" />
<link rel="stylesheet" type="text/css" href="${static.url('js/vendor/markitup/sets/wiki/style.css')}" />
<title><%block name="title"></%block></title>
@@ -27,12 +23,7 @@
<script type="text/javascript" src="${static.url('js/vendor/backbone-min.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/markitup/jquery.markitup.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/markitup/sets/wiki/set.js')}"></script>
- % if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
<%static:js group='main'/>
- % else:
- <script src="${ STATIC_URL }/js/main.js"></script>
- % endif
-
<%static:js group='module-js'/>
<script src="${static.url('js/vendor/jquery.inlineedit.js')}"></script>
<script src="${static.url('js/vendor/jquery.cookie.js')}"></script>
diff --git a/common/djangoapps/pipeline_mako/templates/static_content.html b/common/djangoapps/pipeline_mako/templates/static_content.html
index 00c2c4dff47..225e3e0542e 100644
--- a/common/djangoapps/pipeline_mako/templates/static_content.html
+++ b/common/djangoapps/pipeline_mako/templates/static_content.html
@@ -5,6 +5,24 @@ from static_replace import replace_urls
%>
<%def name='url(file)'>${staticfiles_storage.url(file)}</%def>
-<%def name='css(group)'>${compressed_css(group)}</%def>
-<%def name='js(group)'>${compressed_js(group)}</%def>
+
+<%def name='css(group)'>
+ % if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
+ ${compressed_css(group)}
+ % else:
+ % for filename in settings.PIPELINE_CSS[group]['source_filenames']:
+ <link rel="stylesheet" href="${staticfiles_storage.url(filename.replace('.scss', '.css'))}" type="text/css" media="all" / >
+ % endfor
+ %endif
+</%def>
+<%def name='js(group)'>
+ % if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
+ ${compressed_js(group)}
+ % else:
+ % for filename in settings.PIPELINE_JS[group]['source_filenames']:
+ <script type="text/javascript" src="${staticfiles_storage.url(filename.replace('.coffee', '.js'))}"></script>
+ % endfor
+ %endif
+</%def>
+
<%def name='replace_urls(text)'>${replace_urls(text)}</%def>
diff --git a/lms/templates/courseware.html b/lms/templates/courseware.html
index 1a72a6eab70..29178374fe5 100644
--- a/lms/templates/courseware.html
+++ b/lms/templates/courseware.html
@@ -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>
diff --git a/lms/templates/main.html b/lms/templates/main.html
index 7c9d291bf1f..b8bac37dd24 100644
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -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>
--
GitLab