🚀 发布 1.0.4

qinhua · Nov 16, 2021 · 732a6ea · 732a6ea
1 parent 8dd699e
commit 732a6ea
Show file tree

Hide file tree

Showing 37 changed files with 275 additions and 219 deletions.
diff --git a/archives.ftl b/archives.ftl
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
   <#assign title=settings.archive_title!'文章归档'>
-  <#import "template/macro/header.ftl" as headInfo>
+  <#import "template/common/header.ftl" as headInfo>
   <@headInfo.head title="${title}" type="archives"/>
   <#import "template/macro/tail.ftl" as tailInfo>
   <body>
@@ -65,6 +65,7 @@
           </div>
         </div>
       </div>
+      <#include "template/common/actions.ftl">
       <#include "template/common/footer.ftl">
     </div>
     <@tailInfo.tail type="archives"/> 

diff --git a/categories.ftl b/categories.ftl
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
-  <#import "template/macro/header.ftl" as headInfo>
+  <#import "template/common/header.ftl" as headInfo>
   <@headInfo.head title="文章分类" type="categorys"/>
   <#import "template/macro/tail.ftl" as tailInfo>
   <body>
@@ -43,6 +43,7 @@
         </div>
         <#include "template/common/aside.ftl">
       </div>
+      <#include "template/common/actions.ftl">
       <#include "template/common/footer.ftl">
     </div>
     <@tailInfo.tail type="categories"/> 

diff --git a/category.ftl b/category.ftl
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
-  <#import "template/macro/header.ftl" as headInfo>
+  <#import "template/common/header.ftl" as headInfo>
   <@headInfo.head title="${category.name!}" type="category"/>
   <#import "template/macro/tail.ftl" as tailInfo>
   <body>
@@ -86,6 +86,7 @@
         </div>
         <#--  <#include "template/common/aside.ftl">  -->
       </div>
+      <#include "template/common/actions.ftl">
       <#include "template/common/footer.ftl">
     </div>
     <@tailInfo.tail type="category"/> 

diff --git a/index.ftl b/index.ftl
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
-  <#import "template/macro/header.ftl" as headInfo>
+  <#import "template/common/header.ftl" as headInfo>
   <@headInfo.head title="首页" type="index"/>
   <#import "template/macro/hotcategory.ftl" as hp>
   <#import "template/macro/tail.ftl" as tailInfo>
@@ -60,6 +60,7 @@
         </div>
         <#include "template/common/aside.ftl">
       </div>
+      <#include "template/common/actions.ftl">
       <#include "template/common/footer.ftl">
     </div>
     <@tailInfo.tail type="index"/> 

diff --git a/journals.ftl b/journals.ftl
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
   <#assign title=settings.journals_title!'我的动态'>
-  <#import "template/macro/header.ftl" as headInfo>
+  <#import "template/common/header.ftl" as headInfo>
   <@headInfo.head title="${title}" type="journals"/>
   <#import "template/macro/tail.ftl" as tailInfo>
   <body>
@@ -116,6 +116,7 @@
           <#include "template/common/aside.ftl">
         </#if>
       </div>
+      <#include "template/common/actions.ftl">
       <#include "template/common/footer.ftl">
     </div>
     <@tailInfo.tail type="journals"/> 

diff --git a/links.ftl b/links.ftl
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
   <#assign title=settings.links_title!'友情链接'>
-  <#import "template/macro/header.ftl" as headInfo>
+  <#import "template/common/header.ftl" as headInfo>
   <@headInfo.head title="${title}" type="links"/>
   <#import "template/macro/tail.ftl" as tailInfo>
   <body>
@@ -58,6 +58,7 @@
           <#include "template/common/aside.ftl">
         </#if>
       </div>
+      <#include "template/common/actions.ftl">
       <#include "template/common/footer.ftl">
     </div>
     <@tailInfo.tail type="links"/> 

diff --git a/photos.ftl b/photos.ftl
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
   <#assign title=settings.photos_title!'我的图库'>
-  <#import "template/macro/header.ftl" as headInfo>
+  <#import "template/common/header.ftl" as headInfo>
   <@headInfo.head title="${title}" type="photo"/>
   <#import "template/macro/tail.ftl" as tailInfo>
   <body> 
