完善登录模板，添加微博登录按钮

Author: yangxueguang

accounts/forms.py

@@ -0,0 +1,20 @@
+from django.contrib.auth.forms import AuthenticationForm
+from django.forms import widgets
+
+from registration.forms import RegistrationFormUniqueEmail
+
+
+class LoginForm(AuthenticationForm):
+    def __init__(self, *args, **kwargs):
+        super(LoginForm, self).__init__(*args, **kwargs)
+        self.fields['username'].widget = widgets.TextInput(attrs={'placeholder': "用户名"})
+        self.fields['password'].widget = widgets.PasswordInput(attrs={'placeholder': "密码"})
+
+
+class RegisterForm(RegistrationFormUniqueEmail):
+    def __init__(self, *args, **kwargs):
+        super(RegisterForm, self).__init__(*args, **kwargs)
+        self.fields['username'].widget = widgets.TextInput(attrs={'placeholder': "用户名"})
+        self.fields['email'].widget = widgets.EmailInput(attrs={'placeholder': "邮箱"})
+        self.fields['password1'].widget = widgets.PasswordInput(attrs={'placeholder': "密码"})
+        self.fields['password2'].widget = widgets.PasswordInput(attrs={'placeholder': "确认密码"})

accounts/models.py

@@ -5,4 +5,4 @@
 # Create your models here.
 class BlogUser(AbstractUser):
     nickname = models.CharField('昵称', max_length=50, blank=True)
-    mugshot = models.ImageField('头像', upload_to='upload/mugshots')
+    mugshot = models.ImageField('头像', upload_to='upload/mugshots', blank=True)

accounts/urls.py

@@ -0,0 +1,11 @@
+from django.conf.urls import url
+from django.contrib.auth import views as auth_view
+
+from . import views
+
+from .forms import LoginForm
+
+urlpatterns = [
+    url(r'^login/$', auth_view.login, name='login', kwargs={'authentication_form': LoginForm}),
+    url(r'^register/$', views.RegisterView.as_view(), name='register'),
+]

accounts/views.py

@@ -1,3 +1,10 @@
 from django.shortcuts import render
 
+from registration.backends.default.views import RegistrationView
+
+from .forms import RegisterForm
+
+
 # Create your views here.
+class RegisterView(RegistrationView):
+    form_class = RegisterForm

blog/templates/registration/login.html

@@ -24,8 +24,8 @@ <h1 class="page-title">登录</h1>
                                     <span class="social-text">社交账号登录</span>
                                 </div>
                                 <div class="social-icon">
-                                    <a href=""><i class="icon-sina-weibo"></i></a>
-                                    <a href=""><i class="icon-github"></i></a>
+                                    <a href="{{ weibo }}"><i class="icon-sina-weibo"></i></a>
+{#                                    <a href=""><i class="icon-github"></i></a>#}
                                 </div>
 
                             </div>

blog/templates/registration/registration_form.html

@@ -11,8 +11,10 @@ <h1 class="page-title">注册</h1>
                         {% csrf_token %}
                         <div class="row">
                             <div class="col-md-4 col-md-offset-4">
+                                {{ form.non_field_errors }}
                                 {% for field in form %}
                                     {{ field }}
+                                    {{ field.errors }}
                                 {% endfor %}
                                 <span class="login-text">已有账号？<a href="{% url 'login' %}">立即登录</a></span>
 

blog_project/urls.py

@@ -15,17 +15,26 @@
 """
 from django.conf.urls import url, include
 from django.contrib import admin
-from blog import views
+from django.views.static import serve
+from django.conf import settings
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url(r'', include('blog.urls', namespace='blog', app_name='blog')),
     url(r'', include('comments.urls')),
     url(r'', include('django_comments.urls')),
+    url(r'', include('accounts.urls')),
     url(r'', include('registration.backends.default.urls')),
     url(r'', include('django.contrib.auth.urls')),
     url(r'^search/', include('haystack.urls')),
     url('^notifications/', include('notifications.urls', namespace='notifications')),
     url(r'^likes/', include('likes.urls', namespace='pinax_likes')),
     url(r'', include('social_login.urls', namespace='social_login')),
 ]
+
+if settings.DEBUG:
+    urlpatterns += [
+        url(r'^media/(?P<path>.*)$', serve, {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+    ]

comments/templates/comments/list.html

@@ -3,8 +3,10 @@
 {% load pinax_likes_tags %}
 {% for parent in comment_list %}
     <div class="comment-panel">
-        <img src="{% static 'blog/img/4040demo.jpg' %}">
-        <a href=""><span>{{ parent.name }}</span></a>
+        <img src="
+
+                {% if parent.user.social_user %}{{ parent.user.mugshot }}{% else %}{{ parent.user.mugshot.url }}{% endif %}">
+        <a href=""><span>{{ parent.user.nickname }}</span></a>
         <div class="comment-content">
             {{ parent.comment }}
         </div>
@@ -16,8 +18,9 @@
 
         {% for child in parent.children.all %}
             <div class="inner-panel">
-                <img src="{% static 'blog/img/4040demo.jpg' %}">
-                <span>{{ child.name }}</span> · <span>{{ child.submit_date |timesince }}前</span>
+                <img src="
+                        {% if child.user.social_user %}{{ child.user.mugshot }}{% else %}{{ child.user.mugshot.url }}{% endif %}">
+                <span>{{ child.user.nickname }}</span> · <span>{{ child.submit_date |timesince }}前</span>
                 <a href="">回复</a>
                 <div class="comment-content">
                     {{ child.comment }}

social_login/context_processors.py

@@ -16,16 +16,23 @@
 # `social_sites` is a lazy object, it readly called just access the `social_sites`
 
 
+# def social_sites(request):
+#     def _social_sites():
+#         def make_site(s):
+#             s = import_oauth_class(s)()
+#             return {
+#                 'site_name': s.site_name,
+#                 'site_name_zh': s.site_name_zh,
+#                 'authorize_url': s.authorize_url,
+#             }
+#
+#         return [make_site(s) for s in socialsites.list_sites()]
+#
+#     return {'social_sites': LazyList(_social_sites)}
+
 def social_sites(request):
-    def _social_sites():
-        def make_site(s):
-            s = import_oauth_class(s)()
-            return {
-                'site_name': s.site_name,
-                'site_name_zh': s.site_name_zh,
-                'authorize_url': s.authorize_url,
-            }
-
-        return [make_site(s) for s in socialsites.list_sites()]
-
-    return {'social_sites': LazyList(_social_sites)}
+    def make_site(s):
+        s = import_oauth_class(s)()
+        return s.authorize_url
+
+    return {s.split('.')[-2]: make_site(s) for s in socialsites.list_sites_class()}