diff --git a/archives.ftl b/archives.ftl index ea574d2..bd01c2f 100644 --- a/archives.ftl +++ b/archives.ftl @@ -1,34 +1,55 @@ <#include "layout/layout.ftl"> <#include "layout/common/article.ftl"> -<@layout title="归档 - ${options.blog_title!}" keywords="${options.seo_keywords!}" description="${options.seo_description!}" canonical="${context!}/archives"> -<@postTag method="archiveYear"> - <#list archives as archive> -
-
-

- ${archive.year?c} -

-
- <#list archive.posts as post> -
- <#if post.thumbnail?? && post.thumbnail!=''> - -

- ${post.title!} -

- - -
-
- - ${post.title!} -
+<@layout title="归档 - ${blog_title!}" canonical="${archives_url!}"> +<#list archives as archive> +
+
+

+ ${archive.year?c} +

+
+ <#list archive.posts as post> +
+ <#if post.thumbnail?? && post.thumbnail!='' && (settings.post_thumbnail_enable?? && settings.post_thumbnail_enable)> + +

+ ${post.title!} +

+ + +
+
+ + ${post.title!}
-
- -
+
+
+
- - +
+ +<#if posts.getTotalPages() gt 0> +
+ +
+ diff --git a/categories.ftl b/categories.ftl index e38f5c3..c18e422 100644 --- a/categories.ftl +++ b/categories.ftl @@ -1,5 +1,5 @@ <#include "layout/layout.ftl"> <#include "layout/common/article.ftl"> -<@layout title="分类 - ${options.blog_title!}" keywords="${options.seo_keywords!}" description="${options.seo_description!}" canonical="${context!}/categories"> +<@layout title="分类 - ${blog_title!}" canonical="${categories_url!}"> <#include "layout/categories.ftl"> \ No newline at end of file diff --git a/category.ftl b/category.ftl index 928f184..9648553 100644 --- a/category.ftl +++ b/category.ftl @@ -1,5 +1,5 @@ <#include "layout/layout.ftl"> <#include "layout/common/article.ftl"> -<@layout title="分类：${category.name!} - ${options.blog_title!}" keywords="${options.seo_keywords!}" description="${options.seo_description!}" canonical="${context!}/categories/${category.slugName!}"> +<@layout title="分类：${category.name!} - ${blog_title!}" canonical="${category.fullPath!}"> <#include "layout/category.ftl"> diff --git a/index.ftl b/index.ftl index 9acc7b6..339c951 100644 --- a/index.ftl +++ b/index.ftl @@ -1,6 +1,6 @@ <#include "layout/layout.ftl"> <#include "layout/common/article.ftl"> -<@layout title="${options.blog_title!}" keywords="${options.seo_keywords!}" description="${options.seo_description!}" canonical="${context!}"> +<@layout title="${blog_title!}" canonical="${blog_url!}"> <#list posts.content as post> <#if post.topPriority != 1> <@article post,'index','null',true /> @@ -9,25 +9,23 @@ <#if posts.getTotalPages() gt 0>
diff --git a/journals.ftl b/journals.ftl index d8bace3..6102912 100644 --- a/journals.ftl +++ b/journals.ftl @@ -1,7 +1,6 @@ <#include "layout/layout.ftl"> <#include "layout/common/article.ftl"> -<@layout title="耳语 - ${options.blog_title!}" keywords="${options.seo_keywords!}" description="${options -.seo_description!}" canonical="${context!}/journals"> +<@layout title="耳语 - ${blog_title!}" canonical="${journals_url!}">
<#include "layout/journals/journals.ftl"/>
diff --git a/layout/categories.ftl b/layout/categories.ftl index 1479ff6..3c32ac3 100644 --- a/layout/categories.ftl +++ b/layout/categories.ftl @@ -8,7 +8,7 @@ <@categoryTag method="list"> <#list categories as category>
  • - + ${category.name} diff --git a/layout/category.ftl b/layout/category.ftl index 8ba2bc3..e724f3d 100644 --- a/layout/category.ftl +++ b/layout/category.ftl @@ -3,7 +3,7 @@
    @@ -17,31 +17,23 @@ <#if posts.getTotalPages() gt 0>
    diff --git a/layout/common/article.ftl b/layout/common/article.ftl index 283904f..b3b560a 100644 --- a/layout/common/article.ftl +++ b/layout/common/article.ftl @@ -4,10 +4,10 @@
    style="display: block" > <#if is_post?? || is_page?? || is_sheet??> <#else > - <#if post.thumbnail?? && post.thumbnail!=''> + <#if post.thumbnail?? && post.thumbnail!='' && (settings.post_thumbnail_enable?? && settings.post_thumbnail_enable)>
    <#if index> - + ${post.title!} <#else> @@ -28,7 +28,7 @@
    <#list post.categories as category> ${category.name!}  + href="${category.fullPath!}">${category.name!} 
    @@ -37,7 +37,7 @@
    <#list categories as category> ${category.name!}  + href="${category.fullPath!}">${category.name!} 
    @@ -53,7 +53,7 @@ <#if is_post??>

    <#if index> - ${post.title!} + ${post.title!} <#else> ${post.title!} @@ -61,7 +61,7 @@ <#else>

    <#if index> - ${post.title!} + ${post.title!} <#else> ${post.title!} @@ -82,7 +82,7 @@
    # <#list tags as tag> - ${tag.name!}  + ${tag.name!} 
    @@ -101,7 +101,7 @@
    # <#list post.tags as tag> - ${tag.name!}  + ${tag.name!} 
    @@ -109,7 +109,7 @@ <#if post.summary?? && post.summary!=''>
    - 阅读更多 + 阅读更多
    @@ -124,7 +124,7 @@ 本文由 ${user.nickname!} 创作，如果您觉得本文不错，请随意赞赏
    采用 知识共享署名4.0 国际许可协议进行许可
    本站文章除注明转载/出处外，均为本站原创或翻译，转载前请务必署名
    - 原文链接：${context!}/archives/${post.url!}
    + 原文链接：${post.fullPath!}
    最后更新：${post.editTime?string('yyyy-MM-dd HH:mm:ss')}

    @@ -149,14 +149,14 @@ - <#if !index && (nextPost?? || prePost??)> + <#if !index && (nextPost?? || prevPost??)>
    - <#if prePost??> - + <#if prevPost??> + - ${prePost.title!} + ${prevPost.title!} <#else> @@ -167,7 +167,7 @@
    <#if nextPost??> - + ${nextPost.title!} @@ -182,7 +182,7 @@
    - <#if !index> + <#if !index && settings.comment_enable?? && settings.comment_enable>

    评论

    diff --git a/layout/common/footer.ftl b/layout/common/footer.ftl index a7118f9..78ce125 100644 --- a/layout/common/footer.ftl +++ b/layout/common/footer.ftl @@ -53,11 +53,11 @@ <#if settings.social_free?? && settings.social_free!=''>

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

    <#if settings.caidai!true> - + <#if settings.xiantiao!true> + <@global.footer />
    diff --git a/layout/common/module.ftl b/layout/common/module.ftl index e351747..6757c33 100644 --- a/layout/common/module.ftl +++ b/layout/common/module.ftl @@ -15,15 +15,15 @@ <#if post.topPriority == 1>
    - + ${post.title!}
    ${post.createTime?string["yyyy-MM-dd EE"]} -
    ${post.title!}
    +
    ${post.title!}
    ${post.summary!}
    - 阅读更多 + 阅读更多
    diff --git a/layout/common/navbar.ftl b/layout/common/navbar.ftl index 1965afa..cc9bfd3 100644 --- a/layout/common/navbar.ftl +++ b/layout/common/navbar.ftl @@ -3,10 +3,10 @@
    diff --git a/layout/common/scripts.ftl b/layout/common/scripts.ftl index 7bc60e6..ae1b14f 100644 --- a/layout/common/scripts.ftl +++ b/layout/common/scripts.ftl @@ -4,12 +4,12 @@ <#include "../plugin/mathjax.ftl"> <#include "../plugin/back-to-top.ftl"> - + <#if is_index??> - + <#if is_post??> - + - - - + + + <#include "./plugin/style.theme.ftl"> <#if post?? || journals??> - - + + <#if is_index??> - + @@ -137,8 +137,8 @@ <#list categories as category> <#if category_index <= 4>
  • - ${category.name} + ${category.name!}
    • diff --git a/layout/plugin/animejs.ftl b/layout/plugin/animejs.ftl index f2c2e2c..97f3e94 100644 --- a/layout/plugin/animejs.ftl +++ b/layout/plugin/animejs.ftl @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/layout/search/local.ftl b/layout/search/local.ftl index d68cd18..dce2400 100644 --- a/layout/search/local.ftl +++ b/layout/search/local.ftl @@ -12,7 +12,7 @@ <#--
    最新文章
    --> <#-- <@postTag method="latest" top="5">--> <#-- <#list posts as post>--> - <#-- --> + <#-- --> <#--
    --> <#--
    ${post.title!}--> <#--
    --> @@ -28,13 +28,13 @@
    <@categoryTag method="list"> <#list categories as category> - +
    ${category.name!}
    <#--
    --> <#--
    --> <#-- --> <#-- ${category.name!}--> -<#-- ${category.slugName!}--> +<#-- ${category.slug!}--> <#--
    --> <#--
    -->     @@ -50,7 +50,7 @@
    <@tagTag method="list"> <#list tags as tag> - +
    ${tag.name!}
    <#--
    --> diff --git a/layout/tag.ftl b/layout/tag.ftl index ce6da0c..f61ab36 100644 --- a/layout/tag.ftl +++ b/layout/tag.ftl @@ -4,8 +4,8 @@
    @@ -18,30 +18,23 @@ <#if posts.getTotalPages() gt 0>
    diff --git a/layout/tags.ftl b/layout/tags.ftl index 48325e2..db83edb 100644 --- a/layout/tags.ftl +++ b/layout/tags.ftl @@ -8,7 +8,7 @@ <@tagTag method="list"> <#list tags as tag>
    - + ${tag.name} ${tag.postCount!} diff --git a/layout/widget/cate_posts.ftl b/layout/widget/cate_posts.ftl index 5101cf3..2d9f6c5 100644 --- a/layout/widget/cate_posts.ftl +++ b/layout/widget/cate_posts.ftl @@ -8,8 +8,8 @@ <#list posts as post> <#if post_index lt 3> diff --git a/layout/widget/profile.ftl b/layout/widget/profile.ftl index e8c4874..43eb2e2 100644 --- a/layout/widget/profile.ftl +++ b/layout/widget/profile.ftl @@ -113,7 +113,7 @@ box-shadow: 0 1px 2px 0 rgba(0,0,0,0.1);"> - +
    diff --git a/layout/widget/recent_comments.ftl b/layout/widget/recent_comments.ftl index 473c0ac..2a8f559 100644 --- a/layout/widget/recent_comments.ftl +++ b/layout/widget/recent_comments.ftl @@ -10,7 +10,7 @@
    - ${comment.author!} : ${comment.content!} + ${comment.author!} : ${comment.content!}
    diff --git a/layout/widget/recent_posts.ftl b/layout/widget/recent_posts.ftl index 5798460..b1dddf3 100644 --- a/layout/widget/recent_posts.ftl +++ b/layout/widget/recent_posts.ftl @@ -6,8 +6,8 @@ <@postTag method="latest" top="5"> <#list posts as post>
    diff --git a/layout/widget/tag_posts.ftl b/layout/widget/tag_posts.ftl index 3c594bd..46a0b44 100644 --- a/layout/widget/tag_posts.ftl +++ b/layout/widget/tag_posts.ftl @@ -8,8 +8,8 @@ <#list posts as post> <#if post_index lt 3> diff --git a/layout/widget/tagcloud.ftl b/layout/widget/tagcloud.ftl index 7a7ff51..421cb02 100644 --- a/layout/widget/tagcloud.ftl +++ b/layout/widget/tagcloud.ftl @@ -6,7 +6,7 @@ 标签云 <#list tags as tag> - ${tag.name!} + ${tag.name!}
    diff --git a/links.ftl b/links.ftl index aba7b70..8ccecb1 100644 --- a/links.ftl +++ b/links.ftl @@ -1,7 +1,7 @@ <#include "layout/layout.ftl"> <#include "layout/common/article.ftl"> <#include "layout/comment/comment.ftl"> -<@layout title="链接 - ${options.blog_title!}" keywords="${options.seo_keywords!}" description="${options.seo_description!}" canonical="${context!}/links"> +<@layout title="链接 - ${blog_title!}" canonical="${links_url!}"> <#include "layout/widget/links.ftl">
    diff --git a/photos.ftl b/photos.ftl index 44216c1..94b924b 100644 --- a/photos.ftl +++ b/photos.ftl @@ -6,22 +6,22 @@ ${title!} - - + + - + - + - + <@global.head /> @@ -33,10 +33,10 @@ - - - - + + + + <@navbar 'page' /> @@ -77,9 +77,9 @@ <#include "./layout/plugin/back-to-top.ftl"> - - - + + +