Commit 1fce1dbe by Calen Pennington

Make sure that django-pipelined css and js don't collide between the cms and lms

parent 395cf147
...@@ -243,7 +243,7 @@ with open(module_styles_path, 'w') as module_styles: ...@@ -243,7 +243,7 @@ with open(module_styles_path, 'w') as module_styles:
PIPELINE_CSS = { PIPELINE_CSS = {
'base-style': { 'base-style': {
'source_filenames': ['sass/base-style.scss'], 'source_filenames': ['sass/base-style.scss'],
'output_filename': 'css/base-style.css', 'output_filename': 'css/cms-base-style.css',
}, },
} }
...@@ -260,15 +260,15 @@ PIPELINE_JS = { ...@@ -260,15 +260,15 @@ PIPELINE_JS = {
for pth for pth
in glob2.glob(PROJECT_ROOT / 'static/coffee/src/**/*.coffee') in glob2.glob(PROJECT_ROOT / 'static/coffee/src/**/*.coffee')
], ],
'output_filename': 'js/application.js', 'output_filename': 'js/cms-application.js',
}, },
'module-js': { 'module-js': {
'source_filenames': module_js_sources, 'source_filenames': module_js_sources,
'output_filename': 'js/modules.js', 'output_filename': 'js/cms-modules.js',
}, },
'spec': { 'spec': {
'source_filenames': [pth.replace(PROJECT_ROOT / 'static/', '') for pth in glob2.glob(PROJECT_ROOT / 'static/coffee/spec/**/*.coffee')], 'source_filenames': [pth.replace(PROJECT_ROOT / 'static/', '') for pth in glob2.glob(PROJECT_ROOT / 'static/coffee/spec/**/*.coffee')],
'output_filename': 'js/spec.js' 'output_filename': 'js/cms-spec.js'
} }
} }
......
...@@ -301,15 +301,15 @@ STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage' ...@@ -301,15 +301,15 @@ STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
PIPELINE_CSS = { PIPELINE_CSS = {
'application': { 'application': {
'source_filenames': ['sass/application.scss'], 'source_filenames': ['sass/application.scss'],
'output_filename': 'css/application.css', 'output_filename': 'css/lms-application.css',
}, },
'course': { 'course': {
'source_filenames': ['sass/course.scss', 'js/vendor/CodeMirror/codemirror.css', 'css/vendor/jquery.treeview.css'], 'source_filenames': ['sass/course.scss', 'js/vendor/CodeMirror/codemirror.css', 'css/vendor/jquery.treeview.css'],
'output_filename': 'css/course.css', 'output_filename': 'css/lms-course.css',
}, },
'ie-fixes': { 'ie-fixes': {
'source_filenames': ['sass/ie.scss'], 'source_filenames': ['sass/ie.scss'],
'output_filename': 'css/ie.css', 'output_filename': 'css/lms-ie.css',
}, },
} }
...@@ -410,23 +410,23 @@ PIPELINE_JS = { ...@@ -410,23 +410,23 @@ PIPELINE_JS = {
'js/toggle_login_modal.js', 'js/toggle_login_modal.js',
'js/sticky_filter.js', 'js/sticky_filter.js',
], ],
'output_filename': 'js/application.js' 'output_filename': 'js/lms-application.js'
}, },
'courseware': { 'courseware': {
'source_filenames': [pth.replace(PROJECT_ROOT / 'static/', '') for pth in courseware_only_js], 'source_filenames': [pth.replace(PROJECT_ROOT / 'static/', '') for pth in courseware_only_js],
'output_filename': 'js/courseware.js' 'output_filename': 'js/lms-courseware.js'
}, },
'main_vendor': { 'main_vendor': {
'source_filenames': main_vendor_js, 'source_filenames': main_vendor_js,
'output_filename': 'js/main_vendor.js', 'output_filename': 'js/lms-main_vendor.js',
}, },
'module-js': { 'module-js': {
'source_filenames': module_js_sources, 'source_filenames': module_js_sources,
'output_filename': 'js/modules.js', 'output_filename': 'js/lms-modules.js',
}, },
'spec': { 'spec': {
'source_filenames': [pth.replace(PROJECT_ROOT / 'static/', '') for pth in glob2.glob(PROJECT_ROOT / 'static/coffee/spec/**/*.coffee')], 'source_filenames': [pth.replace(PROJECT_ROOT / 'static/', '') for pth in glob2.glob(PROJECT_ROOT / 'static/coffee/spec/**/*.coffee')],
'output_filename': 'js/spec.js' 'output_filename': 'js/lms-spec.js'
} }
} }
......
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