Merge lp:~ronnie.vd.c/loco-team-portal/rss into lp:loco-team-portal

[Ronnie]

RSS feeds are now using syndication framework

[lp:~ronnie.vd.c/loco-team-portal/rss]

409. By Ronnie on 2011-03-01

Added team meetings_and_events to a single rss

[Michael Hall (mhall119)]

This adds 190 lines of code, shouldn't using an existing framework require less code? What do we gain from this addition?

review: Needs Information

[lp:~ronnie.vd.c/loco-team-portal/rss]

410. By Ronnie on 2011-03-13

Removed old code and changed link on team page

411. By Ronnie on 2011-03-13

Fixed some bugs

[Ronnie (ronnie.vd.c)]

I forgot to remove some old code. The difference is now 100 lines of code.

Al lot of functionality is added.
1. We now have GlobalEvent Feeds
2. We now have combined TeamEvent/TeamMeeting Feeds
3. Easy to add filter options
4. By using the framework we can supply atom and rss 1.0 feeds easily
5. Less clutter in the views.py because the rss is now in separate files (feeds.py)

[Adnane Belmadiaf (daker)]

Look goods to me.

review: Approve

[Michael Hall (mhall119)]

It looks like this has merge conflicts now. I'd also like to keep the old feed URLS, even if they're nothing more than a redirect to the new ones, so that we don't break anything.

review: Needs Fixing

[Adnane Belmadiaf (daker)]

@Ronnie thanks for your work, i have a new MP with your code and fixes for @mhall remark https://code.launchpad.net/~daker/loco-team-portal/fix.rss-feeds/+merge/136294

=== added file 'loco_directory/events/feeds.py'
--- loco_directory/events/feeds.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/feeds.py	2011-03-13 10:44:24 +0000
@@ -0,0 +1,55 @@
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.urlresolvers import reverse
+from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.utils.translation import ugettext as _
+from events.models import TeamEvent, GlobalEvent
+from teams.models import Team
+
+import datetime
+
+class TeamEventFeed(Feed):
+    def get_object(self, bits):
+        if len(bits) >= 1:
+            if bits[0] == 'all':
+                return 'all'
+            else:
+                try:
+                    return Team.objects.get(lp_name=bits[0])
+                except:
+                    raise ObjectDoesNotExist
+        return None
+    
+    def items(self, obj):
+        if isinstance(obj, Team):
+            return TeamEvent.objects.filter(teams=obj, date_end__gt=datetime.datetime.now()).order_by('-date_begin')[:15]
+        else:
+            return TeamEvent.objects.filter(date_end__gt=datetime.datetime.now()).order_by('-date_begin')[:15]
+        
+    def title(self, obj):
+        if isinstance(obj, Team):
+            return _('Upcoming Events for %(teamname)s' % {'teamname': obj.name})
+        else:
+            return _('Upcoming Events')
+
+    def link(self, obj):
+        if isinstance(obj, Team):
+            return reverse('team-event-list', kwargs={'team_slug': obj.lp_name})
+        else:
+            return reverse('event-list')
+
+
+class GlobalEventFeed(TeamEventFeed):
+    def items(self, obj):
+        if isinstance(obj, Team):
+            return GlobalEvent.objects.filter(teamevent__teams=obj, date_end__gt=datetime.datetime.now()).order_by('-date_begin')[:15]
+        else:
+            return GlobalEvent.objects.filter(date_end__gt=datetime.datetime.now()).order_by('-date_begin')[:15]
+        
+    def title(self, obj):
+        if isinstance(obj, Team):
+            return _('Upcoming Global Events where %(teamname)s is participating' % {'teamname': obj.name})
+        else:
+            return _('Upcoming Global Events')
+
+    def link(self, obj):
+        return reverse('event-list')

=== modified file 'loco_directory/events/urls.py'
--- loco_directory/events/urls.py	2011-02-17 20:05:03 +0000
+++ loco_directory/events/urls.py	2011-03-13 10:44:24 +0000
@@ -15,7 +15,6 @@
     url(r'^team/(?P<team_event_id>\d+)/comment/$', 'events.views.team_event_comment_new', name='team-event-comment-new'),
     url(r'^team/(?P<team_event_id>\d+)/copy/$', 'events.views.team_event_copy', name='team-event-copy'),
     url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/add/$', 'events.views.team_event_new', name='team-event-new'),
