From 113f365880db6f25de08774b5a2a90219790aa4a Mon Sep 17 00:00:00 2001
From: Simon Conseil <s.conseil@ip2i.in2p3.fr>
Date: Fri, 17 Oct 2025 21:31:33 +0200
Subject: [PATCH] move header stuff to the base template

---
 .../themes/photoswipe/templates/album.html    |  2 -
 .../photoswipe/templates/album_items.html     |  2 +-
 .../photoswipe/templates/album_list.html      |  8 ++-
 .../themes/photoswipe/templates/base.html     | 49 ++++++++++++++++++
 .../themes/photoswipe/templates/ps_head.html  | 51 -------------------
 5 files changed, 53 insertions(+), 59 deletions(-)
 delete mode 100644 src/sigal/themes/photoswipe/templates/ps_head.html

diff --git a/src/sigal/themes/photoswipe/templates/album.html b/src/sigal/themes/photoswipe/templates/album.html
index 4576542..47a4105 100644
--- a/src/sigal/themes/photoswipe/templates/album.html
+++ b/src/sigal/themes/photoswipe/templates/album.html
@@ -1,8 +1,6 @@
 {% from 'description.html' import img_description %}
 {% extends "base.html" %}
 
-{% include "ps_head.html" %}
-
 {% block content %}
   {% include "album_items.html" %}
 {% endblock %}
diff --git a/src/sigal/themes/photoswipe/templates/album_items.html b/src/sigal/themes/photoswipe/templates/album_items.html
index 31064e3..eb56d95 100644
--- a/src/sigal/themes/photoswipe/templates/album_items.html
+++ b/src/sigal/themes/photoswipe/templates/album_items.html
@@ -9,7 +9,7 @@
           <a href="{{ media.url }}"
              data-pswp-width="{{media.size.width}}"
              data-pswp-height="{{media.size.height}}"
-             {%- if media.big -%}
+             {% if media.big %}
              data-big="{{ media.big_url }}"
              {%- endif -%}
              >
diff --git a/src/sigal/themes/photoswipe/templates/album_list.html b/src/sigal/themes/photoswipe/templates/album_list.html
index 7e7786c..82ef12d 100644
--- a/src/sigal/themes/photoswipe/templates/album_list.html
+++ b/src/sigal/themes/photoswipe/templates/album_list.html
@@ -1,9 +1,5 @@
 {% extends "base.html" %}
 
-{% if album.medias %}
-  {% include "ps_head.html" %}
-{% endif %}
-
 {% block content %}
   <div class="album-list">
   {% for alb in album.albums %}
@@ -16,5 +12,7 @@
   {% endfor %}
   </div>
 
-  {% include "album_items.html" %}
+  {% if album.medias %}
+    {% include "album_items.html" %}
+  {% endif %}
 {% endblock %}
diff --git a/src/sigal/themes/photoswipe/templates/base.html b/src/sigal/themes/photoswipe/templates/base.html
index 3d93339..58f6502 100644
--- a/src/sigal/themes/photoswipe/templates/base.html
+++ b/src/sigal/themes/photoswipe/templates/base.html
@@ -9,6 +9,55 @@
     <meta name="author" content="{{ album.author }}">
     <meta name="viewport" content="width=device-width">
     {% include 'default_head.html' %}
