From 0bd62ff0930a505e03d62ab72e969bdbd0ff654f Mon Sep 17 00:00:00 2001
From: j m <1406993111@qq.com>
Date: Mon, 9 Dec 2024 21:01:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=AD=E7=82=B9=E5=87=BB=E7=BC=96=E8=BE=91=E6=8C=89=E9=94=AE?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=96=87=E7=AB=A0=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/main/article.html | 15 +++++++++------
 theme.yaml                  |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/templates/main/article.html b/templates/main/article.html
index b118d68..242e1c6 100644
--- a/templates/main/article.html
+++ b/templates/main/article.html
@@ -1,11 +1,12 @@
 <th:block xmlns:th="https://www.thymeleaf.org"
      th:fragment="article (post, type)"
      th:with="updateInterval = ${T(java.lang.Math).floor((#dates.createNow().getTime()/1000.0 - post.status.lastModifyTime.getEpochSecond())/86400.0).intValue()},
+     isPost = ${type == 'Post'},
      thumbnail = ${#strings.isEmpty(post.spec.cover) ? #strings.isEmpty(theme.config.post.default_thumbnail) ? '' : theme.config.post.default_thumbnail + (#strings.contains(theme.config.post.default_thumbnail, '?') ? '&' : '?') + 'id=' + post.metadata.name : thumbnail.gen(post.spec.cover, 'xl')}">
 
     <div th:if="${!#strings.isEmpty(thumbnail)}" class="card widget">
         <div class="cover-image" th:style="'background-image: url(' + ${thumbnail} + ')'">
-            <div th:if="${type == 'Post' && !#lists.isEmpty(post.categories)}" class="category">
+            <div th:if="${isPost && !#lists.isEmpty(post.categories)}" class="category">
                 <a th:each="cy : ${post.categories}" th:href="${cy.status.permalink}"
                    th:text="${cy.spec.displayName}"></a>&nbsp;
             </div>
@@ -18,7 +19,8 @@
                     </li>
                     <li><i class="ri-thumb-up-line"></i>[[${post.stats.upvote}]]</li>
                     <li><i class="ri-quill-pen-line"></i>[[${#strings.length(#strings.trim(post.content.content))}]]</li>
-                    <li th:if="${theme.config.basic_style.expand_login_skill && logonUserName == post.spec.owner}" class="is-hidden-laptop"><a target="_blank" title="编辑文章" th:href="@{/console/posts/editor(name=${post.metadata.name})}"><i class="ri-edit-2-line"></i>编辑</a></li>
+                    <li th:if="${theme.config.basic_style.expand_login_skill && logonUserName == post.spec.owner}" class="is-hidden-laptop">
+                        <a target="_blank" title="编辑文章" th:href="@{|/console/${isPost ? 'posts' : 'single-pages'}/editor?name=${post.metadata.name}|}"><i class="ri-edit-2-line"></i>编辑</a></li>
                 </ul>
             </div>
         </div>
@@ -46,9 +48,10 @@
                         </li>
                         <li><i class="ri-thumb-up-line"></i>[[${post.stats.upvote}]]</li>
                         <li><i class="ri-quill-pen-line"></i>[[${#strings.length(#strings.trim(post.content.content))}]]</li>
-                        <li th:if="${theme.config.basic_style.expand_login_skill && logonUserName == post.spec.owner}" class="is-hidden-laptop"><a target="_blank" title="编辑文章" th:href="@{/console/posts/editor(name=${post.metadata.name})}"><i class="ri-edit-2-line"></i>编辑</a></li>
+                        <li th:if="${theme.config.basic_style.expand_login_skill && logonUserName == post.spec.owner}" class="is-hidden-laptop">
+                            <a target="_blank" title="编辑文章"  th:href="@{|/console/${isPost ? 'posts' : 'single-pages'}/editor?name=${post.metadata.name}|}"><i class="ri-edit-2-line"></i>编辑</a></li>
                     </ul>
-                    <div th:if="${type == 'Post' && !#lists.isEmpty(post.categories)}" class="level-item">
+                    <div th:if="${isPost && !#lists.isEmpty(post.categories)}" class="level-item">
                         <a th:each="cy : ${post.categories}" th:href="${cy.status.permalink}"
                            th:text="${cy.spec.displayName}"></a>&nbsp;
                     </div>
@@ -62,7 +65,7 @@
 
             <th:block th:replace="~{main/admire}"/>
 
-            <div th:if="${type == 'Post' && !#lists.isEmpty(post.tags)}" class="article-operation">
+            <div th:if="${isPost && !#lists.isEmpty(post.tags)}" class="article-operation">
                 <div class="level-item">
                     <a th:each=" tag : ${post.tags}" th:href="${tag.status.permalink}"
                        th:text="${tag.spec.displayName}"></a>&nbsp;
@@ -78,7 +81,7 @@
         </div>
     </div>
 
-    <th:block th:if="${type == 'Post'}" th:with="postCursor = ${postFinder.cursor(post.metadata.name)}">
+    <th:block th:if="${isPost}" th:with="postCursor = ${postFinder.cursor(post.metadata.name)}">
         <div th:if="${postCursor.hasPrevious() || postCursor.hasNext()}" class="card">
             <div class="level post-navigation card-content">
                 <a th:if="${postCursor.hasPrevious()}" class="level-item"
diff --git a/theme.yaml b/theme.yaml
index 04bc0ee..91ecce8 100644
--- a/theme.yaml
+++ b/theme.yaml
@@ -30,7 +30,7 @@ spec:
   settingName: theme-dream2-plus-setting
   configMapName: theme-dream2-plus-configMap
   # 版本号
-  version: 1.3.3.beta1
+  version: 1.3.3.beta2
   # 最低支持的 Halo 版本
   require: ">=2.20.0"
   # 许可