fix add photo

camp/static/css/jquery.bxslider.css

@@ -1,170 +0,0 @@
-/** VARIABLES
-===================================*/
-/** RESET AND LAYOUT
-===================================*/
-.bx-wrapper {
-  position: relative;
-  margin-bottom: 60px;
-  padding: 0;
-  *zoom: 1;
-  -ms-touch-action: pan-y;
-  touch-action: pan-y;
-}
-.bx-wrapper img {
-  max-width: 100%;
-  display: block;
-}
-.bxslider {
-  margin: 0;
-  padding: 0;
-}
-ul.bxslider {
-  list-style: none;
-}
-.bx-viewport {
-  /*fix other elements on the page moving (on Chrome)*/
-  -webkit-transform: translatez(0);
-}
-/** THEME
-===================================*/
-
-.bx-wrapper .bx-pager,
-.bx-wrapper .bx-controls-auto {
-  position: absolute;
-  bottom: -30px;
-  width: 100%;
-}
-/* LOADER */
-.bx-wrapper .bx-loading {
-  min-height: 50px;
-  height: auto;
-  width: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 2000;
-}
-/* PAGER */
-.bx-wrapper .bx-pager {
-  text-align: center;
-  font-size: .85em;
-  font-family: Arial;
-  font-weight: bold;
-  color: #666;
-  padding-top: 20px;
-}
-.bx-wrapper .bx-pager.bx-default-pager a {
-  background: #666;
-  text-indent: -9999px;
-  display: block;
-  width: 10px;
-  height: 10px;
-  margin: 0 5px;
-  outline: 0;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
-}
-.bx-wrapper .bx-pager.bx-default-pager a:hover,
-.bx-wrapper .bx-pager.bx-default-pager a.active,
-.bx-wrapper .bx-pager.bx-default-pager a:focus {
-  background: #000;
-}
-.bx-wrapper .bx-pager-item,
-.bx-wrapper .bx-controls-auto .bx-controls-auto-item {
-  display: inline-block;
-  vertical-align: bottom;
-  *zoom: 1;
-  *display: inline;
-}
-.bx-wrapper .bx-pager-item {
-  font-size: 0;
-  line-height: 0;
-}
-/* DIRECTION CONTROLS (NEXT / PREV) */
-.bx-wrapper .bx-prev {
-  left: 10px;
-  background: url('controls.png') no-repeat 0 -32px;
-}
-.bx-wrapper .bx-prev:hover,
-.bx-wrapper .bx-prev:focus {
-  background-position: 0 0;
-}
-.bx-wrapper .bx-next {
-  right: 30px;
-  background: url('controls.png') no-repeat -43px -32px;
-}
-.bx-wrapper .bx-next:hover,
-.bx-wrapper .bx-next:focus {
-  background-position: -43px 0;
-}
-.bx-wrapper .bx-controls-direction a {
-  position: absolute;
-  top: 50%;
-  margin-top: -16px;
-  outline: 0;
-  width: 32px;
-  height: 32px;
-  text-indent: -9999px;
-  z-index: 9999;
-}
-.bx-wrapper .bx-controls-direction a.disabled {
-  display: none;
-}
-/* AUTO CONTROLS (START / STOP) */
-.bx-wrapper .bx-controls-auto {
-  text-align: center;
-}
-.bx-wrapper .bx-controls-auto .bx-start {
-  display: block;
-  text-indent: -9999px;
-  width: 10px;
-  height: 11px;
-  outline: 0;
-  background: url('images/controls.png') -86px -11px no-repeat;
-  margin: 0 3px;
-}
-.bx-wrapper .bx-controls-auto .bx-start:hover,
-.bx-wrapper .bx-controls-auto .bx-start.active,
-.bx-wrapper .bx-controls-auto .bx-start:focus {
-  background-position: -86px 0;
-}
-.bx-wrapper .bx-controls-auto .bx-stop {
-  display: block;
-  text-indent: -9999px;
-  width: 9px;
-  height: 11px;
-  outline: 0;
-  background: url('images/controls.png') -86px -44px no-repeat;
-  margin: 0 3px;
-}
-.bx-wrapper .bx-controls-auto .bx-stop:hover,
-.bx-wrapper .bx-controls-auto .bx-stop.active,
-.bx-wrapper .bx-controls-auto .bx-stop:focus {
-  background-position: -86px -33px;
-}
-/* PAGER WITH AUTO-CONTROLS HYBRID LAYOUT */
-.bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-pager {
-  text-align: left;
-  width: 80%;
-}
-.bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-controls-auto {
-  right: 0;
-  width: 35px;
-}
-/* IMAGE CAPTIONS */
-.bx-wrapper .bx-caption {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  background: #666;
-  background: rgba(80, 80, 80, 0.75);
-  width: 100%;
-}
-.bx-wrapper .bx-caption span {
-  color: #fff;
-  font-family: Arial;
-  display: block;
-  font-size: .85em;
-  padding: 10px;
-}

