Merge lp:~cjohnston/summit/moves-tests into lp:summit

[Chris Johnston]

Unmerged revisions

=== modified file 'summit/schedule/forms.py'
--- summit/schedule/forms.py	2012-08-12 22:32:46 +0000
+++ summit/schedule/forms.py	2013-02-22 01:25:24 +0000
@@ -22,6 +22,7 @@
 
 from common.forms import RenderableMixin
 
+
 class MultipleAttendeeField(forms.ModelMultipleChoiceField):
     def label_from_instance(self, obj):
         return u"%s %s (%s)" % (
@@ -36,12 +37,8 @@
         required=False)
 
     class Media:
-        css = {'all': (
-                       '/media/css/colortip-1.0-jquery.css', 
-                       )}
-        js = (
-              '/media/js/colortip-1.0-jquery.js',
-              )
+        css = {'all': ('/media/css/colortip-1.0-jquery.css',)}
+        js = ('/media/js/colortip-1.0-jquery.js',)
 
     def __init__(self, *args, **kwargs):
         if 'instance' in kwargs:
@@ -72,6 +69,7 @@
             old_save_m2m = self.save_m2m
         else:
             old_save_m2m = None
+
         def save_m2m():
             if old_save_m2m is not None:
                 old_save_m2m()
@@ -94,43 +92,102 @@
 class CreateMeeting(MeetingFormBase, RenderableMixin):
     class Meta:
         model = Meeting
-        fields = ('title', 'description', 'tracks', 'type', 'private', 'spec_url', 'wiki_url',
-                  'pad_url', 'requires_dial_in', 'slots', 'approved', 'video', 'override_break')
+        fields = (
+            'title',
+            'description',
+            'tracks',
+            'type',
+            'private',
+            'spec_url',
+            'wiki_url',
+            'pad_url',
+            'requires_dial_in',
+            'slots',
+            'approved',
+            'video',
+            'override_break'
+        )
+
 
 class OrganizerEditMeeting(MeetingFormBase, RenderableMixin):
     class Meta:
         model = Meeting
-        fields = ('title', 'description', 'tracks', 'type', 'private', 'spec_url', 'wiki_url',
-                  'pad_url', 'requires_dial_in', 'slots', 'approved', 'video', 'override_break')
+        fields = (
+            'title',
+            'description',
+            'tracks',
+            'type',
+            'private',
+            'spec_url',
+            'wiki_url',
+            'pad_url',
+            'requires_dial_in',
+            'slots',
+            'approved',
+            'video',
+            'override_break'
+        )
+
 
 class ProposeMeeting(MeetingFormBase, RenderableMixin):
     class Meta:
         model = Meeting
-        fields = ('title', 'description', 'tracks', 'spec_url', 'wiki_url', 'pad_url')
+        fields = (
+            'title',
+            'description',
+            'tracks',
+            'spec_url',
+            'wiki_url',
+            'pad_url'
+        )
 
 
 class EditMeeting(MeetingFormBase, RenderableMixin):
     class Meta:
         model = Meeting
-        fields = ('title', 'description', 'tracks', 'spec_url', 'wiki_url', 'pad_url')
+        fields = (
+            'title',
+            'description',
+            'tracks',
+            'spec_url',
+            'wiki_url',
+            'pad_url'
+        )
+
 
 class MeetingReview(forms.ModelForm, RenderableMixin):
     class Meta:
         model = Meeting
         fields = ('approved',)
 
+
 class AttendMeeting(forms.ModelForm, RenderableMixin):
     class Meta:
         model = Participant
         fields = ('participation',)
+
     def __init__(self, *args, **kwargs):
         super(AttendMeeting, self).__init__(*args, **kwargs)
-        self.fields['participation'].choices = ((u'ATTENDING', u'Attending'), (u'INTERESTED', u'Very interested in attending'))
+        self.fields['participation'].choices = (
+            (u'ATTENDING', u'Attending'),
+            (u'INTERESTED', u'Very interested in attending')
+        )
+
 
 class OrganizerChangeAttend(forms.ModelForm, RenderableMixin):
     class Meta:
         model = Participant
         fields = ('participation',)
+
     def __init__(self, *args, **kwargs):
         super(OrganizerChangeAttend, self).__init__(*args, **kwargs)
-        self.fields['participation'].choices = ((u'INTERESTED', u'Should Attend'), (u'REQUIRED', u'Required to Attend'))
+        self.fields['participation'].choices = (
+            (u'INTERESTED', u'Should Attend'),
+            (u'REQUIRED', u'Required to Attend')
+        )
+
+
+class EditMeetingHangout(forms.ModelForm, RenderableMixin):
+    class Meta:
+        model = Meeting
+        fields = ('hangout_url', 'broadcast_url')

=== modified file 'summit/schedule/models/attendeemodel.py'
--- summit/schedule/models/attendeemodel.py	2012-04-30 16:48:43 +0000
+++ summit/schedule/models/attendeemodel.py	2013-02-22 01:25:24 +0000
@@ -45,7 +45,7 @@
                                verbose_name='Willing to be Crew',
                                default=False)
     secret_key_id = models.CharField(max_length=32, blank=True, null=True)
-    
+
     class Meta:
         app_label = 'schedule'
         ordering = ('user__username', 'summit')
@@ -86,7 +86,14 @@
     secret_key = property(get_secret_key, set_secret_key)
 
     def ical_url(self):
-        return getattr(settings, 'SITE_ROOT', 'http://summit.ubuntu.com') + reverse('summit.schedule.views.user_private_ical', args=(self.summit.name,self.secret_key))
+        return getattr(
+            settings,
+            'SITE_ROOT',
+            'http://summit.ubuntu.com'
+        ) + reverse(
+            'summit.schedule.views.user_private_ical',
+            args=(self.summit.name, self.secret_key)
+        )
 
     def update_from_launchpad(self, elem):
         """Update from Launchpad data."""

=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py	2013-02-20 17:33:14 +0000
+++ summit/schedule/models/summitmodel.py	2013-02-22 01:25:24 +0000
@@ -47,6 +47,8 @@
 
 #Monkey patch for better use in the admin
 User._meta.ordering = ['username']
+
+
 def unicode_user(user):
     display = []
     if user.first_name:
@@ -56,9 +58,10 @@
     if len(display) == 0:
         return user.username
     else:
-        return user.username + ' (' +' '.join(display) + ')'
+        return user.username + ' (' + ' '.join(display) + ')'
 User.__unicode__ = unicode_user
 
+
 class SummitManager(CurrentSiteManager):
 
     def next(self):
@@ -68,6 +71,7 @@
             # No summits have been defined in the database yet
             return Summit(name="no_summits", title="No Summits Defined")
 
