photo-objects 0.10.1__py3-none-any.whl → 0.10.3__py3-none-any.whl

photo_objects/django/forms.py

@@ -20,6 +20,10 @@ from .models import Album, Photo, PhotoChangeRequest
 KEY_POSTFIX_CHARS = 'bcdfghjklmnpqrstvwxz2456789'
 KEY_POSTFIX_LEN = 5
 
+ALBUM_TITLE_HELP = _(
+    'When creating a new album, album key is generated based on the title. '
+    'Modifying the title later does not change the album key.'
+)
 ALT_TEXT_HELP = _('Alternative text content for the photo.')
 
 
@@ -37,6 +41,44 @@ def description_help(resource):
     }
 
 
+def visibility_help(visibility: str):
+    visibility = Album.Visibility(visibility)
+    if visibility == Album.Visibility.PUBLIC:
+        return _(
+            'The album is visible to anyone without authentication.')
+    if visibility == Album.Visibility.HIDDEN:
+        return _(
+            'The album is visible to anyone with the link. Only '
+            'authenticated users can see the album in albums list.')
+    if visibility == Album.Visibility.PRIVATE:
+        return _(
+            'The album is only visible to authenticated users.')
+    if visibility == Album.Visibility.ADMIN:
+        return _(
+            'The album is only visible to admin users.')
+    return None
+
+
+class VisibilityRadioSelect(RadioSelect):
+    def create_option(
+        self, name, value, label, selected, index, subindex=None, attrs=None
+    ):
+        option = super().create_option(
+            name,
+            value,
+            label,
+            selected,
+            index,
+            subindex=subindex,
+            attrs=attrs)
+        option['label'] = mark_safe(f'''
+<div>
+  <span class="label">{label}</span>
+  <p class="helptext">{visibility_help(option.get('value'))}</p>
+</div>''')
+        return option
+
+
 def _check_admin_visibility(form):
     if form.user and form.user.is_staff:
         return
@@ -60,7 +102,10 @@ class CreateAlbumForm(ModelForm):
         fields = ['key', 'title', 'description', 'visibility']
         help_texts = {
             **description_help('album'),
+            'title': ALBUM_TITLE_HELP,
         }
+        widgets = {'visibility': VisibilityRadioSelect(
+            attrs={'class': 'visibility-select'}), }
 
     def __init__(self, *args, user=None, **kwargs):
         super().__init__(*args, **kwargs)
@@ -136,9 +181,15 @@ class ModifyAlbumForm(ModelForm):
             'cover_photo': _(
                 'Select a cover photo for the album. The cover photo is '
                 'visible on the albums list page and in album preview image.'),
+            'title': ALBUM_TITLE_HELP,
         }
         widgets = {
-            'cover_photo': RadioSelect(attrs={'class': 'photo-select'}),
+            'cover_photo': RadioSelect(
+                attrs={
+                    'class': 'photo-select'}),
+            'visibility': VisibilityRadioSelect(
+                attrs={
+                    'class': 'visibility-select'}),
         }
 
     def __init__(self, *args, user=None, **kwargs):

photo_objects/django/migrations/0008_sitesettings_copyright_notice.py

@@ -0,0 +1,29 @@
+# Generated by Django 5.2.6 on 2025-12-20 18:09
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('photo_objects', '0007_backup'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sitesettings',
+            name='copyright_notice',
+            field=models.CharField(blank=True, help_text='Copyright notice to display in the site footer. Content will be HTML-escaped before rendering.'),
+        ),
+        migrations.AlterField(
+            model_name='sitesettings',
+            name='description',
+            field=models.TextField(blank=True, help_text='Description of the site, used in site level meta description tags and social media previews.'),
+        ),
+        migrations.AlterField(
+            model_name='sitesettings',
+            name='preview_image',
+            field=models.ForeignKey(blank=True, help_text='Photo to use as the site level social media preview image.', null=True, on_delete=django.db.models.deletion.SET_NULL, to='photo_objects.photo'),
+        ),
+    ]

photo_objects/django/models.py

@@ -211,10 +211,26 @@ class SiteSettings(models.Model):
     site = models.OneToOneField(
         Site, on_delete=models.CASCADE, related_name="settings")
 
