photo-objects 0.1.0__tar.gz → 0.2.1__tar.gz

{photo_objects-0.1.0 → photo_objects-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.1.0
+Version: 0.2.1
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License

{photo_objects-0.1.0 → photo_objects-0.2.1}/photo_objects/django/templatetags/photo_objects_extras.py

@@ -1,6 +1,6 @@
 from django import template
 
-from photo_objects.django.models import Album
+from photo_objects.django.api.album import get_site_album
 
 
 register = template.Library()
@@ -41,7 +41,7 @@ def meta_og(context):
     try:
         request = context.get("request")
         site = request.site
-        album = Album.objects.get(key=f'_site_{site.id}')
+        album = get_site_album(site.id)
 
         return {
             'request': request,

{photo_objects-0.1.0 → photo_objects-0.2.1}/photo_objects/django/urls.py

@@ -68,16 +68,7 @@ urlpatterns = [
     # TODO: img/<str:album_key>/<str:photo_key>/<str:size_key> path
     path(
         "users/login",
-        auth_views.LoginView.as_view(
-            template_name="photo_objects/form.html",
-            extra_context={
-                "title": "Login",
-                "action": "Login",
-                "back": BackLink(
-                    f'Back to albums',
-                    reverse_lazy('photo_objects:list_albums')),
-            },
-        ),
+        ui.login,
         name="login",
     ),
     path(

{photo_objects-0.1.0 → photo_objects-0.2.1}/photo_objects/django/views/ui/__init__.py

@@ -1,3 +1,4 @@
 from .album import *
 from .configuration import *
 from .photo import *
+from .users import *

{photo_objects-0.1.0 → photo_objects-0.2.1}/photo_objects/django/views/ui/album.py

@@ -51,13 +51,13 @@ def new_album(request: HttpRequest):
 def get_info(request: HttpRequest, album_key: str):
     site_id = parse_site_id(album_key)
     if site_id is not None and request.site:
-        return (
+        return render_markdown(
             "This is a special album for configuring site metadata for "
-            f"{request.site.name}. Use album title to override the site name, "
-            "albums cover photo to configure the preview image, and album "
-            "description to configure the site description. The album title "
-            "is automatically updated when the related sites name is changed "
-            "and vice versa.")
+            f"**{request.site.name}**. Use album title to change the site "
+            "name, albums cover photo to configure the preview image, and "
+            "album description to configure the site description. The album "
+            "title is automatically updated when the related sites name is "
+            "changed and vice versa.")
 
 
 @json_problem_as_html

{photo_objects-0.1.0 → photo_objects-0.2.1}/photo_objects/django/views/ui/photo.py

@@ -1,7 +1,6 @@
 from django.http import HttpRequest, HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse
-from django.utils.safestring import mark_safe
 
 from photo_objects.django import api
 from photo_objects.django.api.utils import AlbumNotFound, FormValidationFailed

photo_objects-0.2.1/photo_objects/django/views/ui/users.py

@@ -0,0 +1,23 @@
+from django.contrib.auth import views as auth_views
+from django.http import HttpRequest
+from django.urls import reverse_lazy
+
+from photo_objects.django.api.album import get_site_album
+from photo_objects.django.views.utils import BackLink
+
+
+def login(request: HttpRequest):
+    album, _ = get_site_album(request.site)
+
+    return auth_views.LoginView.as_view(
+        template_name="photo_objects/form.html",
+        extra_context={
+            "title": "Login",
+            "photo": album.cover_photo,
+            "action": "Login",
+            "back": BackLink(
+                f'Back to albums',
+                reverse_lazy('photo_objects:list_albums')),
+            "class": "login"
+        },
+    )(request)

{photo_objects-0.1.0 → photo_objects-0.2.1}/photo_objects.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.1.0
+Version: 0.2.1
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License

{photo_objects-0.1.0 → photo_objects-0.2.1}/photo_objects.egg-info/SOURCES.txt

@@ -52,4 +52,5 @@ photo_objects/django/views/ui/__init__.py
 photo_objects/django/views/ui/album.py
 photo_objects/django/views/ui/configuration.py
 photo_objects/django/views/ui/photo.py
+photo_objects/django/views/ui/users.py
 photo_objects/django/views/ui/utils.py

{photo_objects-0.1.0 → photo_objects-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "photo-objects"
-version = "0.1.0"
+version = "0.2.1"
 dependencies = [
     "markdown~=3.7",
     "minio~=7.2",