[svn] Added cave and logbook search, collapsible footer navbar, useless statistics page. Also fixed broken css. Toying with forms but not committing those yet.

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8081 by aaron @ 12/8/2008 4:28 AM

1 files changed, 18 insertions, 0 deletions

diff --git a/expo/views_caves.py b/expo/views_caves.py
index b2e1850..1f108f8 100644
--- a/expo/views_caves.py
+++ b/expo/views_caves.py
@@ -1,12 +1,15 @@
 from django.shortcuts import render_to_response

 from troggle.expo.models import Cave, CaveAndEntrance

 import troggle.settings as settings

+from troggle.expo.forms import CaveForm

+import search

 

 def caveindex(request):

     caves = Cave.objects.all()

     return render_to_response('caveindex.html', {'caves': caves, 'settings': settings})

 

 def cave(request, cave_id):

+    #hm, we're only choosing by the number within kataster, needs to be fixed. Caves in 1626 will presumably not work. - AC 7DEC08

     cave = Cave.objects.filter(kataster_number = cave_id)[0]

     return render_to_response('cave.html', {'cave': cave, 'settings': settings})

 

@@ -17,3 +20,18 @@ def ent(request, cave_id, ent_letter):
                                                 'entrance': cave_and_ent.entrance,

                                                 'letter': cave_and_ent.entrance_letter,

                                                 'settings': settings})

+

+def caveSearch(request):

+    query_string = ''

+    found_entries = None

+    if ('q' in request.GET) and request.GET['q'].strip():

+        query_string = request.GET['q']

+	entry_query = search.get_query(query_string, ['underground_description','official_name',])

+	found_entries = Cave.objects.filter(entry_query)

+

+    return render_to_response('cavesearch.html',

+                          { 'query_string': query_string, 'found_entries': found_entries, 'settings': settings})

+                          #context_instance=RequestContext(request))

+

+

+