标签云和文章归档

yangxueguang · yangxueguang · commit f2aa2e5bef8b · 2016-06-16T19:18:14.000+08:00
diff --git a/blog/models.py b/blog/models.py
@@ -7,13 +7,11 @@
 # Create your models here.
 class ArticleManage(models.Manager):
     def archive(self):
-        date_list = Article.objects.datetimes('created_time', 'month')
+        date_list = Article.objects.datetimes('created_time', 'month', order='DESC')
         date_dict = defaultdict(list)
         for d in date_list:
-            print(type(d.year))
-            print(type(d.month))
             date_dict[d.year].append(d.month)
-        return dict(date_dict)  # 模板不支持defaultdict
+        return sorted(date_dict.items(), reverse=True)  # 模板不支持defaultdict
 
 
 class Article(models.Model):
diff --git a/blog/templates/blog/index.html b/blog/templates/blog/index.html
@@ -49,21 +49,16 @@ <h1 class="title"><a
                 <!-- tags -->
                 <h3>标签:</h3>
                 <div class="list-group">
-                    <a href="#" class="list-group-item"><span class="badge">14</span>Cras justo odio</a>
-                    <a href="#" class="list-group-item"><span class="badge">14</span>Dapibus ac facilisis in</a>
-                    <a href="#" class="list-group-item"><span class="badge">14</span>Morbi leo risus</a>
-                    <a href="#" class="list-group-item"><span class="badge">14</span>Porta ac consectetur ac</a>
-                    <a href="#" class="list-group-item"><span class="badge">14</span>Vestibulum at eros</a>
                     {% for tag in tag_list %}
-                        <a href="{% url 'blog:tags' tag.pk %}" class="list-group-item"><span
-                                class="badge">14</span>{{ tag.name }}</a>
+                        <a href="{% url 'blog:tag' tag.pk %}" class="list-group-item"><span
+                                class="badge"></span>{{ tag.name }}</a>
                     {% endfor %}
                 </div>
 
                 <!-- archive -->
                 <h3>文章归档：</h3>
                 <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
-                    {% for year,months in date_archive.items %}
+                    {% for year,months in date_archive %}
                         <div class="panel panel-default">
                             <div class="panel-heading" role="tab" id="heading{{ forloop.counter }}">
                                 <h4 class="panel-title">
@@ -78,7 +73,7 @@ <h4 class="panel-title">
                                  aria-labelledby="heading{{ forloop.counter }}">
                                 <div class="panel-body">
                                     {% for month in months %}
-                                        {{ month }} 月
+                                        <p>{{ month }} 月</p>
                                     {% endfor %}
                                 </div>
                             </div>
diff --git a/blog/views.py b/blog/views.py
@@ -19,7 +19,7 @@ def get_queryset(self):
     def get_context_data(self, **kwargs):
         kwargs['category_list'] = Category.objects.all().order_by('name')
         kwargs['date_archive'] = Article.objects.archive()
-        print(kwargs['date_archive'])
+        kwargs['tag_list'] = Tag.objects.all().order_by('name')
         return super(IndexView, self).get_context_data(**kwargs)
 
 
