Commit 111a4566 by Usman Khalid

Use settings.PIPELINE_ENABLED instead of settings.FEATURES[USE_DJANGO_PIPELINE].

parent dbcd1bf4
...@@ -62,8 +62,6 @@ from xmodule.mixin import LicenseMixin ...@@ -62,8 +62,6 @@ from xmodule.mixin import LicenseMixin
STUDIO_NAME = "Studio" STUDIO_NAME = "Studio"
STUDIO_SHORT_NAME = "Studio" STUDIO_SHORT_NAME = "Studio"
FEATURES = { FEATURES = {
'USE_DJANGO_PIPELINE': True,
'GITHUB_PUSH': False, 'GITHUB_PUSH': False,
# for consistency in user-experience, keep the value of the following 3 settings # for consistency in user-experience, keep the value of the following 3 settings
......
...@@ -22,7 +22,7 @@ except: ...@@ -22,7 +22,7 @@ except:
group = rtl_group group = rtl_group
%> %>
% if settings.FEATURES['USE_DJANGO_PIPELINE']: % if settings.PIPELINE_ENABLED:
${compressed_css(group, raw=raw)} ${compressed_css(group, raw=raw)}
% else: % else:
% for filename in settings.PIPELINE_CSS[group]['source_filenames']: % for filename in settings.PIPELINE_CSS[group]['source_filenames']:
...@@ -32,7 +32,7 @@ except: ...@@ -32,7 +32,7 @@ except:
</%def> </%def>
<%def name='js(group)'> <%def name='js(group)'>
% if settings.FEATURES['USE_DJANGO_PIPELINE']: % if settings.PIPELINE_ENABLED:
${compressed_js(group)} ${compressed_js(group)}
% else: % else:
% for filename in settings.PIPELINE_JS[group]['source_filenames']: % for filename in settings.PIPELINE_JS[group]['source_filenames']:
......
...@@ -64,8 +64,6 @@ DISCUSSION_SETTINGS = { ...@@ -64,8 +64,6 @@ DISCUSSION_SETTINGS = {
# Features # Features
FEATURES = { FEATURES = {
'USE_DJANGO_PIPELINE': True,
'DISPLAY_DEBUG_INFO_TO_STAFF': True, 'DISPLAY_DEBUG_INFO_TO_STAFF': True,
'DISPLAY_HISTOGRAMS_TO_STAFF': False, # For large courses this slows down courseware access for staff. 'DISPLAY_HISTOGRAMS_TO_STAFF': False, # For large courses this slows down courseware access for staff.
......
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