From 7d2b222de9214874d920acfdc0a0bfe00f8368cc Mon Sep 17 00:00:00 2001
From: liuzhihang <liuzhihangs@qq.com>
Date: Wed, 16 Nov 2022 00:01:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                            | 58 ++++++++++++++++++------
 templates/modules/footer.html            | 13 ++++--
 templates/modules/widgets/top-group.html |  2 +-
 templates/post.html                      |  2 +-
 4 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index 401aa3aa..b15aeb50 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -4,6 +4,22 @@ metadata:
   name: theme-hao-setting
 spec:
   forms:
+    - group: basics
+      label: 基础
+      formSchema:
+        - $formkit: date
+          name: siteStartTime
+          label: 建站时间
+        - $formkit: text
+          name: icp
+          label: ICP 备案
+          placeholder: 请输入 ICP 备案号
+          help: "京ICP备xxxxxxxx号"
+        - $formkit: url
+          name: copyrightAgreement
+          label: 版权协议
+          placeholder: "请输入版权协议地址"
+          help: '文章模块声明版权，也会使用此协议'
     - group: nav
       label: 导航
       formSchema:
@@ -85,6 +101,7 @@ spec:
           label: 今日推荐背景图
           placeholder: 请输入地址
           validation: "url"
+
     - group: layout
       label: 布局
       formSchema:
@@ -186,21 +203,6 @@ spec:
         - $formkit: menuRadio
           name: menu
           label: 底部相关链接
-        - $formkit: text
-          name: copyright_start
-          label: 开始时间
-          placeholder: 建站时间
-          help: "copyright 开始时间"
-        - $formkit: text
-          name: icp
-          label: ICP 备案
-          placeholder: 请输入 ICP 备案号
-          help: "京ICP备xxxxxxxx号"
-        - $formkit: url
-          name: copyrightAgreement
-          label: 版权协议
-          placeholder: "请输入版权协议地址"
-          help: '文章模块声明版权，也会使用此协议'
     - group: post
       label: 文章
       formSchema:
@@ -219,6 +221,32 @@ spec:
           label: 版权声明
           placeholder: '本文是原创文章，采用 <a target="_blank" href="/cc">CC BY-NC-ND 4.0</a> 协议，完整转载请注明来自 <a href="/" target="_blank" >程序员小航</a>'
           help: "版权声明内容，支持填入 HTML 标签"
+    - group: style
+      label: 样式（WIP）
+      formSchema:
+        - $formkit: radio
+          name: color_scheme
+          label: 默认配色
+          value: system
+          options:
+            - label: 跟随系统
+              value: system
+            - label: 深色
+              value: dark
+            - label: 浅色
+              value: light
+        - $formkit: checkbox
+          name: enable_change_color_scheme
+          label: 允许访客切换配色
+          value: true
+        - $formkit: textarea
+          name: fontFamily
+          label: 全局字体
+          placeholder: '"PingFang SC", "Hiragino Sans GB", "Microsoft YaHei"'
+        - $formkit: url
+          name: backgroundImg
+          label: 全局背景图
+          placeholder: "请输入图片地址"
     - group: snackbar
       label: 弹窗
       help: 右下角 snackbar 弹窗
diff --git a/templates/modules/footer.html b/templates/modules/footer.html
index bcf07ff4..e8dc2d9a 100644
--- a/templates/modules/footer.html
+++ b/templates/modules/footer.html
@@ -33,8 +33,11 @@
         <div class="footer-banner-links">
             <div class="footer-banner-left">
                 <div id="footer-banner-tips">
-                    <div class="copyright">©[[${theme.config.footer.copyright_start}]] - [[${#dates.format(new
-                        java.util.Date(), 'yyyy')}]] [[${site.title}]].
+                    <div class="copyright" th:if="${not #strings.isEmpty(theme.config.basics.siteStartTime)}">
+                        ©[[${#strings.arraySplit(theme.config.basics.siteStartTime, '-')[0]}]] - [[${#dates.format(new java.util.Date(), 'yyyy')}]] [[${site.title}]].
+                    </div>
+                    <div class="copyright" th:if="${#strings.isEmpty(theme.config.basics.siteStartTime)}">
+                        ©[[${#dates.format(new java.util.Date(), 'yyyy')}]] [[${site.title}]].
                     </div>
                 </div>
                 <br>
@@ -49,11 +52,11 @@
                 <a class="footer-banner-link" href="https://github.com/liuzhihang/halo-theme-hao">主题</a>
                 <a class="footer-banner-link" href="/about">关于</a>
                 <a class="footer-banner-link" href="https://beian.miit.gov.cn/#/Integrated/index"
-                   rel="noopener external nofollow noreferrer noopener" target="_blank">[[${theme.config.footer.icp}]]
+                   rel="noopener external nofollow noreferrer noopener" target="_blank">[[${theme.config.basics.icp}]]
                 </a>
                 <a class="footer-banner-link cc"
-                   th:href="${theme.config.footer.copyrightAgreement}"
-                   th:if="${not #strings.isEmpty(theme.config.post.copyrightAgreement)}"
+                   th:href="${theme.config.basics.copyrightAgreement}"
+                   th:if="${not #strings.isEmpty(theme.config.basics.copyrightAgreement)}"
                    title="cc协议">
                     <i class="iconfont icon-cc"></i>
                     <i class="iconfont icon-by"></i>
diff --git a/templates/modules/widgets/top-group.html b/templates/modules/widgets/top-group.html
index f355f7d1..50f74d30 100644
--- a/templates/modules/widgets/top-group.html
+++ b/templates/modules/widgets/top-group.html
@@ -23,7 +23,7 @@
 
     <!-- 今日推荐 -->
     <div class="todayCard" id="todayCard"
-         th:if="${theme.config.top.todayRecommend}"
+         th:if="${theme.config.top.todayRecommendSwitch}"
          th:onclick="'window.open('+ ${theme.config.top.todayRecommendUrl} +')'">
         <div class="todayCard-info">
             <div class="todayCard-tips">今日推荐</div>
diff --git a/templates/post.html b/templates/post.html
index 6e0b458b..e31e3150 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -161,7 +161,7 @@
                 <div class="post-copyright" th:if="${theme.config.post.copyright}">
                     <div class="post-copyright__author">
                         <!-- 版权页 以及版权描述文字 -->
-                        <a class="post-copyright__original" th:href="@{${theme.config.post.copyrightAgreement}}"
+                        <a class="post-copyright__original" th:href="@{${theme.config.basics.copyrightAgreement}}"
                            title="该文章为原创文章，注意版权协议">原创</a>
                         <a class="post-copyright-title" href="#"><span th:text="${post.spec.title}"></span></a>
                     </div>