diff options
Diffstat (limited to 'app/photos')
| -rw-r--r-- | app/photos/admin.py | 2 | ||||
| -rw-r--r-- | app/photos/urls.py | 47 | ||||
| -rw-r--r-- | app/photos/views.py | 8 |
3 files changed, 15 insertions, 42 deletions
diff --git a/app/photos/admin.py b/app/photos/admin.py index d740df6..8e605ee 100644 --- a/app/photos/admin.py +++ b/app/photos/admin.py @@ -43,7 +43,7 @@ class LuxImageAdmin(OSMGeoAdmin): fieldsets = ( (None, { - 'fields': (('image'), 'pub_date', 'sizes', 'alt', 'caption', 'point', ('is_public'), ('photo_credit_source', 'photo_credit_url')) + 'fields': ('title', ('image'), 'pub_date', 'sizes', 'alt', 'caption', 'point', ('is_public'), ('photo_credit_source', 'photo_credit_url')) }), ('Exif Data', { 'classes': ('collapse',), diff --git a/app/photos/urls.py b/app/photos/urls.py index 8c51d60..cbac965 100644 --- a/app/photos/urls.py +++ b/app/photos/urls.py @@ -7,7 +7,12 @@ app_name = "photos" urlpatterns = [ path( - r'data/(<str:slug>/$', + r'daily/<int:page>', + views.DailyPhotoList.as_view(), + name="daily_photo_list" + ), + path( + r'data/(<str:slug>/', views.photo_json ), re_path( @@ -20,44 +25,4 @@ urlpatterns = [ views.thumb_preview_json, name="admin_thumb_preview" ), - re_path( - r'galleries/private/(?P<slug>[-\w]+)$', - views.PrivateGallery.as_view(), - name="private" - ), - re_path( - r'galleries/private/(?P<page>\d+)/$', - views.PrivateGalleryList.as_view(), - name="private_list" - ), - re_path( - r'galleries/private/$', - RedirectView.as_view(url="/photos/galleries/private/1/", permanent=False) - ), - re_path( - r'galleries/(?P<slug>[-\w]+)$', - views.Gallery.as_view(), - name="private" - ), - re_path( - r'galleries/(?P<page>\d+)/$', - views.GalleryList.as_view(), - name="private_list" - ), - re_path( - r'galleries/$', - RedirectView.as_view(url="/photos/galleries/1/", permanent=False) - ), - re_path( - r'(?P<page>\d+)/$', - views.gallery_list, - ), - re_path( - r'(?P<slug>[-\w]+)/$', - RedirectView.as_view(url="/photos/%(slug)s/1/", permanent=False) - ), - re_path( - r'', - RedirectView.as_view(url="/photos/1/", permanent=False) - ), ] diff --git a/app/photos/views.py b/app/photos/views.py index ec4ba61..915b022 100644 --- a/app/photos/views.py +++ b/app/photos/views.py @@ -30,6 +30,7 @@ class PrivateGalleryList(PaginatedListView): context['is_private'] = True return context + class Gallery(DetailView): model = LuxGallery slug_field = "slug" @@ -62,6 +63,13 @@ class OldGalleryList(PaginatedListView): return context +class DailyPhotoList(PaginatedListView): + template_name = 'archives/photo_daily_list.html' + + def get_queryset(self): + return LuxImage.objects.filter(is_public=True, title__startswith="daily_") + + def gallery_list(request, page): request.page_url = '/photos/%d/' request.page = int(page) |