From f150a723b484419d98762dd0fac8c34547f6ca7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BD=A6=E4=BA=AE=E4=BA=AE?= <liangliangyy@gmail.com>
Date: Mon, 7 Nov 2016 23:46:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=B0=8Fbu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blog/models.py                     |  2 +-
 blog/static/blog/css/blog.css      |  4 ++++
 blog/views.py                      | 14 +++++---------
 templates/blog/articledetail.html  |  4 +++-
 templates/blog/articletaglist.html | 24 +++++++++++++-----------
 templates/blog/index.html          | 12 +++++++-----
 6 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/blog/models.py b/blog/models.py
index 4a36367..198e2d3 100644
--- a/blog/models.py
+++ b/blog/models.py
@@ -46,7 +46,7 @@ class Article(models.Model):
         return names
 
     def save(self, *args, **kwargs):
-        self.summary = self.summary or self.body[:120]
+        self.summary = self.summary or self.body[:settings.ARTICLE_SUB_LENGTH]
         super().save(*args, **kwargs)
 
     def viewed(self):
diff --git a/blog/static/blog/css/blog.css b/blog/static/blog/css/blog.css
index e0f5f3e..9d73bbb 100644
--- a/blog/static/blog/css/blog.css
+++ b/blog/static/blog/css/blog.css
@@ -101,6 +101,7 @@ h6, .h6 {
 .blog-main {
     font-size: 18px;
     line-height: 1.5;
+
 }
 
 /* Sidebar modules for boxing content */
@@ -180,4 +181,7 @@ h6, .h6 {
     margin-bottom: auto;
 
     border-bottom: 4px double #ededed;
+}
+.views{
+    float: right;
 }
\ No newline at end of file
diff --git a/blog/views.py b/blog/views.py
index 5433764..c55164b 100644
--- a/blog/views.py
+++ b/blog/views.py
@@ -19,11 +19,6 @@ class ArticleListView(ListView):
     # context_object_name属性用于给上下文变量取名（在模板中使用该名字）
     context_object_name = 'article_list'
 
-    def set_article_subbody(self, article_list):
-        for article in article_list:
-            article.body = article.body[0:settings.ARTICLE_SUB_LENGTH]
-        return article_list
-
     def __init__(self):
         self.page_description = ''
 
@@ -36,7 +31,7 @@ class IndexView(ArticleListView):
         #     article.body = article.body[0:settings.ARTICLE_SUB_LENGTH]
         #     # article.body = markdown2.markdown(article.body)
 
-        return self.set_article_subbody(article_list)
+        return article_list
 
 
 class ArticleDetailView(DetailView):
@@ -47,6 +42,7 @@ class ArticleDetailView(DetailView):
 
     def get_object(self):
         obj = super(ArticleDetailView, self).get_object()
+        obj.viewed()
         # obj.body = markdown2.markdown(obj.body)
         return obj
 
@@ -62,7 +58,7 @@ class CategoryDetailView(ArticleListView):
         # print(categoryname)
         self.page_description = '分类目录归档: %s ' % categoryname
         article_list = Article.objects.filter(category__name=categoryname, status='p')
-        return self.set_article_subbody(article_list)
+        return article_list
 
     def get_context_data(self, **kwargs):
         # 增加额外的数据
@@ -76,7 +72,7 @@ class AuthorDetailView(ArticleListView):
 
         self.page_description = '作者文章归档: %s ' % author_name
         article_list = Article.objects.filter(author__username=author_name)
-        return self.set_article_subbody(article_list)
+        return article_list
 
     def get_context_data(self, **kwargs):
         kwargs['page_description'] = self.page_description
@@ -99,7 +95,7 @@ class TagDetailView(ArticleListView):
         tag_name = self.kwargs['tag_name']
         self.page_description = '分类标签: %s ' % tag_name
         article_list = Article.objects.filter(tags__name=tag_name)
-        return self.set_article_subbody(article_list)
+        return article_list
 
     def get_context_data(self, **kwargs):
         kwargs['page_description'] = self.page_description
diff --git a/templates/blog/articledetail.html b/templates/blog/articledetail.html
index 8cbac99..9f67de2 100644
--- a/templates/blog/articledetail.html
+++ b/templates/blog/articledetail.html
@@ -16,7 +16,9 @@
                           datetime="{{ article.created_time }}">
                         {% timeformat article.created_time %}
                     </time>
-                    by <a href="#">{{ article.author }}</a></p>
+                    by <a href="#">{{ article.author }}</a>
+                    <span class="views">{{ article.views }} views</span>
+                </p>
 
                 {{ article.body|custom_markdown }}
             </div><!-- /.blog-post -->
diff --git a/templates/blog/articletaglist.html b/templates/blog/articletaglist.html
index a8ea6e3..dd81ae3 100644
--- a/templates/blog/articletaglist.html
+++ b/templates/blog/articletaglist.html
@@ -1,14 +1,16 @@
-<div class="panel panel-default">
-    <div class="panel-heading">标签</div>
-    <div class="panel-body">
+{% if article_tags_list %}
+    <div class="panel panel-default">
+        <div class="panel-heading">标签</div>
+        <div class="panel-body">
 
+            {% for url,count,tag,color in article_tags_list %}
+                <a class="label label-{{ color }}" style="display: inline-block;" href="{{ url }}"
+                   title="{{ tag.name }}">
+                    {{ tag.name }}
+                    <span class="badge">{{ count }}</span>
+                </a>
+            {% endfor %}
 
-        {% for url,count,tag,color in article_tags_list %}
-            <a class="label label-{{ color }}" style="display: inline-block;" href="{{ url }}" title="{{ tag.name }}">
-                {{ tag.name }}
-                <span class="badge">{{ count }}</span>
-            </a>
-        {% endfor %}
-
+        </div>
     </div>
-</div>
+{% endif %}
diff --git a/templates/blog/index.html b/templates/blog/index.html
index 3638a2f..ca9ce68 100644
--- a/templates/blog/index.html
+++ b/templates/blog/index.html
@@ -20,16 +20,18 @@
                 <div class="blog-post">
                     <a href="{{ article.get_absolute_url }}" class="blog-post-title">{{ article.title }}</a>
 
-                    <p class="blog-post-meta"><a
-                            href="{{ article.category.get_absolute_url }}">{{ article.category.name }}</a>
+                    <p class="blog-post-meta">
+                        <a href="{{ article.category.get_absolute_url }}">{{ article.category.name }}</a>
                         <time class="entry-date"
                               datetime="{{ article.created_time }}">
-                            {% comment %}{{ article.created_time|date:'Y年n月j日' }}{% endcomment %}
                             {% timeformat article.created_time %}
                         </time>
-                        by <a href="{{ article.author.get_absolute_url }}">{{ article.author }}</a></p>
 
-                    {{ article.body|custom_markdown }}
+                        by <a href="{{ article.author.get_absolute_url }}">{{ article.author }}</a>
+                        <span class="views">{{ article.views }} views</span>
+                    </p>
+
+                    {{ article.summary|custom_markdown }}
                     <p class="blog-read-more">
                         <a href="{{ article.get_absolute_url }}">
                             Read more