diff options
Diffstat (limited to 'app/photos')
| -rw-r--r-- | app/photos/admin.py | 19 | ||||
| -rw-r--r-- | app/photos/detail_urls.py | 11 | ||||
| -rw-r--r-- | app/photos/urls.py | 32 |
3 files changed, 43 insertions, 19 deletions
diff --git a/app/photos/admin.py b/app/photos/admin.py index 2f71fcc..8b1d723 100644 --- a/app/photos/admin.py +++ b/app/photos/admin.py @@ -11,24 +11,28 @@ from django.http import HttpResponseRedirect from .forms import UploadZipForm + class LuxImageAdmin(OSMGeoAdmin): - list_display = ('pk','admin_thumbnail', 'pub_date',) + list_display = ('pk', 'admin_thumbnail', 'pub_date',) list_filter = ('pub_date',) search_fields = ['title', 'caption'] admin.site.register(LuxImage, LuxImageAdmin) + class GalleryAdmin(OSMGeoAdmin): list_display = ('title', 'location', 'pub_date') list_filter = ('location',) - + def get_urls(self): urls = super(GalleryAdmin, self).get_urls() - custom_urls = patterns('', - url(r'^upload_zip/$', - self.admin_site.admin_view(self.upload_zip), - name='upload_zip') - ) + custom_urls = [ + url( + r'^upload_zip/$', + self.admin_site.admin_view(self.upload_zip), + name='upload_zip' + ) + ] return custom_urls + urls def upload_zip(self, request): @@ -55,6 +59,7 @@ class GalleryAdmin(OSMGeoAdmin): admin.site.register(Gallery, GalleryAdmin) + class PhotoAdmin(OSMGeoAdmin): list_display = ('title', 'admin_thumbnail', 'flickr_id', 'pub_date',) list_filter = ('pub_date',) diff --git a/app/photos/detail_urls.py b/app/photos/detail_urls.py index 8bdbd79..0ab94f6 100644 --- a/app/photos/detail_urls.py +++ b/app/photos/detail_urls.py @@ -1,7 +1,10 @@ -from django.conf.urls import * +from django.conf.urls import url from django.views.generic.detail import DetailView from photos.models import Photo -urlpatterns = patterns('', - (r'^(?P<object_id>\d+)/$', DetailView.as_view(model=Photo, template_name='details/photo.html')), -) +urlpatterns = [ + url( + r'^(?P<object_id>\d+)/$', + DetailView.as_view(model=Photo, template_name='details/photo.html') + ), +] diff --git a/app/photos/urls.py b/app/photos/urls.py index 91aac41..7d074a9 100644 --- a/app/photos/urls.py +++ b/app/photos/urls.py @@ -1,11 +1,27 @@ -from django.conf.urls import * +from django.conf.urls import url from django.views.generic.base import RedirectView +from . import views -urlpatterns = patterns('', - (r'data/(?P<slug>[-\w]+)/$', 'photos.views.photo_json'), - (r'galleries/(?P<slug>[-\w]+)/$', 'photos.views.gallery'), - (r'(?P<page>\d+)/$', 'photos.views.gallery_list'), - (r'(?P<slug>[-\w]+)/$', RedirectView.as_view(url="/photos/%(slug)s/1/", permanent=False)), - (r'', RedirectView.as_view(url="/photos/1/", permanent=False)), -) +urlpatterns = [ + url( + r'data/(?P<slug>[-\w]+)/$', + views.photo_json + ), + url( + r'galleries/(?P<slug>[-\w]+)/$', + views.gallery, + ), + url( + r'(?P<page>\d+)/$', + views.gallery_list, + ), + url( + r'(?P<slug>[-\w]+)/$', + RedirectView.as_view(url="/photos/%(slug)s/1/", permanent=False) + ), + url( + r'', + RedirectView.as_view(url="/photos/1/", permanent=False) + ), +] |