+
 class Summit(models.Model):
     STATE_CHOICES = (
         (u'sponsor', u'Sponsorship Requests'),
@@ -81,22 +85,51 @@
     sites = models.ManyToManyField(Site)
     location = models.CharField(max_length=100, blank=True)
     description = models.TextField(max_length=2047, blank=True)
-    etherpad = models.URLField(verify_exists=False, max_length=75, blank=False, default='http://pad.ubuntu.com/', help_text="Enter the URL of the etherpad server you would like to use")
-    qr = models.URLField(verify_exists=False, max_length=100, blank=True, default='', help_text="Enter the URL of the QR code for mobile device application")
+    etherpad = models.URLField(
+        verify_exists=False,
+        max_length=75,
+        blank=False,
+        default='http://pad.ubuntu.com/',
+        help_text="Enter the URL of the etherpad server you would like to use"
+    )
+    qr = models.URLField(
+        verify_exists=False,
+        max_length=100,
+        blank=True,
+        default='',
+        help_text="Enter the URL of the QR code for mobile device application"
+    )
     hashtag = models.CharField(max_length=25, blank=True)
-    timezone = models.CharField(max_length=50,
-                                choices=[(x, x) for x in pytz.common_timezones])
+    timezone = models.CharField(
+        max_length=50,
+        choices=[(x, x) for x in pytz.common_timezones]
+    )
     last_update = models.DateTimeField(null=True, blank=True)
-    state = models.CharField(max_length=10, choices=STATE_CHOICES,
-                             default=STATE_CHOICES[0][0])
+    state = models.CharField(
+        max_length=10,
+        choices=STATE_CHOICES,
+        default=STATE_CHOICES[0][0]
+    )
     date_start = models.DateField(blank=False, null=True)
     date_end = models.DateField(blank=False, null=True)
-    managers = models.ManyToManyField(User, blank=True, related_name='managers')
-    schedulers = models.ManyToManyField(User, blank=True, related_name='schedulers')
+    managers = models.ManyToManyField(
+        User,
+        blank=True,
+        related_name='managers'
+    )
+    schedulers = models.ManyToManyField(
+        User,
+        blank=True,
+        related_name='schedulers'
+    )
     virtual_summit = models.BooleanField(
         help_text="Check this if the entire sprint is virtual"
     )
-    help_text = models.TextField(null=True, blank=True, help_text='Summit specific instructions and links for getting help during the event')
+    help_text = models.TextField(
+        null=True,
+        blank=True,
+        help_text='Instructions and links for getting help during the event'
+    )
 
     objects = models.Manager()
     on_site = SummitManager()
@@ -109,7 +142,14 @@
         return self.name
 
     def get_absolute_url(self):
-        return getattr(settings, 'SITE_ROOT', 'http://summit.ubuntu.com') + reverse('summit.schedule.views.summit', args=(self.name,))
+        return getattr(
+            settings,
+            'SITE_ROOT',
+            'http://summit.ubuntu.com'
+        ) + reverse(
+            'summit.schedule.views.summit',
+            args=(self.name,)
+        )
 
     def localize(self, datetime):
         """Convert a datetime to the summit-local timezone.
@@ -172,7 +212,14 @@
         return sorted(dates)
 
     def ical_url(self):
-        return getattr(settings, 'SITE_ROOT', 'http://summit.ubuntu.com') + reverse('summit.schedule.views.ical', args=(self.name,))
+        return getattr(
+            settings,
+            'SITE_ROOT',
+            'http://summit.ubuntu.com'
+        ) + reverse(
+            'summit.schedule.views.ical',
+            args=(self.name,)
+        )
 
     def public_rooms(self):
         """List of public rooms for this summit.
@@ -192,7 +239,9 @@
             else:
                 return cmp(a.track.title, b.track.title)
 
-        rooms = self.room_set.exclude(Q(type__exact='closed') | Q(type__exact='private'))
+        rooms = self.room_set.exclude(
+            Q(type__exact='closed') | Q(type__exact='private')
+        )
         return sorted(rooms, cmp=by_title)
 
     def open_rooms(self):
@@ -231,8 +280,12 @@
         if sprints.count() > 0:
             urls = [sprint.import_url for sprint in sprints]
         else:
-            urls = [("https://launchpad.net/sprints/%s/+temp-meeting-export"
-                   % self.name)]
+            urls = [
+                (
+                    "https://launchpad.net/sprints/%s/+temp-meeting-export"
+                    % self.name
+                )
+            ]
         return urls
 
     def update_from_launchpad_response(self, response, options={}):
@@ -253,9 +306,16 @@
         while trycounter <= retrytotal:
             req = urllib2.Request(url)
             req.add_header("Cache-Control", "no-cache")
-            req.add_header("Cookie", "lp=%s" % getattr(settings, "LP_AUTH_COOKIE", "please-don't-cache-me"))
+            req.add_header(
+                "Cookie",
+                "lp=%s" % getattr(
+                    settings,
+                    "LP_AUTH_COOKIE",
+                    "please-don't-cache-me"
+                )
+            )
             try:
-                 export = urllib2.urlopen(req)
+                export = urllib2.urlopen(req)
             except urllib2.HTTPError, e:
                 trycounter += 1
                 if trycounter >= retrytotal:
@@ -278,12 +338,16 @@
             in_lp |= self.update_from_launchpad_response(sprint_info, options)
 
         if not options.get('skip_meetings', False):
-            in_db = set(m for m in self.meeting_set.exclude(launchpad_blueprint_id__isnull=True))
+            in_db = set(
+                m for m in self.meeting_set.exclude(
+                    launchpad_blueprint_id__isnull=True
+                )
+            )
 
             for extra in in_db.difference(in_lp):
                 print "Marking %s as removed" % extra.name
                 extra.agenda_set.all().delete()
-                extra.approved='REMOVED'
+                extra.approved = 'REMOVED'
                 extra.save()
 
         self.last_update = datetime.utcnow()
@@ -298,19 +362,26 @@
 
         print "user %s" % username
         try:
-            attendee = self.attendee_set.get(user__username__exact=username[:30])
+            attendee = self.attendee_set.get(
+                user__username__exact=username[:30]
+            )
         except ObjectDoesNotExist:
             try:
                 user = User.objects.get(username__exact=username[:30])
             except ObjectDoesNotExist:
-                user = User.objects.create_user(username[:30], '', password=None)
+                user = User.objects.create_user(
+                    username[:30],
+                    '',
+                    password=None
+                )
                 launchpad.set_user_openid(user)
 
             # Create with any start/end time since we overwrite shortly
-            attendee = self.attendee_set.create(user=user,
-                                                start=datetime.utcnow(),
-                                                end=datetime.utcnow())
-
+            attendee = self.attendee_set.create(
+                user=user,
+                start=datetime.utcnow(),
+                end=datetime.utcnow()
+            )
 
         attendee.update_from_launchpad(elem)
 
@@ -333,7 +404,12 @@
         try:
             meeting = self.meeting_set.get(launchpad_blueprint_id=bp_id)
         except ObjectDoesNotExist:
-            meeting = self.meeting_set.create(name=name, title=full_name[:100], slots=slot_length, launchpad_blueprint_id=bp_id)
+            meeting = self.meeting_set.create(
+                name=name,
+                title=full_name[:100],
+                slots=slot_length,
+                launchpad_blueprint_id=bp_id
+            )
         except:
             pass
 
@@ -347,13 +423,18 @@
         This is a pretty simple best-fit/first-come-first-served scheduler,
         but it suffices.
         """
-        for meeting in self.meeting_set.filter(approved='APPROVED', agenda__isnull=True).order_by('id'):
-            meeting.try_schedule(with_interested = True)
+        for meeting in self.meeting_set.filter(
+            approved='APPROVED',
+            agenda__isnull=True
+        ).order_by('id'):
+            meeting.try_schedule(with_interested=True)
 
-        for meeting in self.meeting_set.filter(approved='APPROVED', agenda__isnull=True).order_by('id'):
+        for meeting in self.meeting_set.filter(
+            approved='APPROVED',
+            agenda__isnull=True
+        ).order_by('id'):
             meeting.try_schedule()
 
-
     def check_schedule(self):
         """Check the schedule for existant errors."""
         for meeting in self.meeting_set.all():
@@ -361,14 +442,20 @@
                 try:
                     missing = meeting.check_schedule(agenda.slot, agenda.room)
                     if len(missing):
-                        print "Warning: required people not available: %s at %s in %s: %s" % (
-                            meeting, agenda.slot, agenda.room,
-                            ', '.join(m.user.username for m in missing))
+                        print "Warning: required people not available:"
+                        "%s at %s in %s: %s" % (
+                            meeting,
+                            agenda.slot,
+                            agenda.room,
+                            ', '.join(m.user.username for m in missing)
+                        )
                 except meeting.SchedulingError, e:
-                    print "Error: %s at %s in %s: %s" % (meeting,
-                                                         agenda.slot,
-                                                         agenda.room,
-                                                         e)
+                    print "Error: %s at %s in %s: %s" % (
+                        meeting,
+                        agenda.slot,
+                        agenda.room,
+                        e
+                    )
 
     def reschedule(self):
         """Delete any automatically created agenda items that have problems."""
@@ -426,6 +513,7 @@
             return self.lead_set.filter(lead=attendee).exists()
         return False
 
+
 class SummitSprint(models.Model):
 
     summit = models.ForeignKey(Summit, related_name='sprint_set')

=== added file 'summit/schedule/templates/schedule/edit_hangout.html'
--- summit/schedule/templates/schedule/edit_hangout.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/edit_hangout.html	2013-02-22 01:25:24 +0000
@@ -0,0 +1,45 @@
+{% extends "base.html" %}
+
+{% block page_name %}Edit Hangout - {{ summit.title }}{%endblock %}
+{% block sub_nav %}{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+    <script type="text/javascript" src="{{MEDIA_URL}}js/colortip-1.0-jquery.js"></script>
+    <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
+{% endblock %}
+
+{% block closure %}
+<script type="text/javascript"><!--
+$(document).ready(function(){
+    $('span[rel*=help]').colorTip({color:'orange'});
+});
+--></script>
+<style>
+form ul {
+  height: 12em;
+  overflow-y: scroll;
+  overflow-x: hidden;
+}
+</style>
+{% endblock %}
+
+
+{% block content %}
+<div class="row">
+    <article id="form" class="span-8">
+        {% if form.errors %}
+            <p style="color: red;">
+                Please correct the error{{ form.errors|pluralize }} below.
+            </p>
+        {% endif %}
+
+        <form action="{{ request.path_info }}" method="POST">
+            <fieldset>
+                <h3>Edit Hangout</h3>
+                {{ form.as_template }}
+                {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
+                <input type="submit" name="submit" value="Save" class="submit-button" />
+            </fieldset>
+        </form>
+    </article>
+{% endblock %}

=== added file 'summit/schedule/templates/schedule/virtual_meeting.html'
--- summit/schedule/templates/schedule/virtual_meeting.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/virtual_meeting.html	2013-02-22 01:25:24 +0000
@@ -0,0 +1,146 @@
+{% extends "base.html" %}
+{% load schedule_perms datetime markup %}
+
+{% block page_name %}
+    {{ meeting.title }} - 
+    {% if schedule.date %}{{ schedule.date|strftime:"%Y-%m-%d" }}{% endif %}
+    {% if schedule.room %}{{ schedule.room.title }} - {{ summit.title }}{% endif %}
+{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+ <link rel="stylesheet" type="text/css" media="screen" href="/media/css/virt.css" />
+<meta property="fb:app_id" content="310260202349342" />
+<meta property="og:title" content="{{ meeting.title }}{% if schedule.date %} - {{ schedule.date|strftime:"%Y-%m-%d" }}{% endif %}{% if schedule.room %}{{ schedule.room.title }}{% endif %}" />
+{% if meeting.description %}
+<meta property="og:description" content="{{ meeting.description|linebreaks|striptags }}" />
+{% endif %}
+<meta property="og:url" content="http://summit.ubuntu.com{% url summit.schedule.views.meeting meeting.summit.name, meeting.id, meeting.name|default:'-' %}" />
+<meta property="og:image" content="http://summit.ubuntu.com/media/images/cof_orange_hex1.png" />
+<meta property="og:site_name" content="The Summit Scheduler" />
+<meta property="og:type" content="article" />
+<meta itemprop="name" content="{{ meeting.title }}{% if schedule.date %} - {{ schedule.date|strftime:"%Y-%m-%d" }}{% endif %}{% if schedule.room %}{{ schedule.room.title }}{% endif %}" />
+<meta itemprop="description" content="{{ meeting.description|linebreaks|striptags }}" />
+{% endblock %}
+
+{% block sub_nav_links %}
+    {% if meeting.private %}
+        {% if meeting.private_key and meeting.private_key != '' %}
+            <li><a class="sub-nav-item" href="{% url summit.schedule.views.private_meeting meeting.summit.name, meeting.private_key, meeting.name|default:'-' %}">Shared URL</a></li>
+        {% else %}
+            <li><a class="sub-nav-item" href="{% url summit.schedule.views.meeting meeting.summit.name, meeting.id, meeting.name|default:'-' %}+share">Share meeting</a></li>
+        {% endif %}
+    {% endif %}
+    
+    {% if meeting.spec_url %}
+        {% if summit_organizer or drafter %}
+            <li><a class="sub-nav-item" href="{% url summit.schedule.views.attendee_review summit.name, meeting.id, meeting.name|default:'-' %}">Review attendees</a></li>
+            <li><a class="sub-nav-item" href="{% url summit.schedule.views.edit_meeting_hangout summit.name, meeting.id, meeting.name|default:'-' %}">Edit Hangout Details</a></li>
+        {% endif %}
+        <li><a class="sub-nav-item" href="{{ meeting.spec_url }}">Blueprint</a></li>
+    {% else %}
+        {% if summit_organizer or drafter %}
+            {% if not drafter %}
+                <li><a class="sub-nav-item" href="{% url summit.schedule.views.organizer_edit_meeting summit.name, meeting.id, meeting.name|default:'-' %}">Edit meeting</a></li>
+            {% endif %}
+            {% if not summit_organizer %}
+                <li><a class="sub-nav-item" href="{% url summit.schedule.views.edit_meeting summit.name, meeting.id, meeting.name|default:'-' %}">Edit meeting</a></li>
+            {% endif %}
+            <li><a class="sub-nav-item" href="{% url summit.schedule.views.attendee_review summit.name, meeting.id, meeting.name|default:'-' %}">Review attendees</a></li>
+            <li><a class="sub-nav-item" href="{% url summit.schedule.views.edit_meeting_hangout summit.name, meeting.id, meeting.name|default:'-' %}">Edit Hangout Details</a></li>
+            {% endif %}
+    {% endif %}
+
+    {% if user_is_attending %}
+        {% if user_is_participating %}
+            <li><a class="sub-nav-item" href="{% url summit.schedule.views.unregister meeting.summit.name, meeting.id, meeting.name|default:'-' %}">Skip this meeting</a></li>
+        {% endif %}
+    {% else %}
+        {% if meeting.spec_url %}
+            <li><a class="sub-nav-item" href="{{ meeting.spec_url }}/+subscribe">Subscribe to blueprint</a></li>
+        {% endif %}
+        <li><a class="sub-nav-item" href="{% url summit.schedule.views.attend_meeting meeting.summit.name, meeting.id %}">Attend this meeting</a></li>
+    {% endif %}
+    
+    {% if scheduler %}
+        <li><a class="sub-nav-item" href="{% url summit.schedule.views.meeting_copy meeting.summit.name, meeting.id, meeting.name|default:'-' %}">Copy meeting</a></li>
+    {% endif %}
+{% endblock %}
+
+{% block content %}
+<div class="row">
+<section class="span-9">
+    <h2>{{ meeting.title }}</h2>
+    <div id="description">
+        {{ meeting.description|markdown:'safe' }}
+        <h3><a href="{{ meeting.hangout_url }}">Join the Hangout on Air</a></h3>
+    </div>
+
+</section>
+<article class="span-3 last">
+{% if meeting.private %}
+{% else %}
+<div class="share">
+    <a href="http://www.reddit.com/submit" onclick="window.location = 'http://www.reddit.com/submit?url=' + encodeURIComponent(window.location); return false"> <img style="padding-bottom: 4px;"src="http://www.reddit.com/static/spreddit7.gif" alt="submit to reddit" border="0" /></a><br />
+    <div id="fb-root"></div>
+    <script>(function(d, s, id) {
+        var js, fjs = d.getElementsByTagName(s)[0];
+        if (d.getElementById(id)) {return;}
+        js = d.createElement(s); js.id = id;
+        js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=310260202349342";
+        fjs.parentNode.insertBefore(js, fjs);
+    }(document, 'script', 'facebook-jssdk'));</script>
+    <div class="fb-like" data-href="" data-send="false" data-layout="box_count" data-width="40" data-show-faces="false" data-font="arial"></div>
+    <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
+    <g:plusone size="tall"></g:plusone>
+    <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a>
+    <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+    <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script>
+</div>
+
+{% endif %}
+</article>
+</div>
+<div class="row">
+    <div class="span-4">
+        <div align="center"><iframe width="420" height="295" src="{{ meeting.broadcast_url }}" frameborder="0" allowfullscreen></iframe></div>
+        <iframe src="http://webchat.freenode.net?channels={% for ai in agenda_items %}{{ ai.room.irc_channel }}{% endfor %}&uio=Mj10cnVlJjQ9dHJ1ZSY5PXRydWUmMTA9dHJ1ZSYxMz1mYWxzZSYxND1mYWxzZQbf" width="100%" height="395"></iframe>
+</div>
+<div class="span-7 last">
+    {% if meeting.private %}
+    <h3>WARNING: Contents of this pad may not be private, and may be searcheable by non-attendees!</h3>
+    {% endif %}
+
+<iframe width=100% height=700 src="{{ meeting.link_to_pad }}"></iframe>
+</div>
+</div>
+<div class="row">
+       {% ifnotequal meeting.type 'plenary' %}
+    <div id="Attendees" class="span-4">
+        <h3>Attendees</h3>
+        {% for attendee in attendees %}
+            <a href="http://launchpad.net/~{{ attendee.user.username }}">{% if attendee.participation = 'REQUIRED' %}<strong>{% endif %}{{ attendee.name }}{% if attendee.required %}</strong>{% endif %}</a>{% if not forloop.last %}, {% endif %}
+        {% endfor %}
+    </div>
+        {% endifnotequal %}
+    <div class="span-3">
+{% if summit_organizer %}
+    {% include "schedule/admin.html" %}
+{% endif %}
+    </div>
+    <div id="Links" class="span-3 last">
+        <h3>Links</h3>
+        <ul>
+            <li><a href="{{meeting.link_to_pad}}" target="_new">Notes in a separate window</a></li>
+            <li><a href="{{meeting.edit_link_to_pad}}" target="_new">Edit notes window</a></li>
+            {% if meeting.spec_url %}<li><a href="{{ meeting.spec_url }}">Blueprint</a></li>{% endif %}
+            {% if meeting.wiki_url %}<li><a href="{{ meeting.wiki_url }}">Wiki page</a></li>{% endif %}
+            {% for ai in agenda_items %}
+                {% if ai.room.irc_channel %}<li><a href="https://webchat.freenode.net/?channels={{ai.room.irc_channel}}">IRC Channel: #{{ai.room.irc_channel}}</a></li>{% endif %}
+            {% endfor %}
+
+        </ul>
+    </div>
+
+</article>
+</div>
+{% endblock %}

=== added directory 'summit/schedule/tests'
=== added file 'summit/schedule/tests/__init__.py'
--- summit/schedule/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ summit/schedule/tests/__init__.py	2013-02-22 01:25:24 +0000
@@ -0,0 +1,17 @@
+# The Summit Scheduler web application
+# Copyright (C) 2008 - 2012 Ubuntu Community, Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from tests import *

=== renamed file 'summit/schedule/tests.py' => 'summit/schedule/tests/tests.py'
=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2012-10-26 10:23:28 +0000
+++ summit/schedule/views.py	2013-02-22 01:25:24 +0000
@@ -49,7 +49,8 @@
     EditMeeting,
     MeetingReview,
     AttendMeeting,
-    OrganizerChangeAttend
+    OrganizerChangeAttend,
+    EditMeetingHangout
 )
 
 __all__ = (
@@ -60,6 +61,7 @@
     'today_view',
 )
 
+
 @summit_required
 def summit(request, summit, attendee):
     edit = False
@@ -81,14 +83,17 @@
     return render_to_response("schedule/summit.html", context,
                               context_instance=RequestContext(request))
 
+
 @summit_only_required
 def search(request, summit):
     query = request.GET.get('q', None)
     if query:
-        meetings = summit.meeting_set.filter(Q(name__icontains=query) | Q(title__icontains=query))
+        meetings = summit.meeting_set.filter(
+            Q(name__icontains=query) | Q(title__icontains=query)
+        )
     else:
         meetings = []
-    
+
     context = {
         'summit': summit,
         'query': query,
@@ -96,17 +101,28 @@
     }
     return render_to_response("schedule/search.html", context,
                               context_instance=RequestContext(request))
+
+
 @summit_required
 def daily_schedule(request, summit, attendee, date):
-    viewdate = summit.as_localtime(datetime.datetime.strptime(date, "%Y-%m-%d"))
+    viewdate = summit.as_localtime(
+        datetime.datetime.strptime(date, "%Y-%m-%d")
+    )
     utc_date = summit.delocalize(viewdate)
     day = datetime.timedelta(days=1)
 
     schedule = SortedDict()
     multislot_meetings = SortedDict()
 
-    for slot in summit.slot_set.filter(start_utc__gte=utc_date, end_utc__lte=(utc_date+day)).order_by('start_utc'):
-        if not (slot.type == 'open' or slot.type == 'plenary' or slot.type == 'lunch'):
+    for slot in summit.slot_set.filter(
+        start_utc__gte=utc_date,
+        end_utc__lte=(utc_date+day)
+    ).order_by('start_utc'):
+        if not (
+            slot.type == 'open' or
+            slot.type == 'plenary' or
+            slot.type == 'lunch'
+        ):
             continue
         if not slot in schedule:
             schedule[slot] = SortedDict()
@@ -117,7 +133,7 @@
             if count == 1:
                 del multislot_meetings[agenda]
             else:
-                multislot_meetings[agenda] = count -1
+                multislot_meetings[agenda] = count - 1
 
         # Add meetings from this slot
         for agenda in slot.agenda_set.select_related().order_by('room__name'):
@@ -125,7 +141,7 @@
                 schedule[slot][agenda.room] = agenda
                 if agenda.meeting.slots > 1:
                     multislot_meetings[agenda] = agenda.meeting.slots - 1
-    
+
     if '_popup' in request.GET:
         is_popup = True
 
@@ -141,29 +157,49 @@
     }
     return render_to_response("schedule/daily.html", context,
                               context_instance=RequestContext(request))
-    
+
+
 @summit_attendee_required
 def attendee_schedule(request, summit, attendee):
     pass
-    
+
+
 @summit_required
 def by_date(request, summit, attendee, date):
     return _process_date_view(request, summit, attendee, date)
 
+
 @summit_required
 def today_view(request, summit, attendee):
     today = summit.localize(datetime.datetime.now()).date()
-    return _process_date_view(request, summit, attendee, today.strftime("%Y-%m-%d"))
+    return _process_date_view(
+        request,
+        summit,
+        attendee,
+        today.strftime("%Y-%m-%d")
+    )
+
 
 def _process_date_view(request, summit, attendee, date):
     if 'rooms' in request.GET:
         roomnames = request.GET.get('rooms', '').split(',')
         rooms = list(summit.room_set.filter(name__in=roomnames, type='open'))
         if request.user.is_authenticated() and request.user.is_staff:
-            rooms += list(summit.room_set.filter(name__in=roomnames, type='private'))
+            rooms += list(
+                summit.room_set.filter(
+                    name__in=roomnames,
+                    type='private'
+                )
+            )
     else:
         rooms = None
-    schedule = schedule_factory(request, summit, attendee, room=rooms, date=date)
+    schedule = schedule_factory(
+        request,
+        summit,
+        attendee,
+        room=rooms,
+        date=date
+    )
 
     if request.method == 'POST':
         return schedule.save_change()
@@ -183,25 +219,42 @@
             'previousday': viewdate - day,
             'can_change_agenda': summit.can_change_agenda(attendee),
         }
-        converted_date = summit.delocalize(datetime.datetime.strptime(date, "%Y-%m-%d"))
-        if 'edit' in request.GET or Slot.objects.filter(summit=summit, start_utc__gte=converted_date, end_utc__lte=converted_date+datetime.timedelta(days=1)).count() > 0:
+        converted_date = summit.delocalize(
+            datetime.datetime.strptime(date, "%Y-%m-%d")
+        )
+        if 'edit' in request.GET or Slot.objects.filter(
+            summit=summit,
+            start_utc__gte=converted_date,
+            end_utc__lte=converted_date+datetime.timedelta(days=1)
+        ).count() > 0:
             schedule.calculate()
         else:
             return render_to_response("schedule/nosession.html", context,
-                              context_instance=RequestContext(request))
+                                      context_instance=RequestContext(request))
     return render_to_response("schedule/schedule.html", context,
                               context_instance=RequestContext(request))
 
+
 @summit_required
 def next_table(request, summit, attendee):
     if 'rooms' in request.GET:
         roomnames = request.GET.get('rooms', '').split(',')
         rooms = list(summit.room_set.filter(name__in=roomnames, type='open'))
         if request.user.is_authenticated() and request.user.is_staff:
-            rooms += list(summit.room_set.filter(name__in=roomnames, type='private'))
+            rooms += list(
+                summit.room_set.filter(
+                    name__in=roomnames, type='private'
+                )
+            )
     else:
         rooms = None
-    schedule = Schedule.from_request(request, summit, attendee, room=rooms, nextonly=True)
+    schedule = Schedule.from_request(
+        request,
+        summit,
+        attendee,
+        room=rooms,
+        nextonly=True
+    )
 
     schedule.calculate()
 
@@ -214,6 +267,7 @@
     return render_to_response("schedule/nextsession_table.html", context,
                               context_instance=RequestContext(request))
 
+
 @summit_required
 def next_session(request, summit, attendee):
     url_content = request.GET.urlencode(safe='_:')
@@ -226,16 +280,21 @@
     return render_to_response("schedule/nextsession.html", context,
                               context_instance=RequestContext(request))
 
+
 @summit_required
 def by_room(request, summit, attendee, room_name):
     schedule = SortedDict()
     multislot_meetings = SortedDict()
 
     room = get_object_or_404(Room, name=room_name, summit=summit)
-    
+
     for slot in summit.slot_set.all().order_by('start_utc'):
 
-        if not (slot.type == 'open' or slot.type == 'plenary' or slot.type == 'lunch'):
+        if not (
+            slot.type == 'open' or
+            slot.type == 'plenary' or
+            slot.type == 'lunch'
+        ):
             continue
         if not slot in schedule:
             schedule[slot] = SortedDict()
@@ -246,7 +305,7 @@
             if count == 1:
                 del multislot_meetings[agenda]
             else:
-                multislot_meetings[agenda] = count -1
+                multislot_meetings[agenda] = count - 1
 
         # Add meetings from this slot
         for agenda in slot.agenda_set.filter(room=room).select_related():
@@ -277,7 +336,11 @@
 
     for slot in summit.slot_set.all().order_by('start_utc'):
 
-        if not (slot.type == 'open' or slot.type == 'plenary' or slot.type == 'lunch'):
+        if not (
+            slot.type == 'open' or
+            slot.type == 'plenary' or
+            slot.type == 'lunch'
+        ):
             continue
         if not slot in schedule:
             schedule[slot] = SortedDict()
@@ -288,10 +351,12 @@
             if count == 1:
                 del multislot_meetings[agenda]
             else:
-                multislot_meetings[agenda] = count -1
+                multislot_meetings[agenda] = count - 1
 
         # Add meetings from this slot
-        for agenda in slot.agenda_set.filter(meeting__tracks=track).select_related().order_by('room__name'):
+        for agenda in slot.agenda_set.filter(
+            meeting__tracks=track
+        ).select_related().order_by('room__name'):
             if not agenda.meeting.private or attendee in agenda.meeting.attendees:
                 schedule[slot][agenda.room] = agenda
                 if agenda.meeting.slots > 1:
@@ -309,16 +374,25 @@
     return render_to_response("schedule/by_track.html", context,
                               context_instance=RequestContext(request))
 
+
 @summit_required
 def by_participant(request, summit, attendee, username):
     schedule = SortedDict()
     multislot_meetings = SortedDict()
 
-    participant = get_object_or_404(Attendee, user__username=username, summit=summit)
+    participant = get_object_or_404(
+        Attendee,
+        user__username=username,
+        summit=summit
+    )
 
     for slot in summit.slot_set.all().order_by('start_utc'):
 
-        if not (slot.type == 'open' or slot.type == 'plenary' or slot.type == 'lunch'):
+        if not (
+            slot.type == 'open' or
+            slot.type == 'plenary' or
+            slot.type == 'lunch'
+        ):
             continue
         if not slot in schedule:
             schedule[slot] = SortedDict()
@@ -329,10 +403,18 @@
             if count == 1:
                 del multislot_meetings[agenda]
             else:
-                multislot_meetings[agenda] = count -1
+                multislot_meetings[agenda] = count - 1
 
         # Add meetings from this slot
-        for agenda in slot.agenda_set.filter(Q(meeting__participant__attendee=participant) | Q(meeting__drafter=participant) | Q(meeting__assignee=participant)).select_related().order_by('room__name'):
+        for agenda in slot.agenda_set.filter(
+            Q(
+                meeting__participant__attendee=participant
+            ) | Q(
+                meeting__drafter=participant
+            ) | Q(
+                meeting__assignee=participant
+            )
+        ).select_related().order_by('room__name'):
             if not agenda.meeting.private or attendee in agenda.meeting.attendees:
                 schedule[slot][agenda.room] = agenda
                 if agenda.meeting.slots > 1:
@@ -350,6 +432,7 @@
     return render_to_response("schedule/by_participant.html", context,
                               context_instance=RequestContext(request))
 
+
 @summit_only_required
 def tracks(request, summit):
 
@@ -359,6 +442,7 @@
     return render_to_response("schedule/tracks.html", context,
                               context_instance=RequestContext(request))
 
+
 @summit_required
 def meeting(request, summit, attendee, meeting_id, meeting_slug):
     meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
@@ -366,11 +450,13 @@
         raise Http404
     return _show_meeting(request, summit, meeting, attendee)
 
+
 @summit_required
 def private_meeting(request, summit, attendee, private_key, meeting_slug):
     meeting = get_object_or_404(summit.meeting_set, private_key=private_key)
     return _show_meeting(request, summit, meeting, attendee)
 
+
 def _show_meeting(request, summit, meeting, attendee):
     agendaitems = meeting.agenda_set.all()
     participants = meeting.participant_set.all()
@@ -378,29 +464,40 @@
     tracks = meeting.tracks.all()
     user_is_attending = attendee is not None and attendee in meeting.attendees
     user_is_participating = attendee is not None and attendee in [p.attendee for p in participants if not p.from_launchpad]
-    
+
     if attendee == meeting.drafter:
         drafter = True
     else:
         drafter = False
-    
+
     context = {
         'summit': summit,
-        'meeting':meeting,
-        'agenda_items':agendaitems,
-        'participants':participants,
+        'meeting': meeting,
+        'agenda_items': agendaitems,
+        'participants': participants,
         'attendees': attendees,
         'user_is_attending': user_is_attending,
         'user_is_participating': user_is_participating,
-        'tracks':tracks,
+        'tracks': tracks,
         'ETHERPAD_HOST': summit.etherpad,
         'summit_organizer': summit.is_organizer(attendee),
         'scheduler': summit.can_change_agenda(attendee),
         'is_scheduler': summit.is_scheduler(attendee),
         'drafter': drafter,
     }
-    return render_to_response("schedule/meeting.html", context,
-                              context_instance=RequestContext(request))
+    if summit.virtual_summit or meeting.virtual_meeting:
+        return render_to_response(
+            "schedule/virtual_meeting.html",
+            context,
+            context_instance=RequestContext(request)
+        )
+    else:
+        return render_to_response(
+            "schedule/meeting.html",
+            context,
+            context_instance=RequestContext(request)
+        )
+
 
 @summit_required
 def share_meeting(request, summit, attendee, meeting_id, meeting_slug):
@@ -409,30 +506,62 @@
         # check if the user should be able to see this private meeting
         if attendee is None:
             raise Http404
-            
+
         attendee_allowed = False
         for a in meeting.attendees:
             if a.user.pk == attendee.user.pk:
                 meeting.share()
-                return HttpResponseRedirect(reverse(private_meeting, args=[summit.name, meeting.private_key, meeting_slug]))
+                return HttpResponseRedirect(
+                    reverse(
+                        private_meeting,
+                        args=[summit.name, meeting.private_key, meeting_slug]
+                    )
+                )
         raise Http404
-    return HttpResponseRedirect(reverse(meeting, summit.name, meeting.id, meeting_slug))
-    
+    return HttpResponseRedirect(
+        reverse(
+            meeting,
+            summit.name,
+            meeting.id,
+            meeting_slug
+        )
+    )
+
+
 @summit_attendee_required
 def register(request, summit, attendee, meeting_id, meeting_slug):
     meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
     user_is_attending = attendee is not None and attendee in meeting.attendees
     if not user_is_attending:
-        meeting.participant_set.create(attendee=attendee, participation = 'ATTENDING', from_launchpad=False)
-
-    return HttpResponseRedirect(reverse('summit.schedule.views.meeting', args=(summit.name, meeting.id, meeting_slug)))
+        meeting.participant_set.create(
+            attendee=attendee,
+            participation='ATTENDING',
+            from_launchpad=False
+        )
+
+    return HttpResponseRedirect(
+        reverse(
+            'summit.schedule.views.meeting',
+            args=(summit.name, meeting.id, meeting_slug)
+        )
+    )
+
 
 @summit_attendee_required
 def unregister(request, summit, attendee, meeting_id, meeting_slug):
     meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
-    meeting.participant_set.filter(attendee=attendee, from_launchpad=False).delete()
-
-    return HttpResponseRedirect(reverse('summit.schedule.views.meeting', args=(summit.name, meeting.id, meeting_slug)))
+    meeting.participant_set.filter(
+        attendee=attendee,
+        from_launchpad=False
+    ).delete()
+
+    return HttpResponseRedirect(
+        reverse(
+            'summit.schedule.views.meeting',
+            args=(summit.name, meeting.id, meeting_slug)
+        )
+    )
+
 
 @summit_only_required
 def csv(request, summit):
@@ -442,70 +571,82 @@
     return HttpResponse(schedule.as_csv(),
                         mimetype='text/csv')
 
+
 @summit_only_required
 def ical(request, summit):
     """Return any list events as an ical"""
     schedule = Schedule.from_request(request, summit)
     schedule.calculate()
-    
+
     filename = "%s.ical" % summit.name.replace(' ', '-').lower()
     response = HttpResponse(mimetype='text/calendar')
     response['Content-Disposition'] = 'attachment; filename=%s' % filename.encode('ascii', 'replace')
     response.write(schedule.as_ical())
     return response
 
+
 @summit_only_required
 def user_ical(request, summit, username):
     """Returns a user's registered events as an ical"""
     schedule = Schedule.from_request(request, summit)
     schedule.calculate()
-    
+
     filename = "%s_%s.ical" % (summit.name, username)
     response = HttpResponse(mimetype='text/calendar')
     response['Content-Disposition'] = 'attachment; filename=%s' % filename.replace(' ', '-').lower().encode('ascii', 'replace')
     response.write(schedule.as_ical(only_username=username))
     return response
-    
+
+
 @summit_only_required
 def user_private_ical(request, summit, secret_key):
     """Returns a user's registered events as an ical"""
     attendee = get_object_or_404(Attendee, secret_key_id=secret_key)
     schedule = Schedule.from_request(request, summit, show_private=True)
     schedule.calculate()
-    
+
     response = HttpResponse(mimetype='text/calendar')
     response['Content-Disposition'] = 'attachment; filename=my_schedule_%s.ical' % attendee.secret_key
-    response.write(schedule.as_ical(only_username=attendee.user.username, show_private=True))
+    response.write(
+        schedule.as_ical(
+            only_username=attendee.user.username,
+            show_private=True
+        )
+    )
     return response
-    
+
+
 @summit_only_required
 def room_ical(request, summit, room_name):
     """Returns a room's events as an ical"""
     schedule = Schedule.from_request(request, summit)
     schedule.calculate()
-    
+
     filename = "%s_%s.ical" % (summit.name, room_name)
     response = HttpResponse(mimetype='text/calendar')
     response['Content-Disposition'] = 'attachment; filename=%s' % filename.replace(' ', '-').lower().encode('ascii', 'replace')
     response.write(schedule.as_ical(only_room=room_name))
     return response
-    
+
+
 @summit_only_required
 def track_ical(request, summit, track_slug):
     """Returns a track's events as an ical"""
     schedule = Schedule.from_request(request, summit)
     schedule.calculate()
-    
+
     filename = "%s_%s.ical" % (summit.name, track_slug)
     response = HttpResponse(mimetype='text/calendar')
     response['Content-Disposition'] = 'attachment; filename=%s' % filename.replace(' ', '-').lower().encode('ascii', 'replace')
     response.write(schedule.as_ical(only_track=track_slug))
     return response
-    
+
+
 def logout_view(request):
     logout(request)
     return HttpResponseRedirect('/')
 
+
 @summit_required
 def mobile(request, summit, attendee):
     context = {
@@ -514,6 +655,7 @@
     }
     return render_to_response("schedule/mobile.html", context, RequestContext(request))
 
+
 def past(request):
     pastsummit = Summit.on_site.filter(date_end__lte=datetime.date.today())
     context = {
@@ -522,15 +664,26 @@
     return render_to_response("schedule/past_summit.html", context,
                           context_instance=RequestContext(request))
 
+
 @summit_attendee_required
 def create_meeting(request, summit, attendee):
 
     if not summit.is_organizer(attendee):
-        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+        return HttpResponseRedirect(
+            reverse(
+                'summit.schedule.views.summit',
+                args=(summit.name,)
+            )
+        )
     else:
-        meeting = Meeting(summit=summit, approver=attendee, drafter=attendee, approved='APPROVED')
-    
-        if request.method == 'POST':        
+        meeting = Meeting(
+            summit=summit,
+            approver=attendee,
+            drafter=attendee,
+            approved='APPROVED'
+        )
+
+        if request.method == 'POST':
             form = CreateMeeting(data=request.POST, instance=meeting)
             if form.is_valid():
                 form.save()
@@ -542,15 +695,21 @@
         'summit': summit,
         'form': form,
     }
-    return render_to_response('schedule/create_meeting.html', 
+    return render_to_response('schedule/create_meeting.html',
                           context, RequestContext(request))
 
+
 @summit_attendee_required
 def propose_meeting(request, summit, attendee):
 
-    meeting = Meeting(summit=summit, drafter=attendee, private=False, approved='PENDING')
+    meeting = Meeting(
+        summit=summit,
+        drafter=attendee,
+        private=False,
+        approved='PENDING'
+    )
 
-    if request.method == 'POST':        
+    if request.method == 'POST':
         form = ProposeMeeting(data=request.POST, instance=meeting)
         if form.is_valid():
             form.save()
@@ -562,17 +721,29 @@
         'summit': summit,
         'form': form,
     }
-    return render_to_response('schedule/propose_meeting.html', 
+    return render_to_response('schedule/propose_meeting.html',
                           context, RequestContext(request))
-                          
+
+
 @summit_attendee_required
-def organizer_edit_meeting(request, summit, attendee, meeting_id, meeting_slug):
+def organizer_edit_meeting(
+    request,
+    summit,
+    attendee,
+    meeting_id,
+    meeting_slug
+):
     meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
-    
+
     if not summit.is_organizer(attendee):
-        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+        return HttpResponseRedirect(
+            reverse(
+                'summit.schedule.views.summit',
+                args=(summit.name,)
+            )
+        )
     else:
-        if request.method == 'POST':        
+        if request.method == 'POST':
             form = OrganizerEditMeeting(data=request.POST, instance=meeting)
             if form.is_valid():
                 form.save()
@@ -584,17 +755,23 @@
         'summit': summit,
         'form': form,
     }
-    return render_to_response('schedule/org_edit_meeting.html', 
+    return render_to_response('schedule/org_edit_meeting.html',
                           context, RequestContext(request))
 
+
 @summit_attendee_required
 def edit_meeting(request, summit, attendee, meeting_id, meeting_slug):
     meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
-    
+
     if attendee != meeting.drafter:
-        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+        return HttpResponseRedirect(
+            reverse(
+                'summit.schedule.views.summit',
+                args=(summit.name,)
+            )
+        )
     else:
-        if request.method == 'POST':        
+        if request.method == 'POST':
             form = EditMeeting(data=request.POST, instance=meeting)
             if form.is_valid():
                 form.save()
@@ -606,14 +783,55 @@
         'summit': summit,
         'form': form,
     }
-    return render_to_response('schedule/edit_meeting.html', 
-                          context, RequestContext(request))
+    return render_to_response('schedule/edit_meeting.html',
+                          context, RequestContext(request))
+
+
+@summit_attendee_required
+def edit_meeting_hangout(
+    request,
+    summit,
+    attendee,
+    meeting_id,
+    meeting_slug
+):
+    meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
+    # TODO: Add logic that prevents this view from being accessed if the
+    # Summit or meeting is not virtual
+    if not summit.is_organizer(attendee) and attendee != meeting.drafter:
+        return HttpResponseRedirect(
+            reverse(
+                'summit.schedule.views.summit',
+                args=(summit.name,)
+            )
+        )
+    else:
+        if request.method == 'POST':
+            form = EditMeetingHangout(data=request.POST, instance=meeting)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(meeting.meeting_page_url)
+        else:
+            form = EditMeetingHangout(instance=meeting)
+
+    context = {
+        'summit': summit,
+        'form': form,
+    }
+    return render_to_response('schedule/edit_hangout.html',
+                          context, RequestContext(request))
+
 
 @summit_required
 def review_pending(request, summit, attendee):
 
     if not summit.is_organizer(attendee):
-        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+        return HttpResponseRedirect(
+            reverse(
+                'summit.schedule.views.summit',
+                args=(summit.name,)
+            )
+        )
     else:
         schedule = SortedDict()
 
@@ -632,12 +850,18 @@
     return render_to_response("schedule/review.html", context,
                               context_instance=RequestContext(request))
 
+
 @summit_required
 def meeting_review(request, summit, attendee, meeting_id):
     meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
 
     if not summit.is_organizer(attendee):
-        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+        return HttpResponseRedirect(
+            reverse(
+                'summit.schedule.views.summit',
+                args=(summit.name,)
+            )
+        )
     else:
         if request.method == 'POST':
             form = MeetingReview(data=request.POST, instance=meeting)
@@ -656,12 +880,19 @@
     return render_to_response('schedule/meeting_review.html',
                           context, RequestContext(request))
 
+
 @summit_required
 def created_meetings(request, summit, attendee, username):
 
-    drafter = get_object_or_404(Attendee, summit=summit, user__username=username)
+    drafter = get_object_or_404(
+        Attendee,
+        summit=summit,
+        user__username=username
+    )
     if attendee is None or attendee.id != drafter.id:
-        meetings = summit.meeting_set.filter(drafter=drafter).exclude(private=True)
+        meetings = summit.meeting_set.filter(
+            drafter=drafter
+        ).exclude(private=True)
     else:
         meetings = summit.meeting_set.filter(drafter=drafter)
 
@@ -674,12 +905,18 @@
     return render_to_response("schedule/mine.html", context,
                               context_instance=RequestContext(request))
 
+
 @summit_required
 def meeting_copy(request, summit, attendee, meeting_id, meeting_slug):
     meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
 
     if not summit.can_change_agenda(attendee):
-        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+        return HttpResponseRedirect(
+            reverse(
+                'summit.schedule.views.summit',
+                args=(summit.name,)
+            )
+        )
     else:
         if request.method == 'POST':
             form = CreateMeeting(instance=meeting, data=request.POST)
@@ -692,7 +929,6 @@
                 meeting = form.save()
                 meeting_id = meeting.id
                 return HttpResponseRedirect(meeting.meeting_page_url)
-                
         else:
             form = CreateMeeting(instance=meeting)
 
@@ -700,19 +936,23 @@
         'summit': summit,
         'form': form,
     }
