From 9719c279cda29a710955a1631c2d509a8c340573 Mon Sep 17 00:00:00 2001
From: liangliangyy <liangliangyy@gmail.com>
Date: Mon, 27 Feb 2017 16:03:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E7=B1=BB=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E7=AD=89=E5=88=86=E9=A1=B5=E9=94=99=E8=AF=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blog/templatetags/blog_tags.py              | 43 ++++++++++++++++++++-
 blog/urls.py                                | 10 +++++
 templates/blog/article_index.html           |  6 +--
 templates/blog/tags/article_pagination.html | 14 +++++++
 4 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 templates/blog/tags/article_pagination.html

diff --git a/blog/templatetags/blog_tags.py b/blog/templatetags/blog_tags.py
index e215e0c..4284ca6 100644
--- a/blog/templatetags/blog_tags.py
+++ b/blog/templatetags/blog_tags.py
@@ -15,10 +15,10 @@
 
 from django import template
 from django.conf import settings
-import markdown2
 from django.template.defaultfilters import stringfilter
 from django.utils.safestring import mark_safe
 import random
+from django.core.urlresolvers import reverse
 from blog.models import Article, Category, Tag, Links
 from django.utils.encoding import force_text
 import hashlib
@@ -146,6 +146,47 @@ def load_article_metas(article, user):
     }
 
 
