From dc7abf75836b59ad33d92da04fe727320400d512 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 20 Oct 2012 15:25:07 +0200 Subject: Djangoization - Major refactoring (step 3) Reorganization of views, urls, menus, admin, forms. Changes on models. --- example_project/urls.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'example_project/urls.py') diff --git a/example_project/urls.py b/example_project/urls.py index ea54a61e1..02936e6df 100644 --- a/example_project/urls.py +++ b/example_project/urls.py @@ -1,3 +1,4 @@ +from django.conf import settings from django.conf.urls.defaults import * from django.contrib.auth.models import User @@ -5,15 +6,23 @@ from django.contrib import admin admin.autodiscover() #admin.site.unregister(User) -from settings import URL_PATH - -BASE_URL = r'^' + URL_PATH urlpatterns = patterns('', - (BASE_URL + 'accounts/', include('registration.urls')), - (BASE_URL + r'admin/', include(admin.site.urls)), + (r'^accounts/', include('registration.urls')), + (r'^admin/', include(admin.site.urls)), ('', include('ishtar_common.urls')), ) + +""" +for app in ['archaeological_files', 'archaeological_operations', + 'archaeological_context_records', 'archaeological_warehouse', + 'archaeological_finds']: + if app in settings.INSTALLED_APPS: + urlpatterns = patterns('', + ('', include(app+'.urls')), + ) +""" + urlpatterns += patterns('ishtar_common.views', - url(BASE_URL + '$', 'index', name='start'), + url(r'$', 'index', name='start'), ) -- cgit v1.2.3