diff options
Diffstat (limited to 'chimere/urls.py')
| -rw-r--r-- | chimere/urls.py | 162 |
1 files changed, 39 insertions, 123 deletions
diff --git a/chimere/urls.py b/chimere/urls.py index e7d1a97..3f9305e 100644 --- a/chimere/urls.py +++ b/chimere/urls.py @@ -18,148 +18,64 @@ # See the file COPYING for details. from django.conf import settings -from django.conf.urls import url +from django.conf.urls import url, include +from django.conf.urls.static import static from django.contrib import admin -from django.core.exceptions import ImproperlyConfigured -admin.autodiscover() +from django.contrib.staticfiles.urls import staticfiles_urlpatterns from chimere import views -from chimere.forms import SearchForm -from chimere.views import CategoryDirectoryView, CategoryView, SearchView -from chimere.feeds import LatestPOIsByCategory, LatestPOIsBySubCategory, \ - LatestPOIs, LatestPOIsByZone, LatestPOIsByZoneID +from django.views.static import serve + +admin.autodiscover() def i18n_javascript(request): return admin.site.i18n_javascript(request) -urlpatterns = [ - url(r'^status/$', views.status, name='status'), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?simple$', views.index, - {'simple': True}, name="simple_index") -] - -if settings.CHIMERE_FEEDS: +urlpatterns = [] +if settings.DEBUG: urlpatterns += [ - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds$', views.rss, - name='feeds-form'), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/category/' - r'(?P<category_id>\d+)$', - LatestPOIsByCategory(), name='feeds-cat'), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/subcategory/' - r'(?P<category_id>\d+)$', - LatestPOIsBySubCategory(), name='feeds-subcat'), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/global/$', LatestPOIs(), - name='feeds-global'), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/area/(?P<area>[0-9-_.]+)$', - LatestPOIsByZone(), name='feeds-area'), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/areaid/(?P<area_id>\d+)$', - LatestPOIsByZoneID(), name='feeds-areaid'), + url(r'^media/(?P<path>.*)$', serve, { + 'document_root': settings.MEDIA_ROOT, + }), ] -if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') \ - and settings.CHIMERE_ENABLE_ROUTING: - if not hasattr(settings, 'CHIMERE_ROUTING_TRANSPORT') \ - or not settings.CHIMERE_ROUTING_TRANSPORT: - raise ImproperlyConfigured(u"CHIMERE_ROUTING_TRANSPORT must be set in" - u" settings if you enable routing") +if "tinymce" in settings.INSTALLED_APPS: urlpatterns += [ - url(r'^(?P<area_name>[a-zA-Z0-9_-]*/)?route/' - r'(?P<transport>(%s))/((?P<speed>[0-9][0-9]*)/)?' - r'(?P<lon1>[-]?[0-9]+[.]?[0-9]*)_(?P<lat1>[-]?[0-9]+[.]?[0-9]*)_' - r'(?P<lonlat_steps>([-]?[0-9]+[.]?[0-9]*_[-]?[0-9]+[.]?[0-9]*_)*)' - r'(?P<lon2>[-]?[0-9]+[.]?[0-9]*)_(?P<lat2>[-]?[0-9]+[.]?[0-9]*)$' % - ('|'.join([key - for key, lbl in settings.CHIMERE_ROUTING_TRANSPORT])), - views.route, name="route"), + url(r'^tinymce/', include('tinymce.urls')), ] +urlpatterns += staticfiles_urlpatterns() -if getattr(settings, 'HAYSTACK_SEARCH_ENGINE', None): - from haystack.views import search_view_factory - urlpatterns += [ - url(r'^search/?$', search_view_factory( - view_class=SearchView, - template='search/search_haystack.html', - form_class=SearchForm - ), name='search'), - url(r'^search/autocomplete/$', views.autocomplete, - name='autocomplete-search') - ] -else: - urlpatterns += [ - url(r'^(?:(?P<area_name>[a-zA-Z0-9_-]+)/)?search/?$', - views.SearchView.as_view(), name='search'), - ] urlpatterns += [ - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?dyn/(?P<page_id>\w+)/$', - views.extraPage, name='extra_page'), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?contact/?$', - views.contactus, name="contact"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/$', views.edit, - name="edit"), + url(r'^admin/doc/', include('django.contrib.admindocs.urls')), + url(r'^admin/', include(admin.site.urls)), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?dyn.css$', + views.DynCSS.as_view(), name="dyn-css"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-marker/' - r'(?P<submited>\w+)?$', views.editMarker, name="editmarker"), + r'(?P<submited>\w+)?$', views.editMarker, name="editmarker"), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-marker-tab/' + r'(?P<submited>\w+)?$', views.editMarkerTab, name="edit-marker-tab"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-marker/(?P<item_id>\w+)/' - r'(?P<submited>\w+)?$', views.editMarker, - name="editmarker-item"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/$', - views.editRoute, name="editroute"), + r'(?P<submited>\w+)?$', views.editMarker, name="editmarker-item"), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/$', views.editRoute, + name="editroute"), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route-tab/$', views.editRouteTab, + name="edit-route-tab"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/(?P<item_id>\w+)/' - r'(?P<submited>\w+)?$', - views.editRoute, name="editroute-item"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-polygon/$', - views.editPolygon, name="editpolygon"), + r'(?P<submited>\w+)?$', + views.editRoute, name="editroute-item"), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-polygon/$', views.editPolygon, + name="editpolygon"), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-polygon-tab/$', + views.editPolygonTab, name="edit-polygon-tab"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-polygon/(?P<item_id>\w+)/' - r'(?P<submited>\w+)?$', - views.editPolygon, name="editpolygon-item"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDetail/' - r'(?P<key>[a-zA-Z_-]*\d+)/?$', - views.getDetail, name="get_detail"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDetail/popup/' - r'(?P<key>[a-zA-Z_-]*\d+)/?$', - views.getDetail, {'popup': True}, name="get_detail"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDetail/undefined', - views.getDetailUndefined, name="get_detail_undefined"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDescriptionDetail/' - r'?(?P<category_id>\d+)/?$', views.getDescriptionDetail, - name="get_description_detail"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getGeoObjects/' - r'(?P<category_ids>[a-zA-Z0-9_-]+)(/(?P<status>\w+))?$', - views.getGeoObjects, name="getgeoobjects"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?get-marker/' - r'(?P<pk>[0-9]+)$', views.getMarker, name="get-marker"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getAvailableCategories/$', - views.get_available_categories, name="get_categories"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getAllCategories/$', - views.get_all_categories, name="get_all_categories"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getCategory/(?P<category_id>\d+)/?$', - views.getCategory, name="get_category"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]*/)?get-share-url/(?:(?P<network>\w+)/' - r'(?:(?P<attrs>[a-zA-Z0-9_;.:-]+))?)?/?$', - views.getShareUrl, name="get-share-url"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]*/)?ty/(?P<tiny_urn>\w+)$', - views.redirectFromTinyURN, name="tiny"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?upload_file/' - r'((?P<category_id>\w+)/)?$', views.uploadFile, - name='upload_file'), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?process_route_file/' - r'(?P<file_id>\d+)/$', views.processRouteFile, - name='process_route_file'), - url(r'^(?:(?P<area_name>[a-zA-Z0-9_-]*)/)?categories/$', - CategoryDirectoryView.as_view(), name='category-directory'), - url(r'^(?:(?P<area_name>[a-zA-Z0-9_-]*)/)?categories/' - r'(?P<category_slug>[a-zA-Z0-9_-]+)$', - CategoryView.as_view(), name='category-directory-detail'), - url(r'^(?:(?P<area_name>[a-zA-Z0-9_-]*)/)?property-choices/' - r'(?P<property_slug>[a-zA-Z0-9_-]+)/$', - views.property_choice_list, name='property-choices'), -] - -if settings.PROJECT_APP == "chimere_example_project": - urlpatterns += [ - url(r'^(?P<area_name>[a-zA-Z0-9_-]+)?', views.index, - name="index"), - ] + r'(?P<submited>\w+)?$', + views.editPolygon, name="editpolygon-item"), + url(r'^', include('chimere.urls_chimere', namespace="chimere")), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+)?', views.index, + name="index"), +] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) + |