Commit 7311c66eefc842cdb41468a9911b3b36976d3047
1 parent
02f3137a
Exists in
master
and in
32 other branches
Made it load custom static/templates first
Signed-off-by: Carlos Oliveira <carlospecter@gmail.com> Signed-off-by: Gust <darksshades@hotmail.com>
Showing
1 changed file
with
12 additions
and
12 deletions
Show diff stats
colab/settings.py
| @@ -222,14 +222,6 @@ AUTHENTICATION_BACKENDS = ( | @@ -222,14 +222,6 @@ AUTHENTICATION_BACKENDS = ( | ||
| 222 | 'colab.accounts.auth.ColabBrowserIDBackend', | 222 | 'colab.accounts.auth.ColabBrowserIDBackend', |
| 223 | ) | 223 | ) |
| 224 | 224 | ||
| 225 | -STATICFILES_DIRS = ( | ||
| 226 | - os.path.join(BASE_DIR, 'static'), | ||
| 227 | -) | ||
| 228 | - | ||
| 229 | -TEMPLATE_DIRS = ( | ||
| 230 | - os.path.join(BASE_DIR, 'templates'), | ||
| 231 | -) | ||
| 232 | - | ||
| 233 | LOCALE_PATHS = ( | 225 | LOCALE_PATHS = ( |
| 234 | os.path.join(BASE_DIR, 'locale'), | 226 | os.path.join(BASE_DIR, 'locale'), |
| 235 | ) | 227 | ) |
| @@ -317,8 +309,16 @@ for app_name, app in COLAB_APPS.items(): | @@ -317,8 +309,16 @@ for app_name, app in COLAB_APPS.items(): | ||
| 317 | if context_processor not in TEMPLATE_CONTEXT_PROCESSORS: | 309 | if context_processor not in TEMPLATE_CONTEXT_PROCESSORS: |
| 318 | TEMPLATE_CONTEXT_PROCESSORS += (context_processor,) | 310 | TEMPLATE_CONTEXT_PROCESSORS += (context_processor,) |
| 319 | 311 | ||
| 320 | -colab_templates = locals().get('COLAB_TEMPLATES') or {} | ||
| 321 | -colab_statics = locals().get('COLAB_STATICS') or {} | 312 | +colab_templates = locals().get('COLAB_TEMPLATES') or () |
| 313 | +colab_statics = locals().get('COLAB_STATICS') or [] | ||
| 322 | 314 | ||
| 323 | -TEMPLATE_DIRS += tuple(colab_templates) | ||
| 324 | -STATICFILES_DIRS += tuple(colab_statics) | 315 | +TEMPLATE_DIRS = tuple(colab_templates) |
| 316 | +STATICFILES_DIRS = list(colab_statics) | ||
| 317 | + | ||
| 318 | +STATICFILES_DIRS += [ | ||
| 319 | + os.path.join(BASE_DIR, 'static'), | ||
| 320 | +] | ||
| 321 | + | ||
| 322 | +TEMPLATE_DIRS += ( | ||
| 323 | + os.path.join(BASE_DIR, 'templates'), | ||
| 324 | +) |