Skip to content
Snippets Groups Projects

Development

Merged Development
development into master
Merged Andreas Böttger requested to merge development into master
Compare
and
3 files
+ 108
− 46
Compare changes
  • Side-by-side
  • Inline
Files
3
config/base.py
+ 9
− 4
@@ -196,10 +196,15 @@ STATIC_URL = '/static/'
# Extra places for collectstatic to find static files.
STATICFILES_DIRS = (
os.path.join(PROJECT_ROOT, 'static'),
os.path.join(PROJECT_ROOT, '..', 'templates', 'reader', 'de', 'abb'),
os.path.join(PROJECT_ROOT, '..', 'templates', 'reader', 'ar', 'abb'),
os.path.join(PROJECT_ROOT, '..', 'templates', 'reader', 'fa', 'abb'),
os.path.join(PROJECT_ROOT, '..', 'templates', 'reader', 'en', 'abb'),
os.path.join(PROJECT_ROOT, '..', 'templates'),
# os.path.join(PROJECT_ROOT, '..', 'templates', 'reader', 'de', 'abb'),
# os.path.join(PROJECT_ROOT, '..', 'templates', 'reader', 'ar', 'abb'),
# os.path.join(PROJECT_ROOT, '..', 'templates', 'reader', 'fa', 'abb'),
# os.path.join(PROJECT_ROOT, '..', 'templates', 'reader', 'en', 'abb'),
# os.path.join(PROJECT_ROOT, '..', 'templates', 'studyreader', 'de', 'abb'),
# os.path.join(PROJECT_ROOT, '..', 'templates', 'studyreader', 'ar', 'abb'),
# os.path.join(PROJECT_ROOT, '..', 'templates', 'studyreader', 'fa', 'abb'),
# os.path.join(PROJECT_ROOT, '..', 'templates', 'studyreader', 'en', 'abb'),
)
# Simplified static file serving.