From b9fd5995d0785bb0e0e89f9c898fc2feb712e5c2 Mon Sep 17 00:00:00 2001 From: jinqilin721 Date: Wed, 11 Mar 2020 17:58:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=82=B9=E7=82=B9=E4=BC=98=E5=8C=96:?= =?UTF-8?q?=20=E7=BD=91=E5=9D=80=EF=BC=9Ahttp://blog.xinac.cn/=20=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E6=AD=A3=E5=9C=A8=E5=BB=BA=E8=AE=BE=E4=B8=AD=E3=80=82?= =?UTF-8?q?=201=E3=80=81=E5=85=A8=E9=83=A8=E6=97=A5=E6=9C=9F=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E6=94=B9=E4=B8=BA=EF=BC=9Ayyyy-MM-dd=20EE=202?= =?UTF-8?q?=E3=80=81=E9=A6=96=E9=A1=B5=E5=92=8C=E6=96=87=E7=AB=A0=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E9=87=8F=E3=80=81=E6=B5=8F=E8=A7=88=E9=87=8F=E3=80=81=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=EF=BC=8C=E9=A1=B5=E8=84=9A=E6=98=BE=E7=A4=BA=E9=9D=A0?= =?UTF-8?q?=E5=B7=A6=203=E3=80=81=E4=B8=BB=E9=A2=98=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=85=B3=E6=B3=A8=E6=88=91=E5=92=8C?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E4=BB=A3=E7=A0=81=E4=B8=BB=E9=A2=98=204?= =?UTF-8?q?=E3=80=81=E5=8F=8B=E9=93=BE=E6=8C=89=E6=8E=92=E5=BA=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=205=E3=80=81=E6=91=98=E8=A6=81=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=9C=89=E4=BB=A3=E7=A0=81=E6=97=B6=EF=BC=8C=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BC=9A=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=20word-break:=20break-word;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- archives.ftl | 2 +- layout/common/article.ftl | 105 ++++++----- layout/common/footer.ftl | 31 ++-- layout/common/module.ftl | 2 +- layout/layout.ftl | 15 +- layout/widget/cate_posts.ftl | 2 +- layout/widget/links.ftl | 2 +- layout/widget/profile.ftl | 9 +- layout/widget/recent_posts.ftl | 2 +- layout/widget/tag_posts.ftl | 2 +- layout/widget/toc-post.ftl | 6 +- links.ftl | 62 +++---- photos.ftl | 2 +- settings.yaml | 35 ++++ source/css/style.css | 7 + source/css/style.styl | 1 + source/lib/caidai.js | 324 +++++++++++++++++++++++++++++++++ source/lib/dianji.js | 80 ++++++++ source/lib/toc/toc.min.js | 2 + 19 files changed, 582 insertions(+), 109 deletions(-) create mode 100644 source/lib/caidai.js create mode 100644 source/lib/dianji.js create mode 100644 source/lib/toc/toc.min.js diff --git a/archives.ftl b/archives.ftl index 9e9e422..ea574d2 100644 --- a/archives.ftl +++ b/archives.ftl @@ -20,7 +20,7 @@
- + ${post.title!}
diff --git a/layout/common/article.ftl b/layout/common/article.ftl index 335abb7..6461b98 100644 --- a/layout/common/article.ftl +++ b/layout/common/article.ftl @@ -22,7 +22,7 @@
+ datetime="${post.createTime!}">${post.createTime?string["yyyy-MM-dd EE"]} <#if index> <#if post.categories?? && post.categories?size gt 0>
@@ -43,6 +43,12 @@
+
+
+ 评论(${post.commentCount!'0'}) + 浏览(${post.visits!'0'}) +
+
<#if is_post??>

@@ -62,7 +68,6 @@

-
<#if index && post.summary?? && post.summary!=''> ${post.summary!} @@ -70,65 +75,79 @@ ${post.formatContent!}
- <#if !index && tags?? && (tags?size gt 0)> -
+ <#if !index> +
+ <#if tags?? && (tags?size gt 0)> +
+ # + <#list tags as tag> + ${tag.name!}  + +
+ +
+
- # - <#list tags as tag> - ${tag.name!}  - + 最后编辑时间:${post.editTime!?string('yyyy-MM-dd HH:mm:ss')}
- <#if index && post.summary?? && post.summary!=''> + <#if index>
- + <#if post.tags?? && (post.tags?size gt 0)> +
+ # + <#list post.tags as tag> + ${tag.name!}  + +
+
+ <#if post.summary?? && post.summary!=''> +
+ +
+
- <#if !index> -
-
-

