Merge lp:~cjohnston/summit/ical into lp:summit

[Chris Johnston]

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2011-05-09 17:09:28 +0000
+++ summit/schedule/models/meetingmodel.py	2011-05-15 14:31:11 +0000
@@ -22,7 +22,7 @@
 from django.db import models
 from django.core.exceptions import ObjectDoesNotExist
 from django.conf import settings
-
+from django.core.urlresolvers import reverse
 #from summit.brainstorm.models import Idea
 
 from summit.schedule.fields import NameField
@@ -124,6 +124,11 @@
             }
     link_to_pad = property(get_link_to_pad)
     
+    def get_meeting_page_url(self):
+        args = [self.summit.name, self.name]
+        return reverse('summit.schedule.views.meeting', args=args)
+    meeting_page_url = property(get_meeting_page_url)
+        
     def __unicode__(self):
         if self.name:
             return self.name

=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2011-05-09 20:01:12 +0000
+++ summit/schedule/render.py	2011-05-15 14:31:11 +0000
@@ -285,7 +285,7 @@
                         track = meeting.tracks.all()[0].title.lower()
                     except (IndexError, AttributeError):
                         track = "unknown"
-                    headings += '<th>%s</th>\n' % escape(room.name)
+                    headings += '<th>%s</th>\n' % escape(room.title)
                     meetings += '<td class="%s">%s</td>\n' % (track, escape(meeting_title))
 
         html += '<table>\n'
@@ -1030,7 +1030,7 @@
 END:VEVENT
 ''' % {'id':meeting.id, 'dtstart':dtstart, 'dtend':dtend, 'category':categories,
        'eventname':meeting.title, 'eventplace': room.title, 'type': meeting.type,
-       'roomname':room.name, 'description': meeting.description, 'url':room.icecast_url}
+       'roomname':room.name, 'description': meeting.description, 'url':meeting.meeting_page_url}
         ical += 'END:VCALENDAR'
         return ical