diff --git a/DjangoBlog/settings.py b/DjangoBlog/settings.py index 5798746..cb25d96 100644 --- a/DjangoBlog/settings.py +++ b/DjangoBlog/settings.py @@ -155,6 +155,9 @@ SIDEBAR_ARTICLE_COUNT = 10 # 侧边栏评论数目 SIDEBAR_COMMENT_COUNT = 5 +# 分页 +PAGINATE_BY = 10 + # cache setting """ CACHES = { @@ -167,8 +170,8 @@ CACHES = { OAHUTH = { 'sina': { - 'appkey':'3161614143', - 'appsecret':'ee17c099317f872eeddb25204ea46721', - 'callbackurl':'http://blog.lylinux.org/oauth/weibo' + 'appkey': '3161614143', + 'appsecret': 'ee17c099317f872eeddb25204ea46721', + 'callbackurl': 'http://blog.lylinux.org/oauth/weibo' } } diff --git a/blog/urls.py b/blog/urls.py index 9953d9a..f383264 100644 --- a/blog/urls.py +++ b/blog/urls.py @@ -21,7 +21,7 @@ urlpatterns = [ # url(r'^$', cache_page(60 * 15)(views.IndexView.as_view()), name='index'), url(r'^$', views.IndexView.as_view(), name='index'), # url(r'^article/(?P\d+)$', views.ArticleDetailView.as_view(), name='detail'), - + url(r'^page/(?P\d+)$', views.IndexView.as_view(), name='index_page'), url(r'(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)-(?P\S+).html$', views.ArticleDetailView.as_view(), name='detail'), diff --git a/blog/views.py b/blog/views.py index 4a347c1..391515b 100644 --- a/blog/views.py +++ b/blog/views.py @@ -7,12 +7,13 @@ from django.views.generic import UpdateView from django.views.generic.edit import CreateView, FormView from django.views.generic.dates import YearArchiveView, MonthArchiveView from blog.models import Article, Category, Tag - +from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage from django.core.exceptions import ObjectDoesNotExist from comments.forms import CommentForm - +from django.conf import settings from django import forms + class ArticleListView(ListView): # template_name属性用于指定使用哪个模板进行渲染 template_name = 'blog/index.html' @@ -22,10 +23,13 @@ class ArticleListView(ListView): # 页面类型,分类目录或标签列表等 page_type = '' + paginate_by = settings.PAGINATE_BY + page_kwarg = 'page' class IndexView(ArticleListView): def get_queryset(self): + article_list = Article.objects.filter(status='p') # for article in article_list: @@ -59,7 +63,6 @@ class ArticleDetailView(DetailView): comment_form = CommentForm() if self.request.user.is_authenticated(): - comment_form.fields.update({ 'email': forms.CharField(widget=forms.HiddenInput()), 'name': forms.CharField(widget=forms.HiddenInput()), diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000..4e5593b Binary files /dev/null and b/favicon.ico differ diff --git a/templates/blog/index.html b/templates/blog/index.html index 3e7580f..7c95aff 100644 --- a/templates/blog/index.html +++ b/templates/blog/index.html @@ -14,15 +14,23 @@ {% for article in article_list %} {% load_article_detail article True %} {% endfor %} + {% if is_paginated %} + - - - + {% endif %} {% endblock %}