本文由 ${user.nickname!} 创作,如果您觉得本文不错,请随意赞赏
采用 知识共享署名4.0 国际许可协议进行许可
本站文章除注明转载/出处外,均为本站原创或翻译,转载前请务必署名
原文链接:${context!} - /archives/${post.url!}
最后更新于:${post.editTime?string('yyyy-MM-dd HH:mm:ss')} -

-
-
- - <#if !index> - <#if (settings.donate_alipay?? && settings.donate_alipay!='') || (settings.donate_wechat?? && settings.donate_wechat!='')> -
+
- -
- <#if settings.donate_alipay?? && settings.donate_alipay!=''> - <#include "../donate/alipay.ftl"> - - <#if settings.donate_wechat?? && settings.donate_wechat!=''> - <#include "../donate/wechat.ftl"> - -
+

+ 本文由 ${user.nickname!} 创作,如果您觉得本文不错,请随意赞赏
+ 采用 知识共享署名4.0 国际许可协议进行许可
+ 本站文章除注明转载/出处外,均为本站原创或翻译,转载前请务必署名
+ 原文链接:${context!}/archives/${post.url!}
+ 最后更新:${post.editTime?string('yyyy-MM-dd HH:mm:ss')} +

- + + <#if !index> + <#if (settings.donate_alipay?? && settings.donate_alipay!='') || (settings.donate_wechat?? && settings.donate_wechat!='')> +
+
+ +
+ <#if settings.donate_alipay?? && settings.donate_alipay!=''> + <#include "../donate/alipay.ftl"> + + <#if settings.donate_wechat?? && settings.donate_wechat!=''> + <#include "../donate/wechat.ftl"> + +
+
+
+ + <#if !index && nextPost?? && prePost??>
diff --git a/layout/common/footer.ftl b/layout/common/footer.ftl index 61baca1..ccff048 100644 --- a/layout/common/footer.ftl +++ b/layout/common/footer.ftl @@ -2,17 +2,16 @@
-    <@global.footer /> <#if settings.busuanzi!true> - -
- - +

+ +
+ + +

<#if settings.bokejishi!true> -

+

我的博客已经运行    啦!

<#if settings.social_beian?? && settings.social_beian!=''> -

- ${settings.social_beian!} +

+ + ${settings.social_beian!} +

<#if settings.social_free?? && settings.social_free!=''> - ${settings.social_free!} +

+ © ${.now?string('yyyy')} ${user.nickname!} ${settings.social_free!} +

<#if settings.caidai!true> - + <#if settings.xiantiao!true> +

+ <@global.footer />
diff --git a/layout/common/module.ftl b/layout/common/module.ftl index c0809bb..daf5e33 100644 --- a/layout/common/module.ftl +++ b/layout/common/module.ftl @@ -21,7 +21,7 @@
- ${post.createTime?string["EEE MMM d"]} + ${post.createTime?string["yyyy-MM-dd EE"]}
${post.summary!}
阅读更多 diff --git a/layout/layout.ftl b/layout/layout.ftl index c2218e8..712f107 100644 --- a/layout/layout.ftl +++ b/layout/layout.ftl @@ -25,7 +25,7 @@ - + <@global.head /> @@ -66,11 +66,9 @@ <#if is_post?? || is_sheet?? || is_journal??> - + - + @@ -78,8 +76,7 @@ <#include "./plugin/style.theme.ftl"> <#if post?? || journals??> - + <#if is_index??> @@ -117,7 +114,7 @@ style="margin-left: 10px">
- <#-- 判断是否已经有置顶文章--> + <#--判断是否已经有置顶文章--> <#list posts.content as post> <#if post.topPriority == 1> <#assign isTop = 'yes'> @@ -126,7 +123,7 @@ <#if isTop??>
- <#-- <#include "./common/widget_pin.ftl">--> + <#--<#include "./common/widget_pin.ftl">--> <@module 'slider' />
diff --git a/layout/widget/cate_posts.ftl b/layout/widget/cate_posts.ftl index ae47f1f..5101cf3 100644 --- a/layout/widget/cate_posts.ftl +++ b/layout/widget/cate_posts.ftl @@ -17,7 +17,7 @@
-
+
${post.title!}
diff --git a/layout/widget/links.ftl b/layout/widget/links.ftl index 7896b20..f149f3b 100644 --- a/layout/widget/links.ftl +++ b/layout/widget/links.ftl @@ -7,7 +7,7 @@ 链接