Collectstatic failed in production when comprehensive theme contained custom css files. This patch fixes that problem by removing ComprehensiveThemeFinder from STATICFILES_FINDERS and ComprehensiveThemingAware mixin from STATICFILES_STORAGE. Comprehensive theme static dirs are added to the top of the STATICFILES_DIRS entry, which means that the default django FilesystemFinder will find theme static files, and since the theme folder is at the top of STATICFILES_DIRS, theme files will take precedence over default LMS/CMS static files. This change means that theme static file URLs are no longer prefixed with themes/<theme-name>/, but since we currently only support one comprehensive theme at a time, that shouldn't be a problem. If/when we want to make the choice of a theme dynamic per-request (microsites?), we will have to bring custom theme finders and storage mixins back, but for now, we don't need them.
Name |
Last commit
|
Last update |
---|---|---|
.tx | Loading commit data... | |
cms | Loading commit data... | |
common | Loading commit data... | |
conf/locale | Loading commit data... | |
docs | Loading commit data... | |
lms | Loading commit data... | |
openedx | Loading commit data... | |
pavelib | Loading commit data... | |
requirements | Loading commit data... | |
scripts | Loading commit data... | |
static | Loading commit data... | |
test_root | Loading commit data... | |
themes | Loading commit data... | |
vendor_extra/tinymce | Loading commit data... | |
.coveragerc | Loading commit data... | |
.gitattributes | Loading commit data... | |
.gitignore | Loading commit data... | |
.jshintignore | Loading commit data... | |
.jshintrc | Loading commit data... | |
.ruby-gemset | Loading commit data... | |
.ruby-version | Loading commit data... | |
AUTHORS | Loading commit data... | |
CHANGELOG.rst | Loading commit data... | |
CONTRIBUTING.rst | Loading commit data... | |
Gemfile | Loading commit data... | |
Gemfile.lock | Loading commit data... | |
LICENSE | Loading commit data... | |
README.rst | Loading commit data... | |
circle.yml | Loading commit data... | |
manage.py | Loading commit data... | |
package.json | Loading commit data... | |
pavement.py | Loading commit data... | |
pylintrc | Loading commit data... | |
pylintrc_tweaks | Loading commit data... | |
setup.cfg | Loading commit data... | |
setup.py | Loading commit data... |