summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorMartin Green <martin.speleo@gmail.com>2011-06-02 19:16:16 +0100
committerMartin Green <martin.speleo@gmail.com>2011-06-02 19:16:16 +0100
commitf318105a9bed2792fa3cab017bb6a2d5c8204284 (patch)
tree96c76d9914745758b782ac7619edb96230a7165f /urls.py
parent12df0d417a7350c5e41bc606c90ca516db0178dd (diff)
downloadtroggle-f318105a9bed2792fa3cab017bb6a2d5c8204284.tar.gz
troggle-f318105a9bed2792fa3cab017bb6a2d5c8204284.tar.bz2
troggle-f318105a9bed2792fa3cab017bb6a2d5c8204284.zip
Added editing of flat pages. Added slugfields to models to refer to them.
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/urls.py b/urls.py
index c083c5b..3dc4bc2 100644
--- a/urls.py
+++ b/urls.py
@@ -36,6 +36,12 @@ actualurlpatterns = patterns('',
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'^newfile', views_other.newFile, name="newFile"),
+
+ url(r'^getEntrances/(?P<caveslug>.*)', views_caves.get_entrances, name = "get_entrances"),
+ url(r'^getQMs/(?P<caveslug>.*)', views_caves.get_qms, name = "get_qms"),
+ url(r'^getPeople/(?P<expeditionslug>.*)', views_logbooks.get_people, name = "get_people"),
+ url(r'^getLogBookEntries/(?P<expeditionslug>.*)', views_logbooks.get_logbook_entries, name = "get_logbook_entries"),
url(r'^cave/(?P<cave_id>[^/]+)/?$', views_caves.cave, name="cave"),
url(r'^cavedescription/(?P<cavedescription_name>[^/]+)/?$', views_caves.cave_description, name="cavedescription"),
@@ -127,6 +133,9 @@ actualurlpatterns = patterns('',
url(r'^experimental.*$', views_logbooks.experimental, name="experimental"),
#url(r'^trip_report/?$',views_other.tripreport,name="trip_report")
+
+ url(r'^(.*)_edit$', 'flatpages.views.editflatpage', name="editflatpage"),
+ url(r'^(.*)$', 'flatpages.views.flatpage', name="flatpage"),
)
#Allow prefix to all urls