diff options
| -rw-r--r-- | expo/views_other.py | 2 | ||||
| -rw-r--r-- | templates/index.html | 2 | ||||
| -rw-r--r-- | urls.py | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/expo/views_other.py b/expo/views_other.py index 7c5fc92..1155036 100644 --- a/expo/views_other.py +++ b/expo/views_other.py @@ -29,7 +29,7 @@ def frontPage(request): #'randSent':randSent.randomLogbookSentence(),
expeditions = Expedition.objects.order_by("-year")
- return render_to_response('index.html', {'expeditions':expeditions, 'settings':settings, "message":message})
+ return render_to_response('index.html', {'expeditions':expeditions, 'settings':settings, 'all':'all', "message":message})
def calendar(request,year):
week=['S','S','M','T','W','T','F']
diff --git a/templates/index.html b/templates/index.html index cafc8a8..f30c100 100644 --- a/templates/index.html +++ b/templates/index.html @@ -30,7 +30,7 @@ <li><a href="{% url personindex %}">List of People</a></li>
<li><a href="{% url caveindex %}">List of Caves</a></li>
<li><a href="/statistics">Statistics of what's loaded in the database</a></li>
- <li><a href="{% url survexindex survex_file=all %}">Survex directory</a></li>
+ <li><a href="{% url survexindex all %}">Survex directory</a></li>
<li><a href="{% url survey %}">Survey files</a></li>
</ul>
@@ -8,13 +8,14 @@ admin.autodiscover() urlpatterns = patterns('',
(r'^$', frontPage),
- url(r'^cave/?$', caveindex, name="caveindex"),
+ url(r'^caveindex$', caveindex, name="caveindex"),
+
(r'^cave/(?P<cave_id>[^/]+)/?$', cave),
(r'^cave/(?P<cave_id>[^/]+)/?(?P<ent_letter>[^/])$', ent),
#(r'^cave/(?P<cave_id>[^/]+)/edit/$', edit_cave),
(r'^cavesearch', caveSearch),
- url(r'^survex/(?P<survex_file>.*)\.index$', index, name="survexindex"),
+ url(r'^survex/(.*?)\.index$', index, name="survexindex"),
(r'^survex/(?P<survex_file>.*)\.svx$', svx),
(r'^survex/(?P<survex_file>.*)\.3d$', threed),
(r'^survex/(?P<survex_file>.*)\.log$', log),
|