diff options
Diffstat (limited to 'chimere/urls.py')
| -rw-r--r-- | chimere/urls.py | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/chimere/urls.py b/chimere/urls.py index 407deff..331dbbe 100644 --- a/chimere/urls.py +++ b/chimere/urls.py @@ -23,7 +23,7 @@ from django.conf.urls.defaults import * from django.contrib import admin admin.autodiscover() -from settings import ROOT_PATH, EXTRA_URL +from settings import ROOT_PATH, EXTRA_URL, INSTALLED_APPS from main.models import Area @@ -31,48 +31,54 @@ js_info_dict = { 'packages': 'chimere', } -base = '^' + EXTRA_URL +BASE = '^' + EXTRA_URL urlpatterns = patterns('', - (base + r'admin/(.*)', admin.site.root), - (base + r'static/(?P<path>.*)$', 'django.views.static.serve', + (BASE + r'admin/(.*)', admin.site.root), + (BASE + r'static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': ROOT_PATH + 'static/'}), - (base + r'media/(?P<path>.*)$', 'django.views.static.serve', + (BASE + r'media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': ROOT_PATH + 'media/'}), - (base + r'jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), - (base + r'charte/$', 'chimere.main.views.charte'), + (BASE + r'jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), + (BASE + r'charte/$', 'chimere.main.views.charte'), ) urlpatterns += patterns('chimere.main.views', ) url_areas = Area.objects.filter(urn__isnull=False) -urlpatterns += patterns('chimere.main.views', (base + r'$', 'index'), - (base + r'simple/?$', 'index', {'simple':True}) ) +urlpatterns += patterns('chimere.main.views', (BASE + r'$', 'index'), + (BASE + r'simple/?$', 'index', {'simple':True}) ) for area in url_areas: urlpatterns += patterns('chimere.main.views', - (base + '(' + area.urn + ')/?$', 'index', {'default_area':area}), - (base + '(' + area.urn + ')/simple/?$', 'index', {'default_area':area, + (BASE + '(' + area.urn + ')/?$', 'index', {'default_area':area}), + (BASE + '(' + area.urn + ')/simple/?$', 'index', {'default_area':area, 'simple':True}),) -extra = "|".join([area.urn for area in url_areas]) +EXTRA = "|".join([area.urn for area in url_areas]) default_dct = {} -if extra: - extra = "(?P<area_name>%s)?/?" % extra +EXTRA_NO_AREA = EXTRA +if EXTRA: + EXTRA_NO_AREA = "(%s)?/?" % EXTRA + EXTRA = "(?P<area_name>%s)?/?" % EXTRA else: default_dct = {'area_name':''} urlpatterns += patterns('chimere.main.views', -(base + extra + r'contact/$', 'contactus', default_dct), -(base + extra + r'edit/$', 'edit', default_dct), -(base + extra + r'edit_route/$', 'editRoute', default_dct), -(base + extra + r'submited/(?P<action>\w+)/$', 'submited', default_dct), -(base + extra + r'getDetail/(?P<marker_id>\d+)/$', 'getDetail', default_dct), -(base + extra + r'getDescriptionDetail/(?P<category_id>\d+)/$', +(BASE + EXTRA + r'contact/$', 'contactus', default_dct), +(BASE + EXTRA + r'edit/$', 'edit', default_dct), +(BASE + EXTRA + r'edit_route/$', 'editRoute', default_dct), +(BASE + EXTRA + r'submited/(?P<action>\w+)/$', 'submited', default_dct), +(BASE + EXTRA + r'getDetail/(?P<marker_id>\d+)/$', 'getDetail', default_dct), +(BASE + EXTRA + r'getDescriptionDetail/(?P<category_id>\d+)/$', 'getDescriptionDetail', default_dct), -(base + extra + r'getGeoObjects/(?P<category_ids>\w+)(/(?P<status>\w+))?$', +(BASE + EXTRA + r'getGeoObjects/(?P<category_ids>\w+)(/(?P<status>\w+))?$', 'getGeoObjects', default_dct), -(base + extra + r'getAvailableCategories/((?P<area>\w+))?(/(?P<status>\w+))?(/(?P<force>\w+))?$', +(BASE + EXTRA + r'getAvailableCategories/((?P<area>\w+))?(/(?P<status>\w+))?(/(?P<force>\w+))?$', 'getAvailableCategories', default_dct), -(base + extra + r'ty/(?P<tiny_urn>\w+)$', 'redirectFromTinyURN', default_dct), +(BASE + EXTRA + r'ty/(?P<tiny_urn>\w+)$', 'redirectFromTinyURN', default_dct), ) + +if 'chimere.rss' in INSTALLED_APPS: + urlpatterns += patterns('', + (r'^' + EXTRA_URL, include('chimere.rss.urls')),) |