@@ -67,7 +67,8 @@
             </#if>    
           </@paginationTag>                  -->
         </div>
-      </div> 
+      </div>
+      <#include "template/common/actions.ftl">
       <#include "template/common/footer.ftl">
     </div>
     <@tailInfo.tail type="photos"/>  

diff --git a/post.ftl b/post.ftl
@@ -1,24 +1,26 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
-  <#import "template/macro/header.ftl" as headInfo>
+  <#import "template/common/header.ftl" as headInfo>
   <@headInfo.head title="${post.title!}" type="post"/>
   <#import "template/macro/tail.ftl" as tailInfo>
   <body>
     <div id="Joe">
       <#include "template/common/navbar.ftl">
-      <#include "template/common/post_bread.ftl">
+      <#include "template/module/post_bread.ftl">
       <div class="joe_container joe_main_container page-post">
         <div class="joe_main joe_post">
           <#if settings.enable_post_aside && settings.enable_aside_expander><span class="aside-expander">隐藏侧边栏</span></#if>
           <div class="joe_detail" data-status="${post.status!}" data-cid="${post.id}" data-clikes="${post.likes}" data-curl="${post.fullPath}">
             <#include "template/module/post_status.ftl">
-            <#list categories as category>
-              <#if category_index==1>
-                <div class="joe_detail__category">
-                  <a href="${category.fullPath}" class="item item-0" title="${category.name!}">${category.name!}</a>
-                </div>
-              </#if>
-            </#list>
+            <#if post.status=='PUBLISHED'>
+              <#list post.categories as category>
+                <#if category_index==0>
+                  <div class="joe_detail__category">
+                    <a href="${category.fullPath}" class="item item-0" title="${category.name!}">${category.name!}</a>
+                  </div>
+                </#if>
+              </#list>
+            </#if>
             <h1 class="joe_detail__title${settings.enable_title_shadow?string(' txt-shadow', '')}">${post.title!}</h1>
             <div class="joe_detail__count">
               <div class="joe_detail__count-information">
@@ -69,7 +71,7 @@
               </#if>
             </div>
             <#assign enable_copy = metas.enable_copy!'true'>
-            <article class="joe_detail__article animated fadeIn${settings.enable_code_line_number?then(' line-numbers', '')}${(enable_copy=='true' && settings.enable_copy==true)?then(' copyable', '')}${settings.enable_indent?then(' indent','')}${settings.enable_single_code_select?then(' single_code_select','')}">
+            <article class="joe_detail__article animated fadeIn${settings.enable_code_line_number?then(' line-numbers', '')}${(enable_copy=='true' && settings.enable_copy==true)?then(' copyable', '')}${settings.enable_indent?then(' indent','')}${settings.enable_single_code_select?then(' single_code_select','')}${settings.enable_code_title?then('',' no-code-title')}">
               ${post.formatContent!}
             </article>
             <#assign enable_toc = metas.enable_toc!'true'>
@@ -132,6 +134,7 @@
           <#include "template/common/aside.ftl">
         </#if>
       </div>
+      <#include "template/common/actions.ftl">
       <#include "template/common/footer.ftl">
     </div>
     <#if settings.enable_progress_bar!true>

diff --git a/screenshot.png b/screenshot.png
diff --git a/search.ftl b/search.ftl
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
-  <#import "template/macro/header.ftl" as headInfo>
+  <#import "template/common/header.ftl" as headInfo>
   <@headInfo.head title="${keyword!}的搜索结果" type="search"/>
   <#import "template/macro/tail.ftl" as tailInfo>
   <body>
@@ -91,6 +91,7 @@
           </@paginationTag> 
         </div>
       </div>
+      <#include "template/common/actions.ftl">
       <#include "template/common/footer.ftl">
     </div>
     <@tailInfo.tail type="search"/> 

diff --git a/settings.yaml b/settings.yaml
@@ -56,38 +56,28 @@ genernal:
 theme:
   label: 主题相关
   items:
-    static_mode:
-      name: static_mode
+    theme_mode:
+      name: theme_mode
       label: 主题模式
       type: radio
