projects
/
cascardo
/
ema.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replacing the word lecturer by speaker (suggested by cascardo)
[cascardo/ema.git]
/
urls.py
diff --git
a/urls.py
b/urls.py
index
572767b
..
6a1d60c
100644
(file)
--- a/
urls.py
+++ b/
urls.py
@@
-1,6
+1,14
@@
from django.conf.urls.defaults import *
from django.conf.urls.defaults import *
+from django.conf import settings
+
+MEDIA = {'document_root': settings.INSTANCE('media')}
urlpatterns = patterns('',
(r'^admin/', include('django.contrib.admin.urls')),
urlpatterns = patterns('',
(r'^admin/', include('django.contrib.admin.urls')),
+ (r'^', include('ema.eventos.urls')),
(r'^', include('diario.urls.entries')),
(r'^', include('diario.urls.entries')),
+
+ # static media
+ (r'^(?P<path>imgs/.*)$', 'django.views.static.serve', MEDIA),
+ (r'^(?P<path>css/.*)$', 'django.views.static.serve', MEDIA),
)
)