From b1ab7a99fe6ac27af9af2269c78f332c37262cdb Mon Sep 17 00:00:00 2001 From: ruibaby Date: Fri, 17 Aug 2018 09:39:22 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/themes/anatole/index.ftl | 8 ++------ .../resources/templates/themes/anatole/module/macro.ftl | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/resources/templates/themes/anatole/index.ftl b/src/main/resources/templates/themes/anatole/index.ftl index 84c76b346..c60db04a6 100644 --- a/src/main/resources/templates/themes/anatole/index.ftl +++ b/src/main/resources/templates/themes/anatole/index.ftl @@ -1,9 +1,5 @@ <#include "module/macro.ftl"> -<#if tag??> - <@head title="${tag.tagName} ยท ${options.blog_title?default('Anatole')}" keywords="${options.seo_keywords?default('Anatole')}" description="${options.seo_desc?default('Anatole')}"> -<#else> - <@head title="${options.blog_title?default('Anatole')}" keywords="${options.seo_keywords?default('Anatole')}" description="${options.seo_desc?default('Anatole')}"> - +<@head title="${options.blog_title?default('Anatole')}" keywords="${options.seo_keywords?default('Anatole')}" description="${options.seo_desc?default('Anatole')}"> <#include "module/sidebar.ftl">
<#include "module/page-top.ftl"> @@ -35,4 +31,4 @@
-<@footer> \ No newline at end of file +<@footer> diff --git a/src/main/resources/templates/themes/anatole/module/macro.ftl b/src/main/resources/templates/themes/anatole/module/macro.ftl index d61ce5e7b..a0a8210c4 100644 --- a/src/main/resources/templates/themes/anatole/module/macro.ftl +++ b/src/main/resources/templates/themes/anatole/module/macro.ftl @@ -1,5 +1,5 @@ <#include "../../../common/macro/common_macro.ftl"> -<#macro head title="" keywords="" description=""> +<#macro head title,keywords,description>