Merge pull request #14 from b3log/0.6.9

SEO
2015-06-04 11:12:03 +08:00 · 2015-06-04 11:12:03 +08:00 · 170214daee
commit 170214daee
parent d65cb72cad c0203f126a
13 changed files with 66 additions and 15 deletions
--- a/andrea/index.ftl
+++ b/andrea/index.ftl
@ -3,8 +3,12 @@
 <html>
    <head>
        <@head title="${blogTitle}">
+        <#if metaKeywords??>
        <meta name="keywords" content="${metaKeywords}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        </#if>
+        <#if metaDescription??>
+        <meta name="description" content="${metaDescription}"/>
+        </#if>
        </@head>
    </head>
    <body>
--- a/bruce/index.ftl
+++ b/bruce/index.ftl
@ -3,8 +3,12 @@
 <html>
    <head>
        <@head title="${blogTitle}">
+        <#if metaKeywords??>
        <meta name="keywords" content="${metaKeywords}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        </#if>
+        <#if metaDescription??>
+        <meta name="description" content="${metaDescription}"/>
+        </#if>
        </@head>
    </head>
    <body>
--- a/classic/index.ftl
+++ b/classic/index.ftl
@ -3,8 +3,12 @@
 <html>
    <head>
        <@head title="${blogTitle}">
+        <#if metaKeywords??>
        <meta name="keywords" content="${metaKeywords}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        </#if>
+        <#if metaDescription??>
+        <meta name="description" content="${metaDescription}"/>
+        </#if>
        </@head>
    </head>
    <body>
--- a/community/index.ftl
+++ b/community/index.ftl
@ -3,8 +3,12 @@
 <html>
    <head>
        <@head title="${blogTitle}">
+        <#if metaKeywords??>
        <meta name="keywords" content="${metaKeywords}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        </#if>
+        <#if metaDescription??>
+        <meta name="description" content="${metaDescription}"/>
+        </#if>
        </@head>
    </head>
    <body>
--- a/ease/index.ftl
+++ b/ease/index.ftl
@ -3,8 +3,12 @@
 <html>
    <head>
        <@head title="${blogTitle}">
+        <#if metaKeywords??>
        <meta name="keywords" content="${metaKeywords}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        </#if>
+        <#if metaDescription??>
+        <meta name="description" content="${metaDescription}"/>
+        </#if>
        </@head>
    </head>
    <body>
--- a/favourite/index.ftl
+++ b/favourite/index.ftl
@ -3,8 +3,12 @@
 <html>
    <head>
        <@head title="${blogTitle}">
+        <#if metaKeywords??>
        <meta name="keywords" content="${metaKeywords}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        </#if>
+        <#if metaDescription??>
+        <meta name="description" content="${metaDescription}"/>
+        </#if>
        </@head>
    </head>
    <body>
--- a/i-nove/index.ftl
+++ b/i-nove/index.ftl
@ -3,8 +3,12 @@
 <html>
    <head>
        <@head title="${blogTitle}">
+        <#if metaKeywords??>
        <meta name="keywords" content="${metaKeywords}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        </#if>
+        <#if metaDescription??>
+        <meta name="description" content="${metaDescription}"/>
+        </#if>
        </@head>
    </head>
    <body>
--- a/metro-hot/index.ftl
+++ b/metro-hot/index.ftl
@ -4,9 +4,12 @@
 <html>
    <head>
        <@head title="${blogTitle}">
-        <meta name="keywords" content="${metaKeywords}" />
-        <meta name="description"
-              content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>" />
+        <#if metaKeywords??>
+        <meta name="keywords" content="${metaKeywords}"/>
+        </#if>
+        <#if metaDescription??>
+        <meta name="description" content="${metaDescription}"/>
+        </#if>
        </@head>
    </head>
    <body>
--- a/mobile/index.ftl
+++ b/mobile/index.ftl
@ -3,8 +3,12 @@
 <html>
    <head>
        <@head title="${blogTitle}">
+        <#if metaKeywords??>
        <meta name="keywords" content="${metaKeywords}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        </#if>
+        <#if metaDescription??>
+        <meta name="description" content="${metaDescription}"/>
+        </#if>
        </@head>
    </head>
    <body class="classic-wptouch-bg">
--- a/neoease/index.ftl
+++ b/neoease/index.ftl
@ -3,8 +3,12 @@
 <html>
    <head>
        <@head title="${blogTitle}">
+        <#if metaKeywords??>
        <meta name="keywords" content="${metaKeywords}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        </#if>
+        <#if metaDescription??>
+        <meta name="description" content="${metaDescription}"/>
+        </#if>
        </@head>
    </head>
    <body>
--- a/owmx-3.0/index.ftl
+++ b/owmx-3.0/index.ftl
@ -3,8 +3,12 @@
 <html>
    <head>
        <@head title="${blogTitle}">
+        <#if metaKeywords??>
        <meta name="keywords" content="${metaKeywords}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        </#if>
+        <#if metaDescription??>
+        <meta name="description" content="${metaDescription}"/>
+        </#if>
        </@head>
    </head>
    <body>
--- a/timeline/index.ftl
+++ b/timeline/index.ftl
@ -3,8 +3,12 @@
 <html>
    <head>
        <@head title="${blogTitle}">
+        <#if metaKeywords??>
        <meta name="keywords" content="${metaKeywords}"/>
-        <meta name="description" content="<#list articles1 as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        </#if>
+        <#if metaDescription??>
+        <meta name="description" content="${metaDescription}"/>
+        </#if>
        </@head>
    </head>
    <body>
--- a/tree-house/index.ftl
+++ b/tree-house/index.ftl
@ -3,8 +3,12 @@
 <html>
    <head>
        <@head title="${blogTitle}">
+        <#if metaKeywords??>
        <meta name="keywords" content="${metaKeywords}"/>
-        <meta name="description" content="<#list articles as article>${article.articleTitle}<#if article_has_next>,</#if></#list>"/>
+        </#if>
+        <#if metaDescription??>
+        <meta name="description" content="${metaDescription}"/>
+        </#if>
        </@head>
    </head>
    <body>