Mercurial > public > madeira

comparison mysite/urls.py @ 26:efb2da0b5d10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging the django1.3 branch into trunk.
author Brian Neal <bgneal@gmail.com>
date Wed, 30 Mar 2011 00:16:32 +0000
parents 0dcfcdf50c62
children 903260593491
comparison
equal deleted inserted replaced
21:f3052378ab47 26:efb2da0b5d10
4 4
5 admin.autodiscover() 5 admin.autodiscover()
6 6
7 urlpatterns = patterns('', 7 urlpatterns = patterns('',
8 (r'^', include('mysite.band.urls')), 8 (r'^', include('mysite.band.urls')),
9 (r'^admin/doc/', include('django.contrib.admindocs.urls')),
9 (r'^admin/', include(admin.site.urls)), 10 (r'^admin/', include(admin.site.urls)),
10 (r'^photologue/', include('mysite.photologue.urls')), 11 (r'^photologue/', include('mysite.photologue.urls')),
11 ) 12 )
12 13
13 if settings.DEBUG: 14 if settings.DEBUG:
14 urlpatterns += patterns('', 15 urlpatterns += patterns('',
15 (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), 16 (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
16 ) 17 )