-    url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/rss/$', 'events.views.team_events_rss', name='team-events-rss'),
     url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/ical/$', 'events.views.team_event_list_ical', name='team-event-list-ical'),
     url(r'^team/add/$', 'events.views.team_event_select', name='team-event-select'),
     #global events
@@ -25,5 +24,4 @@
     url(r'^global/(?P<global_event_id>\d+)/update/$', 'events.views.global_event_update', name='global-event-update'),
     url(r'^global/(?P<global_event_id>\d+)/locations/$', 'events.views.global_event_locations', name='global-event-locations'),
     url(r'^global/add/$', 'events.views.global_event_new', name='global-event-new'),
-
 )

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2011-03-06 22:13:43 +0000
+++ loco_directory/events/views.py	2011-03-13 10:44:24 +0000
@@ -164,28 +164,6 @@
         context = {'teams': teams, 'global_event_id': request.GET.get('global_event_id', None)}
         return render_to_response('events/team_event_new_select.html', context, RequestContext(request))
 
-def team_events_rss(request, team_slug):
-    team_object = get_object_or_404(Team, lp_name=team_slug)
-    events = TeamEvent.objects.filter(teams__lp_name=team_slug, date_end__gt=datetime.datetime.now()).order_by('date_begin')[:15]
-    
-    if request.META.has_key('wsgi.url_scheme'):
-        scheme = request.META.get('wsgi.url_scheme')
-    else:
-        scheme = 'http'
-        
-    if request.META.has_key('HTTP_HOST'):
-        host = request.META.get('HTTP_HOST')
-    else:
-        host = request.META.get('SERVER_NAME')
-        
-    if request.META.get('SERVER_PORT', 80) == 80 or request.META.get('SERVER_PORT', 80) == 0:
-        base = '%s://%s' % (scheme, host)
-    else:
-        base = '%s://%s:%s' % (scheme, host, request.META.get('SERVER_PORT', 80))
-    
-    context = {'team_object': team_object, 'events': events, 'base':base}
-    return render_to_response('events/team_events_rss.xml', context, RequestContext(request), mimetype='application/xhtml+xml')
-
 @login_required
 def team_event_new(request, team_slug):
     """

=== added file 'loco_directory/meetings/feeds.py'
--- loco_directory/meetings/feeds.py	1970-01-01 00:00:00 +0000
+++ loco_directory/meetings/feeds.py	2011-03-13 10:44:24 +0000
@@ -0,0 +1,40 @@
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.urlresolvers import reverse
+from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.utils.translation import ugettext as _
+from meetings.models import TeamMeeting
+from teams.models import Team
+
+import datetime
+
+
+class TeamMeetingFeed(Feed):
+    def get_object(self, bits):
+        if len(bits) >= 1:
+            if bits[0] == 'all':
+                return 'all'
+            else:
+                try:
+                    return Team.objects.get(lp_name=bits[0])
+                except:
+                    raise ObjectDoesNotExist
+        return None
+    
+    def items(self, obj):
+        if isinstance(obj, Team):
+            return TeamMeeting.objects.filter(teams=obj, date_end__gt=datetime.datetime.now()).order_by('-date_begin')[:15]
+        else:
+            return TeamMeeting.objects.filter(date_end__gt=datetime.datetime.now()).order_by('-date_begin')[:15]
+        
+    def title(self, obj):
+        if isinstance(obj, Team):
+            return _('Upcoming Meetings for %(teamname)s' % {'teamname': obj.name})
+        else:
+            return _('Upcoming Meetings')
+
+    def link(self, obj):
+        if isinstance(obj, Team):
+            return reverse('team-meeting-list', kwargs={'team_slug': obj.lp_name})
+        else:
+            return reverse('meeting-list')
+            

=== modified file 'loco_directory/meetings/urls.py'
--- loco_directory/meetings/urls.py	2011-01-23 02:17:54 +0000
+++ loco_directory/meetings/urls.py	2011-03-13 10:44:24 +0000
@@ -12,7 +12,6 @@
     url(r'^team/(?P<team_meeting_id>\d+)/update/$', 'meetings.views.team_meeting_update', name='team-meeting-update'),
     url(r'^team/(?P<team_meeting_id>\d+)/copy/$', 'meetings.views.team_meeting_copy', name='team-meeting-copy'),
     url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/add/$', 'meetings.views.team_meeting_new', name='team-meeting-new'),
-    url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/rss/$', 'meetings.views.team_meetings_rss', name='team-meetings-rss'),
     url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/ical/$', 'meetings.views.team_meeting_list_ical', name='team-meeting-list-ical'),
     url(r'^team/add/$', 'meetings.views.team_meeting_select', name='team-meeting-select'),
 

=== modified file 'loco_directory/meetings/views.py'
--- loco_directory/meetings/views.py	2011-02-23 01:05:59 +0000
+++ loco_directory/meetings/views.py	2011-03-13 10:44:24 +0000
@@ -144,28 +144,6 @@
         context = {'teams': teams}
         return render_to_response('meetings/team_meeting_new_select.html', context, RequestContext(request))
 
-def team_meetings_rss(request, team_slug):
-    team_object = get_object_or_404(Team, lp_name=team_slug)
-    meetings = TeamMeeting.objects.filter(teams__lp_name=team_slug, date_end__gt=datetime.datetime.now()).order_by('date_begin')[:15]
-    
-    if request.META.has_key('wsgi.url_scheme'):
-        scheme = request.META.get('wsgi.url_scheme')
-    else:
-        scheme = 'http'
-        
-    if request.META.has_key('HTTP_HOST'):
-        host = request.META.get('HTTP_HOST')
-    else:
-        host = request.META.get('SERVER_NAME')
-        
-    if request.META.get('SERVER_PORT', 80) == 80 or request.META.get('SERVER_PORT', 80) == 0:
-        base = '%s://%s' % (scheme, host)
-    else:
-        base = '%s://%s:%s' % (scheme, host, request.META.get('SERVER_PORT', 80))
-    
-    context = {'team_object': team_object, 'meetings': meetings, 'base':base}
-    return render_to_response('meetings/team_meetings_rss.xml', context, RequestContext(request), mimetype='application/xhtml+xml')
-
 @login_required
 def team_meeting_new(request, team_slug):
     """

