From 6b4d5a71c427c443a81b3972e648b9f6c2cda5e4 Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <1152958806@qq.com>
Date: Mon, 9 Oct 2023 21:06:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E5=BA=93=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/album.html  |  9 ++-------
 templates/photos.html | 46 +++++++++++++++++++++++++++++++++----------
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/templates/album.html b/templates/album.html
index 05c2d856..2e7436dd 100644
--- a/templates/album.html
+++ b/templates/album.html
@@ -22,7 +22,7 @@
 
                     <div class="card-album">
                         <th:block th:each="group : ${photoFinder.groupBy()}">
-                            <div class="card" th:onclick="go([[${group.metadata.name}]])">
+                            <div class="card" th:onclick="pjax.loadUrl([['/photos?group='+${group.metadata.name}]])">
                                 <img class="card_cover"
                                      th:src="${isLazyload ? loadingImg : #annotations.get(group, 'cover')}"
                                      th:data-lazy-src="${ isLazyload ? #annotations.get(group, 'cover') : ''}"
@@ -50,17 +50,12 @@
                                 <figcaption>
                                     <div class="gallery-group-name">[[${group.spec.displayName}]]</div>
                                     <p>[[${#annotations.get(group, 'description')}]]</p><a target="_blank"
-                                                                                           rel="noopener" th:onclick="go([[${group.metadata.name}]])"></a>
+                                                                                           rel="noopener" th:onclick="pjax.loadUrl([['/photos?group='+${group.metadata.name}]])"></a>
                                 </figcaption>
                             </figure>
                         </th:block>
                     </div>
                 </div>
-                <script>
-                    const go = (photo_group_name) => {
-                        window.location.href = '/photos?photo_group_name=' + photo_group_name
-                    }
-                </script>
                 <style>
                     .gallery-groups {
                         box-shadow: var(--heo-shadow-border);
diff --git a/templates/photos.html b/templates/photos.html
index 38ce4219..bf70448f 100644
--- a/templates/photos.html
+++ b/templates/photos.html
@@ -13,18 +13,21 @@
             <div id="page">
                 <th:block th:if="${#strings.equals(theme.config.photos.photosStyle, 'default')}">
                     <th:block th:each="group : ${photoFinder.groupBy()}">
-                        <th:block th:if="${#strings.equals(group.metadata.name, param.photo_group_name)}" th:with="description = ${#annotations.get(group, 'description')},
+                        <th:block
+                                th:if="${#strings.equals(group.metadata.name, param.group) && not #strings.isEmpty(param.group)}"
+                                th:with="description = ${#annotations.get(group, 'description')},
                          background = ${#annotations.get(group, 'background')}">
                             <div class="author-content author-content-item essayPage single"
                                  th:style="'background:url('+${background}+') left 28% / cover no-repeat !important;'">
                                 <div class="card-content">
-                                    <div class="author-content-item-tips" text="相册集"></div>
+                                    <div class="author-content-item-tips">相册集</div>
                                     <span class="author-content-item-title" th:text="${group.spec.displayName}"></span>
                                     <div class="content-bottom">
                                         <div class="tips" th:text="${description}"></div>
                                     </div>
                                     <div class="banner-button-group">
-                                        <a class="banner-button" target="_blank" th:attr="onclick='pjax.loadUrl(\''+ ${theme.config.photos.topLink} +'\')'">
+                                        <a class="banner-button" target="_blank"
+                                           th:attr="onclick='pjax.loadUrl(\''+ ${theme.config.photos.topLink} +'\')'">
                                             <i class="haofont hao-icon-circle-arrow-right"></i>
                                             <span class="banner-button-text" th:text="返回"></span>
                                         </a>
@@ -33,13 +36,33 @@
                             </div>
                         </th:block>
                     </th:block>
+                    <th:block th:if="${#strings.isEmpty(param.group)}"
+                              th:with="background = ${theme.config.photos.backgroundImg}">
+                        <div class="author-content author-content-item essayPage single"
+                             th:style="'background:url('+${background}+') left 28% / cover no-repeat !important;'">
+                            <div class="card-content">
+                                <div class="author-content-item-tips">相册集</div>
+                                <span class="author-content-item-title">全部</span>
+                                <div class="content-bottom">
+                                    <div class="tips"></div>
+                                </div>
+                                <div class="banner-button-group">
+                                    <a class="banner-button" target="_blank"
+                                       th:attr="onclick='pjax.loadUrl(\''+ ${theme.config.photos.topLink} +'\')'">
+                                        <i class="haofont hao-icon-circle-arrow-right"></i>
+                                        <span class="banner-button-text" th:text="返回"></span>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                    </th:block>
                     <div id="article-container">
                         <section class="page-1 loadings">
                             <div class="type-gallery ">
                                 <div class="gallery">
-                                    <div class="fj-gallery-item"
-                                         th:each="photo : ${photoFinder.listBy(param.photo_group_name)}">
-                                        <div th:if="${theme.config.photos.tagEnable}" class="tag-address">[[${photo.spec.displayName}]]</div>
+                                    <div class="fj-gallery-item" th:each="photo : ${photos.items}">
+                                        <div th:if="${theme.config.photos.tagEnable}" class="tag-address">
+                                            [[${photo.spec.displayName}]]</div>
                                         <img th:src="${photo.spec.url}" th:alt="${photo.spec.description}"
                                              th:title="${photo.spec.description}">
 
@@ -52,17 +75,20 @@
 
                 <div class="gallery-groups" th:if="${#strings.equals(theme.config.photos.photosStyle, 'one')}">
                     <th:block th:each="group : ${photoFinder.groupBy()}">
-                        <h1 style="margin: 8px 0px 20px"  th:if="${#strings.equals(group.metadata.name, param.photo_group_name)}">
+                        <h1 style="margin: 8px 0px 20px" th:if="${#strings.equals(group.metadata.name, param.group) && not #strings.isEmpty(param.group) }">
                             [[${group.spec.displayName}]]
                         </h1>
+                        <h1 style="margin: 8px 0px 20px" th:if="${#strings.isEmpty(param.group) }">
+                            全部
+                        </h1>
                     </th:block>
                     <div id="article-container">
                         <section class="page-1 loadings">
                             <div class="type-gallery ">
                                 <div class="gallery">
-                                    <div class="fj-gallery-item"
-                                         th:each="photo : ${photoFinder.listBy(param.photo_group_name)}">
-                                        <div th:if="${theme.config.photos.tagEnable}" class="tag-address">[[${photo.spec.displayName}]]</div>
+                                    <div class="fj-gallery-item" th:each="photo : ${photos.items}">
+                                        <div th:if="${theme.config.photos.tagEnable}" class="tag-address">
+                                            [[${photo.spec.displayName}]]</div>
                                         <img th:src="${photo.spec.url}" th:alt="${photo.spec.description}"
                                              th:title="${photo.spec.description}">