@@ -6,6 +6,8 @@ from django.contrib.comments.views.comments import post_comment from django.conf import settings from django.shortcuts import render_to_response from recaptcha.client import captcha +from tagging.utils import get_tag +from tagging.models import Tag, TaggedItem def feed_redirect(request): @@ -36,14 +38,7 @@ archive_month = privileged_post_queryset(date_based.archive_month) archive_year = privileged_post_queryset(date_based.archive_year) # archive_index = privileged_post_queryset(date_based.archive_index) -def archive_index(request): - context = {'is_admin': False} - posts = Post.objects.active() - if request.user.is_authenticated(): - context.update({'is_admin': True}) - posts = Post.objects.all() - posts = posts.order_by('-pub_date')[:settings.POST_RECENT_COUNT] - links = Link.objects.filter(date_removed__isnull=True).order_by('-pub_date')[:settings.DELICIOUS_RECENT_COUNT] +def _merge_posts_links(posts, links): items = [] for post in posts: items.append((post.pub_date, post)) @@ -51,6 +46,17 @@ def archive_index(request): items.append((link.pub_date, link)) items.sort() items.reverse() + return items + +def archive_index(request, tag=None): + context = {'is_admin': False} + posts = Post.objects.active() + if request.user.is_authenticated(): + context.update({'is_admin': True}) + posts = Post.objects.all() + posts = posts.order_by('-pub_date')[:settings.POST_RECENT_COUNT] + links = Link.objects.filter(date_removed__isnull=True).order_by('-pub_date')[:settings.DELICIOUS_RECENT_COUNT] + items = _merge_posts_links(posts, links) context.update({'post_list': items, 'request': request, 'MEDIA_URL': settings.MEDIA_URL}) return render_to_response('blog/post_archive.html', context) @@ -86,3 +92,15 @@ def post_comment_wrapper(request, next=None): return post_comment(request, next) return HttpResponseRedirect(request.GET.get('p', '/')) +def tag_list(request, tag): + context = {} + tag_instance = get_tag(tag) + if tag_instance is None: + raise Http404('No Tag found matching "%s".' % tag) + posts = TaggedItem.objects.get_by_model(Post, tag_instance) + links = TaggedItem.objects.get_by_model(Link, tag_instance) + context['tag'] = tag_instance + items = _merge_posts_links(posts, links) + context.update({'post_list': items, 'request': request, 'MEDIA_URL': settings.MEDIA_URL}) + return render_to_response('blog/post_archive.html', context) + shiftingbits/blog/views.py @@ -7,12 +7,12 @@ <div class="span-21 posts last archive"> {% for pub_date, post in post_list %} <div class="post{% if not post.active %} inactive{% endif %}"> - {% ifchanged %}<div class="month">{{ pub_date|date:"F" }}</div>{% endifchanged %} + {% ifchanged %}<div class="month">{{ pub_date|date:"F Y" }}</div>{% endifchanged %} <div class="row {{ post.icon_css_class }}"> <div class="tags"> {% tags_for_object post as tag_list %} - {% for tag in tag_list %}{{ tag.name }} {% endfor %} + {% for tag in tag_list %}<a href="/tags/{{ tag.name }}/">{{ tag.name }}</a> {% endfor %} </div> <span class="post-dateline">{{ pub_date|date:"d" }}</span> <h2 class="h2" title="{{ post.title }}"><a href="{{ post.get_absolute_url }}">{{ post.title|truncatewords:10 }}</a></h2> shiftingbits/templates/blog/post_archive.html @@ -4,7 +4,7 @@ from django.contrib import admin from django.views.generic.simple import direct_to_template from shiftingbits.blog.models import Post -from shiftingbits.blog.views import object_detail, archive_index, archive_month, archive_day, archive_year, object_detail_redirect, archive_day_redirect, archive_month_redirect +from shiftingbits.blog.views import object_detail, tag_list, archive_index, archive_month, archive_day, archive_year, object_detail_redirect, archive_day_redirect, archive_month_redirect from shiftingbits.blog.feeds import LatestPostFeed, LatestPostsByTagFeed @@ -29,7 +29,7 @@ urlpatterns = patterns("", url(r"^feeds/(?P<url>.*)/$", "django.contrib.syndication.views.feed", {"feed_dict": feeds}, name="blog_feeds"), ### Tags - url(r"tags/(?P<tag>[^/]+)/$", "tagging.views.tagged_object_list", { "queryset_or_model": Post, "template_object_name":"post", "template_name": "blog/post_archive.html", "related_tags": True}, name="blog_tag_detail"), + url(r"tags/(?P<tag>[^/]+)/$", tag_list, name="blog_tag_detail"), ### Handle the way the old links were via redirect url(r"^(?P<year>\d{4})/(?P<month>[0-9]*)/(?P<day>\w{1,2})/(?P<slug>[-\w]+)/$", object_detail_redirect), shiftingbits/urls.py fb326857be113a4fba3b68339c0e1209f54b27e7 Patrick Altman patrick@studionow.com http://github.com/paltman/shiftingbits/commit/57f966a5c42511fa4aa1b3c39db2529c807b8252 57f966a5c42511fa4aa1b3c39db2529c807b8252 2009-11-01T09:16:18-08:00 2009-11-01T09:16:18-08:00 added back support for tagging 312ee64b67c4e69250948ef811ee38c30cd9b98c Patrick Altman patrick@studionow.com