summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas NOEL <tnoel@entrouvert.com>2012-04-29 14:59:01 (GMT)
committerThomas NOEL <tnoel@entrouvert.com>2012-04-29 14:59:01 (GMT)
commit419abfc0e05afe6d120fb4c658157778c07b11ac (patch)
treeafa290743fc80dd2af4ab78eea940e17637980bb
parentaf814c77d845b3b59d3f750470c047ab0a1c4ee0 (diff)
downloadsurveillao-419abfc0e05afe6d120fb4c658157778c07b11ac.zip
surveillao-419abfc0e05afe6d120fb4c658157778c07b11ac.tar.gz
surveillao-419abfc0e05afe6d120fb4c658157778c07b11ac.tar.bz2
use static filesHEADmaster
-rw-r--r--settings.py6
-rw-r--r--urls.py4
2 files changed, 6 insertions, 4 deletions
diff --git a/settings.py b/settings.py
index 49c6761..0860181 100644
--- a/settings.py
+++ b/settings.py
@@ -56,10 +56,7 @@ MEDIA_ROOT = ''
# Examples: "http://media.lawrence.com", "http://example.com/media/"
MEDIA_URL = ''
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
+STATIC_URL = '/static/'
# Make this unique, and don't share it with anybody.
SECRET_KEY = 'zfo3_!k*ypj=2v)pte6(&_7=6up#fr@gpa-=t#%4vtsq%gre%s'
@@ -96,5 +93,6 @@ INSTALLED_APPS = (
'django.contrib.messages',
'django.contrib.admin',
'django.contrib.admindocs',
+ 'django.contrib.staticfiles',
'base',
)
diff --git a/urls.py b/urls.py
index b54842c..8d6da15 100644
--- a/urls.py
+++ b/urls.py
@@ -15,3 +15,7 @@ urlpatterns = patterns('',
(r'^all.atom$', AoFeed()),
(r'^mark.atom$', AoFeedMark()),
)
+
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+urlpatterns += staticfiles_urlpatterns()
+