make this work with django 1.4

Author: markng

.gitignore

@@ -1,2 +1,3 @@
 *.pyc
 settings.py
+dotdorset.sqlite3

aggregator/feed.py

@@ -1,5 +1,5 @@
-from django.contrib.syndication.feeds import Feed as DjangoFeed
-from django.contrib.syndication.feeds import FeedDoesNotExist
+from django.contrib.syndication.views import Feed as DjangoFeed
+from django.contrib.syndication.views import FeedDoesNotExist
 from dotdorset.aggregator.models import FeedItem, Feed, Category
 
 class CategoryFeed(DjangoFeed):

css/main.css aggregator/static/css/main.css

@@ -6,7 +6,7 @@
           <h2>Putting Dorset on the digital map. <a href="/join/"><strong>Join us.</strong></a></h2>
         </div>
         <div id="blogs">
-          <h2>Blogs <a href="/feeds/categories/Blogs"><img src="/images/feed.png" alt="RSS Feed" /></a></h2>
+          <h2>Blogs <a href="/feeds/categories/Blogs"><img src="{{ STATIC_URL }}images/feed.png" alt="RSS Feed" /></a></h2>
           <p>To have your blog listed here, email <a href="mailto:[email protected]">[email protected]</a></p>
           {% for item in blogitems %}
           <h3><a href="{{ item.link }}">{{ item.title }}</a></h3>
@@ -16,7 +16,7 @@ <h4><a href="{{ item.feed.link }}">{{ item.feed }}</a></h4>
         </div>
 
         <div id="events">
-          <h2>Events <a href="/feeds/categories/Events"><img src="/images/feed.png" alt="RSS Feed" /></a></h2>
+          <h2>Events <a href="/feeds/categories/Events"><img src="{{ STATIC_URL }}images/feed.png" alt="RSS Feed" /></a></h2>
           <p>To get your Dorset events listed here, add them to the <a href="http://upcoming.yahoo.com/group/4604/">Dorset Web Group</a> on upcoming.</p>
           {% for item in eventitems %}
           <h3><a href="{{ item.link }}">{{ item.title }}</a></h3>
@@ -28,7 +28,7 @@ <h3><a href="{{ item.link }}">{{ item.title }}</a></h3>
 
 
         <div id="jobs">
-          <h2>Jobs <a href="/feeds/categories/Jobs"><img src="/images/feed.png" alt="RSS Feed" /></a></h2>
+          <h2>Jobs <a href="/feeds/categories/Jobs"><img src="{{ STATIC_URL }}images/feed.png" alt="RSS Feed" /></a></h2>
           <p>If you're a web company based in Dorset, and have have an RSS feed for your jobs, email <a href="mailto:[email protected]">[email protected]</a> to get listed here for <strong>free !</strong></p>
           {% for item in jobitems %}
           <h3><a href="{{ item.link }}">{{ item.title }}</a></h3>
@@ -47,7 +47,7 @@ <h3><a href="{{ item.link }}">{{ item.title }}</a></h3>
         </div>
 
         <div id="twitter">
-          <h2><a href="http://twitter.com/dotdorset">Twitter</a> <a href="/feeds/categories/Twitter"><img src="/images/feed.png" alt="RSS Feed" /></a></h2>
+          <h2><a href="http://twitter.com/dotdorset">Twitter</a> <a href="/feeds/categories/Twitter"><img src="{{ STATIC_URL }}images/feed.png" alt="RSS Feed" /></a></h2>
           <p>Follow <a href="http://twitter.com/dotdorset"><strong>@dotdorset</strong></a> if you want to appear here !</p>
           {% for item in twitteritems %}
           <div class="content{% cycle '' ' even' %}">
@@ -61,7 +61,7 @@ <h2><a href="http://twitter.com/dotdorset">Twitter</a> <a href="/feeds/categorie
         </div>
 
         <div id="mailinglist">
-          <h2><a href="http://groups.google.com/group/dotdorset">Mailing List</a> <a href="http://groups.google.com/group/dotdorset/feed/rss_v2_0_msgs.xml"><img src="/images/feed.png" alt="RSS Feed" /></a></h2>
+          <h2><a href="http://groups.google.com/group/dotdorset">Mailing List</a> <a href="http://groups.google.com/group/dotdorset/feed/rss_v2_0_msgs.xml"><img src="{{ STATIC_URL }}images/feed.png" alt="RSS Feed" /></a></h2>
           <p>To subscribe to the mailing list, either <a href="http://groups.google.com/group/dotdorset"><strong>join the google group</strong></a> or email <a href="mailto:[email protected]"><strong>[email protected]</strong></a>.</p>
           {% for item in mlitems %}
           <h3><a href="{{ item.link }}">{{ item.title }}</a></h3>
@@ -75,7 +75,7 @@ <h3><a href="{{ item.link }}">{{ item.title }}</a></h3>
           {% endfor %}          
         </div>
         <div id="bookmarks">
-          <h2>Bookmarks <a href="/feeds/categories/Bookmarks"><img src="/images/feed.png" alt="RSS Feed" /></a></h2>
+          <h2>Bookmarks <a href="/feeds/categories/Bookmarks"><img src="{{ STATIC_URL }}images/feed.png" alt="RSS Feed" /></a></h2>
           <p>To have your bookmarks listed here, email <a href="mailto:[email protected]">[email protected]</a></p>
           {% for item in bookmarkitems %}
           <div class="content{% cycle '' ' even' %}">

images/dotDorset-168x168.png aggregator/static/images/dotDorset-168x168.png

@@ -3,6 +3,7 @@
 from dotdorset.settings import GOOGLE_MAPS_API_KEYS
 from django.template import Template
 from django.template.loader import render_to_string
+from django.template import RequestContext
 import pprint
 
 def index(request):
@@ -14,5 +15,6 @@ def index(request):
   totemplate['jobitems'] = FeedItem.objects.filter(feed__category__name='Jobs').order_by('-pub_date')[0:3]
   totemplate['bookmarkitems'] = FeedItem.objects.filter(feed__category__name='Bookmarks').order_by('-pub_date')[0:20]
   totemplate['eventitems'] = FeedItem.objects.filter(feed__category__name='Events').order_by('-pub_date')[0:3]
-  rendered = render_to_string('aggregator_index.html', totemplate)
+  context = RequestContext(request, totemplate)
+  rendered = render_to_string('aggregator_index.html', context)
   return HttpResponse(rendered)