summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--demo/urls.py19
-rw-r--r--fb/urls.py6
2 files changed, 14 insertions, 11 deletions
diff --git a/demo/urls.py b/demo/urls.py
index c732221..8879afc 100644
--- a/demo/urls.py
+++ b/demo/urls.py
@@ -1,16 +1,13 @@
from django.conf.urls.defaults import *
+from django.contrib import admin
+from django.http import HttpResponse
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
+admin.autodiscover()
urlpatterns = patterns('',
- # Example:
- # (r'^demo/', include('demo.foo.urls')),
-
- # Uncomment the admin/doc line below to enable admin documentation:
- # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
- # Uncomment the next line to enable the admin:
- # (r'^admin/', include(admin.site.urls)),
+ (r'^$', lambda r: HttpResponse("demo base", mimetype="text/plain")),
+
+ (r'^fb/', include('fb.urls')),
+ (r'^admin/doc/', include('django.contrib.admindocs.urls')),
+ (r'^admin/', include(admin.site.urls)),
)
diff --git a/fb/urls.py b/fb/urls.py
new file mode 100644
index 0000000..6334fa1
--- /dev/null
+++ b/fb/urls.py
@@ -0,0 +1,6 @@
+from django.conf.urls.defaults import *
+from django.http import HttpResponse
+
+urlpatterns = patterns('',
+ (r'^$', lambda r: HttpResponse("django-fb base", mimetype="text/plain")),
+) \ No newline at end of file