-    description = models.TextField(blank=True)
+    description = models.TextField(
+        blank=True,
+        help_text=_(
+            "Description of the site, used in site level meta description "
+            "tags and social media previews."),
+    )
     preview_image = models.ForeignKey(
-        Photo, blank=True, null=True, on_delete=models.SET_NULL)
-
+        Photo,
+        blank=True,
+        null=True,
+        on_delete=models.SET_NULL,
+        help_text=_(
+            "Photo to use as the site level social media preview image."),
+    )
+    copyright_notice = models.CharField(
+        blank=True,
+        help_text=_(
+            "Copyright notice to display in the site footer. Content will be "
+            "HTML-escaped before rendering."),
+    )
     objects = SiteSettingsManager()
 
     def __str__(self):

photo_objects/django/templatetags/photo_objects_extras.py

@@ -1,5 +1,7 @@
 from datetime import datetime
 from django import template
+from django.utils.safestring import mark_safe
+from django.utils.html import escape
 
 from photo_objects.django.models import SiteSettings
 from photo_objects.django.views.utils import meta_description
@@ -59,3 +61,19 @@ def meta_og(context):
         }
     except Exception:
         return context
+
+
+@register.simple_tag(takes_context=True)
+def copyright_notice(context):
+    try:
+        request = context.get("request")
+        site = request.site
+
+        settings = SiteSettings.objects.get(site)
+
+        if settings.copyright_notice:
+            notice = escape(settings.copyright_notice)
+            return mark_safe(f"<div>{notice}</div>")
+        return ""
+    except Exception:
+        return ""

photo_objects/django/views/ui/album.py

@@ -56,6 +56,18 @@ def get_info(request: HttpRequest, album_key: str):
     return None
 
 
+def _timeline(album: Album):
+    if not album.first_timestamp or not album.last_timestamp:
+        return None
+
+    start = album.first_timestamp.strftime("%Y %B")
+    end = album.last_timestamp.strftime("%Y %B")
+
+    if start == end:
+        return start
+    return f"{start} – {end}"
+
+
 @json_problem_as_html
 def show_album(request: HttpRequest, album_key: str):
     album = api.check_album_access(request, album_key)
@@ -64,6 +76,7 @@ def show_album(request: HttpRequest, album_key: str):
     back = BackLink("Albums", reverse('photo_objects:list_albums'))
     details = {
         "Description": render_markdown(album.description),
+        "Timeline": _timeline(album),
         "Visibility": Album.Visibility(album.visibility).label,
     }
 

{photo_objects-0.10.1.dist-info → photo_objects-0.10.3.dist-info}/METADATA

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

{photo_objects-0.10.1.dist-info → photo_objects-0.10.3.dist-info}/RECORD

@@ -8,8 +8,8 @@ photo_objects/django/admin.py,sha256=pvyQKs2FMtKtSS2PE_NKR_jsSi7-GKz3bbsqDNgjt6w
 photo_objects/django/apps.py,sha256=Apqu6o6fpoxda18NQgKupvQRvTAZxVviIK_-dUR3rck,1444
 photo_objects/django/conf.py,sha256=ZpeIulEc1tpr8AO52meNKOF30Xf5osbDtDyHvQRtkx4,2593
 photo_objects/django/context_processors.py,sha256=XacUmcYV-4NMMMNXPWrHKdvNd6lfyamisngaVerREiU,306
-photo_objects/django/forms.py,sha256=HIkDRQhSMzvj0D4BdKEuEndB3bV-3NTH_h0gMRQ9UlQ,6123
-photo_objects/django/models.py,sha256=OxkkczIBg7TaFWWm4VdtbRMJOK_OQKrV29g-X2cm5BQ,7247
+photo_objects/django/forms.py,sha256=DWCnVEznev3h5ztYXz0gjMGZ8QUwlqML4KUKHcUiiZ4,7848
+photo_objects/django/models.py,sha256=DsbaFo3xhzy5MHgtZXYmZuaHYqJSPPCTaZWAy_lHndU,7746
 photo_objects/django/objsto.py,sha256=kf-Tv-kDt47Mnx0xMolAct_lP4M0H9xg03M3BnfAnJM,6909
 photo_objects/django/signals.py,sha256=_gb4vlZkeFNYWXxwhNreaUJoOsbIWvP8OovVLtzepaE,2161
 photo_objects/django/urls.py,sha256=QHGjDj3XCArLtmMcP3DKp8H9Xfd2X4SEvEKmMnx2KDk,2551