-    
-    return render_to_response('schedule/create_meeting.html', 
+
+    return render_to_response('schedule/create_meeting.html',
                           context, RequestContext(request))
 
+
 @summit_attendee_required
 def attend_meeting(request, summit, attendee, meeting_id):
     meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
 
     try:
-        participant = Participant.objects.get(attendee=attendee, meeting=meeting)
+        participant = Participant.objects.get(
+            attendee=attendee,
+            meeting=meeting
+        )
     except Participant.DoesNotExist:
         participant = Participant(attendee=attendee, meeting=meeting)
-        
+
     if request.method == 'POST':
         form = AttendMeeting(data=request.POST, instance=participant)
         if form.is_valid():
@@ -731,44 +971,79 @@
     return render_to_response('schedule/attend.html',
                           context, RequestContext(request))
 
+
 @summit_required
 def attendee_review(request, summit, attendee, meeting_slug, meeting_id):
     meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
 
     if not summit.is_organizer(attendee) and attendee != meeting.drafter:
-        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+        return HttpResponseRedirect(
+            reverse(
+                'summit.schedule.views.summit',
+                args=(summit.name,)
+            )
+        )
     else:
         participants = meeting.participant_set.all()
 
     context = {
         'summit': summit,
-        'meeting':meeting,
-        'participants':participants,
+        'meeting': meeting,
+        'participants': participants,
         'summit_organizer': summit.is_organizer(attendee),
 
     }
     return render_to_response("schedule/attendees.html", context,
                               context_instance=RequestContext(request))
 
+
 @summit_attendee_required
-def organizer_edit_attendees(request, summit, logged_in_user, username, meeting_id):
+def organizer_edit_attendees(
+    request,
+    summit,
+    logged_in_user,
+    username,
+    meeting_id
+):
     meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
-    attendee = get_object_or_404(Attendee, summit=summit, user__username=username)
+    attendee = get_object_or_404(
+        Attendee,
+        summit=summit,
+        user__username=username
+    )
     meeting_slug = get_object_or_404(Meeting, summit=summit, id=meeting_id)
 
-    if not summit.is_organizer(logged_in_user) and logged_in_user != meeting.drafter:
-        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+    if not summit.is_organizer(
+        logged_in_user
+    ) and logged_in_user != meeting.drafter:
+        return HttpResponseRedirect(
+            reverse(
+                'summit.schedule.views.summit',
+                args=(summit.name,)
+            )
+        )
     else:
         try:
-            participant = Participant.objects.get(attendee=attendee, meeting=meeting)
+            participant = Participant.objects.get(
+                attendee=attendee,
+                meeting=meeting
+            )
         except Participant.DoesNotExist:
             participant = Participant(attendee=attendee, meeting=meeting)
-        
+
         if request.method == 'POST':
-            form = OrganizerChangeAttend(data=request.POST, instance=participant)
+            form = OrganizerChangeAttend(
+                data=request.POST,
+                instance=participant
+            )
             if form.is_valid():
                 form.save()
-                return HttpResponseRedirect(reverse('summit.schedule.views.attendee_review', args=(summit.name, meeting.id, meeting.name)))
+                return HttpResponseRedirect(
+                    reverse(
+                        'summit.schedule.views.attendee_review',
+                        args=(summit.name, meeting.id, meeting.name)
+                    )
+                )
         else:
             form = OrganizerChangeAttend(instance=participant)
 
@@ -784,11 +1059,22 @@
 
 
 @summit_attendee_required
-def delete_meeting_confirm(request, summit, attendee, meeting_id, meeting_slug):
+def delete_meeting_confirm(
+    request,
+    summit,
+    attendee,
+    meeting_id,
+    meeting_slug
+):
     meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
-    
+
     if not attendee.user in summit.schedulers.all() and not attendee.user.has_perm('schedule.change_agenda'):
-        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+        return HttpResponseRedirect(
+            reverse(
+                'summit.schedule.views.summit',
+                args=(summit.name,)
+            )
+        )
 
     context = {
         'summit': summit,
@@ -801,18 +1087,29 @@
 
 @summit_attendee_required
 def delete_meeting(request, summit, attendee, meeting_id, meeting_slug):
-    meeting = get_object_or_404(summit.meeting_set, pk = meeting_id)
+    meeting = get_object_or_404(summit.meeting_set, pk=meeting_id)
     if not attendee.user in summit.schedulers.all() and not attendee.user.has_perm('schedule.change_agenda'):
-        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+        return HttpResponseRedirect(
+            reverse(
+                'summit.schedule.views.summit',
+                args=(summit.name,)
+            )
+        )
     else:
         meeting.approved = 'REMOVED'
         meeting.save()
         meeting.agenda_set.all().delete()
-        return HttpResponseRedirect(reverse('summit.schedule.views.delete_confirmed', args=(summit.name,)))
+        return HttpResponseRedirect(
+            reverse(
+                'summit.schedule.views.delete_confirmed',
+                args=(summit.name,)
+            )
+        )
+
 
 def delete_confirmed(request, summit_name):
     summit = get_object_or_404(Summit, name=summit_name)
-    
+
     context = {
         'summit': summit
     }

=== modified file 'summit/urls.py'
--- summit/urls.py	2012-10-26 09:32:11 +0000
+++ summit/urls.py	2013-02-22 01:25:24 +0000
@@ -16,7 +16,6 @@
 
 from django.conf.urls.defaults import *
 from django.conf import settings
-import ubuntu_website
 
 from common.views import login_failure
 
@@ -24,13 +23,15 @@
 admin.autodiscover()
 
 
-urlpatterns = patterns('',
+urlpatterns = patterns(
+    '',
     (r'^$', 'summit.common.views.index'),
     (r'^admin/', admin.site.urls),
     (r'^api/', include('services.urls')),
 )
 
-urlpatterns += patterns('django_openid_auth.views',
+urlpatterns += patterns(
+    'django_openid_auth.views',
     url(r'^openid/login/$', 'login_begin', name='openid-login',
         kwargs={'render_failure': login_failure}),
     url(r'^openid/complete/$', 'login_complete', name='openid-complete',
@@ -38,19 +39,17 @@
     url(r'^openid/logo.gif$', 'logo', name='openid-logo'),
 )
 
-urlpatterns += patterns('summit.sponsor.views',
+urlpatterns += patterns(
+    'summit.sponsor.views',
     (r'^(?P<summit_name>[\w-]+)/sponsorship/$', 'sponsorship'),
     (r'^(?P<summit_name>[\w-]+)/sponsorship/done/$', 'done'),
     (r'^(?P<summit_name>[\w-]+)/sponsorship/review/$', 'review_list'),
-
     (r'^(?P<summit_name>[\w-]+)/suggestsponsorship/$', 'suggestsponsorship'),
     (r'^(?P<summit_name>[\w-]+)/suggestsponsorship/done/$', 'suggestiondone'),
-
     (r'^(?P<summit_name>[\w-]+)/nonlaunchpadsponsorship/$',
         'nonlaunchpadsponsorship'),
     (r'^(?P<summit_name>[\w-]+)/nonlaunchpadsponsorship/done/$',
         'nonlaunchpaddone'),
-
     (r'^(?P<summit_name>[\w-]+)/sponsorship/review/(?P<sponsorship_id>[0-9]+)$',
         'review'),
     (r'^(?P<summit_name>[\w-]+)/suggestedsponsorship/review/(?P<sponsorship_id>[0-9]+)$',
@@ -61,7 +60,8 @@
     (r'^(?P<summit_name>[\w-]+)/sponsorship/export/$', 'export'),
 )
 
-urlpatterns += patterns('summit.schedule.views',
+urlpatterns += patterns(
+    'summit.schedule.views',
     url(r'^today/(?P<summit_name>[\w-]+)/$', 'today_view', name='today'),
     url(r'^past/', 'past', name='past'),
     url(r'^logout$', 'logout_view', name='logout'),
@@ -69,42 +69,66 @@
     (r'^(?P<summit_name>[\w-]+)/mobile/$', 'mobile'),
     (r'^(?P<summit_name>[\w-]+)/search/$', 'search'),
     (r'^(?P<summit_name>[\w-]+)/propose_meeting/$', 'propose_meeting'),
-    (r'^(?P<summit_name>[\w-]+)/edit_meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'edit_meeting'),
+    (r'^(?P<summit_name>[\w-]+)/edit_meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$',
+     'edit_meeting'),
     (r'^(?P<summit_name>[\w-]+)/review/$', 'review_pending'),
-    (r'^(?P<summit_name>[\w-]+)/review_meeting/(?P<meeting_id>\d+)/$', 'meeting_review'),
-    (r'^(?P<summit_name>[\w-]+)/attend_meeting/(?P<meeting_id>\d+)/$', 'attend_meeting'),
-    (r'^(?P<summit_name>[\w-]+)/edit_attendee/(?P<meeting_id>\d+)/(?P<username>[%+\.\w-]+)/$', 'organizer_edit_attendees'),
+    (r'^(?P<summit_name>[\w-]+)/review_meeting/(?P<meeting_id>\d+)/$',
+     'meeting_review'),
+    (r'^(?P<summit_name>[\w-]+)/attend_meeting/(?P<meeting_id>\d+)/$',
+     'attend_meeting'),
+    (r'^(?P<summit_name>[\w-]+)/edit_attendee/(?P<meeting_id>\d+)/(?P<username>[%+\.\w-]+)/$',
+     'organizer_edit_attendees'),
     (r'^(?P<summit_name>[\w-]+)/create_meeting/$', 'create_meeting'),
-    (r'^(?P<summit_name>[\w-]+)/edit_mtg/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'organizer_edit_meeting'),
-    (r'^(?P<summit_name>[\w-]+)/confirm_del_mtg/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'delete_meeting_confirm'),
-    (r'^(?P<summit_name>[\w-]+)/del_mtg/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'delete_meeting'),
+    (r'^(?P<summit_name>[\w-]+)/edit_mtg/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$',
+     'organizer_edit_meeting'),
+    (r'^(?P<summit_name>[\w-]+)/hangout/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$',
+     'edit_meeting_hangout'),
+    (r'^(?P<summit_name>[\w-]+)/confirm_del_mtg/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$',
+     'delete_meeting_confirm'),
+    (r'^(?P<summit_name>[\w-]+)/del_mtg/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$',
+     'delete_meeting'),
     (r'^(?P<summit_name>[\w-]+)/deleted/$', 'delete_confirmed'),
-    (r'^(?P<summit_name>[\w-]+)/attendee_review/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'attendee_review'),
+    (r'^(?P<summit_name>[\w-]+)/attendee_review/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$',
+     'attendee_review'),
     (r'^(?P<summit_name>[\w-]+)/tracks$', 'tracks'),
     (r'^(?P<summit_name>[\w-]+)/next$', 'next_session'),
     (r'^(?P<summit_name>[\w-]+)/next_table$', 'next_table'),
-    (r'^(?P<summit_name>[\w-]+)/(?P<username>[%+\.\w-]+)/meetings$', 'created_meetings'),
+    (r'^(?P<summit_name>[\w-]+)/(?P<username>[%+\.\w-]+)/meetings$',
+     'created_meetings'),
     (r'^(?P<summit_name>[\w-]+)/(?P<date>[\d-]+)/$', 'daily_schedule'),
     (r'^(?P<summit_name>[\w-]+)/(?P<date>[\d-]+)/display$', 'by_date'),
     (r'^(?P<summit_name>[\w-]+)/(?P<room_name>[%+\.\w-]+)/$', 'by_room'),
-    (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[%+\.\w-]+)/$', 'by_track'),
-    (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/\+share$', 'share_meeting'),
-    (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/\+register', 'register'),
-    (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/\+unregister', 'unregister'),
-    (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'meeting'),
-    (r'^(?P<summit_name>[\w-]+)/private/(?P<private_key>[0-9a-f]{32})/(?P<meeting_slug>[%+\.\w-]+)/$', 'private_meeting'),
-    (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/copy/$', 'meeting_copy'),
+    (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[%+\.\w-]+)/$',
+     'by_track'),
+    (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/\+share$',
+     'share_meeting'),
+    (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/\+register',
+     'register'),
+    (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/\+unregister',
+     'unregister'),
+    (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$',
+     'meeting'),
+    (r'^(?P<summit_name>[\w-]+)/private/(?P<private_key>[0-9a-f]{32})/(?P<meeting_slug>[%+\.\w-]+)/$',
+     'private_meeting'),
+    (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/copy/$',
+     'meeting_copy'),
     (r'^(?P<summit_name>[\w-]+)\.csv$', 'csv'),
     (r'^(?P<summit_name>[\w-]+)\.ical$', 'ical'),
-    (r'^(?P<summit_name>[\w-]+)/participant/(?P<username>[%+\.\w-]+)/$', 'by_participant'),
-    (r'^(?P<summit_name>[\w-]+)/participant/my_schedule_(?P<secret_key>[0-9a-f]{32})\.ical$', 'user_private_ical'),
-    (r'^(?P<summit_name>[\w-]+)/participant/(?P<username>[%+\.\w-]+)\.ical$', 'user_ical'),
-    (r'^(?P<summit_name>[\w-]+)/room/(?P<room_name>[%+\.\w-]+).ical$', 'room_ical'),
-    (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[%+\.\w-]+).ical$', 'track_ical'),
+    (r'^(?P<summit_name>[\w-]+)/participant/(?P<username>[%+\.\w-]+)/$',
+     'by_participant'),
+    (r'^(?P<summit_name>[\w-]+)/participant/my_schedule_(?P<secret_key>[0-9a-f]{32})\.ical$',
+     'user_private_ical'),
+    (r'^(?P<summit_name>[\w-]+)/participant/(?P<username>[%+\.\w-]+)\.ical$',
+     'user_ical'),
+    (r'^(?P<summit_name>[\w-]+)/room/(?P<room_name>[%+\.\w-]+).ical$',
+     'room_ical'),
+    (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[%+\.\w-]+).ical$',
+     'track_ical'),
 )
 
 if settings.DEBUG or settings.SERVE_STATIC:
-    urlpatterns += patterns('',
+    urlpatterns += patterns(
+        '',
         (r'^media/(?P<path>.*)$', 'django.views.static.serve',
             {'document_root': settings.MEDIA_ROOT}),
         (r'^(robots.txt)$', 'django.views.static.serve',