From ad5d03586f33f864ffd0bc179c770e991d39588e Mon Sep 17 00:00:00 2001
From: nineya <361654768@qq.com>
Date: Wed, 22 Mar 2023 17:52:21 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E9=A1=B5=E8=84=9A=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/common/footer.html  | 67 ++++++++++++++---------------------
 templates/common/navbar.html  |  2 +-
 templates/common/scripts.html |  6 ++--
 3 files changed, 30 insertions(+), 45 deletions(-)

diff --git a/templates/common/footer.html b/templates/common/footer.html
index f489f23..bb1db01 100644
--- a/templates/common/footer.html
+++ b/templates/common/footer.html
@@ -1,53 +1,40 @@
-<footer class="footer">
+<footer class="footer" xmlns:th="https://www.thymeleaf.org">
     <div class="container">
         <ul class="footer-container">
             <li>
-                <a class="logo-title" href="${context!}">
-                    <#if blog_logo?? && blog_logo!=''>
-                        <img class="logo-img" src="${blog_logo!}" alt="${blog_title!}" height="28">
-                        <img class="logo-img-dark"
-                             src="<#if settings.night_logo?? && settings.night_logo!=''>${settings.night_logo!}<#else>${blog_logo!}</#if>"
-                             alt="${blog_title!}" height="28">
-                    <#else>
-                        ${blog_title!}
-                    </#if>
-                </a>
+              <a class="logo-title" th:href="${site.url}">
+                <th:block th:if="${#strings.isEmpty(site.logo)}" th:text="${site.title}"/>
+                <th:block th:unless="${#strings.isEmpty(site.logo)}">
+                  <img class="logo-img" th:src="${site.logo}" th:alt="${site.title}" height="28">
+                  <img class="logo-img-dark" th:src="${#annotations.getOrDefault(theme.config.basic_info, 'night_logo', ${site.logo})}" th:alt="${site.title}" height="28">
+                </th:block>
+              </a>
             </li>
             <li>
-                <p class="icon-spot">
-                    <span>&copy; ${.now?string('yyyy')} ${user.nickname!}</span><#if settings.record_number?? && settings.record_number!=''><a href="http://beian.miit.gov.cn/publish/query/indexFirst.action" target="_blank" rel="noopener noreferrer nofollow">${settings.record_number!
-                    }</a></#if><span class="footer-truncation">Powered by <a class="powered" href="https://halo.run/" target="_blank">Halo</a> & <a class="powered" href="https://github.com/nineya/halo-theme-dream" target="_blank">Dream</a></span></p>
-                <#if (settings.website_time?? && settings.website_time!='') || settings.enable_busuanzi!true>
-                    <p class="icon-spot">
-                    <#if settings.website_time?? && settings.website_time!=''>
-                        <span id="websiteDate">建站<span class="stand">00</span>天<span class="stand">0</span>时<span class="stand">0</span>分<span class="stand">0</span>秒</span>
-                    </#if>
-                    <#if settings.enable_busuanzi!true>
-                        <span class="icon-spot footer-truncation">
+              <p class="icon-spot">
+                <span th:text="'&copy; '+${#dates.format(#dates.createNow(), 'yyyy')}+' '+ ${site.title}"></span><a
+                  th:if="${!#strings.isEmpty(theme.config.basic_info.record_number)}"
+                  href="http://beian.miit.gov.cn/publish/query/indexFirst.action" target="_blank" rel="noopener noreferrer nofollow"
+                  th:text="${theme.config.basic_info.record_number}"></a><span class="footer-truncation">Powered by <a class="powered" href="https://halo.run/" target="_blank">Halo</a> & <a class="powered" href="https://github.com/nineya/halo-theme-dream" target="_blank">Dream</a></span></p>
+              <p class="icon-spot" th:if="${!#strings.isEmpty(theme.config.basic_info.website_time) && theme.config.basic_info.enable_busuanzi}">
+                <span th:if="${!#strings.isEmpty(theme.config.basic_info.website_time)}" id="websiteDate">建站<span class="stand">00</span>天<span class="stand">0</span>时<span class="stand">0</span>分<span class="stand">0</span>秒</span>
+                <span th:if="${theme.config.basic_info.enable_busuanzi}" class="icon-spot footer-truncation">
                             <span id="busuanzi_container_site_uv" style="display: none">
-                            <i class="fa fa-user" aria-hidden="true"></i>
-					        <span class="stand" id="busuanzi_value_site_uv">0</span>访客
-					        </span>
+                              <i class="fa fa-user" aria-hidden="true"></i><span class="stand" id="busuanzi_value_site_uv">0</span>访客
+                            </span>
                             <span id="busuanzi_container_site_pv" style="display: none">
-                            <i class="fa fa-bar-chart" aria-hidden="true"></i>
-					        <span class="stand" id="busuanzi_value_site_pv">0</span>访问
+                              <i class="fa fa-bar-chart" aria-hidden="true"></i><span class="stand" id="busuanzi_value_site_pv">0</span>访问
+                            </span>
                         </span>
-					</span>
-                    </#if>
-                    </p>
-                </#if>
-                <#if settings.record_number_ps?? && settings.record_number_ps!=''>
-                    <p><a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=${settings.record_number_ps?replace('[^\\d]','','ri')}"
-                          target="_blank" rel="noopener noreferrer nofollow"><img src="https://www.beian.gov.cn/portal/download" alt="公网安备" style="vertical-align: text-top; width: 1.2em; margin-right: 4px;"/>${settings.record_number_ps!}</a></p>
-                </#if>
-                <#if settings.cloud_by_logo?? && settings.cloud_by_logo!=''>
-                    <p>本站由<a class="cloud-driven" target="_blank"
-                             rel="noopener noreferrer nofollow"${(settings.cloud_by_url?? && settings.cloud_by_url!='')?then(' href="${settings.cloud_by_url}"', '')}><img
-                                    alt="云服务商" src="${settings.cloud_by_logo}"/></a>提供云服务</p>
-                </#if>
+              </p>
+              <p th:if="${!#strings.isEmpty(theme.config.basic_info.record_number_ps)}"><a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=${settings.record_number_ps?replace('[^\\d]','','ri')}" target="_blank" rel="noopener noreferrer nofollow"><img
+                src="https://www.beian.gov.cn/portal/download" alt="公网安备" style="vertical-align: text-top; width: 1.2em; margin-right: 4px;"/>${theme.config.basic_info.record_number_ps}</a></p>
+              <p th:if="${!#strings.isEmpty(theme.config.basic_info.cloud_by_logo)}">本站由<a
+                class="cloud-driven" target="_blank" rel="noopener noreferrer nofollow" th:href="${theme.config.basic_info.cloud_by_url}"><img
+                alt="云服务商" src="${theme.config.basic_info.cloud_by_logo}"/></a>提供云服务</p>
             </li>
             <li>
-                <@global.footer_info />
+                <halo:footer />
             </li>
         </ul>
     </div>
diff --git a/templates/common/navbar.html b/templates/common/navbar.html
index c331791..ea46e21 100644
--- a/templates/common/navbar.html
+++ b/templates/common/navbar.html
@@ -2,7 +2,7 @@
     <div class="navbar-above">
         <div th:class="${theme.config.basic_style.sidebar_column != 'all' ? 'container two-column' : 'container' }">
             <i class="fa fa-bars navbar-slideicon"></i>
-            <a class="navbar-item logo-title"  th:href="${site.url}">
+            <a class="navbar-item logo-title" th:href="${site.url}">
                 <th:block th:if="${#strings.isEmpty(site.logo)}" th:text="${site.title}"/>
                 <th:block th:unless="${#strings.isEmpty(site.logo)}">
                     <img class="logo-img" th:src="${site.logo}" th:alt="${site.title}" height="28">
diff --git a/templates/common/scripts.html b/templates/common/scripts.html
index 0fdcecf..f355d35 100644
--- a/templates/common/scripts.html
+++ b/templates/common/scripts.html
@@ -5,7 +5,7 @@
 <!--<#if is_carousel??>-->
 <!--    <script data-pjax th:src="@{/assets/lib/swiper@8.4.6/swiper-bundle.min.js}"></script>-->
 <!--</#if>-->
-<!--<script th:src="@{/assets/js/common.min.js(mew=${theme.spec.version})}"></script>-->
+<script th:src="@{/assets/js/common.min.js(mew=${theme.spec.version})}"></script>
 
 <!--<#if post?? || is_journals?? || is_error??>-->
 <!--    <script data-pjax th:src="@{/assets/lib/highlightjs@11.5.1/highlight.min.js}"></script>-->
@@ -33,9 +33,7 @@
 <!--</#if>-->
 
 <script th:src="@{/assets/lib/jquery-pjax@2.0.1/jquery.pjax.min.js}"></script>
-<!--<#if settings.load_progress?? && settings.load_progress != 'none'>-->
-<!--    <script th:src="@{/assets/js/dprogress.min.js(mew=${theme.spec.version})}"></script>-->
-<!--</#if>-->
+<script th:if="${theme.config.basic_style.load_progress != 'none'}" th:src="@{/assets/js/dprogress.min.js(mew=${theme.spec.version})}"></script>
 <script th:src="@{/assets/js/pjax.min.js(mew=${theme.spec.version})}"></script>
 <script async th:src="@{/assets/lib/qmsg/qmsg.min.js}"></script>