+
+{% if album.medias %}
+    <link rel="stylesheet" href="{{ theme.url }}/photoswipe.css">
+    <script type="module">
+    import PhotoSwipeLightbox from '{{ theme.url }}/photoswipe-lightbox.esm.min.js';
+    import PhotoSwipe from '{{ theme.url }}/photoswipe.esm.min.js';
+    import PhotoSwipeDynamicCaption from '{{ theme.url }}/photoswipe-dynamic-caption-plugin.esm.min.js';
+    import PhotoSwipeFullscreen from '{{ theme.url }}/photoswipe-fullscreen.esm.min.js';
+    import PhotoSwipeVideoPlugin from '{{ theme.url }}/photoswipe-video-plugin.esm.min.js';
+
+    const lightbox = new PhotoSwipeLightbox({
+      gallery: '.gallery',
+      children: '.thumbnail',
+      pswpModule: PhotoSwipe
+    });
+    const captionPlugin = new PhotoSwipeDynamicCaption(lightbox, {type: 'auto'});
+    const fullscreenPlugin = new PhotoSwipeFullscreen(lightbox);
+    const videoPlugin = new PhotoSwipeVideoPlugin(lightbox, {autoplay: true});
+
+    lightbox.on('uiRegister', function() {
+      lightbox.pswp.ui.registerElement({
+        name: 'download-button',
+        order: 8,
+        isButton: true,
+        tagName: 'a',
+        html: {
+          isCustomSVG: true,
+          inner: '<path d="M20.5 14.3 17.1 18V10h-2.2v7.9l-3.4-3.6L10 16l6 6.1 6-6.1ZM23 23H9v2h14Z" id="pswp__icn-download"/>',
+          outlineID: 'pswp__icn-download'
+        },
+        onInit: (el, pswp) => {
+          el.setAttribute('download', '');
+          el.setAttribute('target', '_blank');
+          el.setAttribute('rel', 'noopener');
+          pswp.on('change', () => {
+            if (pswp.currSlide.data.element.children[0].dataset.big) {
+              el.href = pswp.currSlide.data.element.children[0].dataset.big;
+            } else {
+              el.href = pswp.currSlide.data.src;
+            }
+          });
+        }
+      });
+    });
+
+    lightbox.init();
+    </script>
+{% endif %}
+
     {% block extra_head %}{% endblock extra_head %}
     <link rel="stylesheet" href="{{ theme.url }}/styles.css">
     {% if user_css %}
diff --git a/src/sigal/themes/photoswipe/templates/ps_head.html b/src/sigal/themes/photoswipe/templates/ps_head.html
deleted file mode 100644
index 77b1e0c..0000000
--- a/src/sigal/themes/photoswipe/templates/ps_head.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{% block extra_head %}
-  <!--
-    FIXME: When this is imported into "album_list.html",
-    {{ theme.url }} is empty
-  -->
-  <link rel="stylesheet" href="{{ theme.url }}/photoswipe.css">
-  <script type="module">
-  import PhotoSwipeLightbox from '{{ theme.url }}/photoswipe-lightbox.esm.min.js';
-  import PhotoSwipe from '{{ theme.url }}/photoswipe.esm.min.js';
-  import PhotoSwipeDynamicCaption from '{{ theme.url }}/photoswipe-dynamic-caption-plugin.esm.min.js';
-  import PhotoSwipeFullscreen from '{{ theme.url }}/photoswipe-fullscreen.esm.min.js';
-  import PhotoSwipeVideoPlugin from '{{ theme.url }}/photoswipe-video-plugin.esm.min.js';
-
-  const lightbox = new PhotoSwipeLightbox({
-    gallery: '.gallery',
-    children: '.thumbnail',
-    pswpModule: PhotoSwipe
-  });
-  const captionPlugin = new PhotoSwipeDynamicCaption(lightbox, {type: 'auto'});
-  const fullscreenPlugin = new PhotoSwipeFullscreen(lightbox);
-  const videoPlugin = new PhotoSwipeVideoPlugin(lightbox, {autoplay: true});
-
-  lightbox.on('uiRegister', function() {
-    lightbox.pswp.ui.registerElement({
-      name: 'download-button',
-      order: 8,
-      isButton: true,
-      tagName: 'a',
-      html: {
-        isCustomSVG: true,
-        inner: '<path d="M20.5 14.3 17.1 18V10h-2.2v7.9l-3.4-3.6L10 16l6 6.1 6-6.1ZM23 23H9v2h14Z" id="pswp__icn-download"/>',
-        outlineID: 'pswp__icn-download'
-      },
-      onInit: (el, pswp) => {
-        el.setAttribute('download', '');
-        el.setAttribute('target', '_blank');
-        el.setAttribute('rel', 'noopener');
-        pswp.on('change', () => {
-          if (pswp.currSlide.data.element.children[0].dataset.big) {
-            el.href = pswp.currSlide.data.element.children[0].dataset.big;
-          } else {
-            el.href = pswp.currSlide.data.src;
-          }
-        });
-      }
-    });
-  });
-
-  lightbox.init();
-  </script>
-{% endblock extra_head %}