Merge lp:~daker/loco-team-portal/fix.rss-feeds into lp:loco-team-portal

[Adnane Belmadiaf]

* RSS feeds are now using syndication framework
* Old URLs feed now redirect to the new ones

=== added file 'loco_directory/events/feeds.py'
--- loco_directory/events/feeds.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/feeds.py	2012-11-26 23:13:22 +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/views.py'
--- loco_directory/events/views.py	2012-11-05 21:16:15 +0000
+++ loco_directory/events/views.py	2012-11-26 23:13:22 +0000
@@ -217,26 +217,7 @@
 
 
 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')
+    return redirect('/feeds/events/%s/' % team_slug, permanent=True)
 
 
 @login_required
@@ -383,8 +364,8 @@
     create a comment for a team event
     """
     team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
-    
-    if request.method == 'POST':                
+
+    if request.method == 'POST':
         form = TeamEventCommentForm(data=request.POST)
         if form.is_valid():
             team_event_comment = form.save(commit=False)
@@ -397,7 +378,7 @@
             return redirect( team_event_object )
     else:
         form = TeamEventCommentForm()
-    
+
     context = {
         'team_event_object': team_event_object,
         'form': form,
@@ -596,7 +577,7 @@
     """
     update a comment for a team event
     """
-    if request.method == 'POST': 
+    if request.method == 'POST':
         response_dict = {}
         id = request.POST.get('id', False)
         comment = request.POST.get('comment', False)
@@ -614,7 +595,7 @@
         else:
             response_dict.update({'success': False, 'response': _('Missing arguments.') })
     else:
-        response_dict.update({'success': False, 'response': _('You can\'t edit this comment using this method.') }) 
+        response_dict.update({'success': False, 'response': _('You can\'t edit this comment using this method.') })
     return HttpResponse(simplejson.dumps(response_dict), mimetype='application/json')
 
 @login_required
 
=== added file 'loco_directory/meetings/feeds.py'
--- loco_directory/meetings/feeds.py	1970-01-01 00:00:00 +0000
+++ loco_directory/meetings/feeds.py	2012-11-26 23:13:22 +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/views.py'
--- loco_directory/meetings/views.py	2012-07-14 20:07:11 +0000
+++ loco_directory/meetings/views.py	2012-11-26 23:13:22 +0000
@@ -50,9 +50,9 @@
     for meeting in meetings:
         meeting.as_ical(calendar)
     response.write(calendar.serialize())
-    
+
     return response
-    
+
 
 def meeting_ical(request, team_slug, team_meeting_id):
     """
@@ -126,7 +126,7 @@
         'team_meeting_object': team_meeting_object,
         'user_is_team_member': is_member,
     }
