From 55ff980c13aba1844e85a94457b361998937251c Mon Sep 17 00:00:00 2001 From: julylies Date: Sun, 19 Jun 2022 00:31:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9E=8E=E6=94=B9=E7=9A=84=E4=B8=80=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 400.ftl | 2 +- 404.ftl | 2 +- 500.ftl | 2 +- archives.ftl | 42 +-------------------- category.ftl | 8 +++- header.ftl | 36 ++---------------- index.ftl | 10 ++++- links.ftl | 2 +- module/comment.ftl | 6 +-- module/links-module.ftl | 27 ------------- module/menu-module.ftl | 16 -------- module/module_links.ftl | 24 ++++++++++++ module/module_menu.ftl | 31 +++++++++++++++ module/module_pageNav.ftl | 27 +++++++++++++ module/{post-module.ftl => module_post.ftl} | 38 ++++--------------- module/page-nav.ftl | 28 -------------- page.ftl | 8 +++- search.ftl | 8 +++- settings.yaml | 2 +- sheet_about.ftl | 2 +- sheet_links.ftl | 2 +- tag.ftl | 8 +++- 22 files changed, 140 insertions(+), 191 deletions(-) delete mode 100644 module/links-module.ftl delete mode 100644 module/menu-module.ftl create mode 100644 module/module_links.ftl create mode 100644 module/module_menu.ftl create mode 100644 module/module_pageNav.ftl rename module/{post-module.ftl => module_post.ftl} (64%) delete mode 100644 module/page-nav.ftl diff --git a/400.ftl b/400.ftl index 7f3518e..6b2cd3c 100644 --- a/400.ftl +++ b/400.ftl @@ -4,7 +4,7 @@

400

-

找不到页面啦

+

嘤嘤嘤，找不到页面啦

diff --git a/404.ftl b/404.ftl index 24ae757..bb0d71c 100644 --- a/404.ftl +++ b/404.ftl @@ -4,7 +4,7 @@

404

-

找不到页面啦

+

嘤嘤嘤，找不到页面啦

diff --git a/500.ftl b/500.ftl index 7ab4475..1b27ce6 100644 --- a/500.ftl +++ b/500.ftl @@ -4,7 +4,7 @@

500

-

出错了

+

嘤嘤嘤，出错了

diff --git a/archives.ftl b/archives.ftl index b1ec13c..6f38320 100644 --- a/archives.ftl +++ b/archives.ftl @@ -5,46 +5,6 @@

归档

- <#--<@categoryTag method="list"> - <#list categories as category> - ${category.name!}（${category.postCount!}） - - - -
- <@postTag method="archive" type="month"> -
- <#list archives as archive> -

${archive.year?c}-${archive.month?c}

-
    - <#list archive.posts?sort_by("createTime")?reverse as post> -
  • - ${post.title!} -
    - - - <#list post.categories as category> - - ${category.name!} - - - - - <#list post.tags as tag> - - ${tag.name} - - - - ${post.commentCount!}°C -
    -
    • - -
- -
- -
-->
<@postTag method="archive" type="month">
@@ -63,4 +23,4 @@
-<#include "footer.ftl"> +<#include "footer.ftl"> \ No newline at end of file diff --git a/category.ftl b/category.ftl index 026aea9..a92f5c0 100644 --- a/category.ftl +++ b/category.ftl @@ -1,5 +1,11 @@ <#include "header.ftl"> <@head title="分类：${category.name} - ${blog_title!}" /> +<#include "module/module_pageNav.ftl">

分类：${category.name}

