Clean code

gallery/admin.py

@@ -11,7 +11,7 @@ from imagekit.processors import ResizeToFit
 from gallery.models import Album, City, Location, Photo, Redir
 
 
-# Thumbnail-luokka admin-näkymää varten
+# Thumbnail spec for admin previews
 class AdminThumbnailSpec(ImageSpec):
     processors = [ResizeToFit(100, 100)]
     format = 'JPEG'
@@ -19,7 +19,7 @@ class AdminThumbnailSpec(ImageSpec):
 
 
 def cached_admin_thumb(instance):
-    """Palauttaa cachetetun thumbnailin, jos kuva on olemassa."""
+    """Return cached thumbnail for admin display if photo exists."""
     if instance.photo:
         cached = ImageCacheFile(AdminThumbnailSpec(instance.photo))
         cached.generate()
@@ -27,7 +27,6 @@ def cached_admin_thumb(instance):
     return None
 
 
-# 🔹 RedirAdmin – uudelleenohjausten hallinta
 class RedirAdmin(admin.ModelAdmin):
     list_display = ('path', 'album', 'test_url')
     search_fields = ('path',)
@@ -36,21 +35,18 @@ class RedirAdmin(admin.ModelAdmin):
     list_editable = ('album',)
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
-        """Järjestää albumivalikon aakkosjärjestykseen."""
         if db_field.name == "album":
             kwargs["queryset"] = Album.objects.all().order_by('name')
         return super().formfield_for_foreignkey(db_field, request, **kwargs)
 
     def test_url(self, obj):
-        """Luo linkin, jolla voi testata uudelleenohjauksen."""
+        """Generate clickable test link for redirection."""
         return format_html(
-            '<a href="/{}" target="_blank">http://nyymix.net/{}</a>',
+            '<a href="/{0}" target="_blank">http://nyymix.net/{0}</a>', obj.path
-            obj.path, obj.path
         )
     test_url.short_description = "Test Redirection"
 
 
-# 🔹 CityAdmin – kaupunkien hallinta
 class CityAdmin(admin.ModelAdmin):
     list_display = ('name',)
     search_fields = ('name',)
@@ -58,16 +54,13 @@ class CityAdmin(admin.ModelAdmin):
     list_per_page = 30
 
 
-# 🔹 LocationAdmin – sijaintien hallinta
 class LocationAdmin(admin.ModelAdmin):
     list_display = ('city', 'place')
     list_filter = ('city',)
     ordering = ('city__name',)
-    search_fields = ('place', 'city__name',)
+    search_fields = ('place', 'city__name')
     list_per_page = 30
 
-
-# 🔹 AlbumAdmin – albumien hallinta
 class AlbumAdmin(admin.ModelAdmin):
     prepopulated_fields = {'slug': ('name',)}
     list_display = ('name', 'location', 'album_date', 'is_public', 'upload_link', 'thumbnail')
@@ -79,7 +72,7 @@ class AlbumAdmin(admin.ModelAdmin):
     change_form_template = "admin/gallery/album/change_form.html"
 
     def get_urls(self):
