equal
deleted
inserted
replaced
|
1 from django.conf import settings |
1 from django.conf.urls import patterns, include, url |
2 from django.conf.urls import patterns, include, url |
|
3 from django.conf.urls.static import static |
|
4 from django.contrib import admin |
2 |
5 |
3 import qrurls.urls |
6 import qrurls.urls |
4 |
7 |
5 from django.contrib import admin |
|
6 admin.autodiscover() |
8 admin.autodiscover() |
7 |
9 |
8 urlpatterns = patterns('', |
10 urlpatterns = patterns('', |
9 # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), |
11 # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), |
10 url(r'^admin/', include(admin.site.urls)), |
12 url(r'^admin/', include(admin.site.urls)), |
12 |
14 |
13 # Default. |
15 # Default. |
14 url(r'^', include(qrurls.urls.urlpatterns)), |
16 url(r'^', include(qrurls.urls.urlpatterns)), |
15 ) |
17 ) |
16 |
18 |
|
19 if settings.DEBUG: |
|
20 # MEDIA |
|
21 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) |
17 |
22 |