-      default: "off"
-      description: "为博客设置主题模式（用户/浅色/暗黑），默认为用户模式，仅在用户模式下页面才有主题切换按钮"
+      default: "user"
+      description: "设置博客的主题模式（用户/自动/浅色/暗黑），默认为用户模式，仅在用户模式下页面才有主题切换按钮，自动模式下根据时间自动切换"
       options:
-        - value: "off"
+        - value: "user"
           label: 用户模式
+        - value: "auto"
+          label: 自动模式
         - value: "light"
           label: 浅色模式
         - value: "dark"
           label: 暗黑模式
-    enable_auto_switch_mode:
-      name: enable_auto_switch_mode
-      label: 自动切换主题模式
-      type: switch
-      data-type: bool
-      default: false
-      description: "在特定时间自动切换浅色/暗黑模式，可配置时间范围（注意：该模式会忽略固定模式的设置，且页面不展示主题切换按钮）"
-      options:
-        - value: true
-          label: 是
-        - value: false
-          label: 否
     light_time_scope:
       name: light_time_scope
       label: 浅色模式生效时间范围
       type: text
       default: "5:00~19:00"
       placeholder: "输入格式如：5:00~19:00"
-      description: "设置浅色模式自动生效的时间范围，范围之外为暗黑模式，仅在“自动切换”开启情况下生效"
+      description: "设置浅色模式自动生效的时间范围，范围之外为暗黑模式（仅在主题模式为 “自动模式” 下生效）"
     mode_color_light:
       name: mode_color_light
       label: 主题色（浅色）
@@ -316,7 +306,7 @@ navbar:
       type: switch
       data-type: bool
       default: true
-      description: "导航条是否展示博客LOGO"
+      description: "导航条是否展示博客LOGO，LOGO图标请到 '后台管理设置-博客设置-常规设置' 中配置"
       options:
         - value: true
           label: 展示
@@ -1418,6 +1408,18 @@ post:
           label: 开启
         - value: false
           label: 关闭
+    enable_code_title:
+      name: enable_code_title
+      label: 代码标题
+      type: switch
+      data-type: bool
+      default: true
+      description: "开启代码块的标题"
+      options:
+        - value: true
+          label: 开启
+        - value: false
+          label: 关闭
     enable_code_expander:
       name: enable_code_expander
       label: 代码折叠
@@ -1819,6 +1821,14 @@ social:
       defaut: ""
       # default: "https://github.com/qinhua"
       placeholder: "github主页地址"
+      placeholder: "邮箱地址"
+    gitee:
+      name: gitee
+      label: Gitee
+      type: text
+      defaut: ""
+      # default: "https://gitee.com/duider"
+      placeholder: "gitee主页地址"
     zhihu:
       name: zhihu
       label: 知乎
@@ -2560,13 +2570,25 @@ others:
           label: 开启
         - value: false
           label: 关闭
+    enable_console_theme:
+      name: enable_console_theme
+      label: 控制台输出主题信息
+      type: switch
+      data-type: bool
+      default: true
+      description: "是否在控制台输出主题相关信息"
+      options:
+        - value: true
+          label: 开启
+        - value: false
+          label: 关闭
     show_loaded_time:
       name: show_loaded_time
-      label: 展示页面加载耗时
+      label: 控制台输出页面加载耗时
       type: switch
       data-type: bool
       default: false
-      description: "是否在控制台展示页面加载耗时日志"
+      description: "是否在控制台输出当前页面加载耗时"
       options:
         - value: true
           label: 开启

diff --git a/sheet.ftl b/sheet.ftl
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
-  <#import "template/macro/header.ftl" as headInfo>
+  <#import "template/common/header.ftl" as headInfo>
   <@headInfo.head title="${sheet.title}" type="sheet"/>
   <#import "template/macro/tail.ftl" as tailInfo>
   <body>
@@ -61,6 +61,7 @@
         </div>
         <#include "template/common/aside.ftl">
       </div>
+      <#include "template/common/actions.ftl">
       <#include "template/common/footer.ftl">
     </div>
     <@tailInfo.tail type="sheet"/>