From 70894d8d2b9e8d0213dbfed6e65e7ad2a9ceb39f 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 | 4 ++ 404.ftl | 4 ++ header.ftl | 84 ++++++++++++++++++++++++++++++++++++++- index.ftl | 11 +++++ module/comment.ftl | 6 +++ module/module_links.ftl | 28 ++++++++++++- module/module_menu.ftl | 32 +++++++++++++++ module/module_pageNav.ftl | 25 ++++++++++++ module/module_post.ftl | 70 +++++++++++++++++++++++++++++++- 9 files changed, 261 insertions(+), 3 deletions(-) diff --git a/400.ftl b/400.ftl index 0c6541a..4c064cc 100644 --- a/400.ftl +++ b/400.ftl @@ -5,7 +5,11 @@

400

嘤嘤嘤，找不到页面啦

+<<<<<<< HEAD +======= + +>>>>>>> 4fe9ac8 (瞎改的一天)
diff --git a/404.ftl b/404.ftl index fed0fcb..470a995 100644 --- a/404.ftl +++ b/404.ftl @@ -5,7 +5,11 @@

404

嘤嘤嘤，找不到页面啦

+<<<<<<< HEAD +======= + +>>>>>>> 4fe9ac8 (瞎改的一天)
diff --git a/header.ftl b/header.ftl index 8e2aa7b..4bcafde 100644 --- a/header.ftl +++ b/header.ftl @@ -2,6 +2,7 @@ +<<<<<<< HEAD ${title} @@ -83,4 +84,85 @@ <#include "module/module_menu.ftl"> - \ No newline at end of file + +======= + ${title} + + + + + + + + <#----> + + + <#-- 导航面包蟹--> + + + + + + + + + + + + + + <#if !(options.blog_favicon?? && options.blog_favicon!='')> + + + + + + + + <#----> + + + <@global.head /> + <#if !(options.blog_favicon?? && options.blog_favicon!='')> + + + <#-- 背景图片--> + <#if settings.background?? && settings.background!=''> + + + <#-- 自定css--> + <#if settings.custom_css?? && settings.custom_css!=''> + ${custom_css!} + + + <#-- 夜间模式 --> + + class="dark-theme" + <#elseif (settings.night_mode?? && settings.night_mode == '1')> + <#assign currentDateTime = .now> + <#assign hour=currentDateTime?string("HH") > + <#if (hour?eval >=20|| hour?eval <=6) > + class="dark-theme" + + +> +
+
+

${blog_title!}

+
+
+
+
+
+
+ + +
+ + +>>>>>>> 4fe9ac8 (瞎改的一天) diff --git a/index.ftl b/index.ftl index 7ade81d..526223f 100644 --- a/index.ftl +++ b/index.ftl @@ -1,4 +1,5 @@ <#include "header.ftl"> +<<<<<<< HEAD <@head title="${blog_title!}" /> <#include "module/module_pageNav.ftl">
@@ -7,4 +8,14 @@ <@pageNav method="index" />
+======= +<@head title="${blog_title!}" /> +<#include "module/module_pageNav.ftl"> +
+
+ <#include "module/module_post.ftl"> + <@pageNav method="index" /> +
+
+>>>>>>> 4fe9ac8 (瞎改的一天) <#include "footer.ftl"> \ No newline at end of file diff --git a/module/comment.ftl b/module/comment.ftl index 6e107c4..076a070 100644 --- a/module/comment.ftl +++ b/module/comment.ftl @@ -1,7 +1,13 @@ <#macro comment target,type> <#if !post.disallowComment!false> +<<<<<<< HEAD +======= + + + +>>>>>>> 4fe9ac8 (瞎改的一天) \ No newline at end of file diff --git a/module/module_links.ftl b/module/module_links.ftl index 300acde..785d9e0 100644 --- a/module/module_links.ftl +++ b/module/module_links.ftl @@ -1,4 +1,5 @@

友情链接

+<<<<<<< HEAD
<@linkTag method="listTeams"> @@ -23,4 +24,29 @@
-
\ No newline at end of file + +======= +
+
+ <@linkTag method="listTeams"> + <#list teams as item> +

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

+ + + +
+
+ +>>>>>>> 4fe9ac8 (瞎改的一天) diff --git a/module/module_menu.ftl b/module/module_menu.ftl index a36c87f..bcde3eb 100644 --- a/module/module_menu.ftl +++ b/module/module_menu.ftl @@ -1,4 +1,5 @@ <@menuTag method="tree"> +<<<<<<< HEAD <#list menus?sort_by('priority') as menu> <#if menu.children?? && menu.children?size gt 0>
@@ -28,4 +29,35 @@
+======= + <#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> +
+ + +>>>>>>> 4fe9ac8 (瞎改的一天) \ No newline at end of file diff --git a/module/module_pageNav.ftl b/module/module_pageNav.ftl index 11e7970..8e3d6a2 100644 --- a/module/module_pageNav.ftl +++ b/module/module_pageNav.ftl @@ -1,3 +1,4 @@ +<<<<<<< HEAD <#macro pageNav method keyword="">
<@paginationTag method="${method}" slug="${slug!}" page="${posts.number}" total="${posts.totalPages}" @@ -11,11 +12,26 @@ <#if number.isCurrent> ${number.page!} +======= +<#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!} +>>>>>>> 4fe9ac8 (瞎改的一天) <#else> ${number.page!} +<<<<<<< HEAD <#if pagination.hasNext> @@ -23,6 +39,15 @@ » +======= + + + <#if pagination.hasNext> + + » + + +>>>>>>> 4fe9ac8 (瞎改的一天)
\ No newline at end of file diff --git a/module/module_post.ftl b/module/module_post.ftl index dc64a2d..92af0c2 100644 --- a/module/module_post.ftl +++ b/module/module_post.ftl @@ -1,3 +1,4 @@ +<<<<<<< HEAD <#include "module_homeSocial.ftl" /> <#--判断页面显示标题--> <#if is_tag??> @@ -50,4 +51,71 @@ -
\ No newline at end of file + +======= + + <#--判断主页显示社交链接--> + <#if is_index??> +
+

${blog_title!}

+ ${user.description!} +
+ <#if settings.home_social?? && settings.home_social != ''> + ${settings.home_social!} + +
+
+ + <#--判断页面显示标题--> + <#if is_tag??> +
+

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

+
+ + <#if is_category??> +
+

“${category.name}”分类下的文章

+
+ + <#if is_search??> +
+

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

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

+ ${post.title!} +

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

${post.summary!}

+ <#--文章标签等--> +
+ + + <#list post.categories as category> + + ${category.name!} + + + + + <#list post.tags as tag> + ${tag.name} + + + + ${post.commentCount!}°C + + + ${post.visits!} + +
+
+ +
+>>>>>>> 4fe9ac8 (瞎改的一天)