photo-objects 0.10.0__py3-none-any.whl → 0.10.2__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-0.10.0.dist-info → photo_objects-0.10.2.dist-info}/METADATA

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

{photo_objects-0.10.0.dist-info → photo_objects-0.10.2.dist-info}/RECORD

@@ -8,7 +8,7 @@ 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/forms.py,sha256=DWCnVEznev3h5ztYXz0gjMGZ8QUwlqML4KUKHcUiiZ4,7848
 photo_objects/django/models.py,sha256=OxkkczIBg7TaFWWm4VdtbRMJOK_OQKrV29g-X2cm5BQ,7247
 photo_objects/django/objsto.py,sha256=kf-Tv-kDt47Mnx0xMolAct_lP4M0H9xg03M3BnfAnJM,6909
 photo_objects/django/signals.py,sha256=_gb4vlZkeFNYWXxwhNreaUJoOsbIWvP8OovVLtzepaE,2161
@@ -59,8 +59,8 @@ photo_objects/django/views/ui/photo.py,sha256=EOu43klthhmG6ysCrw2NWb7Vcz8I3FBR6G
 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.0.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
-photo_objects-0.10.0.dist-info/METADATA,sha256=NoIKg2yngg8mybPuaHUl336sipa2ftiG7JSWJWxJzOo,3616
-photo_objects-0.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-photo_objects-0.10.0.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
-photo_objects-0.10.0.dist-info/RECORD,,
+photo_objects-0.10.2.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
+photo_objects-0.10.2.dist-info/METADATA,sha256=q_Nk6If3razFXjshLRH0swB4m1OcqG6pgeugr3g5USU,3616
+photo_objects-0.10.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+photo_objects-0.10.2.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
+photo_objects-0.10.2.dist-info/RECORD,,