|
|
@@ -1,18 +1,20 @@
|
|
1
|
|
-from django.conf.urls.defaults import *
|
|
|
1
|
+from django.conf.urls.defaults import patterns, url, include
|
|
2
|
2
|
from django.conf import settings
|
|
3
|
3
|
from django.contrib import admin
|
|
4
|
4
|
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
|
|
5
|
5
|
from django.conf.urls.static import static
|
|
6
|
6
|
from django.views.generic import TemplateView
|
|
7
|
7
|
|
|
8
|
|
-from oscar.app import shop
|
|
|
8
|
+from apps.app import application
|
|
|
9
|
+
|
|
|
10
|
+# These need to be imported into this namespace
|
|
9
|
11
|
from oscar.views import handler500, handler404
|
|
10
|
12
|
|
|
11
|
13
|
admin.autodiscover()
|
|
12
|
14
|
|
|
13
|
15
|
urlpatterns = patterns('',
|
|
14
|
16
|
(r'^admin/', include(admin.site.urls)),
|
|
15
|
|
- (r'', include(shop.urls)),
|
|
|
17
|
+ (r'', include(application.urls)),
|
|
16
|
18
|
)
|
|
17
|
19
|
|
|
18
|
20
|
if settings.DEBUG:
|