diff --git a/next/archive-articles.ftl b/next/archive-articles.ftl index 486c653..b31aafd 100644 --- a/next/archive-articles.ftl +++ b/next/archive-articles.ftl @@ -28,7 +28,8 @@ <#include "header.ftl"> -
+
+
@@ -45,6 +46,7 @@ <#include "article-list.ftl">
<#include "side.ftl"> +
<#include "footer.ftl"> diff --git a/next/archives.ftl b/next/archives.ftl index 20551fa..65d81bc 100644 --- a/next/archives.ftl +++ b/next/archives.ftl @@ -28,7 +28,8 @@ <#include "header.ftl"> -
+
+
@@ -57,6 +58,7 @@
<#include "side.ftl"> +
<#include "footer.ftl"> diff --git a/next/article.ftl b/next/article.ftl index c32a281..9b0a7c4 100644 --- a/next/article.ftl +++ b/next/article.ftl @@ -51,7 +51,8 @@ <#include "header.ftl"> -
+
+
@@ -122,6 +123,7 @@ <@comments commentList=articleComments article=article>
<#include "side.ftl"> +
<#include "footer.ftl"> <@comment_script oId=article.oId> diff --git a/next/category-articles.ftl b/next/category-articles.ftl index 3611e7b..8a377b6 100644 --- a/next/category-articles.ftl +++ b/next/category-articles.ftl @@ -28,7 +28,8 @@ <#include "header.ftl"> -
+
+

@@ -39,6 +40,7 @@ <#include "article-list.ftl">

<#include "side.ftl"> +
<#include "footer.ftl"> diff --git a/next/dynamic.ftl b/next/dynamic.ftl index c366635..b3ab642 100644 --- a/next/dynamic.ftl +++ b/next/dynamic.ftl @@ -28,7 +28,8 @@ <#include "header.ftl"> -
+
+
<#if 0 != recentComments?size>
    @@ -57,6 +58,7 @@
<#include "side.ftl"> +
<#include "footer.ftl"> diff --git a/next/index.ftl b/next/index.ftl index 06de47e..7f99ff4 100644 --- a/next/index.ftl +++ b/next/index.ftl @@ -20,26 +20,26 @@ <#include "macro-head.ftl"> - - <@head title="${blogTitle}"> - <#if metaKeywords??> - - - <#if metaDescription??> - - - - - - <#include "header.ftl"> -
-
-
- <#include "article-list.ftl"> -
- <#include "side.ftl"> -
-
- <#include "footer.ftl"> - + + <@head title="${blogTitle}"> + <#if metaKeywords??> + + + <#if metaDescription??> + + + + + +<#include "header.ftl"> +
+
+
+ <#include "article-list.ftl"> +
+ <#include "side.ftl"> +
+
+<#include "footer.ftl"> + diff --git a/next/page.ftl b/next/page.ftl index 11b8a8d..a7880c5 100644 --- a/next/page.ftl +++ b/next/page.ftl @@ -29,7 +29,8 @@ <#include "header.ftl"> -
+
+
${page.pageContent} @@ -37,6 +38,7 @@ <@comments commentList=pageComments article=page>
<#include "side.ftl"> +
<#include "footer.ftl"> <@comment_script oId=page.oId> diff --git a/next/tag-articles.ftl b/next/tag-articles.ftl index 9e4fd34..0bf9799 100644 --- a/next/tag-articles.ftl +++ b/next/tag-articles.ftl @@ -28,7 +28,8 @@ <#include "header.ftl"> -
+
+

@@ -39,6 +40,7 @@ <#include "article-list.ftl">

<#include "side.ftl"> +
<#include "footer.ftl"> diff --git a/next/tags.ftl b/next/tags.ftl index bfab7ea..72f1d37 100644 --- a/next/tags.ftl +++ b/next/tags.ftl @@ -28,7 +28,8 @@ <#include "header.ftl"> -
+
+
<#if mostUsedCategories?size != 0>
@@ -69,6 +70,7 @@
<#include "side.ftl"> +
<#include "footer.ftl">