-        """Lisää mukautetun URL-reitin valokuvien lataamiselle."""
+        """Add custom upload route to admin."""
         urls = super().get_urls()
         custom_urls = [
             path('<int:album_id>/upload/', self.admin_site.admin_view(self.upload_photos), name="gallery_album_upload"),
@@ -87,9 +80,8 @@ class AlbumAdmin(admin.ModelAdmin):
         return custom_urls + urls
 
     def upload_photos(self, request, album_id, *args, **kwargs):
-        """Käsittelee valokuvien lataamisen albumiin."""
+        """Handle photo upload via admin UI."""
         album = get_object_or_404(Album, id=album_id)
-
         if request.method == 'POST' and request.FILES:
             uploaded_files = request.FILES.getlist('photo')
             if not uploaded_files:
@@ -102,7 +94,7 @@ class AlbumAdmin(admin.ModelAdmin):
         return render(request, 'admin/upload_photos.html', {'album': album})
 
     def upload_link(self, obj):
-        """Lisää 'Upload Photos' -painikkeen albumin muokkaussivulle."""
+        """Show 'Upload Photos' button in album list."""
         if obj.id:
             url = reverse("admin:gallery_album_upload", kwargs={"album_id": obj.id})
             return format_html('<a href="{}" class="button">Upload Photos</a>', url)
@@ -110,7 +102,7 @@ class AlbumAdmin(admin.ModelAdmin):
     upload_link.short_description = "Upload Photos"
 
     def thumbnail(self, obj):
-        """Näyttää albumin kansikuvan pikkukuvan."""
+        """Show album cover thumbnail."""
         if obj.cover and obj.cover.photo:
             return format_html(
                 '<img src="{}" style="width: 50px; height: auto;"/>',
@@ -120,7 +112,7 @@ class AlbumAdmin(admin.ModelAdmin):
     thumbnail.short_description = "Thumbnail"
 
     def cover_preview(self, obj):
-        """Näyttää albumin kansikuvan suurempana esikatseluna."""
+        """Preview full-size cover image in album admin page."""
         if obj.cover and obj.cover.photo:
             return format_html(
                 '<img src="{}" style="max-width: 300px; height: auto;"/>',
@@ -130,22 +122,13 @@ class AlbumAdmin(admin.ModelAdmin):
     cover_preview.short_description = "Cover Preview"
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
-        """
+        """Limit cover image choices to photos in this album."""
-        Suodattaa 'cover'-valinnan niin, että se näyttää vain albumiin kuuluvat kuvat.
-        Uuden albumin luonnissa vaihtoehto pidetään tyhjänä.
-        """
         if db_field.name == "cover":
-            # Jos albumia ollaan luomassa (ei pk:ta), ei anneta mitään vaihtoehtoja
-            if request.resolver_match.kwargs.get("object_id") is None:
-                kwargs["queryset"] = Photo.objects.none()
-            else:
-                # Haetaan vain nykyiseen albumiin kuuluvat kuvat
             album_id = request.resolver_match.kwargs.get("object_id")
-                kwargs["queryset"] = Photo.objects.filter(album_id=album_id)
+            kwargs["queryset"] = Photo.objects.filter(album_id=album_id) if album_id else Photo.objects.none()
         return super().formfield_for_foreignkey(db_field, request, **kwargs)
 
 
-# 🔹 PhotoAdmin – kuvien hallinta
 class PhotoAdmin(admin.ModelAdmin):
     list_display = ('slug', 'album', 'is_favorite', 'admin_thumbnail')
     list_display_links = ('slug',)
@@ -157,7 +140,7 @@ class PhotoAdmin(admin.ModelAdmin):
     list_editable = ('is_favorite',)
 
 
-# 🔹 Rekisteröidään admin-paneeliin
+# Register models in admin
 admin.site.register(City, CityAdmin)
 admin.site.register(Location, LocationAdmin)
 admin.site.register(Album, AlbumAdmin)

gallery/templates/gallery/album_detail.html

@@ -3,7 +3,7 @@
 
 
 <!-- Title -->
-{% block title %} Gallery : Albums : {{ album.name }} {% endblock %}
+{% block title %} Gallery : {{ album.name }} {% endblock %}
 
 <!-- Parallax -->
 {% block parallax %}

gallery/templates/gallery/photo_detail.html

@@ -2,7 +2,7 @@
 {% load exif_filters %}
 
 <!-- Title -->
-{% block title %} Gallery : Photo : {{ photo.slug }} {% endblock %}
+{% block title %} Gallery : {{ photo.album.name }} : {{ photo.slug }} {% endblock %}
 
 
 <!-- Content -->
@@ -71,7 +71,7 @@
                         <div>{{ photo.likes }}</div>
                     </div>
                     <div class="uk-grid-small" uk-grid>
-                        <div class="uk-width-expand" uk-leader>Download</div>
+                        <div class="uk-width-expand" uk-leader>Download photo</div>
                         <div><a href="{{ photo.photo.url }}">{{ photo.width }}x{{ photo.height }}</a></div>
                     </div>
                 </div>
@@ -104,7 +104,7 @@
                         <div>{{ photo.exif.FocalLength|exif_focallength}}</div>
                     </div>
                     <div class="uk-grid-small" uk-grid>
-                        <div class="uk-width-expand" uk-leader>Focal Length</div>
+                        <div class="uk-width-expand" uk-leader>Focal Length in 35mm</div>
                         <div>{{ photo.exif.FocalLengthIn35mmFilm|exif_focallength }}</div>
                     </div>
                 </div>

gallery/templates/gallery/search.html

@@ -13,6 +13,7 @@
 {% block content %}
 
 <div class="uk-grid-small uk-child-width-1-2@s uk-child-width-1-3@m" uk-grid="masonry: true">
+    {% if results %}
         {% for album in results %}
         <div>
             <div class="uk-card uk-card-default">
@@ -28,6 +29,9 @@
             </div>
         </div>
         {% endfor %}
+    {% else %}
+        <p>Not found: "{{ query }}".</p>
+    {% endif %}
 </div>
 
 {% include "./partials/pagination.html" %}

gallery/views.py

@@ -8,14 +8,15 @@ from .models import Album, Photo, Redir
 
 
 class AlbumsList(ListView):
+    """Displays a paginated list of public albums."""
     model = Album
     template_name = 'gallery/album_list.html'
-    queryset = Album.objects.filter(is_public=True)
+    queryset = Album.objects.filter(is_public=True).order_by('-album_date')
-    ordering = ['-album_date']
     paginate_by = 30
 
 
 class AlbumDetail(DetailView):
+    """Shows a single album and its paginated photos."""
     model = Album
     template_name = 'gallery/album_detail.html'
 
@@ -26,33 +27,39 @@ class AlbumDetail(DetailView):
         context = super().get_context_data(**kwargs)
         photos = self.object.photos.all().order_by('taken_at')
 
-        # Pagination
         paginator = Paginator(photos, 30)
-        page_number = self.request.GET.get('page')
+        page_obj = paginator.get_page(self.request.GET.get('page'))
-        page_obj = paginator.get_page(page_number)
 
-        # Return
+        context.update({
-        context['photos'] = page_obj.object_list
+            'photos': page_obj.object_list,
-        context['page_obj'] = page_obj
+            'page_obj': page_obj
+        })
         return context
 
 
+
 class PhotosList(ListView):
+    """Shows all public photos sorted by user-selected ordering."""
     model = Photo
     paginate_by = 30
 
     def get_queryset(self):
-        orderdic = {'latest': '-taken_at', 'liked': 'likes', 'popular': '-views'}
+        ordering_options = {
-        order = orderdic.get(self.request.GET.get('order', 'latest'), '-taken_at')
+            'latest': '-taken_at',
+            'liked': 'likes',
+            'popular': '-views'
+        }
+        order = ordering_options.get(self.request.GET.get('order', 'latest'), '-taken_at')
         return Photo.objects.filter(album__is_public=True).order_by(order).select_related('album')
 
-    def get_context_data(self, *args, **kwargs):
+    def get_context_data(self, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
+        context = super().get_context_data(**kwargs)
         context['order'] = self.request.GET.get('order', 'latest')
         return context
 
 
 class PhotoDetail(DetailView):
+    """Shows a single photo and handles liking functionality."""
     model = Photo
     slug_url_kwarg = 'photo_slug'
     template_name = 'gallery/photo_detail.html'
@@ -62,23 +69,25 @@ class PhotoDetail(DetailView):
         photo_slug = self.kwargs.get('photo_slug')
         photo = get_object_or_404(Photo, slug=photo_slug, album__slug=album_slug)
 
+        # Track views using session to avoid duplicate counts
         if photo.slug not in self.request.session:
             photo.add_view()
             self.request.session[photo.slug] = 0
 
         return photo
 
-    def get_context_data(self, *args, **kwargs):
+    def get_context_data(self, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
+        context = super().get_context_data(**kwargs)
-        context["next"] = self.object.get_next()
+        context.update({
-        context["prev"] = self.object.get_prev()
+            "next": self.object.get_next(),
+            "prev": self.object.get_prev()
+        })
         return context
 
     def post(self, request, *args, **kwargs):
         photo = self.get_object()
 
-        if request.POST.get("like") == "true":
+        if request.POST.get("like") == "true" and self.request.session.get(photo.slug) == 0:
-            if self.request.session.get(photo.slug) == 0:
             photo.add_like()
             self.request.session[photo.slug] = 1
 
@@ -90,15 +99,18 @@ class PhotoDetail(DetailView):
 
 
 class About(TemplateView):
+    """Static about page."""
     template_name = "gallery/about.html"
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["about"] = settings.ABOUT_PAGE_SETTINGS  # Haetaan asetukset
+        context["about"] = settings.ABOUT_PAGE_SETTINGS
         return context
 
 
+
 class Search(TemplateView):
+    """Search view for public albums by name, place or city."""
     template_name = "gallery/search.html"
 
     def get_context_data(self, **kwargs):
@@ -116,16 +128,18 @@ class Search(TemplateView):
             ).order_by('-album_date').distinct()
 
         paginator = Paginator(results, 30)
-        page_number = self.request.GET.get('page')
+        page_obj = paginator.get_page(self.request.GET.get('page'))
-        page_obj = paginator.get_page(page_number)
 
-        context['results'] = page_obj.object_list
+        context.update({
-        context['page_obj'] = page_obj
+            'results': page_obj.object_list,
-        context['paginator'] = paginator
+            'page_obj': page_obj,
-        context['is_paginated'] = page_obj.has_other_pages()
+            'paginator': paginator,
+            'is_paginated': page_obj.has_other_pages()
+        })
         return context
 
+
 def redirect_to_album(request, redir_path):
+    """Handles redirect logic for shortened/legacy album URLs."""
     redir = get_object_or_404(Redir, path=redir_path)
     return redirect('gallery:album_url', album_slug=redir.album.slug)
-

templates/base.html

@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    {% load static %}
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <!-- UIkit CSS -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.21.16/dist/css/uikit.min.css" />
-    <!-- UIkit JS -->
-    <script src="https://cdn.jsdelivr.net/npm/uikit@3.21.16/dist/js/uikit.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/uikit@3.21.16/dist/js/uikit-icons.min.js"></script>
-    <!-- Muistox CSS -->
-    <link href="{% static 'css/muistox.css' %}" rel="stylesheet">
-    <link rel="shortcut icon" type="image/png" href="{% static 'favicon.ico' %}" />
-    <title>{% block title %} Gallery {% endblock %}</title>
-</head>
-
-<body>
-
-        <!-- Parallax -->
-        {% block parallax %}
-        {% endblock %}
-
-        <!-- Navbar -->
-        {% block navbar %}
-        <div uk-sticky="sel-target: .uk-navbar-container; cls-active: uk-navbar-sticky;">
-            <nav class="uk-navbar-container" uk-navbar>
-                <div class="uk-navbar-left uk-margin-left">
-                    <ul class="uk-navbar-nav">
-                        <li><a href="{% url 'gallery:main_url' %}"><span uk-icon="camera"></span></a></li>
-                        <li class="uk-visible@m"><a href="{% url 'gallery:albums_url' %}">Albums</a></li>
-                        <li class="uk-visible@m"><a href="{% url 'gallery:photos_url' %}">Photostream</a></li>
-                    </ul>
-                </div>
-                <div class="uk-navbar-right uk-margin-right">
-                    <ul class="uk-navbar-nav">
-                        <li class="uk-visible@m"><a href="{% url 'gallery:about_url' %}">About</a></li>
-                        {% if user.is_authenticated %}
-                        <li class="uk-visible@m"><a href="{% url 'admin:index' %}">Admin</a></li>
-                        {% endif %}
-                        <li class="uk-hidden@m"><a class="uk-navbar-toggle" uk-navbar-toggle-icon uk-toggle="target: #offcanvas-nav"></a></li>
-                    </ul>
-                </div>
-            </nav>
-        </div>
-        
-        <!-- Navbar mobile -->
-        <div id="offcanvas-nav" uk-offcanvas="flip: true; overlay: true">
-            <div class="uk-offcanvas-bar">
-                <button class="uk-offcanvas-close" type="button" uk-close></button>
-                <ul class="uk-nav uk-nav-default">
-                    <li><a href="{% url 'gallery:main_url' %}">Home</a></li>
-                    <li><a href="{% url 'gallery:albums_url' %}">Albums</a></li>
-                    <li><a href="{% url 'gallery:photos_url' %}">Photostream</a></li>
-                    <li><a href="{% url 'gallery:about_url' %}">About</a></li>
-                    {% if user.is_authenticated %}
-                    <li><a href="{% url 'admin:index' %}">Admin</a></li>
-                    {% endif %}
-                </ul>
-            </div>
-        </div>
-        {% endblock %}
-    
-    <!-- Header -->
-    <header class="uk-align-center uk-container-large">
-        <!-- Breadcrumb -->
-        {% block breadcrumb %} {% endblock %}
-    </header>
-
-    <!-- Main -->
-    <main class="uk-align-center uk-container-large">
-        {% block content %} No Content {% endblock %}
-    </main> 
-
-    <!-- Footer -->
-    <footer class="uk-align-center uk-container-large uk-text-center uk-text-light">
-        &copy; {% now "Y" %} Nyymix, powered by <a href="https://git.hakkeri.net/nyymix/muistox">muistox</a>.
-    </footer>   
-
-    <!-- Muistox JS -->
-    <script src="{% static 'js/muistox.js' %}" type="text/javascript"></script>
-
-</body>
-
-</html>