camp/static/css/main.css

@@ -58,6 +58,11 @@ a:focus, a:hover {
 	padding-left: 0em !important;
 	padding-top: 10px;  /* moved below search bar */
 }
+@media screen and (max-width: 39.9375em) {
+    .special-column {
+        padding-right: 0;
+    }
+}
 
 .index-text {
 	padding-left: 3%;

camp/static/css/site.scss

@@ -1,4 +1,9 @@
 .gallery-dialog  {
+  background: #282828;
+  overflow: hidden;
+  border: 1px solid black;
+}
+.gallery-dialog, .gallery-main-stage {
   &:open {
       background: #282828;
       width: 100%;
@@ -22,11 +27,13 @@
       height: calc(100vh - 180px);
   }
   @media screen and (max-width: 39.9375em) {
+    &:open {
+      overflow: auto;
+    }
     .photo-container .image {
         height: auto;
         width: 100%;
     }
-
   }
   .main-image {
       width: 100%;
@@ -35,15 +42,20 @@
   }
   .caption {
       margin: 10px 0;
-      font-size: 18px;
+      font-size: 14px;
       color: lightgray;
       text-align: center;
   }
   .thumbnails {
     display: flex;
     justify-content: center;
-    flex-wrap: wrap;
     margin-top: 10px;
+    overflow: auto;
+  }
+  @media screen and (max-width: 39.9375em) {
+    .thumbnails {
+      flex-wrap: wrap;
+    }
   }
   .thumbnail {
     width: 80px;
@@ -52,9 +64,6 @@
     cursor: pointer;
     border: 2px solid transparent;
   }
-  .thumbnail.active {
-    border-color: blue;
-  }
   .nav-btn {
       cursor: pointer;
       font-size: 20px;
@@ -84,7 +93,8 @@
   .close:hover {
       color: white !important;
   }
-  .download.disabled {
+  .download.disabled,
+  .edit.disabled  {
       display: none;
   }
   .download {
@@ -95,7 +105,15 @@
       right: 24px
 
   }
-  .download:hover {
+  .edit {
+      color: lightgray !important;
+      cursor: pointer;
+      position: absolute;
+      top: 4px;
+      left: 4px
+  }
+  .download:hover,
+  .edit:hover  {
       color: white !important;
   }
   @media screen and (max-width: 39.9375em) {
@@ -122,3 +140,60 @@
   }
 }
 
+.gallery-main-stage {
+  .photo-container .image {
+      height: auto;
+  }
+  .download {
+      right: 4px
+
+  }
+  @media screen and (max-width: 39.9375em) {
+      .download {
+      }
+  }
+}
+
+.gallery-dialog, .inline-gallery {
+  .thumbnail {
+    cursor: pointer;
+    border: 2px solid transparent;
+  }
+  .thumbnail.active {
+    cursor: initial;
+    border-color: #1779ba;
+  }
+}
+
+.inline-photo {
+  display: inline-block;
+  .caption {
+    display: none;
+  }
+  .photo {
+    scroll-margin-top: 12px;
+  }
+}
+.inline {
+  margin-left: -12px;
+  width: 100vw;
+  li {
+    padding: 0;
+  }
+  .inline-photo {
+    display: block;
+    .caption {
+      display: block;
+      color: #ffffff;
+      padding-left: 2px;
+      padding-right: 2px;
+      p {
+        margin-bottom: 0;
+      }
+    }
+  }
+}
+@media screen and (max-width: 39.9375em) {
+    .gallery {
+    }
+}

camp/static/js/gallery.js

@@ -1,9 +1,34 @@
+function isNumber(x) {
+  return parseFloat(x) == x
+};
+
+function isMobile() {
+    return getComputedStyle(document.querySelector('.special-column')).paddingRight == '0px'
+}
+
+function isInView(el) {
+    var rect = el.getBoundingClientRect();
+    var elemTop = rect.top;
+    var elemBottom = rect.bottom;
+
+    // Only completely visible elements return true:
+    var isVisible = (elemTop >= 0) && (elemBottom <= window.innerHeight);
+    // Partially visible elements return true:
+    //isVisible = elemTop < window.innerHeight && elemBottom >= 0;
+    return isVisible;
+}
+
 function parseGalleryHash() {
     let parts = document.location.hash.slice(1).split('/')
-    if (parts[0] == 'g') {
+    if (parts.lengh == 1 && isNumber(parts[0])) {
         return {
-            "gallery": parseInt(parts[1], 10),
+            'gallery': 'inline',
-            "image": parseInt(parts[2], 10),
+            "image": parseInt(parts[0], 10) - 1,
+        }
+    } else if (parts.length  == 2 && isNumber(parts[0]) && isNumber(parts[1])) {
+        return {
+            "gallery": parseInt(parts[0], 10) - 1,
+            "image": parseInt(parts[1], 10) - 1,
         }
     }
     return {}
@@ -11,9 +36,38 @@ function parseGalleryHash() {
 
 function loadGalleries() {
     let current = parseGalleryHash()
-    let galleryIdx = 1
+    let galleryIdx = 0
     document.querySelectorAll('.gallery').forEach(gallery => {
         var photos = [], dialog
+        gallery.querySelectorAll(".photo").forEach(img => {
+            const src = img.src.replace('_thumbnail', '_display')
+            let photo = {
+                src: src,
+                caption: img.dataset.caption,
+                orig: img.dataset.orig,
+                edit: img.dataset.edit
+            }
+            photos.push(photo)
+            img.parentElement.href = `#${galleryIdx+1}/${photos.length}`
+            img.parentElement.addEventListener("click", event => {
+                event.preventDefault()
+                event.stopPropagation()
+                dialog.open(src, -1, event)
+            })
+        })
+        if (isMobile()) {
+            dialog = loadInlineGallery(photos, galleryIdx, null, gallery)
+        } else {
+            dialog = loadGallery(photos, galleryIdx, null, gallery)
+        }
+        dialog.element && gallery.appendChild(dialog.element)
+        if (current.gallery == galleryIdx) {
+            dialog.open(undefined, current.image)
+        }
+        galleryIdx += 1
+    })
+    document.querySelectorAll('.inline-gallery').forEach(gallery => {
+        var photos = [], stage
         gallery.querySelectorAll(".photo").forEach(img => {
             const src = img.src.replace('_thumbnail', '_display')
             let photo = {
@@ -25,20 +79,86 @@ function loadGalleries() {
             img.parentElement.addEventListener("click", event => {
                 event.preventDefault()
                 event.stopPropagation()
-                dialog.open(src)
+                dialog.open(src, -1, event)
             })
         })
-        dialog = loadGallery(photos, galleryIdx)
+        const main = document.querySelector('.gallery-main-stage')
-        gallery.appendChild(dialog.element)
+        stage = loadGallery(photos, 'inline', main, gallery)
-        if (current.gallery == galleryIdx) {
-            dialog.open(undefined, current.image)
-        }
-        galleryIdx += 1
     })
 }
 
-function loadGallery(images, idx) {
+function loadInlineGallery(images, idx, main, thumbnails) {
-    var gallery = document.createElement("dialog")
+    thumbnails.querySelectorAll('.photo').forEach(img => {
+        const container = document.createElement('div')
+        container.classList.add("inline-photo")
+        container.innerHTML = `
+            <img class="photo" src="${img.src}">
+            <div class="caption">${img.dataset.caption||''}</div>
+        `
+        img.replaceWith(container)
+    })
+
+    function scroll(event) {
+        let found = false
+        let index = 0
+        thumbnails.querySelectorAll('.photo').forEach(img => {
+            if (!found) {
+                if (isInView(img)) {
+                    found = true
+                    const hash = `#${idx + 1}/${index + 1}`
+                    if (document.location.hash != hash) {
+                        document.location.hash = hash
+                    }
+                }
+            }
+            index += 1
+        })
+        /*
+        // fixme this jumps don't do it
+        if (!found && document.location.hash.slice(1).length) {
+            document.location.hash = ''
+        }
+        */
+    }
+
+    return {
+        element: null,
+        open: function(src, newIdx=-1, event=null) {
+            let img
+            if (newIdx != -1) {
+                img = thumbnails.querySelectorAll('.photo')[newIdx - 1]
+            }
+            if (thumbnails.classList.contains("inline")) {
+                thumbnails.classList.remove("inline");
+                thumbnails.querySelectorAll('.photo').forEach(img => {
+                    img.src = img.src.replace('_display', '_thumbnail')
+                })
+                thumbnails.previousElementSibling.scrollIntoView()
+                window.removeEventListener("scroll", scroll)
+            } else {
+                thumbnails.classList.add("inline");
+                thumbnails.querySelectorAll('.photo').forEach(img => {
+                    img.src = img.src.replace('_thumbnail', '_display')
+                })
+                setTimeout(() => {
+                    if (img) {
+                        img.scrollIntoView()
+                    } else if (event && event.target) {
+                        event.target.scrollIntoView()
+                    }
+                }, 20)
+                window.addEventListener("scroll", scroll)
+            }
+        }
+    }
+}
+function loadGallery(images, idx, main, thumbnails) {
+    let gallery;
+
+    if (idx == 'inline') {
+        gallery = main
+    } else {
+        gallery = document.createElement("dialog")
         gallery.classList.add("gallery-dialog")
         gallery.innerHTML = `
             <div class="photo-container">
@@ -49,6 +169,7 @@ function loadGallery(images, idx) {
                 <button class="next nav-btn">Next ❯</button>
             </div>
             <button class="close">&#10006;</button>
+            <a class="edit disabled" target="_blank" title="edit">&#9998;</a>
             <a class="download disabled" target="_blank" download title="download original">
                 <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 304 384"><path fill="currentColor" d="M299 128L149 277L0 128h85V0h128v128h86zM0 320h299v43H0v-43z"/></svg>
             </a>
@@ -70,14 +191,19 @@ function loadGallery(images, idx) {
                 gallery.close();
             }
         })
+    }
     let currentIndex = 0;
 
     const mainImage = gallery.querySelector(".main-image");
     const caption = gallery.querySelector(".caption");
     const prevBtn = gallery.querySelector(".prev.nav-btn");
     const nextBtn = gallery.querySelector(".next.nav-btn");
-    const thumbnailsContainer = gallery.querySelector(".thumbnails");
     const download = gallery.querySelector(".download");
+    const edit = gallery.querySelector(".edit");
+    let thumbnailsContainer
+    if (idx != 'inline') {
+        thumbnailsContainer = gallery.querySelector(".thumbnails");
+    }
 
     gallery.addEventListener("keydown", event => {
         if (event.keyCode == 39) {
@@ -97,9 +223,18 @@ function loadGallery(images, idx) {
             mainImage.src = images[index].src;
         }, 0)
         caption.innerHTML = images[index].caption;
+        if (idx == 'inline') {
+            thumbnails.querySelectorAll(".thumbnail").forEach((thumb, i) => {
+                thumb.classList.toggle("active", i === index);
+            });
+        } else {
             gallery.querySelectorAll(".thumbnail").forEach((thumb, i) => {
                 thumb.classList.toggle("active", i === index);
             });
+            if (thumbnailsContainer && !isMobile()) {
+                gallery.querySelector('.active').scrollIntoView()
+            }
+        }
         if (images[index].orig) {
             download.href = images[index].orig
             download.classList.remove('disabled')
@@ -107,9 +242,22 @@ function loadGallery(images, idx) {
             download.href = ""
             download.classList.add('disabled')
         }
+        if (edit) {
+            if (images[index].edit) {
+                edit.href = images[index].edit
+                edit.classList.remove('disabled')
+            } else {
+                edit.href = ""
+                edit.classList.add('disabled')
+            }
+        }
         prevBtn.disabled = index === 0;
         nextBtn.disabled = index === images.length - 1;
-        document.location.hash = `#g/${idx}/${index}`
+        if (idx == 'inline') {
+            document.location.hash = `#${index + 1}`
+        } else {
+            document.location.hash = `#${idx + 1}/${index + 1}`
+        }
     }
 
     function createThumbnails() {
@@ -117,7 +265,9 @@ function loadGallery(images, idx) {
             const thumb = document.createElement("img");
             thumb.src = img.src.replace('_display', '_thumbnail');
             thumb.classList.add("thumbnail");
-            thumb.onclick = () => {
+            thumb.onclick = (event) => {
+                event.preventDefault()
+                event.stopPropagation()
                 currentIndex = index;
                 updateGallery(index);
             };
@@ -131,6 +281,8 @@ function loadGallery(images, idx) {
     }
 
     prevBtn.onclick = () => {
+        event.preventDefault()
+        event.stopPropagation()
         if (currentIndex > 0) {
             currentIndex--;
             updateGallery(currentIndex);
@@ -138,29 +290,31 @@ function loadGallery(images, idx) {
     };
 
     nextBtn.onclick = () => {
+        event.preventDefault()
+        event.stopPropagation()
         if (currentIndex < images.length - 1) {
             currentIndex++;
             updateGallery(currentIndex);
         }
     };
 
-    createThumbnails();
+    idx != 'inline' && createThumbnails();
     updateGallery(currentIndex);
 
     const imagesIndex = images.map(img => img.src);
     return {
         element: gallery,
-        open: function(src, idx=-1) {
+        open: function(src, newIdx=-1) {
-            if (idx != -1) {
+            if (newIdx != -1) {
-                currentIndex = idx
+                currentIndex = newIdx
             } else {
                 currentIndex = imagesIndex.indexOf(src)
             }
             updateGallery(currentIndex)
+            if (idx != 'inline') {
                 showGallery()
             }
         }
+    }
 }
 window.addEventListener("load", loadGalleries)
-
-

camp/static/js/slideshow.js

@@ -1,50 +0,0 @@
-var startSlide = 0;
-if (document.querySelectorAll('.select-image').length && document.location.hash.length) {
-    startSlide = parseInt(document.location.hash.slice(1)) - 1
-}
-function loadSlideshow() {
-    $('a.original-link').bind('touchstart MSPointerDown pointerdown', function(event) {
-        event.stopPropagation()
-    });
-    $('a.original-link').on({
-        mousedown: function(event) {
-            event.stopPropagation()
-        },
-    })
-    slider = $('.slider1').show().bxSlider({
-      startSlide: startSlide,
-      preloadImages: 'all',
-      adaptiveHeight : true,
-      pager : false,
-});
-
-var images = $('.slider1 img'), count = images.length;
-images.on({load: function(event) {
-    setTimeout(function() {
-        slider.resize()
-        slider.redrawSlider()
-    }, 100)
-}})
-
-document.querySelectorAll('.select-image').forEach(function(a) {
-    a.onclick = function(event) {
-        event.preventDefault();
-        slider.goToSlide(parseInt(this.dataset.id) - 1)
-        document.location.hash = '#' + this.dataset.id;
-    };
-});
-
-$(document).keydown(function(e){
-    if (e.keyCode == 39) // Right arrow 
-        {
-            slider && slider.goToNextSlide && slider.goToNextSlide();
-            return false;
-        }
-    else if (e.keyCode == 37) // left arrow
-        {
-            slider && slider.goToPrevSlide && slider.goToPrevSlide();
-            return false;
-       }
- });
-}
-$(document).ready(loadSlideshow);

camp/templates/sortedm2m/sorted_checkbox_select_multiple_widget.html

@@ -8,16 +8,24 @@
     </p>
     <ul class="sortedm2m-items">
     {% for row in selected %}
-        <li class="sortedm2m-item"><label{{ row.label_for|safe }}>{{ row.rendered_cb }} {{ row | admin_thumbnail }} {{ row.option_label }}</label></li>
+    <li class="sortedm2m-item"><label{{ row.label_for|safe }}>{{ row.rendered_cb }} {{ row | admin_thumbnail }} <div>{{ row.option_label }}</div></label></li>
     {% endfor %}
 
     {% for row in unselected %}
-        <li class="sortedm2m-item"><label{{ row.label_for|safe }}>{{ row.rendered_cb }} {{ row | admin_thumbnail }}{{ row.option_label }}</label></li>
+    <li class="sortedm2m-item"><label{{ row.label_for|safe }}>{{ row.rendered_cb }} {{ row | admin_thumbnail }}<div>{{ row.option_label }}</div></label></li>
     {% endfor %}
     </ul>
 
     <p class="help">
         {% trans "Choose items and order by drag & drop." %}
     </p>
-
+    <style>
+        .sortedm2m-container ul label {
+            display: flex;
+            gap: 8px;
+        }
+        .sortedm2m-item > label > div {
+            text-wrap-mode: wrap;
+        }
+    </style>
 </div>

content/models.py

@@ -200,7 +200,8 @@ class Content(models.Model):
         if self.photo and self.photo.image.url.endswith('.gif'):
             video_path = self.photo.image.path.replace('.gif', '.mp4')
             image_path = self.photo.image.path.replace('.gif', '.jpg')
-            if os.path.exists(self.photo.image.path) and not os.path.exists(video_path):
+            if os.path.exists(self.photo.image.path):
+                if not os.path.exists(video_path):
                     height = self.photo.image.height
                     if height % 2:
                         height += 1

content/templates/base.html

@@ -10,7 +10,6 @@
     {% endblock %}
     <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans"/>
     <link rel="stylesheet" type="text/css" href="{% static "css/foundation.css" %}?20250201">
-    <link rel="stylesheet" type="text/css" href="{% static "css/jquery.bxslider.css" %}">
     {% compress css file site %}
     <link rel="stylesheet" type="text/css" href="{% static "css/main.css" %}"> 
     <link rel="stylesheet" type="text/css" href="{% static "css/app.css" %}"> 
@@ -47,16 +46,12 @@
   {% block content %}
   {% endblock %}
 
-
-  {}
     <script src="{% static "js/jquery.js" %}"></script>
     <script src="{% static "js/foundation.js" %}"></script>
   {% compress js file base %}
     <script src="{% static "js/app.js" %}"></script>
     <script src="{% static "js/what-input.js" %}"></script>
-    <script src="{% static "js/jquery.bxslider.js" %}?2"></script>
     <script src="{% static "js/gallery.js" %}"></script>
-    <script src="{% static "js/slideshow.js" %}"></script>
   {% endcompress %}
   {% block end %}
   {% endblock %}

content/templates/gallery.html

@@ -2,7 +2,12 @@
     <h6><strong>{{gallery.title}}</strong></h6>
     <ul class="clearing-thumbs gallery" data-clearing>
     {% for photo in gallery.public %}
-    <li><a href="{{ gallery.get_absolute_url }}#{{forloop.counter}}"><img src="{{ photo.get_thumbnail_url }}" class="photo" data-caption="{{ photo.caption_html }}"{% if request.user.is_staff %} data-orig="{{ photo.image.url }}"{% endif %}></a></li>
+    <li><a href="{{ gallery.get_absolute_url }}#{{forloop.counter}}"><img src="{{ photo.get_thumbnail_url }}"
+           class="photo"
+           data-caption="{{ photo.caption_html }}"
+           {% if request.user.is_staff %}data-orig="{{ photo.image.url }}"{% endif %}
+           {% if request.user.is_staff %}data-edit="{{ photo.edit_url }}"{% endif %}
+        ></a></li>
     {% endfor %}
     </ul>
 {% endif %}

content/templates/photologue/gallery_detail.html

@@ -10,33 +10,34 @@
         <h6 class="page-header"><a href="{{ gallery.content.all.0.get_absolute_url }}">Back to {{ gallery.content.all.0.title }}</a></h6>
         {% endif %}
         <h5>{{ gallery.title }}</h5>
-        <ul class="slider1">
+        {% with gallery.public.0 as photo %}
-            {% for photo in gallery.public %}
+        <div class="gallery-main-stage">
-            <li id="slide-{{photo.slug}}">
+            <div class="photo-container">
-                <img src="{{ photo.get_display_url }}" alt="{{ photo.title }}" loading="lazy">
+                <div class="image">
-                <p>
+                    <img src="{{ photo.get_display_url }}" alt="{{ photo.title }}" class="main-image" alt="{{ photo.title }}">
-                    {{ photo.caption|safe }}
+                </div>
-                    {% if photo.caption %}<br>{%endif%}
+                <button class="prev nav-btn">❮ Prev</button>
-                    {% if request.user.is_staff %}<a href="{{ photo.image.url }}" class="original-link" target="_blank" >Link to original file</a>{% endif %}
+                <button class="next nav-btn">Next ❯</button>
-                </p>
+                <a class="download disabled" target="_blank" download title="download original">
-
+                    <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 304 384"><path fill="currentColor" d="M299 128L149 277L0 128h85V0h128v128h86zM0 320h299v43H0v-43z"/></svg>
-            </li>
+                </a>
-            {% endfor %}
+            </div>
-        </ul>
+            <div class="caption">{{ photo.caption_html }}</div>
+        </div>
+        {% endwith %}
     </div>
     <div class="medium-3 columns">
         <br>
         <p>{% trans "Other photos" %}:</p>
-        <div>
+        <div class="inline-gallery">
                 {% for photo in gallery.public %}
                 <div style="float: left; padding: 4px">
-                    <a href="{{ photo.get_absolute_url }}" class="select-image" data-id="{{forloop.counter}}">
+                    <a href="{{ gallery.get_absolute_url }}#{{forloop.counter}}">
-                        <img src="{{ photo.get_thumbnail_url }}" class="thumbnail" alt="{{ photo.title }}">
+                        <img src="{{ photo.get_thumbnail_url }}" class="thumbnail photo" alt="{{ photo.title }}" data-caption="{{ photo.caption_html }}"{% if request.user.is_staff %} data-orig="{{ photo.image.url }}"{% endif %}>
                     </a>
                 </div>
                 {% endfor %}
         </div>
     </div>
 </div>
-
 {% endblock %}

content/templates/photologue/photo_detail.html

@@ -8,7 +8,7 @@
     <div class="medium-9 columns">
         <img src="{{ object.get_display_url }}" alt="{{ object.title }}">
         <p>
-            {{ object.caption|safe }}
+            {{ object.caption_html|safe }}
             {% if object.caption %}<br>{%endif%}
             {% if request.user.is_staff %}<a href="{{ photo.image.url }}" class="original-link" target="_blank" >Link to original file</a>{% endif %}
         </p>

photologue/models.py

@@ -281,7 +281,9 @@ class ImageModel(models.Model):
         if func is None:
             return _('An "admin_thumbnail" photo size has not been defined.')
         else:
-            if hasattr(self, 'get_absolute_url'):
+            if not self.id:
+                return ""
+            elif hasattr(self, 'get_absolute_url'):
                 return mark_safe(f'<a href="{self.get_absolute_url()}"><img src="{func()}"></a>')
             else:
                 return mark_safe(f'<a href="{self.image.url}"><img src="{func()}"></a>')
@@ -539,7 +541,7 @@ class Photo(ImageModel):
         verbose_name_plural = _("photos")
 
     def __str__(self):
-        return self.title
+        return "%s\n%s" % (self.title, self.caption)
 
     def save(self, *args, **kwargs):
         # If crop_from or effect property has been changed on existing image,
@@ -594,9 +596,12 @@ class Photo(ImageModel):
     def caption_html(self):
         caption = self.caption
         if caption:
-            return mark_safe(markdownify(caption))
+            return markdownify(caption)
         return caption
 
+    def edit_url(self):
+        return '/admin/photologue/photo/%s/change/' % self.id
+
 class BaseEffect(models.Model):
     name = models.CharField(_('name'),
                             max_length=30,