-<#include "module/post-module.ftl"> +
+
+ <#include "module/module_post.ftl"> + <@pageNav method="categoryPosts" /> +
+
<#include "footer.ftl"> diff --git a/header.ftl b/header.ftl index d67392b..63d49c8 100644 --- a/header.ftl +++ b/header.ftl @@ -27,7 +27,9 @@ - + <#if !(options.blog_favicon?? && options.blog_favicon!='')> + + @@ -74,37 +76,7 @@ diff --git a/index.ftl b/index.ftl index 187c7a6..8dd9b0c 100644 --- a/index.ftl +++ b/index.ftl @@ -1,4 +1,10 @@ <#include "header.ftl"> -<@head title="${blog_title!}"/> -<#include "module/post-module.ftl"> +<@head title="${blog_title!}" /> +<#include "module/module_pageNav.ftl"> +
+
+ <#include "module/module_post.ftl"> + <@pageNav method="index" /> +
+
<#include "footer.ftl"> \ No newline at end of file diff --git a/links.ftl b/links.ftl index 319fef8..3a4f0d8 100644 --- a/links.ftl +++ b/links.ftl @@ -1,4 +1,4 @@ <#include "header.ftl"> <@head title="友情链接 -${blog_title!}" /> -<#include "module/links-module.ftl"> +<#include "module/module_links.ftl"> <#include "footer.ftl"> diff --git a/module/comment.ftl b/module/comment.ftl index d053a20..21bc2ba 100644 --- a/module/comment.ftl +++ b/module/comment.ftl @@ -1,7 +1,7 @@ <#macro comment target,type> <#if !post.disallowComment!false> - -- -- + + + \ No newline at end of file diff --git a/module/links-module.ftl b/module/links-module.ftl deleted file mode 100644 index d318831..0000000 --- a/module/links-module.ftl +++ /dev/null @@ -1,27 +0,0 @@ -
-

友情链接

-
-
- <@linkTag method="listTeams"> - <#list teams as item> - <#--><@global.comment target=sheet type="sheet" />--> -

- ${((item.team!'')?length>0)?string((item.team!''), '小伙伴们')} -