-    return render_to_response('meetings/team_meeting_detail.html', 
+    return render_to_response('meetings/team_meeting_detail.html',
                                          context, RequestContext(request))
 
 @login_required
@@ -135,7 +135,7 @@
     delete a meeting
     """
     team_meeting_object = get_object_or_404(TeamMeeting, pk=team_meeting_id)
-    
+
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
     #check if user is admin or owner of a team
     is_contact = False
@@ -145,7 +145,7 @@
             break
 
     if is_on_lc or is_contact:
-        if request.method == 'POST':		
+        if request.method == 'POST':
             team_meeting_object.delete()
             request.user.message_set.create(message=_('Team Meeting removed.'))
             return redirect( 'meeting-list' )
@@ -172,26 +172,7 @@
         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')
+    return redirect('/feeds/meetings/%s/' % team_slug, permanent=True)
 
 @login_required
 def team_meeting_new(request, team_slug):
@@ -199,11 +180,11 @@
     new team meeting
     """
     team_object = get_object_or_404(Team, lp_name=team_slug)
-    
+
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
     is_member = launchpad.is_team_member(request.user, team_object)
-    
-    team_meeting_object = TeamMeeting(chair=team_object.owner_profile, 
+
+    team_meeting_object = TeamMeeting(chair=team_object.owner_profile,
                                       channel=team_object.irc_chan)
     if is_on_lc or is_member:
         if request.method == 'POST':
@@ -211,16 +192,16 @@
             if form.is_valid():
                 team_meeting = form.save()
                 team_meeting.teams.add(team_object)
-                team_meeting_id = team_meeting.id 
+                team_meeting_id = team_meeting.id
                 return HttpResponseRedirect(team_meeting_object.get_absolute_url())
         else:
             form = TeamMeetingForm(teams=[team_object], instance=team_meeting_object)
-                
+
         context = {
             'team_object': team_object,
             'form': form,
         }
-        return render_to_response('meetings/team_meeting_new.html', 
+        return render_to_response('meetings/team_meeting_new.html',
                                          context, RequestContext(request))
     else:
         # XXX: Once we move to a new ACL system, this needs fixing.
@@ -232,13 +213,13 @@
     """
     copy team meeting
     """
-    
+
     team_meeting = get_object_or_404(TeamMeeting, pk=team_meeting_id)
     team_object = team_meeting.teams.all()[0]
 
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
     is_member = launchpad.is_team_member(request.user, team_object)
-    
+
     if is_on_lc or is_member:
         if request.method == 'POST':
             form = TeamMeetingForm(instance=team_meeting, data=request.POST, teams=team_meeting.teams.all())
@@ -246,16 +227,16 @@
             if form.is_valid():
                 team_meeting = form.save()
                 team_meeting.teams.add(team_object)
-                team_meeting_id = team_meeting.id 
+                team_meeting_id = team_meeting.id
                 return HttpResponseRedirect(team_meeting.get_absolute_url())
         else:
             form = TeamMeetingForm(instance=team_meeting, teams=team_meeting.teams.all())
-        
+
         context = {
             'team_object': team_object,
             'form': form,
         }
-        return render_to_response('meetings/team_meeting_new.html', 
+        return render_to_response('meetings/team_meeting_new.html',
                                          context, RequestContext(request))
     else:
         # XXX: Once we move to a new ACL system, this needs fixing.
@@ -274,11 +255,11 @@
         if launchpad.is_team_member(request.user, team):
             is_member = True
             break
-    
+
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
-    
+
     if is_on_lc or is_member:
-        if request.method == 'POST':		
+        if request.method == 'POST':
             form = TeamMeetingForm(data=request.POST, instance=team_meeting_object)
             if form.is_valid():
                 form.save()
@@ -286,11 +267,11 @@
                 return redirect( team_meeting_object )
         else:
             form = TeamMeetingForm(instance=team_meeting_object)
-            
+
         context = {
             'form': form,
         }
-        return render_to_response('meetings/team_meeting_update.html', 
+        return render_to_response('meetings/team_meeting_update.html',
                                          context, RequestContext(request))
     else:
         request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting.'), _('You are not a member of the team or on the LoCo Council.')))
@@ -304,11 +285,11 @@
     team_meeting_object = get_object_or_404(TeamMeeting, pk=team_meeting_id)
     try:
         user = UserProfile.objects.get(user=request.user)
-        agenda_item_object = AgendaItem(meeting=team_meeting_object, 
+        agenda_item_object = AgendaItem(meeting=team_meeting_object,
                                    owner=user,
                                    created_date=datetime.datetime.now())
     except UserProfile.DoesNotExist:
-        agenda_item_object = AgendaItem(meeting=team_meeting_object, 
+        agenda_item_object = AgendaItem(meeting=team_meeting_object,
                                    created_date=datetime.datetime.now())
     is_member = False
     for team in team_meeting_object.teams.all():
@@ -316,7 +297,7 @@
             is_member = True
             break
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
-        
+
     if is_on_lc or is_member:
         if request.method == 'POST':
             form = AgendaItemForm(data=request.POST, instance=agenda_item_object)
@@ -326,12 +307,12 @@
                 return redirect( team_meeting_object )
         else:
             form = AgendaItemForm(instance=agenda_item_object)
-                
+
         context = {
             'team_meeting_object': team_meeting_object,
             'form': form,
         }
-        return render_to_response('meetings/agenda_item_new.html', 
+        return render_to_response('meetings/agenda_item_new.html',
                                          context, RequestContext(request))
     else:
         # XXX: Once we move to a new ACL system, this needs fixing.
@@ -351,11 +332,11 @@
         if launchpad.is_team_member(request.user, team):
             is_member = True
             break
-    
+
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
-    
+
     if is_on_lc or is_member:
-        if request.method == 'POST':		
+        if request.method == 'POST':
             form = AgendaItemForm(data=request.POST, instance=agenda_item_object)
             if form.is_valid():
                 form.save()
@@ -363,13 +344,13 @@
                 return redirect( team_meeting_object )
         else:
             form = AgendaItemForm(instance=agenda_item_object)
-            
+
         context = {
             'team_meeting_object': team_meeting_object,
             'agenda_item_object': agenda_item_object,
             'form': form,
         }
-        return render_to_response('meetings/agenda_item_update.html', 
+        return render_to_response('meetings/agenda_item_update.html',
                                          context, RequestContext(request))
     else:
         request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting agenda.'), _('You are not a member of the team or on the LoCo Council.')))
@@ -388,11 +369,11 @@
         if launchpad.is_team_member(request.user, team):
             is_member = True
             break
-    
+
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
-    
+
     if is_on_lc or is_member:
-        if request.method == 'POST':		
+        if request.method == 'POST':
             agenda_item_object.delete()
             request.user.message_set.create(message=_('Agenda Item removed.'))
             return redirect( team_meeting_object )
 
=== added file 'loco_directory/teams/feeds.py'
--- loco_directory/teams/feeds.py	1970-01-01 00:00:00 +0000
+++ loco_directory/teams/feeds.py	2012-11-26 23:13:22 +0000
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+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	2012-11-18 22:02:56 +0000
+++ loco_directory/teams/views.py	2012-11-26 23:13:22 +0000
@@ -83,15 +83,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	2011-03-16 17:20:55 +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.first_team.lp_name 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.first_team.lp_name 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	2012-11-26 23:13:22 +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	2012-11-26 23:13:22 +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	2012-11-26 23:13:22 +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	2012-11-26 23:13:22 +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	2012-11-26 23:13:22 +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	2012-11-26 23:13:22 +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	2012-11-26 23:13:22 +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	2012-11-26 23:13:22 +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	2011-06-17 17:10:41 +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.first_team.lp_name e.id %}</link>
-			<description>{% trans "When:" %} {% spaceless %}
-			{% ifequal e.date_begin|date e.local_date_end|date %}
-				{{ e.local_date_begin|date:"D, d N Y H:i" }} - {{ e.local_date_end|date:"H:i T" }}
-			{% else %}
-				{{ e.local_date_begin|date:"D, d N Y H:i" }} - {{ e.local_date_end|date:"D, d N Y H:i T" }}
-			{% endifequal %}
-			{% endspaceless %}</description>
-			<guid>{{base}}{% url team-meeting-detail e.first_team.lp_name e.id %}</guid>
-		</item>
-		{% endfor %}
-	</channel>
-</rss>
 
=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2012-11-12 20:25:25 +0000
+++ loco_directory/templates/teams/team_detail.html	2012-11-26 23:13:22 +0000
@@ -3,10 +3,6 @@
 
 {% block page_name %}{% trans team.name %}{% endblock %}
 
-{% block page_banner %}
-<img src="{{MEDIA_URL}}img/banner.png" title="Test Banner"/>
-{% endblock %}
-
 {% block sub_nav_links %}
     <li><a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
     {% if is_member %}{% else %}<li><a class="sub-nav-item" href="https://launchpad.net/~{{ team.lp_name }}/+join">{% trans "Join This Team!" %}</a></li>{% endif %}
@@ -46,30 +42,21 @@
             'http://search.twitter.com/',
         ]
     });
-
     {% if team.flickr_id %}
         $('#flickr').flickr({ key: "{{ flickr_api_key }}", id: "{{ team.flickr_id }}", amount: perPage });
     {% endif %}
-
     {% if team.picasa_id %}
         $('#picasa').picasa({ id: "{{ team.picasa_id }}", amount: perPage });
     {% endif %}
-
     {% if team.pixie_id %}
         $('#pixie').pixie({ key: "{{ pixie_api_key }}", id: "{{ team.pixie_id }}", amount: perPage });
     {% endif %}
-
-    if ($(location).attr('hash') == "#chat") {
-        $('#webchat').show('fast', function() {
-            $(window).scrollTop($('#webchat').position().top);
-        });
-    }
 });
 </script>
 {% if team.flickr_id or team.picasa_id or team.pixie_id %}
 
 {% 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 %}
@@ -189,7 +176,7 @@
                             <a href="{% url team-event-history team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
                         </span>
                         <span>
-                            <a class="pictogram rss action" href="{% url team-events-rss team.lp_name %}" title="{% trans "RSS Feed" %}"></a>
+                            <a class="pictogram rss action" href="/feeds/teams/{{ team.lp_name }}" title="{% trans "RSS Feed" %}"></a>
                         </span>
                         <span>
                             <a class="pictogram ical action" href="{% url team-calendar team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
 
=== modified file 'loco_directory/templates/teams/team_event_list.html'
--- loco_directory/templates/teams/team_event_list.html	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/teams/team_event_list.html	2012-11-26 23:13:22 +0000
@@ -6,13 +6,13 @@
 {% block sub_nav_links %}
 <li><a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
 <li><a class="sub-nav-item" href="{% url team-event-history team_object.lp_name %}">{% trans "Past Events" %}</a></li>
-<li><a class="sub-nav-item" href="{% url team-events-rss team_object.lp_name %}" title="{% trans "Team Events (RSS)" %}"">{% trans "Team Events (RSS)" %}</a></li>
+<li><a class="sub-nav-item" href="/feeds/events/{{ team_object.lp_name }}" title="{% trans "Team Events (RSS)" %}">{% trans "Team Events (RSS)" %}</a></li>
 {% if is_member %}<li><a class="sub-nav-item" href="{% url team-event-new team_object.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a></li>{% endif %}
 {% 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	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/teams/team_meeting_list.html	2012-11-26 23:13:22 +0000
@@ -6,13 +6,12 @@
 {% block sub_nav_links %}
 <li><a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
 <li><a class="sub-nav-item" href="{% url team-meeting-history team_object.lp_name %}">{% trans "Past Meetings" %}</a></li>
-<li><a class="sub-nav-item" href="{% url team-meetings-rss team_object.lp_name %}" title="{% trans "Team Meetings (RSS)" %}"">{% trans "Team Meetings (RSS)" %}</a></li>
+<li><a class="sub-nav-item" href="/feeds/meetings/{{ team_object.lp_name }}" title="{% trans "Team Meetings (RSS)" %}">{% trans "Team Meetings (RSS)" %}</a></li>
 {% 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 %}" />
-{% endblock %}
+<link type="application/rss+xml" rel="alternate" title="Team Meetings (RSS)" href="/feeds/meetings/{{ team_object.lp_name }}" />{% endblock %}
 
 {% block content %}
 <div class="row">
 
=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py	2012-11-18 22:02:56 +0000
+++ loco_directory/urls.py	2012-11-26 23:13:22 +0000
@@ -7,6 +7,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'),
@@ -27,6 +38,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'),
     url(r'', include('userprofiles.urls')),
 )