=== added file 'loco_directory/teams/feeds.py'
--- loco_directory/teams/feeds.py	1970-01-01 00:00:00 +0000
+++ loco_directory/teams/feeds.py	2011-03-13 10:44:24 +0000
@@ -0,0 +1,55 @@
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.urlresolvers import reverse
+from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.utils.translation import ugettext as _
+from meetings.models import TeamMeeting
+from events.models import TeamEvent
+from teams.models import Team
+
+import datetime
+
+
+class TeamFeed(Feed):
+    def get_object(self, bits):
+        if len(bits) >= 1:
+            if bits[0] == 'all':
+                return 'all'
+            else:
+                try:
+                    return Team.objects.get(lp_name=bits[0])
+                except:
+                    raise ObjectDoesNotExist
+        return None
+    
+    def items(self, obj):
+        if isinstance(obj, Team):
+            meetings = TeamMeeting.objects.filter(teams=obj, date_end__gt=datetime.datetime.now()).order_by('-date_begin')
+            events = TeamEvent.objects.filter(teams=obj, date_end__gt=datetime.datetime.now()).order_by('-date_begin')
+        else:
+            meetings = TeamMeeting.objects.filter(date_end__gt=datetime.datetime.now()).order_by('-date_begin')
+            events = TeamEvent.objects.filter(date_end__gt=datetime.datetime.now()).order_by('-date_begin')
+            
+        events_and_meetings = []
+        events = events[:15].iterator()
+        meetings = meetings[:15].iterator()
+        for event in events:
+            events_and_meetings.append(event)
+        for meeting in meetings:
+            events_and_meetings.append(meeting)
+
+        events_and_meetings.sort(key=lambda event: event.date_begin)
+        return events_and_meetings
+        
+    def title(self, obj):
+        if isinstance(obj, Team):
+            return _('Upcoming Events and Meetings for %(teamname)s' % {'teamname': obj.name})
+        else:
+            return _('Upcoming Events and Meetings')
+
+    def link(self, obj):
+        if isinstance(obj, Team):
+            return obj.get_absolute_url()
+        else:
+            return '/'
+            
+            

=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py	2011-02-17 21:16:56 +0000
+++ loco_directory/teams/views.py	2011-03-13 10:44:24 +0000
@@ -78,15 +78,18 @@
     return render_to_response('teams/team_list.html', context,
                   RequestContext(request))
 
