diff options
| author | Martin Green <martin.speleo@gmail.com> | 2012-06-10 14:59:21 +0100 |
|---|---|---|
| committer | Martin Green <martin.speleo@gmail.com> | 2012-06-10 14:59:21 +0100 |
| commit | 90245201846b1f95e0c26a59e8272be88b38e479 (patch) | |
| tree | 8efa7048ab0acbd3666b114ea2e93a09e2477a8a /urls.py | |
| parent | 52620ea1c58d80387eb2e19b45228ada393f4701 (diff) | |
| download | troggle-90245201846b1f95e0c26a59e8272be88b38e479.tar.gz troggle-90245201846b1f95e0c26a59e8272be88b38e479.tar.bz2 troggle-90245201846b1f95e0c26a59e8272be88b38e479.zip | |
Start to change dataformat for caves, along with there editing. Start to change survex reader to cope better with equates/tags.
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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<slug>[^/]+)/edit/', views_caves.editEntrance, name = "editentrance"), #url(r'^cavedescription/(?P<cavedescription_name>[^/]+)/?$', 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<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ADMIN_DIR, 'show_indexes':True}), |