diff --git a/header.ftl b/header.ftl
index 2b77801..adda462 100644
--- a/header.ftl
+++ b/header.ftl
@@ -13,7 +13,8 @@
-
+ <#--
-->
+
<@global.head />
<#if ! (options.blog_favicon?? && options.blog_favicon!='')>
diff --git a/index.ftl b/index.ftl
index 070f263..443b3c9 100644
--- a/index.ftl
+++ b/index.ftl
@@ -1,6 +1,4 @@
<#include "header.ftl" />
<@head title="${blog_title!}"/>
-<#--
公告 <#macro greet>
Hello Joe! <@greet>@greet>
-#macro>
${settings.index_notice!}
-->
-<#include "module/post-list.ftl">
+<#include "module/post-module.ftl">
<#include "footer.ftl" />
\ No newline at end of file
diff --git a/links.ftl b/links.ftl
index 3d3db77..e041208 100644
--- a/links.ftl
+++ b/links.ftl
@@ -1,18 +1,4 @@
<#include "header.ftl">
<@head title="友情链接 -${blog_title!}" />
-
友情链接
-
- <@linkTag method="list">
- <#if links?? && links?size gt 0>
- <#list links as link>
-
- ${link.name}
- <#if link.description!=''>
- – ${link.description}
- #if>
-
- #list>
- #if>
- @linkTag>
-
+
<#include "module/links-module.ftl">
<#include "footer.ftl">
diff --git a/module/links-module.ftl b/module/links-module.ftl
new file mode 100644
index 0000000..ceafa9f
--- /dev/null
+++ b/module/links-module.ftl
@@ -0,0 +1,27 @@
+
+
友情链接
+
+
+ <@linkTag method="listTeams">
+ <#list teams as item>
+ <#--><@global.comment target=sheet type="sheet" />-->
+
+ ${((item.team!'')?length>0)?string((item.team!''), '小伙伴们')}
+
+
+ #list>
+ @linkTag>
+
+
+
\ No newline at end of file
diff --git a/module/menu.ftl b/module/menu-module.ftl
similarity index 100%
rename from module/menu.ftl
rename to module/menu-module.ftl
diff --git a/module/post-list.ftl b/module/post-module.ftl
similarity index 98%
rename from module/post-list.ftl
rename to module/post-module.ftl
index 63e5406..112af73 100644
--- a/module/post-list.ftl
+++ b/module/post-module.ftl
@@ -4,7 +4,6 @@
${blog_title!}
${user.description!}
- <#-- 待优化-->
<#if settings.home_social?? && settings.home_social != ''>
${settings.home_social!}
diff --git a/post.ftl b/post.ftl
index 01a5dd6..25f3cdd 100644
--- a/post.ftl
+++ b/post.ftl
@@ -63,8 +63,7 @@
#if>
- <#include "module/comment.ftl">
- <@comment post=post type="post" />
+ <@global.comment target=post type="post" />
<#include "footer.ftl">
diff --git a/search.ftl b/search.ftl
new file mode 100644
index 0000000..3d3db77
--- /dev/null
+++ b/search.ftl
@@ -0,0 +1,18 @@
+<#include "header.ftl">
+<@head title="友情链接 -${blog_title!}" />
+
+<#include "footer.ftl">
diff --git a/sheet.ftl b/sheet.ftl
index 844e958..86aabda 100644
--- a/sheet.ftl
+++ b/sheet.ftl
@@ -7,8 +7,7 @@
- <#include "module/comment.ftl">
- <@comment post=sheet type="sheet" />
+ <@global.comment target=sheet type="sheet" />