summaryrefslogtreecommitdiff
path: root/example_project/urls.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-10-20 15:25:07 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-10-20 15:25:07 +0200
commitdc7abf75836b59ad33d92da04fe727320400d512 (patch)
treeb26e820671aa6af552a4b03147c44a9d2aa84be8 /example_project/urls.py
parent029d08540f66524c371ae87ede5c1281fbe2c568 (diff)
downloadIshtar-dc7abf75836b59ad33d92da04fe727320400d512.tar.bz2
Ishtar-dc7abf75836b59ad33d92da04fe727320400d512.zip
Djangoization - Major refactoring (step 3)
Reorganization of views, urls, menus, admin, forms. Changes on models.
Diffstat (limited to 'example_project/urls.py')
-rw-r--r--example_project/urls.py21
1 files changed, 15 insertions, 6 deletions
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'),
)