From 92348510d9754077dd1386b7324f2576f93a823d Mon Sep 17 00:00:00 2001
From: liangliangyy <liangliangyy@gmail.com>
Date: Wed, 1 Mar 2017 16:52:42 +0800
Subject: [PATCH] =?UTF-8?q?description=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/blog/article_detail.html | 2 +-
 templates/blog/article_index.html  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/blog/article_detail.html b/templates/blog/article_detail.html
index f4f4191..653eaa3 100755
--- a/templates/blog/article_detail.html
+++ b/templates/blog/article_detail.html
@@ -5,8 +5,8 @@
     <meta property="og:type" content="article"/>
     <meta property="og:title" content="{{ article.title }}"/>
 
-    <meta property="og:description" content="{{ article.body|truncate }}"/>
 
+    <meta property="og:description" content="{{ article.body|custom_markdown|striptags|truncatewords:20 }}"/>
     <meta property="og:url"
           content="{{ article.get_full_url }}"/>
     <meta property="article:published_time" content="{% datetimeformat article.pub_time %}"/>
diff --git a/templates/blog/article_index.html b/templates/blog/article_index.html
index 83b6fdc..c112dec 100644
--- a/templates/blog/article_index.html
+++ b/templates/blog/article_index.html
@@ -4,12 +4,11 @@
 {% block header %}
     {% if tag_name %}
         <title>{{ page_type }}:{{ tag_name }} | {{ SITE_DESCRIPTION }}</title>
-        <meta name="description" content="{{ page_type }}:{{ tag_name }}"/>
+        {% comment %}<meta name="description" content="{{ page_type }}:{{ tag_name }}"/>{% endcomment %}
     {% else %}
         <title>{{ SITE_NAME }} | {{ SITE_DESCRIPTION }}</title>
-        <meta name="description" content="{{ SITE_SEO_DESCRIPTION }}"/>
     {% endif %}
-
+    <meta name="description" content="{{ SITE_SEO_DESCRIPTION }}"/>
     <meta name="keywords" content="{{ SITE_KEYWORDS }}"/>
     <meta property="og:type" content="blog"/>
     <meta property="og:title" content="{{ SITE_NAME }}"/>