From 5edcf3ef9e31cace1ffb98f67704c92a45887738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BD=A6=E4=BA=AE=E4=BA=AE?= <liangliangyy@gmail.com>
Date: Sat, 24 Dec 2016 16:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=9A=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=94=99=E8=AF=AFbug=EF=BC=8C=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 accounts/urls.py                           |  1 +
 accounts/views.py                          |  6 +++++-
 blog/models.py                             |  4 ++++
 blog/templatetags/blog_tags.py             | 10 ++++++----
 blog/views.py                              |  9 +++------
 comments/forms.py                          |  6 +++++-
 comments/views.py                          |  3 ++-
 templates/account/login.html               |  4 ++--
 templates/account/registration_form.html   |  2 +-
 templates/accountbase.html                 |  2 +-
 templates/blog/articledetail.html          |  4 +++-
 templates/blog/tags/article_info.html      | 17 ++++++++++++-----
 templates/blog/tags/article_meta_info.html |  8 ++++++--
 templates/blog/tags/sidebar.html           |  2 +-
 templates/comments/tags/comment_item.html  | 18 +++++++++++-------
 templates/comments/tags/post_comment.html  |  4 +++-
 16 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/accounts/urls.py b/accounts/urls.py
index e972a46..d753d24 100644
--- a/accounts/urls.py
+++ b/accounts/urls.py
@@ -22,4 +22,5 @@ from .forms import LoginForm
 urlpatterns = [
     url(r'^login/$', views.LoginView.as_view(success_url='/'), name='login', kwargs={'authentication_form': LoginForm}),
     url(r'^register/$', views.RegisterView.as_view(success_url="/"), name='register'),
+    url(r'^logout/$', views.logout, name='logout')
 ]
diff --git a/accounts/views.py b/accounts/views.py
index f29e8cb..39ffb44 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -1,6 +1,6 @@
 from django.shortcuts import render
 
-from django.contrib.auth.views import login
+from django.contrib.auth.views import login, logout
 from .forms import RegisterForm, LoginForm
 from django.contrib.auth import authenticate
 from django.views.generic.edit import FormView
@@ -25,6 +25,10 @@ class RegisterView(FormView):
         return HttpResponseRedirect('/')
 
 
+def LogOut(requests):
+    logout(request=requests)
+    return HttpResponseRedirect("/")
+
 
 class LoginView(FormView):
     form_class = LoginForm
diff --git a/blog/models.py b/blog/models.py
index 2319f3e..17b408f 100644
--- a/blog/models.py
+++ b/blog/models.py
@@ -83,6 +83,10 @@ class Article(models.Model):
         comments = self.comment_set.all()
         parent_comments = comments.filter(parent_comment=None)
 
