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 %} - by {{ article.author }}
+ by {{ article.author }} + {{ article.views }} views + {{ article.body|custom_markdown }} 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 @@ -