Commit 51a0f014 authored by Andreas Böttger's avatar Andreas Böttger 😬
Browse files

Merge branch 'development' into '6-urls-der-bilder-in-den-gitbooks'

Development

See merge request !20
parents 895cd52f 6177a6b6
Pipeline #33319 canceled with stages
in 2 minutes and 27 seconds
......@@ -103,7 +103,6 @@ build_pages:
if [ -f book.json ]; then cat book.json; fi;
gitbook install;
gitbook build;
mkdir -p ./templates/studyreader
)
- mv ./_raw/study-book/_book ./templates/studyreader
......
......@@ -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.
......
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