+def get_events_and_meetings(team_object):
+    team_events = list(TeamEvent.objects.filter(teams=team_object))
+    team_meetings = list(TeamMeeting.objects.filter(teams=team_object))
+    team_events.extend(team_meetings)
+    return team_events
+
 def team_ical(request, team_slug):
     """
     Return a ical list with the events and meetings in ical format.
     """
     team_object = get_object_or_404(Team, lp_name=team_slug)
-    team_events = list(TeamEvent.objects.filter(teams__lp_name=team_slug))
-    team_meetings = list(TeamMeeting.objects.filter(teams__lp_name=team_slug))
-    team_events.extend(team_meetings)
-    return as_ical(team_events, team_object.name)
+    return as_ical(get_events_and_meetings(team_object), team_object.name)
 
 def team_event_list(request, team_slug):
     """

=== removed file 'loco_directory/templates/events/team_events_rss.xml'
--- loco_directory/templates/events/team_events_rss.xml	2010-08-17 08:48:39 +0000
+++ loco_directory/templates/events/team_events_rss.xml	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-{% load i18n %}
-<rss version="2.0">
-	<channel>
-		<title>{% blocktrans with team_object.name as team_name %}Upcoming Events for {{team_name}}{% endblocktrans %}</title>
-		<link>{{base}}{% url team-event-list team_object.lp_name %}</link>
-
-		{% for e in events %}
-		<item>
-			<title> {{ e.name }}</title>
-			<link>{{base}}{% url team-event-detail e.id %}</link>
-			<description>{% trans "When:" %} {% spaceless %}
-			{% ifequal e.date_begin|date e.date_end|date %}
-				{{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"H:i O" }}
-			{% else %}
-				{{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"D, d N Y H:i O" }}
-			{% endifequal %}
-			{% endspaceless %}{% if e.venue.name %} | {% trans "Where:" %} {{ e.venue.name }}{% endif %}
-			{% if e.description %} | {% trans "Description:" %} {{ e.description }}{% endif %}</description>
-			<guid>{{base}}{% url team-event-detail e.id %}</guid>
-		</item>
-		{% endfor %}
-	</channel>
-</rss>

=== added directory 'loco_directory/templates/feeds'
=== added file 'loco_directory/templates/feeds/events_description.html'
--- loco_directory/templates/feeds/events_description.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/feeds/events_description.html	2011-03-13 10:44:24 +0000
@@ -0,0 +1,10 @@
+{% load i18n %}
+{% trans "When:" %} {% spaceless %}
+{% ifequal obj.date_begin|date obj.date_end|date %}
+	{{ obj.date_begin|date:"D, d N Y H:i" }} - {{ obj.date_end|date:"H:i O" }}
+{% else %}
+	{{ obj.date_begin|date:"D, d N Y H:i" }} - {{ obj.date_end|date:"D, d N Y H:i O" }}
+{% endifequal %}
+{% endspaceless %}
+{% if obj.venue.name %} | {% trans "Where:" %} {{ obj.venue.name }}{% endif %}
+{% if obj.description %} | {% trans "Description:" %} {{ obj.description }}{% endif %}

=== added file 'loco_directory/templates/feeds/events_title.html'
--- loco_directory/templates/feeds/events_title.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/feeds/events_title.html	2011-03-13 10:44:24 +0000
@@ -0,0 +1,1 @@
+{{ obj.name }}

=== added file 'loco_directory/templates/feeds/globalevents_description.html'
--- loco_directory/templates/feeds/globalevents_description.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/feeds/globalevents_description.html	2011-03-13 10:44:24 +0000
@@ -0,0 +1,9 @@
+{% load i18n %}
+{% trans "When:" %} {% spaceless %}
+{% ifequal obj.date_begin|date obj.date_end|date %}
+	{{ obj.date_begin|date:"D, d N Y H:i" }} - {{ obj.date_end|date:"H:i O" }}
+{% else %}
+	{{ obj.date_begin|date:"D, d N Y H:i" }} - {{ obj.date_end|date:"D, d N Y H:i O" }}
+{% endifequal %}
+{% endspaceless %}
+{% if obj.description %} | {% trans "Description:" %} {{ obj.description }}{% endif %}

=== added file 'loco_directory/templates/feeds/globalevents_title.html'
--- loco_directory/templates/feeds/globalevents_title.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/feeds/globalevents_title.html	2011-03-13 10:44:24 +0000
@@ -0,0 +1,1 @@
+{{ obj.name }}

=== added file 'loco_directory/templates/feeds/meetings_description.html'
--- loco_directory/templates/feeds/meetings_description.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/feeds/meetings_description.html	2011-03-13 10:44:24 +0000
@@ -0,0 +1,8 @@
+{% load i18n %}
+{% trans "When:" %} {% spaceless %}
+{% ifequal obj.date_begin|date obj.date_end|date %}
+	{{ obj.date_begin|date:"D, d N Y H:i" }} - {{ obj.date_end|date:"H:i O" }}
+{% else %}
+	{{ obj.date_begin|date:"D, d N Y H:i" }} - {{ obj.date_end|date:"D, d N Y H:i O" }}
+{% endifequal %}
+{% endspaceless %}

=== added file 'loco_directory/templates/feeds/meetings_title.html'
--- loco_directory/templates/feeds/meetings_title.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/feeds/meetings_title.html	2011-03-13 10:44:24 +0000
@@ -0,0 +1,1 @@
+{{ obj.name }}

=== added file 'loco_directory/templates/feeds/teams_description.html'
--- loco_directory/templates/feeds/teams_description.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/feeds/teams_description.html	2011-03-13 10:44:24 +0000
@@ -0,0 +1,10 @@
+{% load i18n %}
+{% trans "When:" %} {% spaceless %}
+{% ifequal obj.date_begin|date obj.date_end|date %}
+	{{ obj.date_begin|date:"D, d N Y H:i" }} - {{ obj.date_end|date:"H:i O" }}
+{% else %}
+	{{ obj.date_begin|date:"D, d N Y H:i" }} - {{ obj.date_end|date:"D, d N Y H:i O" }}
+{% endifequal %}
+{% endspaceless %}
+{% if obj.venue.name %} | {% trans "Where:" %} {{ obj.venue.name }}{% endif %}
+{% if obj.description %} | {% trans "Description:" %} {{ obj.description }}{% endif %}

=== added file 'loco_directory/templates/feeds/teams_title.html'
--- loco_directory/templates/feeds/teams_title.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/feeds/teams_title.html	2011-03-13 10:44:24 +0000
@@ -0,0 +1,1 @@
+{{ obj.name }}

=== removed file 'loco_directory/templates/meetings/team_meetings_rss.xml'
--- loco_directory/templates/meetings/team_meetings_rss.xml	2010-12-02 07:56:46 +0000
+++ loco_directory/templates/meetings/team_meetings_rss.xml	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-{% load i18n %}
-<rss version="2.0">
-	<channel>
-		<title>{% blocktrans with team_object.name as team_name %}Upcoming Meetings for {{team_name}}{% endblocktrans %}</title>
-		<link>{{base}}{% url team-meeting-list team_object.lp_name %}</link>
-
-		{% for e in meetings %}
-		<item>
-			<title> {{ e.name }}</title>
-			<link>{{base}}{% url team-meeting-detail e.id %}</link>
-			<description>{% trans "When:" %} {% spaceless %}
-			{% ifequal e.date_begin|date e.date_end|date %}
-				{{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"H:i O" }}
-			{% else %}
-				{{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"D, d N Y H:i O" }}
-			{% endifequal %}
-			{% endspaceless %}</description>
-			<guid>{{base}}{% url team-meeting-detail e.id %}</guid>
-		</item>
-		{% endfor %}
-	</channel>
-</rss>

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2011-03-02 22:34:34 +0000
+++ loco_directory/templates/teams/team_detail.html	2011-03-13 10:44:24 +0000
@@ -89,7 +89,7 @@
 }
 </style> 
 {% endif %}
-<link type="application/rss+xml" rel="alternate" title="{% trans "Team Events (RSS)" %}" href="{% url team-events-rss team.lp_name %}" />
+<link type="application/rss+xml" rel="alternate" title="{% trans "Team (RSS)" %}" href="/feeds/teams/{{ team.lp_name }}" />
 {% endblock %}
 
 {% block content %}
@@ -183,7 +183,7 @@
                     <li style="font-size:0.98em"><a href="{% url team-event-list team.lp_name %}">{% trans "All Events" %}</a></li>
                     <li style="font-size:0.98em"><a href="{% url team-meeting-list team.lp_name %}">{% trans "All Meetings" %}</a></li>
                     <li style="font-size:0.98em"><a href="{% url team-event-history team.lp_name %}">{% trans "Past Events" %}</a></li>
-                    <li style="font-size:0.98em"><a href="{% url team-events-rss team.lp_name %}">{% trans "RSS Feed" %}</a></li>
+                    <li style="font-size:0.98em"><a href="/feeds/teams/{{ team.lp_name }}">{% trans "RSS Feed" %}</a></li>
                     <li style="font-size:0.98em"><a href="{% url team-calendar team.lp_name %}">{% trans "iCal Feed" %}</a></li>
                 </ul>
                 {% if team.next_5_events_and_meetings %}

=== modified file 'loco_directory/templates/teams/team_event_list.html'
--- loco_directory/templates/teams/team_event_list.html	2010-11-20 17:25:50 +0000
+++ loco_directory/templates/teams/team_event_list.html	2011-03-13 10:44:24 +0000
@@ -6,12 +6,12 @@
 {% block sub_nav_links %}
 <a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>
 <a class="sub-nav-item" href="{% url team-event-history team_object.lp_name %}">{% trans "Past Events" %}</a>
-<a class="sub-nav-item" href="{% url team-events-rss team_object.lp_name %}" title="{% trans "Team Events (RSS)" %}"">{% trans "Team Events (RSS)" %}</a>
+<a class="sub-nav-item" href="/feeds/events/{{ team_object.lp_name }}" title="{% trans "Team Events (RSS)" %}"">{% trans "Team Events (RSS)" %}</a>
 {% endblock %}
 
 
 {% block extrahead %}{{ block.super }}
-<link type="application/rss+xml" rel="alternate" title="Team Events (RSS)" href="{% url team-events-rss team_object.lp_name %}" />
+<link type="application/rss+xml" rel="alternate" title="Team Events (RSS)" href="/feeds/events/{{ team_object.lp_name }}" />
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/templates/teams/team_meeting_list.html'
--- loco_directory/templates/teams/team_meeting_list.html	2010-12-02 09:12:22 +0000
+++ loco_directory/templates/teams/team_meeting_list.html	2011-03-13 10:44:24 +0000
@@ -6,12 +6,12 @@
 {% block sub_nav_links %}
 <a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>
 <a class="sub-nav-item" href="{% url team-meeting-history team_object.lp_name %}">{% trans "Past Meetings" %}</a>
-<a class="sub-nav-item" href="{% url team-meetings-rss team_object.lp_name %}" title="{% trans "Team Meetings (RSS)" %}"">{% trans "Team Meetings (RSS)" %}</a>
+<a class="sub-nav-item" href="/feeds/meetings/{{ team_object.lp_name }}" title="{% trans "Team Meetings (RSS)" %}"">{% trans "Team Meetings (RSS)" %}</a>
 {% endblock %}
 
 
 {% block extrahead %}{{ block.super }}
-<link type="application/rss+xml" rel="alternate" title="Team Meetings (RSS)" href="{% url team-meetings-rss team_object.lp_name %}" />
+<link type="application/rss+xml" rel="alternate" title="Team Meetings (RSS)" href="/feeds/meetings/{{ team_object.lp_name }}" />
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py	2010-12-02 09:12:22 +0000
+++ loco_directory/urls.py	2011-03-13 10:44:24 +0000
@@ -5,6 +5,17 @@
 
 admin.autodiscover()
 
+from events.feeds import TeamEventFeed, GlobalEventFeed
+from meetings.feeds import TeamMeetingFeed
+from teams.feeds import TeamFeed
+
+feeds = {
+    'teams': TeamFeed,
+    'events': TeamEventFeed,
+    'globalevents': GlobalEventFeed,
+    'meetings': TeamMeetingFeed,
+}
+
 urlpatterns = patterns('',
     url(r'^$', 'common.views.index', name='home'),
     url(r'^language/', 'common.views.set_language', name='set_language'),
@@ -25,6 +36,7 @@
     url(r'^jsi18n', 'django.views.i18n.javascript_catalog', name='jsi18n'),
     url(r'^services/', include('services.urls')),
     url(r'^search/', 'common.views.site_search', name='site_search'),
+    url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}, name='feed_view'),
 )
 
 if settings.STATIC_SERVE: