Merge pull request #588 from carolcoral/main

1.4.5

package.json

@@ -1,6 +1,6 @@
 {
   "name": "halo-theme-hao",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "dependencies": {
   }
 }

settings.yaml

@@ -645,8 +645,8 @@ spec:
             - $formkit: attachment
               name: backgroundImg
               label: 背景图片
-              value: https://pic.cnkj.site/b/2023/6585299246b8a.webp?type=blog
+              value: /themes/theme-hao/assets/images/sidebar/profile.webp
-              placeholder: 请输入背景图片地址
+              placeholder: 请输入背景图片路径或地址（建议使用 280px * 330px 图片效果最佳）
             - $formkit: attachment
               name: stickerImg
               if: $get(profileStyle).value == 'one'
@@ -1058,7 +1058,15 @@ spec:
           name: footerContent
           label: 页脚内容
           value:
-            default_enable: true
+            default_enable_group:
+              default_enable: true
+              dingyue: true
+              zhuti: true
+              about: true
+              icp_icon: true
+              gongwangan: true
+              yingsi: true
+              yunzhichi: false
             style_one:
               owner_enable: false
               runtime_enable: true
@@ -1072,43 +1080,131 @@ spec:
                   shields: "https://npm.onmicrosoft.cn/hao-theme-static@1.3.6/images/Frame-Halo-blue.svg"
                   message: "博客框架为halo2.x"
           children:
-            - $formkit: radio
+            - $formkit: group
-              name: default_enable
+              name: default_enable_group
-              id: default_enable
+              label: 底部页脚
-              key: default_enable
+              value:
-              label: 底部
+              children:
-              options:
+                - $formkit: radio
-                - label: 显示
+                  name: default_enable
-                  value: true
+                  id: default_enable
-                - label: 隐藏
+                  key: default_enable
-                  value: false
+                  label: 底部启用
-            - $formkit: radio
+                  options:
-              if: $get(default_enable).value
+                    - label: 显示
-              name: dingyue
+                      value: true
-              label: 订阅
+                    - label: 隐藏
-              options:
+                      value: false
-                - label: 显示
+                - $formkit: radio
-                  value: true
+                  if: $get(default_enable).value
-                - label: 隐藏
+                  name: dingyue
-                  value: false
+                  id: dingyue
-            - $formkit: radio
+                  key: dingyue
-              if: $get(default_enable).value
+                  label: 订阅
-              name: zhuti
+                  options:
-              label: 主题
+                    - label: 显示
-              options:
+                      value: true
-                - label: 显示
+                    - label: 隐藏
-                  value: true
+                      value: false
-                - label: 隐藏
+                - $formkit: radio
-                  value: false
+                  if: $get(default_enable).value
-            - $formkit: radio
+                  name: zhuti
-              if: $get(default_enable).value
+                  id: zhuti
-              name: about
+                  key: zhuti
-              label: 关于
+                  label: 主题
-              options:
+                  options:
-                - label: 显示
+                    - label: 显示
-                  value: true
+                      value: true
-                - label: 隐藏
+                    - label: 隐藏
-                  value: false
+                      value: false
+                - $formkit: radio
+                  if: $get(default_enable).value
+                  name: about
+                  id: about
+                  key: about
+                  label: 关于
+                  options:
+                    - label: 显示
+                      value: true
+                    - label: 隐藏
+                      value: false
+                - $formkit: radio
+                  if: $get(default_enable).value
+                  name: icp_icon
+                  id: icp_icon
+                  key: icp_icon
+                  label: icp备案
+                  options:
+                    - label: 显示
+                      value: true
+                    - label: 隐藏
+                      value: false
+                - $formkit: radio
+                  if: $get(default_enable).value
+                  name: gongwangan
+                  id: gongwangan
+                  key: gongwangan
+                  label: 公网安备案
+                  options:
+                    - label: 显示
+                      value: true
+                    - label: 隐藏
+                      value: false
+                - $formkit: radio
+                  if: $get(default_enable).value
+                  name: yingsi
+                  id: yingsi
+                  key: yingsi
+                  label: 隐私
+                  options:
+                    - label: 显示
+                      value: true
+                    - label: 隐藏
+                      value: false
+                - $formkit: radio
+                  if: $get(default_enable).value
+                  name: yunzhichi
+                  id: yunzhichi
+                  key: yunzhichi
+                  label: 云服务支持
+                  options:
+                    - label: 显示
+                      value: true
+                    - label: 隐藏
+                      value: false
+                - $formkit: select
+                  name: yunzhichi_list
+                  id: yunzhichi_list
+                  key: yunzhichi_list
+                  if: $get(yunzhichi).value
+                  label: 云服务商
+                  options:
+                    - value: upyun_cloud
+                      label: 又拍云
+                    - value: aliyun_cloud
+                      label: 阿里云
+                    - value: tencent_cloud
+                      label: 腾讯云
+                    - value: huawei_cloud
+                      label: 华为云
+                    - value: custom_cloud
+                      label: 自定义地址
+                - $formkit: attachment
+                  name: yunzhichi_url
+                  id: yunzhichi_url
+                  key: yunzhichi_url
+                  label: 自定义云支持地址
+                  if: $get(yunzhichi_list).value == 'custom_cloud'
+                  value:
+                  placeholder: 请输入自定义云支持地址
+                - $formkit: attachment
+                  name: yunzhichi_url_link
+                  id: yunzhichi_url_link
+                  key: yunzhichi_url_link
+                  label: 自定义云支持跳转地址
+                  if: $get(yunzhichi_list).value == 'custom_cloud'
+                  value:
+                  placeholder: 请输入自定义云支持跳转地址（注意是跳转地址不是图片展示地址）
             - $formkit: group
               name: style_one
               label: 中间

templates/modules/footer.html

@@ -1,5 +1,5 @@
 <!-- 页脚模块 -->
-<footer id="footer">
+<footer id="footer" xmlns:th="http://www.w3.org/1999/xhtml">
 
     <div id="heo-footer-bar" th:if="${theme.config.footer.footer_bar.footer_bar_enable}">
         <div class="footer-logo"><th:block th:utext="${theme.config.footer.footer_bar.logo}"></th:block></div>
@@ -79,7 +79,7 @@
                  th:data-lazy-src="${ isLazyload ? img : ''}" th:alt="${data.message}" />
         </a>
     </p>
-    <span th:if="${!theme.config.footer.footerContent.default_enable}" style="padding: 20px 20px;">
+    <span th:if="${!theme.config.footer.footerContent.default_enable_group.default_enable}" style="padding: 20px 20px;">
 
     </span>
 
@@ -95,13 +95,13 @@
             th:if="${(theme.config.footer.footerContent.style_one.owner_enable
             || (not #lists.isEmpty(theme.config.footer.footerContent.style_one.bdageitem) && theme.config.footer.footerContent.style_one.bdageitem_enable )
             || theme.config.footer.footerContent.style_one.runtime_enable)
-        && theme.config.footer.footerContent.default_enable}">
+        && theme.config.footer.footerContent.default_enable_group.default_enable}">
         #heo-footer {
             margin-bottom: 1rem;
         }
     </style>
 
-    <div th:if="${theme.config.footer.footerContent.default_enable}" id="footer-banner">
+    <div th:if="${theme.config.footer.footerContent.default_enable_group.default_enable}" id="footer-banner">
         <div class="footer-banner-links">
             <div class="footer-banner-left">
                 <div id="footer-banner-tips">
@@ -118,11 +118,58 @@
                 </div>
             </div>
             <div class="footer-banner-right">
+                
+                <!-- 又拍云 -->
+                <a th:if="${theme.config.footer.footerContent.default_enable_group.yunzhichi && theme.config.footer.footerContent.default_enable_group.yunzhichi_list == 'upyun_cloud'}"
+                   class="footer-banner-link cloud" href="https://www.upyun.com/"
+                   rel="noopener external nofollow noreferrer noopener"
+                   target="_blank">
+                    <span>本网站由</span>&nbsp;&nbsp;
+                    <img th:src="${assets_link + '/images/footer/upyun-5.png'}" alt="upyun" class="entered loading cloud" />
+                    &nbsp;&nbsp;<span>提供CDN加速/云存储服务</span>
+                </a>
+                <!-- 阿里云 -->
+                <a th:if="${theme.config.footer.footerContent.default_enable_group.yunzhichi && theme.config.footer.footerContent.default_enable_group.yunzhichi_list == 'aliyun_cloud'}"
+                   class="footer-banner-link cloud" href="https://www.aliyun.com/"
+                   rel="noopener external nofollow noreferrer noopener"
+                   target="_blank">
+                    <span>本网站由</span>&nbsp;&nbsp;
+                    <img th:src="${assets_link + '/images/footer/aliyun.png'}" alt="aliyun_cloud" class="entered loading cloud" />
+                    &nbsp;&nbsp;<span>提供CDN加速/云存储服务</span>
+                </a>
+                <!-- 腾讯云 -->
+                <a th:if="${theme.config.footer.footerContent.default_enable_group.yunzhichi && theme.config.footer.footerContent.default_enable_group.yunzhichi_list == 'tencent_cloud'}"
+                   class="footer-banner-link cloud" href="https://cloud.tencent.com/"
+                   rel="noopener external nofollow noreferrer noopener"
+                   target="_blank">
+                    <span>本网站由</span>&nbsp;&nbsp;
+                    <img th:src="${assets_link + '/images/footer/tencent.png'}" alt="tencent_cloud" class="entered loading cloud" />
+                    &nbsp;&nbsp;<span>提供CDN加速/云存储服务</span>
+                </a>
+                <!-- 华为云 -->
+                <a th:if="${theme.config.footer.footerContent.default_enable_group.yunzhichi && theme.config.footer.footerContent.default_enable_group.yunzhichi_list == 'huawei_cloud'}"
+                   class="footer-banner-link cloud" href="https://www.huaweicloud.com/"
+                   rel="noopener external nofollow noreferrer noopener"
+                   target="_blank">
+                    <span>本网站由</span>&nbsp;&nbsp;
+                    <img th:src="${assets_link + '/images/footer/huawei.png'}" alt="huawei_cloud" class="entered loading cloud" />
+                    &nbsp;&nbsp;<span>提供CDN加速/云存储服务</span>
+                </a>
+                <!-- 自定义云服务信息 -->
+                <a th:if="${theme.config.footer.footerContent.default_enable_group.yunzhichi && theme.config.footer.footerContent.default_enable_group.yunzhichi_list == 'custom_cloud' && not #strings.isEmpty(theme.config.footer.footerContent.default_enable_group.yunzhichi_url)}"
+                   class="footer-banner-link cloud" th:href="@{${theme.config.footer.footerContent.default_enable_group.yunzhichi_url_link}}"
+                   rel="noopener external nofollow noreferrer noopener"
+                   target="_blank">
+                    <span>本网站由</span>&nbsp;&nbsp;
+                    <img th:src="@{${theme.config.footer.footerContent.default_enable_group.yunzhichi_url}}" alt="custom_cloud" class="entered loading cloud"/>
+                    &nbsp;&nbsp;<span>提供CDN加速/云存储服务</span>
+                </a>
+                
                 <!-- 订阅 需要 RSS 插件支持 -->
-                <a class="footer-banner-link" href="/rss.xml" th:if="${pluginFinder.available('PluginFeed')} and ${theme.config.footer.footerContent.dingyue}">订阅</a>
+                <a class="footer-banner-link" href="/rss.xml" th:if="${pluginFinder.available('PluginFeed')} and ${theme.config.footer.footerContent.default_enable_group.dingyue}">订阅</a>
-                <a th:if="${theme.config.footer.footerContent.zhuti}" class="footer-banner-link" href="https://github.com/liuzhihang/halo-theme-hao">主题</a>
+                <a th:if="${theme.config.footer.footerContent.default_enable_group.zhuti}" class="footer-banner-link" href="https://github.com/liuzhihang/halo-theme-hao">主题</a>
-                <a th:if="${theme.config.footer.footerContent.about}" class="footer-banner-link" href="/about">关于</a>
+                <a th:if="${theme.config.footer.footerContent.default_enable_group.about}" class="footer-banner-link" href="/about">关于</a>
-                <a th:if="${not #strings.isEmpty(theme.config.basics.icp)}"
+                <a th:if="${not #strings.isEmpty(theme.config.basics.icp) && theme.config.footer.footerContent.default_enable_group.icp_icon}"
                    class="footer-banner-link" href="https://beian.miit.gov.cn/#/Integrated/index"
                    rel="noopener external nofollow noreferrer noopener"
                    target="_blank">
@@ -131,7 +178,7 @@
                     <img th:if="${#strings.startsWith(theme.config.basics.icp, 'http')}"
                          th:src="@{${theme.config.basics.icp}}" alt="icp"/>
                 </a>
-                <a th:if="${not #strings.isEmpty(theme.config.basics.gongan)}"
+                <a th:if="${not #strings.isEmpty(theme.config.basics.gongan) && theme.config.footer.footerContent.default_enable_group.gongwangan}"
                    class="footer-banner-link" href="http://www.beian.gov.cn/portal/registerSystemInfo"
                    rel="noopener external nofollow noreferrer noopener"
                    target="_blank">
@@ -140,7 +187,7 @@
                          th:src="@{${theme.config.basics.gongan}}" alt="gongan"/>
                 </a>
                 <a class="footer-banner-link cc" th:href="${theme.config.basics.copyrightAgreement}"
-                   th:if="${not #strings.isEmpty(theme.config.basics.copyrightAgreement)}" title="cc协议">
+                   th:if="${not #strings.isEmpty(theme.config.basics.copyrightAgreement) && theme.config.footer.footerContent.default_enable_group.yingsi}" title="cc协议">
                     <i class="haofont hao-icon-copyright-line"></i>
                     <i class="haofont hao-icon-creative-commons-by-line"></i>
                     <i class="haofont hao-icon-creative-commons-nc-line"></i>
@@ -166,4 +213,14 @@
     <!--评论弹幕弹窗 -->
     <div class="comment-barrage needEndHide" style="display: none;"></div>
 
-</footer>
+    <style>
+        a.footer-banner-link.cloud {
+            display: flex;
+            align-items: center;
+        }
+        img.entered.loading.cloud {
+            height: 32px;
+        }
+    </style>
+    
+</footer>

templates/modules/post-list.html

@@ -40,7 +40,14 @@
                 </a>
                 <div class="content" th:text="${post.status.excerpt}"></div>
             </div>
-
+            
+            <div class="dateshow">
+                <i class="haofont hao-icon-calendar-alt dateshowicon"></i>
+                <span class="banner-button-text" th:text="发表于 + '&nbsp;' + ${#dates.format(post.spec.publishTime,'yyyy-MM-dd')}"></span>
+                &nbsp;&nbsp;
+                <i class="haofont hao-icon-history dateshowicon"></i>
+                <span class="banner-button-text" th:text="更新于 + '&nbsp;' + ${#dates.format(post.status.lastModifyTime,'yyyy-MM-dd')}"></span>
+            </div>
 
             <div class="article-meta-wrap">
                 <!-- tag -->
@@ -98,6 +105,29 @@
                 transform: translateX(100%) skewX(-60deg);
             }
         </style>
+        
+        <style>
+            .dateshow {
+                position: absolute;
+                bottom: 55px;
+                transition: 0.3s;
+                display: flex;
+                flex-direction: row;
+                flex-wrap: nowrap;
+                width: 100%;
+                left: 0;
+                padding: 0 32px;
+                white-space: nowrap;
+            }
+            i.haofont.hao-icon-calendar-alt.dateshowicon {
+                font-size: 20px;
+                margin-top: 6px;
+            }
+            i.haofont.hao-icon-history.dateshowicon {
+                font-size: 20px;
+                margin-top: 6px;
+            }
+        </style>
     </div>
 
     <!-- 分页 -->

templates/modules/sidebar.html

@@ -64,8 +64,9 @@
              th:with="tags = ${tagFinder.listAll()}">
             <div class="item-headline"></div>
             <div class="card-tag-cloud">
-                <a style="font-size:14.3px;color:#d3d3d3" th:each="tag : ${tags}"
+                <a class="tag-item" style="font-size:1em" th:each="tag,iterStat : ${tags}"
                    th:href="@{${tag.status.permalink}}"
+                   th:if="${tagQuantity >= 0 && iterStat.index < tagQuantity || tagQuantity < 0}"
                    th:title="${tag.spec.displayName}">
                     <!-- 角标 -->
                     [[${tag.spec.displayName}]]<sup th:text="${tag.status.visiblePostCount}"></sup>
@@ -73,4 +74,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

templates/modules/variables/site-config.html

@@ -129,7 +129,7 @@
                 locale: [[${not #strings.isEmpty(theme.config.comments.walines.locale) ? theme.config.comments.walines.locale : '' }]]
             },
             footer: {
-                default_enable: [[${theme.config.footer.footerContent.default_enable}]]
+                default_enable: [[${theme.config.footer.footerContent.default_enable_group.default_enable}]]
             }
         }
     };

theme.yaml

@@ -51,5 +51,5 @@ spec:
   repo: https://githubfast.com/liuzhihang/halo-theme-hao
   settingName: "theme-hao-setting"
   configMapName: "theme-hao-configMap"
-  version: "1.4.4"
+  version: "1.4.5"
   require: ">=2.10.0"