- - - -
-
- diff --git a/module/menu-module.ftl b/module/menu-module.ftl deleted file mode 100644 index 55db6f0..0000000 --- a/module/menu-module.ftl +++ /dev/null @@ -1,16 +0,0 @@ -<@menuTag method="list"> - <#-- - ?sort_by('priority')：根据菜单的排序编号排序 - --> - <#list menus?sort_by('priority') as menu> -
  • - - <#if menu.icon?? && menu.icon?trim?length gt 0> - - - ${menu.name} - -
    • - - \ No newline at end of file diff --git a/module/module_links.ftl b/module/module_links.ftl new file mode 100644 index 0000000..c3f83c9 --- /dev/null +++ b/module/module_links.ftl @@ -0,0 +1,24 @@ +

    友情链接

    +
    +
    + <@linkTag method="listTeams"> + <#list teams as item> +

    + ${((item.team!'')?length>0)?string((item.team!''), '小伙伴们')} +

    + + + +
    +
    + diff --git a/module/module_menu.ftl b/module/module_menu.ftl new file mode 100644 index 0000000..881fdb2 --- /dev/null +++ b/module/module_menu.ftl @@ -0,0 +1,31 @@ +<@menuTag method="tree"> + <#list menus?sort_by('priority') as menu> + <#if menu.children?? && menu.children?size gt 0> +
    + + href="${menu.url!}" target="${menu.target!}" > + + <#if menu.icon?? && menu.icon?trim?length gt 0> + + ${menu.name} + + + <#if menu.children?? && menu.children?size gt 0> +
    + <#list menu.children?sort_by('priority') as child> + + + <#if child.icon?? && child.icon?trim?length gt 1> + + ${child.name} + + + + +
    + + <#if menu.children?? && menu.children?size gt 0> +
    + + + \ No newline at end of file diff --git a/module/module_pageNav.ftl b/module/module_pageNav.ftl new file mode 100644 index 0000000..8c92d5e --- /dev/null +++ b/module/module_pageNav.ftl @@ -0,0 +1,27 @@ +<#macro pageNav method> +
    + <@paginationTag method="${method}" slug="${slug!}" page="${posts.number}" keyword="${keyword}" total="${posts.totalPages}" display="3"> + <#if pagination.hasPrev> + + « + + + <#list pagination.rainbowPages as number> + <#if number.isCurrent> + + ${number.page!} + + <#else> + + ${number.page!} + + + + <#if pagination.hasNext> + + » + + + +
    + \ No newline at end of file diff --git a/module/post-module.ftl b/module/module_post.ftl similarity index 64% rename from module/post-module.ftl rename to module/module_post.ftl index 2b013e7..5d2e121 100644 --- a/module/post-module.ftl +++ b/module/module_post.ftl @@ -1,5 +1,5 @@ -
    -
    + + <#--判断主页显示社交链接--> <#if is_index??>

    ${blog_title!}

    @@ -11,6 +11,7 @@
    + <#--判断页面显示标题--> <#if is_tag??>

    包含“${tag.name}”标签的文章

    @@ -26,13 +27,16 @@

    包含“${keyword!}”关键字的文章

    + <#--显示文章-->
    <#list posts.content as post>

    ${post.title!}

    + <#--显示文章简介-->

    ${post.summary!}

    + <#--文章标签等-->
    -
    -
    - <@paginationTag method="index" slug="${slug!}" page="${posts.number}" total="${posts.totalPages}" display="3"> - <#-- <@paginationTag method="${method!}" slug="${slug!}" page="${posts.number}" total="${posts.totalPages}" display="3">--> - <#if pagination.hasPrev> - - « - - - <#list pagination.rainbowPages as number> - <#if number.isCurrent> - - ${number.page!} - - <#else> - - ${number.page!} - - - - <#if pagination.hasNext> - - » - - - -
    -
    -
    \ No newline at end of file + \ No newline at end of file diff --git a/module/page-nav.ftl b/module/page-nav.ftl deleted file mode 100644 index 74dde2f..0000000 --- a/module/page-nav.ftl +++ /dev/null @@ -1,28 +0,0 @@ -<#macro pagination method='index' slug="" display = "3"> -
    - <#-- <@paginationTag method="index" slug="${slug!}" page="${posts.number}" total="${posts.totalPages}" display="3">--> - <@paginationTag method="${method!}" slug="${slug!}" page="${posts.number}" total="${posts.totalPages}" display="3"> - <#if pagination.hasPrev> - - « - - - <#list pagination.rainbowPages as number> - <#if number.isCurrent> - - ${number.page!} - - <#else> - - ${number.page!} - - - - <#if pagination.hasNext> - - » - - - -
    - \ No newline at end of file diff --git a/page.ftl b/page.ftl index 1aa50eb..19a0cad 100644 --- a/page.ftl +++ b/page.ftl @@ -1,4 +1,10 @@ <#include "header.ftl"> <@head title="page -${blog_title!}" /> -<#include "module/post-module.ftl"> +<#include "module/module_pageNav.ftl"> +
    +
    + <#include "module/module_post.ftl"> + <@pageNav method="page" /> +
    +
    <#include "footer.ftl"> diff --git a/search.ftl b/search.ftl index 79ad0fc..a538932 100644 --- a/search.ftl +++ b/search.ftl @@ -1,4 +1,10 @@ <#include "header.ftl"> <@head title="搜索结果：${keyword!} - ${blog_title!}"/> -<#include "module/post-module.ftl"> +<#include "module/module_pageNav.ftl"> +
    +
    + <#include "module/module_post.ftl"> + <@pageNav method="search" /> +
    +
    <#include "footer.ftl"> \ No newline at end of file diff --git a/settings.yaml b/settings.yaml index 999661e..7683f73 100644 --- a/settings.yaml +++ b/settings.yaml @@ -5,7 +5,7 @@ general: name: favicon label: 站点图标 type: attachment - default: 'https://api.lixingyong.com/api/images' + default: '' description: '在这里填入一张 png 图片地址（192x192px），不填则使用默认图标' background: name: background diff --git a/sheet_about.ftl b/sheet_about.ftl index b87ecb7..bd45750 100644 --- a/sheet_about.ftl +++ b/sheet_about.ftl @@ -2,7 +2,7 @@ <@head title="${sheet.title!} - ${blog_title!}" />
    - <#include "module/post-module.ftl"> + <#include "module/module_post.ftl">
    <#include "footer.ftl"> diff --git a/sheet_links.ftl b/sheet_links.ftl index 72f1925..15cc009 100644 --- a/sheet_links.ftl +++ b/sheet_links.ftl @@ -3,7 +3,7 @@
    ${sheet.formatContent!} - <#include "module/links-module.ftl"> + <#include "module/module_links.ftl">
    <@global.comment target=sheet type="sheet" />
    diff --git a/tag.ftl b/tag.ftl index 993b7c5..652d680 100644 --- a/tag.ftl +++ b/tag.ftl @@ -1,4 +1,10 @@ <#include "header.ftl"> <@head title="标签：${tag.name} - ${blog_title!}" /> -<#include "module/post-module.ftl"> +<#include "module/module_pageNav.ftl"> +
    +
    + <#include "module/module_post.ftl"> + <@pageNav method="tagPosts" /> +
    +
    <#include "footer.ftl"> \ No newline at end of file