edit logbooks, new logbook format, increased database normalisation

1 files changed, 5 insertions, 0 deletions

diff --git a/urls.py b/urls.py
index 92f3c26..71312c0 100644
--- a/urls.py
+++ b/urls.py
@@ -33,6 +33,9 @@ urlpatterns = patterns('',
     url(r'^expeditions/?$',  object_list,  {'queryset':Expedition.objects.all(),'template_name':'object_list.html'},name="expeditions"),

     url(r'^personexpedition/(?P<first_name>[A-Z]*[a-z]*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-z]*)/(?P<year>\d+)/?$', views_logbooks.personexpedition, name="personexpedition"),

     url(r'^logbookentry/(?P<date>.*)/(?P<slug>.*)/?$', views_logbooks.logbookentry,name="logbookentry"),

+    url(r'^newlogbookentry/(?P<expeditionyear>.*)$', views_logbooks.newLogbookEntry,     name="newLogBookEntry"),

+    url(r'^editlogbookentry/(?P<expeditionyear>[^/]*)/(?P<pdate>[^/]*)/(?P<pslug>[^/]*)/$', views_logbooks.newLogbookEntry,     name="editLogBookEntry"),

+    url(r'^deletelogbookentry/(?P<expeditionyear>[^/]*)/(?P<date>[^/]*)/(?P<slug>[^/]*)/$', views_logbooks.deleteLogbookEntry, name="deleteLogBookEntry"),

 

     url(r'^cave/(?P<cave_id>[^/]+)/?$', views_caves.cave, name="cave"),

     url(r'^cavedescription/(?P<cavedescription_name>[^/]+)/?$', views_caves.cave_description, name="cavedescription"),

@@ -83,6 +86,8 @@ urlpatterns = patterns('',
 

     (r'^site_media/(?P<path>.*)$', 'django.views.static.serve',

         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),

+    (r'^tinymce_media/(?P<path>.*)$', 'django.views.static.serve',

+        {'document_root': settings.TINY_MCE_MEDIA_ROOT, 'show_indexes': True}),

                 

         

     url(r'^survexblock/(.+)$',                     views_caves.survexblock, name="survexblock"),