@@ -32,9 +32,10 @@ photo_objects/django/migrations/0004_camera_setup_and_settings.py,sha256=CS5xyIH
 photo_objects/django/migrations/0005_sitesettings.py,sha256=Ilf5vUwTFQfXVP37zz0NWo5dQdeHDh5e-MV3enm0ZKI,994
 photo_objects/django/migrations/0006_photo_alt_text.py,sha256=5ZWR-bfS_72Mpb0SrvtnWzVME-zlcRPzDCofmFWkUeU,1003
 photo_objects/django/migrations/0007_backup.py,sha256=tLHLAnojppT6mhFF3FokGdwDbIj40_yqO9qMFm0H3UI,649
+photo_objects/django/migrations/0008_sitesettings_copyright_notice.py,sha256=PmSAR85zZ6YEqfjZJCBnTONroIf4GSGC2m9BUkb2xf4,1118
 photo_objects/django/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-photo_objects/django/templatetags/photo_objects_extras.py,sha256=1L6wweVA96rTWVXqgyf8gSey1wQKi01h6sqv9kZeTIY,1399
+photo_objects/django/templatetags/photo_objects_extras.py,sha256=FH5JlNigVf1StIphRrd87nRzEhbrB9FYDWSiS7M1cAY,1890
 photo_objects/django/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/tests/test_album.py,sha256=Uik36QbhaEojed6g862xqj8YI0d2963StU-lOpqMqAc,13095
 photo_objects/django/tests/test_auth.py,sha256=hgr1UMVLvSI1x5zY7wTEXSBKfM5E_sNMIFlx8mVWYPY,3928
@@ -53,14 +54,14 @@ photo_objects/django/views/api/auth.py,sha256=EN_ExegzmLN-bhSzu3L9-6UE9qodPd7_ZR
 photo_objects/django/views/api/photo.py,sha256=WHSayWTi_wG6otq6Rz1IKqJ5ik5riclR3AWB15ge5RU,4613
 photo_objects/django/views/api/utils.py,sha256=uQzKdSKHRAux5OZzqgWQr0gsK_FeweQP0cg_67OWA_Y,264
 photo_objects/django/views/ui/__init__.py,sha256=Y3XrckZExbHpWVNwDUGLfb99_midb8-5j6Ouf_Yu_G4,128
-photo_objects/django/views/ui/album.py,sha256=IYjhjBj9MOffUDUSTm3IMjJoz-xGfvA_LVa0Vc_aXV8,5167
+photo_objects/django/views/ui/album.py,sha256=0n_c-5MYJouzg2plK6_ZBtE6iqOdaqttY1RdsFO2V9s,5495
 photo_objects/django/views/ui/configuration.py,sha256=miEJTm_cRANu9Wt3SCcU-tYUwM7WLKgQm8zgApmKMxE,5464
 photo_objects/django/views/ui/photo.py,sha256=EOu43klthhmG6ysCrw2NWb7Vcz8I3FBR6GZUFhLBLG4,6281
 photo_objects/django/views/ui/photo_change_request.py,sha256=PGP98APOVTkTw3FTvzYn92BBshensFwA8U0w8l1vIjg,2127
 photo_objects/django/views/ui/users.py,sha256=ABAtKwNoViYy2ht6X313BSm6wgvL302LVUNimp43gxc,649
 photo_objects/django/views/ui/utils.py,sha256=fAEgG6cdL_u9TBLWgqQGG8zC0RX1a-9vC6C06ST7InM,823
-photo_objects-0.10.1.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
-photo_objects-0.10.1.dist-info/METADATA,sha256=-epYO3uZXgbPW4MgGPKBKAb6JBG-ByGD0ID_3ts2gtA,3616
-photo_objects-0.10.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-photo_objects-0.10.1.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
-photo_objects-0.10.1.dist-info/RECORD,,
+photo_objects-0.10.3.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
+photo_objects-0.10.3.dist-info/METADATA,sha256=9I5HA3kH3eW3Sg5bY3GC1Yd24wv_0haEP2Jta8IEyOw,3616
+photo_objects-0.10.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+photo_objects-0.10.3.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
+photo_objects-0.10.3.dist-info/RECORD,,