diff --git a/.gitignore b/.gitignore index 6bde768..0276b50 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ nosetests.xml # Media & Static media /staticfiles/* +db/static/bower_components/ \ No newline at end of file diff --git a/db/settings/base.py b/db/settings/base.py index 0a2f9da..7e09a5a 100644 --- a/db/settings/base.py +++ b/db/settings/base.py @@ -19,11 +19,17 @@ THIRD_PARTY_APPS = ( 'allauth.account', 'crispy_forms', 'compressor', + 'djangobower', ) LOCAL_APPS = ( 'db.base', 'db.api', ) +BOWER_INSTALLED_APPS = ( + 'underscore', + 'backbone', + 'd3#3.5.17', +) INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS # Middlware @@ -100,12 +106,16 @@ STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', 'compressor.finders.CompressorFinder', + 'djangobower.finders.BowerFinder', ) MEDIA_ROOT = path.join(BASE_DIR, 'media') MEDIA_URL = '/media/' CRISPY_TEMPLATE_PACK = 'bootstrap3' SATELLITE_DEFAULT_IMAGE = '/static/img/sat.png' +# Django-Bower +BOWER_COMPONENTS_ROOT = path.join(BASE_DIR, 'static') + # App conf ROOT_URLCONF = 'db.urls' WSGI_APPLICATION = 'db.wsgi.application' diff --git a/db/templates/base.html b/db/templates/base.html index dd997b9..891b883 100644 --- a/db/templates/base.html +++ b/db/templates/base.html @@ -112,6 +112,9 @@ {% compress js %} + + + {% block javascript %} {% endblock javascript %}