<#if settings.links_thumbnail?? && settings.links_thumbnail!=''>
@@ -64,7 +64,7 @@
<#if settings.link_comment_id?? && settings.link_comment_id!='' && settings.enable_comment!true>
diff --git a/template/main/admire.ftl b/templates/main/admire.ftl
similarity index 100%
rename from template/main/admire.ftl
rename to templates/main/admire.ftl
diff --git a/template/main/article.ftl b/templates/main/article.ftl
similarity index 100%
rename from template/main/article.ftl
rename to templates/main/article.ftl
diff --git a/template/main/article_list.ftl b/templates/main/article_list.ftl
similarity index 100%
rename from template/main/article_list.ftl
rename to templates/main/article_list.ftl
diff --git a/template/main/article_literature.ftl b/templates/main/article_literature.ftl
similarity index 100%
rename from template/main/article_literature.ftl
rename to templates/main/article_literature.ftl
diff --git a/template/main/comment.ftl b/templates/main/comment.ftl
similarity index 100%
rename from template/main/comment.ftl
rename to templates/main/comment.ftl
diff --git a/template/main/copyright.ftl b/templates/main/copyright.ftl
similarity index 100%
rename from template/main/copyright.ftl
rename to templates/main/copyright.ftl
diff --git a/template/main/pagination.ftl b/templates/main/pagination.ftl
similarity index 100%
rename from template/main/pagination.ftl
rename to templates/main/pagination.ftl
diff --git a/photos.ftl b/templates/photos.ftl
similarity index 95%
rename from photos.ftl
rename to templates/photos.ftl
index 9a8985d..2dff130 100644
--- a/photos.ftl
+++ b/templates/photos.ftl
@@ -1,4 +1,4 @@
-<#include "template/layout.ftl">
+<#include "templates/layout_pjax.ftl">
<@layout title="相册 - ${blog_title!}" canonical="${photos_url!}">
<#if (photos.content)?? && photos.content?size gt 0>
diff --git a/post.ftl b/templates/post.ftl
similarity index 60%
rename from post.ftl
rename to templates/post.ftl
index f966c04..5733e07 100644
--- a/post.ftl
+++ b/templates/post.ftl
@@ -1,5 +1,5 @@
-<#include "template/layout.ftl">
-<#include "template/main/article.ftl">
+<#include "templates/layout_pjax.ftl">
+<#include "templates/main/article.ftl">
<@layout title="${post.title!} - ${blog_title!}" canonical="${post.fullPath!}">
<@article post,"post" />
\ No newline at end of file
diff --git a/post_literature.ftl b/templates/post_literature.ftl
similarity index 58%
rename from post_literature.ftl
rename to templates/post_literature.ftl
index f675780..79090d9 100644
--- a/post_literature.ftl
+++ b/templates/post_literature.ftl
@@ -1,5 +1,5 @@
-<#include "template/layout.ftl">
-<#include "template/main/article_literature.ftl">
+<#include "templates/layout_pjax.ftl">
+<#include "templates/main/article_literature.ftl">
<@layout title="${post.title!} - ${blog_title!}" canonical="${post.fullPath!}">
<@articleLiterature post,"post" />
\ No newline at end of file
diff --git a/search.ftl b/templates/search.ftl
similarity index 78%
rename from search.ftl
rename to templates/search.ftl
index ff56275..3faf92f 100644
--- a/search.ftl
+++ b/templates/search.ftl
@@ -1,9 +1,9 @@
-<#include "template/layout.ftl">
+<#include "templates/layout_pjax.ftl">
<@layout title="搜索：${keyword} - ${blog_title!}" canonical="${blog_url!}/search?keyword=${keyword}">
<#if (posts.content)?? && posts.content?size gt 0>
- <#include "template/main/article_list.ftl">
+ <#include "templates/main/article_list.ftl">
<@article_list posts.content/>
- <#include "template/main/pagination.ftl">
+ <#include "templates/main/pagination.ftl">
<@pagination method="search" datas=posts keyword="${keyword!}" display="${settings.page_number!5}" />
<#else>
diff --git a/sheet.ftl b/templates/sheet.ftl
similarity index 60%
rename from sheet.ftl
rename to templates/sheet.ftl
index 407921b..dc78d1c 100644
--- a/sheet.ftl
+++ b/templates/sheet.ftl
@@ -1,5 +1,5 @@
-<#include "template/layout.ftl">
-<#include "template/main/article.ftl">
+<#include "templates/layout_pjax.ftl">
+<#include "templates/main/article.ftl">
<@layout title="${sheet.title} - ${blog_title!}" canonical="${sheet.fullPath!}">
<@article sheet,"sheet" />
\ No newline at end of file
diff --git a/sheet_literature.ftl b/templates/sheet_literature.ftl
similarity index 59%
rename from sheet_literature.ftl
rename to templates/sheet_literature.ftl
index cfd0534..6bdef3c 100644
--- a/sheet_literature.ftl
+++ b/templates/sheet_literature.ftl
@@ -1,5 +1,5 @@
-<#include "template/layout.ftl">
-<#include "template/main/article_literature.ftl">
+<#include "templates/layout_pjax.ftl">
+<#include "templates/main/article_literature.ftl">
<@layout title="${sheet.title} - ${blog_title!}" canonical="${sheet.fullPath!}">
<@articleLiterature sheet,"sheet" />
\ No newline at end of file
diff --git a/tag.ftl b/templates/tag.ftl
similarity index 83%
rename from tag.ftl
rename to templates/tag.ftl
index 4f88486..c380d94 100644
--- a/tag.ftl
+++ b/templates/tag.ftl
@@ -1,4 +1,4 @@
-<#include "template/layout.ftl">
+<#include "templates/layout_pjax.ftl">
<@layout title="标签：${tag.name!} - ${blog_title!}" canonical="${tag.fullPath!}">
<#if (posts.content)?? && posts.content?size gt 0>
@@ -7,9 +7,9 @@
${tag.name}
- <#include "template/main/article_list.ftl">
+ <#include "templates/main/article_list.ftl">
<@article_list posts.content/>
- <#include "template/main/pagination.ftl">
+ <#include "templates/main/pagination.ftl">
<@pagination method="tagPosts" datas=posts slug="${tag.slug!}" display="${settings.page_number!5}" />
<#else>
diff --git a/tags.ftl b/templates/tags.ftl
similarity index 96%
rename from tags.ftl
rename to templates/tags.ftl
index 2f0a2ef..51bbc79 100644
--- a/tags.ftl
+++ b/templates/tags.ftl
@@ -1,4 +1,4 @@
-<#include "template/layout.ftl">
+<#include "templates/layout_pjax.ftl">
<@layout title="标签 - ${blog_title!}" canonical="${tags_url!}">
<@tagTag method="list">
<#if tags?? && tags?size gt 0>
diff --git a/template/widget/ad_piece.ftl b/templates/widget/ad_piece.ftl
similarity index 100%
rename from template/widget/ad_piece.ftl
rename to templates/widget/ad_piece.ftl
diff --git a/template/widget/categories.ftl b/templates/widget/categories.ftl
similarity index 100%
rename from template/widget/categories.ftl
rename to templates/widget/categories.ftl
diff --git a/template/widget/links.ftl b/templates/widget/links.ftl
similarity index 100%
rename from template/widget/links.ftl
rename to templates/widget/links.ftl
diff --git a/template/widget/love.ftl b/templates/widget/love.ftl
similarity index 100%
rename from template/widget/love.ftl
rename to templates/widget/love.ftl
diff --git a/template/widget/music.ftl b/templates/widget/music.ftl
similarity index 100%
rename from template/widget/music.ftl
rename to templates/widget/music.ftl
diff --git a/template/widget/notice.ftl b/templates/widget/notice.ftl
similarity index 100%
rename from template/widget/notice.ftl
rename to templates/widget/notice.ftl
diff --git a/template/widget/profile.ftl b/templates/widget/profile.ftl
similarity index 100%
rename from template/widget/profile.ftl
rename to templates/widget/profile.ftl
diff --git a/template/widget/recent_comments.ftl b/templates/widget/recent_comments.ftl
similarity index 100%
rename from template/widget/recent_comments.ftl
rename to templates/widget/recent_comments.ftl
diff --git a/template/widget/recent_posts.ftl b/templates/widget/recent_posts.ftl
similarity index 100%
rename from template/widget/recent_posts.ftl
rename to templates/widget/recent_posts.ftl
diff --git a/template/widget/tagcloud.ftl b/templates/widget/tagcloud.ftl
similarity index 100%
rename from template/widget/tagcloud.ftl
rename to templates/widget/tagcloud.ftl
diff --git a/template/widget/tags.ftl b/templates/widget/tags.ftl
similarity index 100%
rename from template/widget/tags.ftl
rename to templates/widget/tags.ftl
diff --git a/template/widget/toc.ftl b/templates/widget/toc.ftl
similarity index 100%
rename from template/widget/toc.ftl
rename to templates/widget/toc.ftl