From f41f244101bcda9414f8a7a1a8b400e4ace3a463 Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Sat, 19 Mar 2011 20:55:24 +0200 Subject: added base urls --- demo/urls.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'demo') 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)), ) -- cgit v1.3.1