1 files changed, 8 insertions, 14 deletions
diff --git a/app/photos/views.py b/app/photos/views.py
index 7d10841..0c413e0 100644
--- a/app/photos/views.py
+++ b/app/photos/views.py
@@ -1,9 +1,8 @@
 from django.shortcuts import render_to_response,get_object_or_404
 from django.template import RequestContext
-from django.views.generic.list_detail import object_list
 from django.http import Http404,HttpResponse
 from django.core import serializers
-from django.conf import settings
+
 
 from photos.models import Photo,PhotoGallery
 from locations.models import Country, Region
@@ -13,16 +12,11 @@ from locations.models import Country, Region
 def gallery_list(request,page):
     request.page_url = '/photos/%d/'
     request.page = int(page)
-    qs = PhotoGallery.objects.all()
-    try:
-        is_build = request.POST['builder']
-        extra_context= {
-            'page':page,
-            'MEDIA_URL': settings.BAKED_MEDIA_URL
+    context = {
+        'object_list': PhotoGallery.objects.all(),
+        'page':page,
         }
-    except KeyError:
-        extra_context={'page':page,}
-    return object_list(request, queryset=qs, template_name='archives/photos.html',extra_context=extra_context)
+    return render_to_response("archives/photos.html", context, context_instance = RequestContext(request))
 
 def gallery(request,slug):
     context = {
@@ -49,10 +43,10 @@ def gallery_list_by_area(request,slug,page):
         if not region:
             raise Http404
     context = {
-        'region': region,
+        'object_list': qs,
         'country_list': Country.objects.filter(visited=True),
         'region_list': Region.objects.all(),
+        'region': region,
         'page': page
     }
-    return object_list(request, queryset=qs, template_name='archives/photos.html',
-                       extra_context=context)
+    return render_to_response("archives/photos.html", context, context_instance = RequestContext(request))