+@register.inclusion_tag('blog/tags/article_pagination.html')
+def load_pagination_info(page_obj, page_type, tag_name):
+    previous_url = ''
+    next_url = ''
+    if page_type == '':
+        if page_obj.has_next():
+            next_number = page_obj.next_page_number()
+            next_url = reverse('blog:index_page', kwargs={'page': next_number})
+        if page_obj.has_previous():
+            previous_number = page_obj.previous_page_number()
+            previous_url = reverse('blog:index_page', kwargs={'page': previous_number})
+    if page_type == '分类标签归档':
+        if page_obj.has_next():
+            next_number = page_obj.next_page_number()
+            next_url = reverse('blog:tag_detail_page', kwargs={'page': next_number, 'tag_name': tag_name})
+        if page_obj.has_previous():
+            previous_number = page_obj.previous_page_number()
+            previous_url = reverse('blog:tag_detail_page', kwargs={'page': previous_number, 'tag_name': tag_name})
+    if page_type == '作者文章归档':
+        if page_obj.has_next():
+            next_number = page_obj.next_page_number()
+            next_url = reverse('blog:author_detail_page', kwargs={'page': next_number, 'author_name': tag_name})
+        if page_obj.has_previous():
+            previous_number = page_obj.previous_page_number()
+            previous_url = reverse('blog:author_detail_page', kwargs={'page': previous_number, 'author_name': tag_name})
+
+    if page_type == '分类目录归档':
+        if page_obj.has_next():
+            next_number = page_obj.next_page_number()
+            next_url = reverse('blog:category_detail_page', kwargs={'page': next_number, 'category_name': tag_name})
+        if page_obj.has_previous():
+            previous_number = page_obj.previous_page_number()
+            previous_url = reverse('blog:category_detail_page', kwargs={'page': previous_number, 'category_name': tag_name})
+
+    return {
+        'previous_url': previous_url,
+        'next_url': next_url,
+        'page_obj':page_obj
+    }
+
+
 """
 @register.inclusion_tag('nav.html')
 def load_nav_info():
diff --git a/blog/urls.py b/blog/urls.py
index 500479b..cd757be 100644
--- a/blog/urls.py
+++ b/blog/urls.py
@@ -30,6 +30,7 @@ def key_prefixer(request):
 urlpatterns = [
     url(r'^$', views.IndexView.as_view(), name='index'),
     url(r'^page/(?P<page>\d+)$', views.IndexView.as_view(), name='index_page'),
+
     url(r'^article/(?P<year>\d+)/(?P<month>\d+)/(?P<day>\d+)/(?P<article_id>\d+)-(?P<slug>\S+).html$',
         # cache_page(60 * 60 * 10, key_prefix="blogdetail")(views.ArticleDetailView.as_view()),
         views.ArticleDetailView.as_view(),
@@ -38,11 +39,20 @@ urlpatterns = [
     url(r'^blogpage/(?P<year>\d+)/(?P<month>\d+)/(?P<day>\d+)/(?P<page_id>\d+)-(?P<slug>[\w-]+).html$',
         views.ArticleDetailView.as_view(),
         name='pagedetail'),
+
     url(r'^category/(?P<category_name>[\w-]+).html$', views.CategoryDetailView.as_view(), name='category_detail'),
+    url(r'^category/(?P<category_name>[\w-]+)/(?P<page>\d+).html$', views.CategoryDetailView.as_view(),
+        name='category_detail_page'),
     # url(r'^category/(?P<category_name>[\w-]+)/(?P<page>\d+).html$', views.CategoryDetailView.as_view(),
     #   name='category_detail'),
+
     url(r'^author/(?P<author_name>\w+).html$', views.AuthorDetailView.as_view(), name='author_detail'),
+    url(r'^author/(?P<author_name>\w+)/(?P<page>\d+).html$', views.AuthorDetailView.as_view(),
+        name='author_detail_page'),
+
     url(r'^tag/(?P<tag_name>.+).html$', views.TagDetailView.as_view(), name='tag_detail'),
+    url(r'^tag/(?P<tag_name>.+)/(?P<page>\d+).html$', views.TagDetailView.as_view(), name='tag_detail_page'),
+
     url(r'^upload', views.fileupload, name='upload'),
     url(r'^refresh', views.refresh_memcache, name='refresh')
 ]
diff --git a/templates/blog/article_index.html b/templates/blog/article_index.html
index f8d91b3..544dcd3 100644
--- a/templates/blog/article_index.html
+++ b/templates/blog/article_index.html
@@ -18,7 +18,6 @@
     <meta property="og:site_name" content="{{ SITE_NAME }}"/>
 {% endblock %}
 {% block content %}
-
     <div id="primary" class="site-content">
         <div id="content" role="main">
             {% if page_type and tag_name %}
@@ -32,7 +31,8 @@
                 {% load_article_detail article True user %}
             {% endfor %}
             {% if is_paginated %}
-                <nav id="nav-below" class="navigation" role="navigation">
+                {% load_pagination_info page_obj page_type tag_name %}
+                {% comment %} <nav id="nav-below" class="navigation" role="navigation">
                     <h3 class="assistive-text">文章导航</h3>
                     {% if page_obj.has_next %}
                         <div class="nav-previous"><a
@@ -45,7 +45,7 @@
                                     class="meta-nav">→</span></a>
                         </div>
                     {% endif %}
-                </nav><!-- .navigation -->
+                </nav><!-- .navigation -->{% endcomment %}
 
             {% endif %}
         </div><!-- #content -->
diff --git a/templates/blog/tags/article_pagination.html b/templates/blog/tags/article_pagination.html
new file mode 100644
index 0000000..ad3c2f4
--- /dev/null
+++ b/templates/blog/tags/article_pagination.html
@@ -0,0 +1,14 @@
+<nav id="nav-below" class="navigation" role="navigation">
+    <h3 class="assistive-text">文章导航</h3>
+    {% if page_obj.has_next  and next_url%}
+        <div class="nav-previous"><a
+                href="{{ next_url }}"><span
+                class="meta-nav">&larr;</span> 早期文章</a></div>
+    {% endif %}
+    {% if page_obj.has_previous and previous_url %}
+        <div class="nav-next"><a href="{{ previous_url }}">较新文章
+            <span
+                    class="meta-nav">→</span></a>
+        </div>
+    {% endif %}
+</nav><!-- .navigation -->
\ No newline at end of file