Changeset 346

Timestamp:

06/30/10 22:21:37 (2 months ago)

Author:

nicholas

Message:

First attempts and calendar template tag and fixing the tags rss feed.
Testing still needed.

Location:

Python/blog/trunk/blog

Files:

• feeds.py (modified) (2 diffs)
• templates/blog/tags (added)
• templates/blog/tags/calendar.html (added)
• templatetags/blog.py (modified) (2 diffs)

Python/blog/trunk/blog/feeds.py

@@ -3 +3 @@
 from django.contrib.comments.feeds import LatestCommentFeed
 from django.core.urlresolvers import reverse
+from django.shortcuts import get_object_or_404
+
 from blog.models import Entry
 
@@ -19 +21 @@
         return Entry.objects.published()[:10]
 
-
 class LatestEntriesByTag(Feed):
     _site = Site.objects.get_current()
-    title = '%s feed' % _site.name
-    description = '%s posts feed.' % _site.name
 
-    def link(self):
-        return reverse('entry_index')
+    def get_object(self, request, tag):
+        return get_object_or_404(Tag, slug=tag)
+
+    def title(self, obj):
+        return '%s feed: %s' % [_site.name, obj.tag]
+
+    def description(self, obj):
+        return '%s posts feed for %s' % [_site.name, obj.tag]
+
+    def link(self, obj):
+        return reverse('tag_list', ident=obj.tag)
 
     def item_pubdate(self, obj):
         return obj.pub_date
 
-    def items(self):
+    def items(self, obj):
         return Entry.objects.published()[:10]
 

Python/blog/trunk/blog/templatetags/blog.py

@@ +1 @@
+import calendar
+import datetime
+
 from django import template
 from django.core.exceptions import ObjectDoesNotExist
@@ -108 +111 @@
     return EntryList(bits[1], type, limit, author)
 entry_archive = register.tag(entry_archive)
+
+def month_cal(year=datetime.date.today().year, month=datetime.date.today().month): 
+
+    # Fix this to just use calendar.* for all math.
+
+    first_day_of_month = datetime.date(year, month, 1)
+    last_day_of_month = calendar.monthrange(year, month)
+    first_day_of_calendar = first_day_of_month - datetime.timedelta(first_day_of_month.weekday())
+
+    last_day_of_calendar = datetime.date(year,month,last_day_of_month[1]) + datetime.timedelta(7 - calendar.weekday(year,month,last_day_of_month[1]))
+
+    event_list = Entry.objects.published(pub_date__gte=first_day_of_calendar, pub_date__lte=last_day_of_calendar)
+
+    month_cal = []
+    week = []
+    week_headers = []
+
+    i = 0
+    day = first_day_of_calendar
+    while day <= last_day_of_calendar:
+        if i < 7:
+            week_headers.append(day)
+        cal_day = {}
+        cal_day['day'] = day
+        cal_day['event'] = False
+        for event in event_list:
+            if day >= event.start_date.date() and day <= event.end_date.date():
+                cal_day['event'] = True
+        if day.month == month:
+            cal_day['in_month'] = True
+        else:
+            cal_day['in_month'] = False  
+        week.append(cal_day)
+        if day.weekday() == 6:
+            month_cal.append(week)
+            week = []
+        i += 1
+        day += datetime.timedelta(1)
+
+    return {'calendar': month_cal, 'headers': week_headers}
+
+register.inclusion_tag('blog/tags/calendar.html')(month_cal)