From 711fefb0da7b4a744c71f3d1648d3398c401f4fc Mon Sep 17 00:00:00 2001 From: Martin Green Date: Sun, 10 Jun 2012 14:59:21 +0100 Subject: Start to change dataformat for caves, along with there editing. Start to change survex reader to cope better with equates/tags. --- urls.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 02bd134..01b0185 100644 --- a/urls.py +++ b/urls.py @@ -49,6 +49,7 @@ actualurlpatterns = patterns('', url(r'^cave/description/([^/]+)/?$', views_caves.caveDescription), url(r'^cave/qms/([^/]+)/?$', views_caves.caveQMs), url(r'^cave/logbook/([^/]+)/?$', views_caves.caveLogbook), + url(r'^entrance/(?P[^/]+)/edit/', views_caves.editEntrance, name = "editentrance"), #url(r'^cavedescription/(?P[^/]+)/?$', views_caves.cave_description, name="cavedescription"), #url(r'^cavedescription/?$', object_list, {'queryset':CaveDescription.objects.all(),'template_name':'object_list.html'}, name="cavedescriptions"), #url(r'^cavehref/(.+)$', views_caves.cave, name="cave"),url(r'cave'), @@ -83,7 +84,8 @@ actualurlpatterns = patterns('', url(r'^eyecandy$', views_other.eyecandy), (r'^admin/doc/?', include('django.contrib.admindocs.urls')), - url(r'^admin/(.*)', admin.site.get_urls, name="admin"), + #url(r'^admin/(.*)', admin.site.get_urls, name="admin"), + (r'^admin/', include(admin.site.urls)), # don't know why this needs troggle/ in here. nice to get it out url(r'^troggle/media-admin/(?P.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ADMIN_DIR, 'show_indexes':True}), -- cgit v1.2.3