+    def get_admin_url(self):
+        info = (self._meta.app_label, self._meta.model_name)
+        return reverse('admin:%s_%s_change' % info, args=(self.pk,))
+
 
 '''
 class BlogPage(models.Model):
diff --git a/blog/templatetags/blog_tags.py b/blog/templatetags/blog_tags.py
index fc92e54..6d99fed 100644
--- a/blog/templatetags/blog_tags.py
+++ b/blog/templatetags/blog_tags.py
@@ -138,14 +138,15 @@ def load_sidebar(user):
 
 
 @register.inclusion_tag('blog/tags/article_meta_info.html')
-def load_article_metas(article):
+def load_article_metas(article, user):
     """
     获得文章meta信息
     :param article:
     :return:
     """
     return {
-        'article': article
+        'article': article,
+        'user': user
     }
 
 
@@ -160,7 +161,7 @@ def load_nav_info():
 
 
 @register.inclusion_tag('blog/tags/article_info.html')
-def load_article_detail(article, isindex):
+def load_article_detail(article, isindex, user):
     """
     加载文章详情
     :param article:
@@ -169,7 +170,8 @@ def load_article_detail(article, isindex):
     """
     return {
         'article': article,
-        'isindex': isindex
+        'isindex': isindex,
+        'user': user
     }
 
 
diff --git a/blog/views.py b/blog/views.py
index 192025a..8814989 100644
--- a/blog/views.py
+++ b/blog/views.py
@@ -17,7 +17,7 @@ from django import http
 from django.http import HttpResponse
 from abc import ABCMeta, abstractmethod
 
-
+"""
 class SeoProcessor():
     __metaclass__ = ABCMeta
 
@@ -32,6 +32,7 @@ class SeoProcessor():
     @abstractmethod
     def get_description(self):
         pass
+"""
 
 
 class ArticleListView(ListView):
@@ -47,11 +48,7 @@ class ArticleListView(ListView):
     page_kwarg = 'page'
 
 
-class IndexView(ArticleListView, SeoProcessor):
-    def get_title(self):
-        return '逝去日子的博客'
-    def get_keywords(self):
-        pass
+class IndexView(ArticleListView):
     def get_queryset(self):
         article_list = Article.objects.filter(status='p')
 
diff --git a/comments/forms.py b/comments/forms.py
index 93bfcfb..1790954 100644
--- a/comments/forms.py
+++ b/comments/forms.py
@@ -44,7 +44,10 @@ class LoginCommentForm(ModelForm):
 class CommentForm(ModelForm):
     url = forms.URLField(label='网址', required=False)
     email = forms.EmailField(label='电子邮箱', required=False)
-    name = forms.CharField(label='姓名')
+    name = forms.CharField(label='姓名', widget=forms.TextInput(attrs=
+                                                              {'value': "", 'size': "30", 'maxlength': "245",
+                                                               'aria-required': 'true'}
+                                                              ))
     parent_comment_id = forms.IntegerField(widget=forms.HiddenInput, required=False)
     """
     if get_user_model().is_authenticated:
@@ -61,6 +64,7 @@ class CommentForm(ModelForm):
                 'name': forms.CharField(widget=forms.HiddenInput()),
             })
     """
+
     class Meta:
         model = Comment
         fields = ['body']
diff --git a/comments/views.py b/comments/views.py
index 96d2965..1b624aa 100644
--- a/comments/views.py
+++ b/comments/views.py
@@ -52,4 +52,5 @@ class CommentPostView(FormView):
 
         comment.save(True)
 
-        return HttpResponseRedirect(article.get_absolute_url())
+        # return HttpResponseRedirect(article.get_absolute_url() + "#div-comment-" + comment.pk)
+        return HttpResponseRedirect("%s#div-comment-%d" % (article.get_absolute_url(), comment.pk))
diff --git a/templates/account/login.html b/templates/account/login.html
index a3e04a3..91335f6 100644
--- a/templates/account/login.html
+++ b/templates/account/login.html
@@ -15,7 +15,7 @@
                 <input type="password" id="inputPassword" class="form-control" placeholder="Password" required>{% endcomment %}
                 {{ form.non_field_errors }}
                 {% for field in form %}
-                    {{ field  }}
+                    {{ field }}
                     {{ field.errors }}
                 {% endfor %}
 
@@ -33,7 +33,7 @@
         </div>
 
         <p class="text-center">
-            <a>Create an account</a>
+            <a href="{% url "account:register" %}">Create an account</a>
         </p>
 
     </div> <!-- /container -->
diff --git a/templates/account/registration_form.html b/templates/account/registration_form.html
index b02901a..f6f126a 100644
--- a/templates/account/registration_form.html
+++ b/templates/account/registration_form.html
@@ -34,7 +34,7 @@
         </div>
 
         <p class="text-center">
-            <a>Create an account</a>
+            <a href="{% url "account:login" %}">LogIn</a>
         </p>
 
     </div> <!-- /container -->
diff --git a/templates/accountbase.html b/templates/accountbase.html
index ba209fe..e1df7d6 100644
--- a/templates/accountbase.html
+++ b/templates/accountbase.html
@@ -10,7 +10,7 @@
     <meta name="author" content="">
     <link rel="icon" href="../../favicon.ico">
 
-    <title>Signin Template for TODC Bootstrap</title>
+    <title>{{ SITE_NAME }} | {{ SITE_DESCRIPTION }}</title>
 
     <!-- Bootstrap core CSS -->
     <link href="{% static 'assets/css/bootstrap.min.css' %}" rel="stylesheet">
diff --git a/templates/blog/articledetail.html b/templates/blog/articledetail.html
index 9f5af18..729ee0a 100755
--- a/templates/blog/articledetail.html
+++ b/templates/blog/articledetail.html
@@ -1,5 +1,6 @@
 {% extends 'base.html' %}
 {% load blog_tags %}
+
 {% block header %}
     <title>{{ article.title }} | {{ SITE_DESCRIPTION }}</title>
     <meta property="og:type" content="article"/>
@@ -15,10 +16,11 @@
     {% endfor %}
     <meta property="og:site_name" content="{{ SITE_NAME }}"/>
 {% endblock %}
+
 {% block content %}
     <div id="primary" class="site-content">
         <div id="content" role="main">
-            {% load_article_detail article False %}
+            {% load_article_detail article False user %}
 
 
             <nav class="nav-single">
diff --git a/templates/blog/tags/article_info.html b/templates/blog/tags/article_info.html
index 3d1dfea..65e76c9 100644
--- a/templates/blog/tags/article_info.html
+++ b/templates/blog/tags/article_info.html
@@ -4,12 +4,19 @@
     <header class="entry-header">
 
         <h1 class="entry-title">
-            <a href="{{ article.get_absolute_url }}"
-               rel="bookmark">{{ article.title }}</a>
+            {% if  isindex %}
+                <a href="{{ article.get_absolute_url }}"
+                   rel="bookmark">{{ article.title }}</a>
+            {% else %}
+                {{ article.title }}
+            {% endif %}
         </h1>
         <div class="comments-link">
-            <a href="{{ article.get_absolute_url }}"
-               class="ds-thread-count" data-thread-key="3815" rel="nofollow"><span class="leave-reply">发表评论</span></a>
+            {% if article.comment_status == "o" %}
+                <a href="{{ article.get_absolute_url }}#comments"
+                   class="ds-thread-count" data-thread-key="3815" rel="nofollow"><span
+                        class="leave-reply">发表评论</span></a>
+            {% endif %}
             <div style="float:right">
                 {{ article.views }} views
             </div>
@@ -30,5 +37,5 @@
         {% endif %}
 
     </div><!-- .entry-content -->
-    {% load_article_metas article %}
+    {% load_article_metas article user %}
 </article><!-- #post -->
\ No newline at end of file
diff --git a/templates/blog/tags/article_meta_info.html b/templates/blog/tags/article_meta_info.html
index 8fa92f2..1c2cd41 100644
--- a/templates/blog/tags/article_meta_info.html
+++ b/templates/blog/tags/article_meta_info.html
@@ -9,7 +9,7 @@
     。属于<a href="{{ article.category.get_absolute_url }}" rel="category tag">{{ article.category.name }}</a>分类，
     {% if article.tags.all %}
         被贴了
-        
+
         {% for t in article.tags.all %}
             <a href="{{ t.get_absolute_url }}" rel="tag">{{ t.name }}</a>
             {% if t != article.tags.all.last %}
@@ -24,5 +24,9 @@
                                                              title="查看所有由{{ article.author.username }}发布的文章"
                                                              rel="author">
         {{ article.author.username }}
-    </a></span>。</span>
+    </a></span>。
+        {% if user.is_authenticated %}
+            <a href="{{ article.get_admin_url }}">编辑</a>
+        {% endif %}
+    </span>
 </footer><!-- .entry-meta -->
\ No newline at end of file
diff --git a/templates/blog/tags/sidebar.html b/templates/blog/tags/sidebar.html
index 7e99d91..4dc568b 100755
--- a/templates/blog/tags/sidebar.html
+++ b/templates/blog/tags/sidebar.html
@@ -78,7 +78,7 @@
         <ul>
             <li><a href="{{ SITE_BASE_URL }}/admin/">管理站点</a></li>
             {% if user.is_authenticated %}
-                <li><a href="{{ SITE_BASE_URL }}/logout/">登出</a>
+                <li><a href="{% url "account:logout" %}">登出</a>
                 </li>
 
             {% else %}
diff --git a/templates/comments/tags/comment_item.html b/templates/comments/tags/comment_item.html
index 9bf94f9..5f82d49 100644
--- a/templates/comments/tags/comment_item.html
+++ b/templates/comments/tags/comment_item.html
@@ -5,14 +5,18 @@
             <img alt=""
                  src="{{ comment_item.author.email|gravatar_url:150 }}"
                  srcset="{{ comment_item.author.email|gravatar_url:150 }}"
-                 class="avatar avatar-96 photo" height="96" width="96"> <cite class="fn"><a
-                href="#" rel="external nofollow"
-                class="url">{{ comment_item.author.username }}</a></cite><span
-                class="says">说道：</span></div>
+                 class="avatar avatar-96 photo" height="96" width="96">
+            <cite class="fn">
+                <a rel="nofollow" href="{{ comment_item.author.get_absolute_url }}" rel="external nofollow"
+                   class="url">{{ comment_item.author.username }}
+                </a>
+            </cite>
+            <span class="says">说道：</span>
+        </div>
 
-        <div class="comment-meta commentmetadata"><a
-                href="#">
-            {{ comment_item.created_time }}</a></div>
+        <div class="comment-meta commentmetadata">
+            {{ comment_item.created_time }}
+        </div>
 
         <p>{{ comment_item.body }}</p>
 
diff --git a/templates/comments/tags/post_comment.html b/templates/comments/tags/post_comment.html
index 3a599cf..f7434e9 100644
--- a/templates/comments/tags/post_comment.html
+++ b/templates/comments/tags/post_comment.html
@@ -11,6 +11,7 @@
             </p>{% endcomment %}
             <p class="comment-form-comment">
                 {{ form.body.label_tag }}
+
                 {{ form.body }}
                 {{ form.body.errors }}
                 {% comment %}<label for="comment">评论</label> <textarea id="comment" name="comment"
@@ -47,7 +48,8 @@
             </p>{% endcomment %}
             {{ form.parent_comment_id }}
 
-            <p class="form-submit"><input name="submit" type="submit" id="submit" class="submit" value="发表评论"/>
+            <p class="form-submit">
+                <input name="submit" type="submit" id="submit" class="submit" value="发表评论"/>
                 <small class="cancel-comment" id="cancel_comment" style="display: none">
                     <a href="javascript:void(0)" id="cancel-comment-reply-link" onclick="cancel_reply()">取消回复</a>
                 </small>