Merge lp:~cjohnston/summit/new-meeting-stuff into lp:summit

[Chris Johnston]

[lp:~cjohnston/summit/new-meeting-stuff]

303. By Chris Johnston on 2012-03-07

Fix conflict from production

304. By Chris Johnston on 2012-03-07

[r=mhall119] Adds django sites to summit to allow for multiple different unique sites

305. By Chris Johnston on 2012-03-07

Version 1.0.6 Release

306. By Chris Johnston on 2012-03-08

[r=mhall119] Reverses the order of the past summits so that newest appears first.

307. By Chris Johnston on 2012-03-08

[r=mhall119] This adds theme support to Summit to allow LC and UDS to have separate themes, as well as add a menu app that will allow each site to have it's own menu without having to mess with templates.

308. By Chris Johnston on 2012-03-08

Version 1.0.7 release

309. By Chris Johnston on 2012-03-08

[r=mhall119] Fixes errors created in a previous merge that I failed to catch before pushing.

310. By Chris Johnston on 2012-03-11

Updating docs to reflect sites

311. By Chris Johnston on 2012-03-17

Fixes most theme issues

312. By Chris Johnston on 2012-03-17

Resolve conflicts

=== modified file '.bzrignore'
--- .bzrignore	2011-11-30 17:46:39 +0000
+++ .bzrignore	2012-03-17 19:42:19 +0000
@@ -10,3 +10,5 @@
 www
 README
 env
+ubuntu_settings.py
+django.wsgi

=== modified file 'summit/common/templates/base.html'
--- summit/common/templates/base.html	2012-03-17 19:42:19 +0000
+++ summit/common/templates/base.html	2012-03-17 19:42:19 +0000
@@ -21,7 +21,7 @@
   <link rel="stylesheet" type="text/css" media="screen" href="/media/css/layout.css" /> 
   <link rel="stylesheet" type="text/css" media="screen" href="/media/css/style.css" />  
   <link rel="stylesheet" type="text/css" media="screen" href="/media/css/twidenash.css" /> 
-  {% block 960css %}<link rel="stylesheet" type="text/css" href="{{ubuntu_website_media}}/css/960.css" />{% endblock %}
+  {% block 960css %}<!--<link rel="stylesheet" type="text/css" href="{{ubuntu_website_media}}/css/960.css" />-->{% endblock %}
 {% block head %}
   <script type="text/javascript">
     var _gaq = _gaq || [];
@@ -53,27 +53,13 @@
     {% endif %}
 {% endblock %}
 {% block main_nav_links %}
-<!--
-    <a class="main-nav-item" href="http://uds.ubuntu.com/travel/" title="Travel">Travel</a>
-    {% if next_summit %}
-        <a class="main-nav-item {% ifequal url_base next_summit.name %}current{% endifequal %}" href="{% url summit.schedule.views.summit next_summit.name %}" title="Schedule">Schedule</a>
-    {% else %}
-        <a class="main-nav-item {% ifequal url_base next_summit.name %}current{% endifequal %}" href="{% url summit.common.views.index %}" title="Schedule">Schedule</a>
-    {% endif %}
-    <a class="main-nav-item" href="http://uds.ubuntu.com/participate/" title="Participate">Participate</a>
-    <a class="main-nav-item" href="http://uds.ubuntu.com/social/" title="Social">Social</a>
-    <a class="main-nav-item" href="http://uds.ubuntu.com/uds-sponsors/" title=Sponsors">Sponsors</a>
-    <a class="main-nav-item" href="http://connect.linaro.org/events/event/linaro-connect-q112/" title="Linaro @ UDS">Linaro Connect</a>
-    {% if next_summit %}
-        <a class="main-nav-item {% ifequal url_base 'today' %}current{% endifequal %}" href="{% url summit.schedule.views.today_view next_summit.name %}" title="Today">Today</a>
-    {% endif %}
-
--->
     {% load menubuilder %}
     {% menu main_menu %}
+    <ul class="clearfix">
     {% for item in menuitems %}
-        <a class="main-nav-item" href="{{ item.url }}" title="{{ item.title|escape }}"{% if item.current %} class='current'{% endif %}>{{ item.title }}</a>
+        <li{% if item.current %} class='active'{% endif %}><a class="main-nav-item" href="{{ item.url }}" title="{{ item.title|escape }}">{{ item.title }}</a></li>
     {% endfor %}
+    </ul>
 {% endblock %}
 
 {% block search %}{% endblock %}
@@ -89,16 +75,7 @@
 	  {% endfor %}
 	{% endif %}
 {% endblock %}
-{% block side_bar %}
-	<div id="side_bar">
-		<div id="side_bar_links_container">
-		<h3>Management Menu</h3>
-		{% block side_bar_links %}{% endblock %}
-		<!-- Concept 1: indented div <div style="padding: 2px 8px 0px 8px;font-size:medium"><a href="ubuntu.com">Create a Private Meeting</a></div>  -->
-		<!-- Concept 2: list element <li><a href="ubuntu.com">Create a Private Meeting</a></li> -->
-		<li><a href="ubuntu.com">Create a Private Meeting</a></li>
-		</div>
-	</div>
+{% block side_bar_links %}
 {% endblock %}
 
 {% block content %}
@@ -109,9 +86,9 @@
 
 {% block footer %}
     <div class="copyright">
-        &copy; 2008-{% now "Y" %} Canonical Ltd., Ubuntu Community. Ubuntu is a registered trademark of Canonical Ltd.<br />
-        Problems with Summit? <a href="https://bugs.launchpad.net/summit/+filebug">File a Bug</a><br />
-        Summit {{ summit_version }}
+        <p>&copy; 2008-{% now "Y" %} Canonical Ltd., Ubuntu Community. Ubuntu is a registered trademark of Canonical Ltd.</p>
+        <p>Problems with Summit? <a href="https://bugs.launchpad.net/summit/+filebug">File a Bug &rsaquo;</a></p>
+        <p>Summit {{ summit_version }}</p>
     </div>
 {% endblock %}
 

=== modified file 'summit/common/templates/common/index.html'
--- summit/common/templates/common/index.html	2012-01-28 11:37:36 +0000
+++ summit/common/templates/common/index.html	2012-03-17 19:42:19 +0000
@@ -24,10 +24,12 @@
 {% endblock %}
 
 {% block sub_nav %}{% endblock %}
+{% block side_bar %}{% endblock %}
 {% block content %}
-<article class="minor-content">
+<div class="row">
+<article class="span-12">
     {% if summit %}
-    <h1><a href="/{{ summit.name }}">{{ summit.title }}</a></h1>
+    <h1><a href="/{{ summit.name }}">{{ summit.title }} &rsaquo;</a></h1>
     <p>
       {% include "schedule/summit_info.html" %}
     </p>
@@ -35,4 +37,5 @@
     <p>No summits registered.</p>
     {% endif %}
 </article>
+</div>
 {% endblock %}

=== modified file 'summit/django.wsgi'
--- summit/django.wsgi	2012-03-06 22:20:05 +0000
+++ summit/django.wsgi	2012-03-17 19:42:19 +0000
@@ -1,9 +1,8 @@
 import os
 import sys
 
-sys.path.insert(0,'/srv/django-1.3')
-sys.path.append('/srv/summit.ubuntu.com')
-sys.path.append('/srv/summit.ubuntu.com/summit')
+sys.path.append('/srv/summit')
+sys.path.append('/srv/summit/summit')
 os.environ['DJANGO_SETTINGS_MODULE'] = 'ubuntu_settings'
 
 import django.core.handlers.wsgi

=== modified file 'summit/schedule/admin/meetingadmin.py'
--- summit/schedule/admin/meetingadmin.py	2012-02-06 04:57:02 +0000
+++ summit/schedule/admin/meetingadmin.py	2012-03-17 19:42:19 +0000
@@ -140,7 +140,7 @@
 
     fieldsets = (
         (None, {
-            'fields': ('summit', 'name', 'title', 'description',
+            'fields': ('summit', 'name', 'title', 'description', 'approved',
                        'type', 'tracks', 'topics', 'requires_dial_in', 'video'),
         }),
         ("References", {

=== added file 'summit/schedule/autoslug.py'
--- summit/schedule/autoslug.py	1970-01-01 00:00:00 +0000
+++ summit/schedule/autoslug.py	2012-03-17 19:42:19 +0000
@@ -0,0 +1,79 @@
+from django.template.defaultfilters import slugify
+
+class AutoSlugMixin(object):
+    """
+    Automatically set slug to slugified version of the name if left empty.
+    Use this as follows::
+
+        class MyModel(AutoSlugMixin, models.Model):
+            def save(self):
+                super(MyModel, self).save()
+
+                self.update_slug()
+
+    The name of the slug field and the field to populate from can be set
+    using the `_slug_from` and `_slug_field` properties.
+
+    The big advantage of this method of setting slugs over others
+    (ie. django-autoslug) is that we can set the value of slugs
+    automatically based on the value of a field of an a field with a foreign
+    key relation. For example::
+
+        class MyModel(AutoSlugMixin, models.Model):
+            slug = models.SlugField()
+
+            def generate_slug(self):
+                qs = self.mymodeltranslation_set.all()[:1]
+                if qs.exists():
+                    return qs[0].name
+                else:
+                    return ''
+
+        class MyModelTranslation(models.Model):
+            parent = models.ForeignKey(MyModel)
+            name = models.CharField()
+
+            def save(self):
+                super(MyModel, self).save()
+
+                self.parent.update_slug()
+
+        (The code above is untested and _might_ be buggy.)
+
+    """
+    _slug_from = 'title'
+    _slug_field = 'name'
+
+    def slugify(self, name):
+        return slugify(name)
+
+    def generate_slug(self):
+        name = getattr(self, self._slug_from)
+        return self.slugify(name)
+
+    def update_slug(self, commit=True):
+        if not getattr(self, self._slug_field) and \
+               getattr(self, self._slug_from):
+            setattr(self, self._slug_field, self.generate_slug())
+
+            if commit:
+                self.save()
+
+
+class AutoUniqueSlugMixin(AutoSlugMixin):
+    """ Make sure that the generated slug is unique. """
+
+    def is_unique_slug(self, slug):
+        qs = self.__class__.objects.filter(**{self._slug_field: slug})
+        return not qs.exists()
+
+    def generate_slug(self):
+        original_slug = super(AutoUniqueSlugMixin, self).generate_slug()
+        slug = original_slug
+
+        iteration = 1
+        while not self.is_unique_slug(slug):
+            slug = "%s-%d" % (original_slug, iteration)
+            iteration += 1
+
+        return slug

=== modified file 'summit/schedule/forms.py'
--- summit/schedule/forms.py	2012-01-25 21:20:09 +0000
+++ summit/schedule/forms.py	2012-03-17 19:42:19 +0000
@@ -37,6 +37,67 @@
             obj.user.first_name, obj.user.last_name, obj.user.username)
 
 
+class MeetingFormBase(forms.ModelForm):
+    participants = MultipleAttendeeField(
+        queryset=Attendee.objects.all,
+        widget=forms.CheckboxSelectMultiple,
+        label='Participants',
+        required=False)
+
+    class Media:
+        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:
+            if kwargs['instance'].pk is not None:
+                # We get the 'initial' keyword argument or initialize it
+                # as a dict if it didn't exist.
+                initial = kwargs.setdefault('initial', {})
+                # The widget for a ModelMultipleChoiceField expects
+                # a list of primary key for the selected data.
+                initial['participants'] = [
+                    attendee.pk
+                    for attendee in kwargs['instance'].participants.all()]
+
+        super(MeetingFormBase, self).__init__(*args, **kwargs)
+
+        summit = self.instance.summit
+        self.fields['participants'].queryset = Attendee.objects.filter(
+            summit=summit).order_by('user__first_name',
+                                    'user__last_name',
+                                    'user__username')
+
+    def save(self, commit=True):
+        instance = super(MeetingFormBase, self).save(commit)
+
+        # Prepare a 'save_m2m' method for the form,
+        if 'save_m2m' in dir(self):
+            old_save_m2m = self.save_m2m
+        else:
+            old_save_m2m = None
+        def save_m2m():
+            if old_save_m2m is not None:
+                old_save_m2m()
+            # This is where we actually link the pizza with toppings
+            instance.participants.clear()
+            for participant in self.cleaned_data['participants']:
+                record = Participant(meeting=instance, attendee=participant,
+                                     required=True)
+                record.save()
+        self.save_m2m = save_m2m
+
+        # Do we need to save all changes now?
+        if commit:
+            instance.save()
+            self.save_m2m()
+
+        return instance
+
 class PrivateMeetingFormBase(forms.ModelForm):
     participants = MultipleAttendeeField(
         queryset=Attendee.objects.all,
@@ -98,16 +159,33 @@
 
         return instance
 
-
 class CreatePrivateMeeting(PrivateMeetingFormBase, RenderableMixin):
     class Meta:
         model = Meeting
-        fields = ('name', 'title', 'description', 'spec_url', 'wiki_url',
+        fields = ('title', 'description', 'tracks', 'spec_url', 'wiki_url',
                   'pad_url', 'requires_dial_in')
 
 
 class EditPrivateMeeting(PrivateMeetingFormBase, RenderableMixin):
     class Meta:
         model = Meeting
-        fields = ('title', 'description', 'spec_url', 'wiki_url', 'pad_url',
-                  'requires_dial_in')
+        fields = ('title', 'description', 'tracks', 'spec_url', 'wiki_url', 'pad_url',
+                  'requires_dial_in')
+
+class ProposeMeeting(PrivateMeetingFormBase, RenderableMixin):
+    class Meta:
+        model = Meeting
+        fields = ('title', 'description', 'tracks', 'spec_url', 'wiki_url',
+                  'pad_url', 'requires_dial_in')
+
+
+class EditMeeting(PrivateMeetingFormBase, RenderableMixin):
+    class Meta:
+        model = Meeting
+        fields = ('title', 'description', 'tracks', 'spec_url', 'wiki_url', 'pad_url',
+                  'requires_dial_in')
+
+class MeetingReview(forms.ModelForm, RenderableMixin):
+    class Meta:
+        model = Meeting
+        fields = ('approved',)

=== added file 'summit/schedule/migrations/0017_add_review_status.py'
--- summit/schedule/migrations/0017_add_review_status.py	1970-01-01 00:00:00 +0000
+++ summit/schedule/migrations/0017_add_review_status.py	2012-03-17 19:42:19 +0000
@@ -0,0 +1,204 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'Meeting.approved'
+        db.add_column('schedule_meeting', 'approved', self.gf('django.db.models.fields.CharField')(default='PENDING', max_length=10, null=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'Meeting.approved'
+        db.delete_column('schedule_meeting', 'approved')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'ordering': "['username']", 'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'schedule.agenda': {
+            'Meta': {'ordering': "('slot', 'room')", 'unique_together': "(('slot', 'room'),)", 'object_name': 'Agenda'},
+            'auto': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
+            'room': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Room']"}),
+            'slot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Slot']"})
+        },
+        'schedule.attendee': {
+            'Meta': {'ordering': "('user__username', 'summit')", 'object_name': 'Attendee'},
+            'crew': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_column': "'crew'"}),
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'secret_key_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'schedule.attendeebusy': {
+            'Meta': {'ordering': "('attendee', 'start_utc', 'end_utc')", 'object_name': 'AttendeeBusy'},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Attendee']"}),
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
+        },
+        'schedule.crew': {
+            'Meta': {'ordering': "('date_utc', 'attendee')", 'object_name': 'Crew'},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'crew_schedule'", 'to': "orm['schedule.Attendee']"}),
+            'date_utc': ('django.db.models.fields.DateField', [], {'db_column': "'date'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'schedule.lead': {
+            'Meta': {'ordering': "('summit', 'track')", 'object_name': 'Lead'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lead': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'lead'", 'to': "orm['schedule.Attendee']"}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'track': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Track']"})
+        },
+        'schedule.meeting': {
+            'Meta': {'object_name': 'Meeting'},
+            'approved': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '10', 'null': 'True'}),
+            'approver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'approver_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'assignee': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'assignee_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
+            'drafter': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'drafter_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '100'}),
+            'pad_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'participants': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Attendee']", 'symmetrical': 'False', 'through': "orm['schedule.Participant']", 'blank': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'private': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'private_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'requires_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'scribe': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scribe_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'slots': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'spec_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'blueprint'", 'max_length': '15'}),
+            'video': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'schedule.participant': {
+            'Meta': {'ordering': "('meeting', 'attendee', 'required')", 'object_name': 'Participant'},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}),
+            'from_launchpad': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'schedule.room': {
+            'Meta': {'ordering': "('summit', 'name')", 'object_name': 'Room'},
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'end'", 'blank': 'True'}),
+            'has_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icecast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
+            'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'start'", 'blank': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
+        },
+        'schedule.roombusy': {
+            'Meta': {'ordering': "('room', 'start_utc', 'end_utc')", 'object_name': 'RoomBusy'},
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'room': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Room']"}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
+        },
+        'schedule.slot': {
+            'Meta': {'ordering': "('summit', 'start_utc', 'end_utc')", 'object_name': 'Slot'},
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
+        },
+        'schedule.summit': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Summit'},
+            'date_end': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            'date_start': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
+            'etherpad': ('django.db.models.fields.URLField', [], {'default': "'http://pad.ubuntu.com/'", 'max_length': '75'}),
+            'hashtag': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_update': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'managers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'managers'", 'blank': 'True', 'to': "orm['auth.User']"}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
+            'qr': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}),
+            'schedulers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'schedulers'", 'blank': 'True', 'to': "orm['auth.User']"}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "u'sponsor'", 'max_length': '10'}),
+            'timezone': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'schedule.summitsprint': {
+            'Meta': {'ordering': "('summit', 'import_url')", 'object_name': 'SummitSprint'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'import_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sprint_set'", 'to': "orm['schedule.Summit']"})
+        },
+        'schedule.topic': {
+            'Meta': {'ordering': "('summit', 'title')", 'object_name': 'Topic'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'schedule.track': {
+            'Meta': {'ordering': "('summit', 'title', 'slug')", 'object_name': 'Track'},
+            'allow_adjacent_sessions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'color': ('django.db.models.fields.CharField', [], {'default': "'FFFFFF'", 'max_length': '6'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['schedule']

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2012-01-27 12:35:43 +0000
+++ summit/schedule/models/meetingmodel.py	2012-03-17 19:42:19 +0000
@@ -32,12 +32,14 @@
 from summit.schedule.models.topicmodel import Topic
 from summit.schedule.models.attendeemodel import Attendee
 
+from summit.schedule.autoslug import AutoSlugMixin
+
 __all__ = (
     'Meeting',
 )
 
 
-class Meeting(models.Model):
+class Meeting(AutoSlugMixin, models.Model):
 
     class SchedulingError(Exception):
         pass
@@ -69,6 +71,12 @@
         (90, u'Essential'),
     )
 
+    REVIEW_CHOICES = (
+        (u'PENDING', u'Pending'),
+        (u'APPROVED', u'Approved'),
+        (u'DECLINED', u'Declined'),
+    )
+
     summit = models.ForeignKey(Summit)
     name = NameField(max_length=100, help_text="Lowercase alphanumeric characters and dashes only.")
     title = models.CharField(max_length=100, help_text="Alphanumeric characters and spaces are allowed")
@@ -90,6 +98,8 @@
     pad_url = models.URLField(verify_exists=False,
                                verbose_name="Pad URL", null=True, blank=True)
     slots = models.IntegerField(default=1)
+    approved = models.CharField(max_length=10, choices=REVIEW_CHOICES,
+                              null=True, default='PENDING')
     private = models.BooleanField(default=False)
     private_key = models.CharField(max_length=32, null=True, blank=True)
 
@@ -112,6 +122,10 @@
     class Meta:
         app_label = 'schedule'
 
+    def save(self):
+        super(Meeting, self).save()
+        self.update_slug()
+
     def share(self):
         if not self.pk or not self.private:
             return

=== modified file 'summit/schedule/templates/schedule/create_private.html'
--- summit/schedule/templates/schedule/create_private.html	2012-01-25 22:42:54 +0000
+++ summit/schedule/templates/schedule/create_private.html	2012-03-17 19:42:19 +0000
@@ -25,7 +25,7 @@
 
 
 {% block content %}
-
+{% block side_bar %}{% endblock %}
     <article id="form" class="main-content">
         {% if form.errors %}
             <p style="color: red;">

=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html	2012-03-05 01:31:47 +0000
+++ summit/schedule/templates/schedule/daily.html	2012-03-17 19:42:19 +0000
@@ -158,14 +158,15 @@
 
 {% block sub_nav_links %}
 {% if ical %}
-<a class="sub-nav-item" href="{{ ical }}">iCal Feed</a>
+<li><a class="sub-nav-item" href="{{ ical }}">iCal Feed</a></li>
 {% endif %}
-<a class="sub-nav-item" href="{% url mobile %}">Mobile</a>
-<a class="sub-nav-item" href="display">Wide Display</a>
+<li><a class="sub-nav-item" href="{% url mobile %}">Mobile</a></li>
+<li><a class="sub-nav-item" href="display">Wide Display</a></li>
 {% endblock %}
 
 {% block content %}
-<article class="main-content">
+<div class="row">
+<article class="span-12">
 
 <div class="schedule-head">
 {% if summit.qr %}
@@ -180,7 +181,7 @@
 </div>
 
 {% for slot, meetings in schedule.items %}
-<table  class="basic">
+<table class="basic">
 <thead><tr><th colspan="2">{{slot.start.time|strftime:"%H:%M"}} - {{slot.end.time|strftime:"%H:%M"}} {% ifequal slot.type 'plenary' %}[PLENARY]{% endifequal %}</th></tr></thead>
 <tbody>
 {% if slot.type == 'lunch' %}
@@ -245,7 +246,7 @@
 </table>
 {% endfor %}
 
-<br /><br /><br /><br />
+</div>
 </article>
 
 <script>

=== added file 'summit/schedule/templates/schedule/edit_meeting.html'
--- summit/schedule/templates/schedule/edit_meeting.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/edit_meeting.html	2012-03-17 19:42:19 +0000
@@ -0,0 +1,45 @@
+{% extends "base.html" %}
+
+{% block page_name %}Edit Meeting - {{ 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 extrafooter %}
+<script type="text/javascript"><!--
+$(document).ready(function(){
+    $('span[rel*=help]').colorTip({color:'orange'});
+});
+--></script>
+<style>
+ul {
+  height: 12em;
+  overflow-y: scroll;
+  overflow-x: hidden;
+}
+</style>
+{% endblock %}
+
+
+{% block content %}
+{% block side_bar %}{% endblock %}
+    <article id="form" class="main-content">
+        {% 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>
+                <legend>Edit Meeting</legend>
+                {{ form.as_template }}
+            </fieldset>
+                {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
+                <input type="submit" name="submit" value="Save" class="submit-button" /> 
+        </form>
+    </article>
+{% endblock %}

=== modified file 'summit/schedule/templates/schedule/edit_private.html'
--- summit/schedule/templates/schedule/edit_private.html	2012-01-25 22:42:54 +0000
+++ summit/schedule/templates/schedule/edit_private.html	2012-03-17 19:42:19 +0000
@@ -25,7 +25,7 @@
 
 
 {% block content %}
-
+{% block side_bar %}{% endblock %}
     <article id="form" class="main-content">
         {% if form.errors %}
             <p style="color: red;">

=== modified file 'summit/schedule/templates/schedule/meeting.html'
--- summit/schedule/templates/schedule/meeting.html	2012-02-07 15:13:43 +0000
+++ summit/schedule/templates/schedule/meeting.html	2012-03-17 19:42:19 +0000
@@ -24,27 +24,32 @@
 {% block sub_nav_links %}
     {% if meeting.private %}
     {% if meeting.private_key and meeting.private_key != '' %}
-    <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><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 %}
-    <a class="sub-nav-item" href="{% url summit.schedule.views.meeting meeting.summit.name, meeting.id, meeting.name|default:'-' %}+share">Share Meeting</a>
+    <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 %}
-    <a class="sub-nav-item" href="{% url summit.schedule.views.edit_private summit.name, meeting.id, meeting.name|default:'-' %}">Edit Meeting</a>
+    <li><a class="sub-nav-item" href="{% url summit.schedule.views.edit_private summit.name, meeting.id, meeting.name|default:'-' %}">Edit Meeting</a></li>
+    {% else %}
+    <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 %}
     {% if user_is_attending %}
         {% if user_is_participating %}
-        <a class="sub-nav-item" href="{% url summit.schedule.views.unregister meeting.summit.name, meeting.id, meeting.name|default:'-' %}">Skip this meeting</a>
+        <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 %}
-            <a class="sub-nav-item" href="{{ meeting.spec_url }}/+subscribe">Subscribe to Blueprint</a>
+            <li><a class="sub-nav-item" href="{{ meeting.spec_url }}/+subscribe">Subscribe to Blueprint</a></li>
         {% endif %}
-        <a class="sub-nav-item" href="{% url summit.schedule.views.register meeting.summit.name, meeting.id, meeting.name|default:'-' %}">Attend this meeting</a>
-    {% endif %}
-    {% if meeting.spec_url %}<a class="sub-nav-item" href="{{ meeting.spec_url }}">Blueprint</a>{% endif %}
+        <li><a class="sub-nav-item" href="{% url summit.schedule.views.register meeting.summit.name, meeting.id, meeting.name|default:'-' %}">Attend this meeting</a></li>
+    {% endif %}
+    {% if meeting.spec_url %}
+        <li><a class="sub-nav-item" href="{{ meeting.spec_url }}">Blueprint</a></li>
+    {% endif %}
 {% endblock %}
 
 {% block content %}
-<section class="double-side-content">
+<div class="row">
+<section class="span-9">
     <h2>{{ meeting.title }}</h2>
     {% for ai in agenda_items %}
         <h3>{{ ai.slot }} in {{ ai.room.title }}</h3>
@@ -54,9 +59,9 @@
     </div>
 
 </section>
+<article class="span-3 last">
 {% if meeting.private %}
 {% else %}
-<article class="side-content alone">
 <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>
@@ -74,17 +79,22 @@
     <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>
-{% endif %}
-
+</div>
+<div class="row">
+<div class="span-12">
     {% 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" style="float:left;width:60%;">
+    <div id="Attendees" class="span-7">
         <h3>Attendees</h3>
         {% for participant in participants %}
             <a href="http://launchpad.net/~{{ participant.attendee.user }}">{% if participant.required %}<strong>{% endif %}{{ participant.attendee.name }}{% if participant.required %}</strong>{% endif %}</a>{% if not forloop.last %}, {% endif %}
@@ -92,7 +102,7 @@
     </div>
         {% endifnotequal %}
 
-    <div id="Links" style="float:left;width:40%;">
+    <div id="Links" class="span-5 last">
         <h3>Links</h3>
         <ul>
             <li><a href="{{meeting.link_to_pad}}" target="_new">Notes in a separate window</a></li>
@@ -106,4 +116,5 @@
     </div>
 
 </article>
+</div>
 {% endblock %}

=== added file 'summit/schedule/templates/schedule/meeting_review.html'
--- summit/schedule/templates/schedule/meeting_review.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/meeting_review.html	2012-03-17 19:42:19 +0000
@@ -0,0 +1,45 @@
+{% extends "base.html" %}
+
+{% block page_name %}Review Meeting - {{ 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 extrafooter %}
+<script type="text/javascript"><!--
+$(document).ready(function(){
+    $('span[rel*=help]').colorTip({color:'orange'});
+});
+--></script>
+<style>
+ul {
+  height: 12em;
+  overflow-y: scroll;
+  overflow-x: hidden;
+}
+</style>
+{% endblock %}
+
+
+{% block content %}
+{% block side_bar %}{% endblock %}
+    <article id="form" class="main-content">
+        {% 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>
+                <legend>Review Meeting</legend>
+                {{ form.as_template }}
+            </fieldset>
+                {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
+                <input type="submit" name="submit" value="Save" class="submit-button" /> 
+        </form>
+    </article>
+{% endblock %}

=== modified file 'summit/schedule/templates/schedule/mobile.html'
--- summit/schedule/templates/schedule/mobile.html	2012-01-23 01:18:55 +0000
+++ summit/schedule/templates/schedule/mobile.html	2012-03-17 19:42:19 +0000
@@ -5,7 +5,9 @@
 {% block sub_nav %}{% endblock %}
 
 {% block content %}
-<article class="minor-content">
+
+<div class="row">
+<article class="span-12">
 <h1>Mobile Schedule</h1>
 
 <p>For those that have an Android or iPhone we have a new way to access the UDS schedule. We have arranged to have the UDS schedule available on the <a href="http://guidebookapp.com/getit?ref=email">Guidebook</a> software. </p>
@@ -23,4 +25,5 @@
 
 <p>* Use the UDS Wifi as International roaming data rates may apply if you don't.</p>
 </article>
+</div>
 {% endblock %}

=== modified file 'summit/schedule/templates/schedule/nosession.html'
--- summit/schedule/templates/schedule/nosession.html	2011-02-15 03:12:18 +0000
+++ summit/schedule/templates/schedule/nosession.html	2012-03-17 19:42:19 +0000
@@ -14,5 +14,6 @@
 {% endblock %}
 
 {% block content %}
+{% block side_bar %}{% endblock %}
 There are no sessions scheduled for today.
 {% endblock %}

=== modified file 'summit/schedule/templates/schedule/not-attending.html'
--- summit/schedule/templates/schedule/not-attending.html	2012-01-23 01:18:55 +0000
+++ summit/schedule/templates/schedule/not-attending.html	2012-03-17 19:42:19 +0000
@@ -3,6 +3,7 @@
 {% block page_name %}{{ summit.title }}{% endblock %}
 
 {% block content %}
+{% block side_bar %}{% endblock %}
 <h1>{{ summit.title }}</h1>
 {% include "schedule/summit_info.html" %}
 

=== modified file 'summit/schedule/templates/schedule/past_summit.html'
--- summit/schedule/templates/schedule/past_summit.html	2012-01-27 14:36:25 +0000
+++ summit/schedule/templates/schedule/past_summit.html	2012-03-17 19:42:19 +0000
@@ -4,18 +4,20 @@
 {% block page_name %}Previous Summits{%endblock %}
 
 {% block sub_nav_links %}
-    <a class="sub-nav-item" href="{% url summit.schedule.views.summit next_summit.name %}">Current Summit</a>
+    <li><a class="sub-nav-item" href="{% url summit.schedule.views.summit next_summit.name %}">Current Summit</a></li>
 {% endblock %}
 
 {% block content %}
 
-<article class="main-content">
 {% for summit in past_summit reversed %}
-<h1><a href="{% url summit.schedule.views.summit summit.name %} ">{{ summit.title }}</a></h1>
-<p>
-{% include "schedule/summit_info.html" %}
-</p>
+    <div class="row">
+        <article class="span-12">
+            <h1><a href="{% url summit.schedule.views.summit summit.name %} ">{{ summit.title }} &rsaquo;</a></h1>
+            <p>
+                {% include "schedule/summit_info.html" %}
+            </p>
+        </article>
+    </div>
 {% endfor %}
-</article>
 
 {% endblock %}

=== added file 'summit/schedule/templates/schedule/propose_meeting.html'
--- summit/schedule/templates/schedule/propose_meeting.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/propose_meeting.html	2012-03-17 19:42:19 +0000
@@ -0,0 +1,45 @@
+{% extends "base.html" %}
+
+{% block page_name %}Propse a Meeting - {{ 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 extrafooter %}
+<script type="text/javascript"><!--
+$(document).ready(function(){
+    $('span[rel*=help]').colorTip({color:'orange'});
+});
+--></script>
+<style>
+ul {
+  height: 12em;
+  overflow-y: scroll;
+  overflow-x: hidden;
+}
+</style>
+{% endblock %}
+
+
+{% block content %}
+{% block side_bar %}{% endblock %}
+    <article id="form" class="main-content">
+        {% 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>
+                <legend>Propose a Meeting</legend>
+                {{ form.as_template }}
+            </fieldset>
+                {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
+                <input type="submit" name="submit" value="Create" class="submit-button" /> 
+        </form>
+    </article>
+{% endblock %}

=== added file 'summit/schedule/templates/schedule/review.html'
--- summit/schedule/templates/schedule/review.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/review.html	2012-03-17 19:42:19 +0000
@@ -0,0 +1,115 @@
+{% extends "base.html" %}
+
+{% block page_name %}
+Review Proposed Meetings - {{ summit.title }}
+{% endblock %}
+
+{% block head %}
+{% if linaro %}
+    <base target="_blank" />
+{% endif %}
+{{ block.super }}
+<script language="JavaScript">
+
+function show_agenda_details(agenda_id, index_id) {
+    var elem_id = 'agenda-'+agenda_id+'-'+index_id+'-details'
+    var details = document.getElementById(elem_id)
+    details.style.display='block';
+}
+
+function hide_agenda_details(agenda_id, index_id) {
+    var elem_id = 'agenda-'+agenda_id+'-'+index_id+'-details'
+    var details = document.getElementById(elem_id)
+    details.style.display='none';
+}
+
+</script>
+<style>
+TABLE img.icon {
+    vertical-align: bottom;
+    width: 16px;
+    height: 16px;
+}
+
+table.basic span.main-agenda-item-tracks {
+    font-size: 0.8em;
+}
+
+div.agenda-details {
+    display: none;
+    padding: 5px;
+    position: absolute;
+    margin-left: 20px;
+    font-size: 0.9em;
+    color: #FFFFFF;
+    background-color: #101010;
+    border: #000000 1px solid;
+    border-radius: 5px;
+    min-width: 200px;
+    max-width: 500px;
+    z-index: 100;
+}
+
+div.meeting-description {
+    white-space: pre-wrap;
+}
+
+div.agenda-details LI {
+    font-size: 1.0em;
+}
+
+div.schedule-head {
+    position: relative;
+    overflow: visible;
+    z-index: 10;
+}
+
+div.schedule-head .schedule-qrcode {
+    height: 63px;
+    vertical-align: top;
+    margin-left: -3px;
+    margin-top: -3px;
+}
+
+div.schedule-head .schedule-date {
+    font-weight: normal;
+    font-size: 36px;
+    margin-left: 5px;
+}
+
+div.schedule-head .schedule-crew, .last-updated {
+    font-size: 0.7pc;
+}
+
+</style>
+{% endblock %}
+
+{% block sub_nav %}
+{% endblock %}
+
+{% block content %}
+{% block side_bar %}{% endblock %}
+<article class="main-content">
+
+{% for track, meetings in schedule.items %}
+<div class="schedule-head">
+    {{ track.title }}
+</div>
+<table class="basic">
+{% for meeting in meetings %}
+<tr style="background-color: {{ meeting.track_color }}; {% if meeting.private %}border: 1px; border-style: solid; border-color: #FF0000;{% endif %}">
+<td width="75%">
+    <a href="{{ meeting.meeting_page_url }}" style="color: #000000;" class="main-agenda-item-name">
+        {{ meeting.title }}
+    </a>
+</td>
+<td width="25%">
+<a href="{% url summit.schedule.views.meeting_review summit.name meeting.id %}">Status: {{ meeting.get_approved_display }}</a>
+</td>
+</tr>
+{% endfor %}
+</table>
+{% endfor%}
+</article>
+
+{% endblock %}

=== modified file 'summit/schedule/templates/schedule/schedule.html'
--- summit/schedule/templates/schedule/schedule.html	2012-03-07 14:11:34 +0000
+++ summit/schedule/templates/schedule/schedule.html	2012-03-17 19:42:19 +0000
@@ -43,20 +43,20 @@
 
 {% block sub_nav_links %}
 {% if schedule.edit %}
-    <a class="sub-nav-item" href="{{ request.url }}?">Read Only</a>
+    <li><a class="sub-nav-item" href="{{ request.url }}?">Read Only</a></li>
 {% else %}
     {% if can_change_agenda %}
-        <a class="sub-nav-item" href="{{ request.url }}?edit">Edit</a>
+        <li><a class="sub-nav-item" href="{{ request.url }}?edit">Edit</a></li>
     {% endif %}
 {% endif %}
 {% if ical %}
-<a class="sub-nav-item" href="{{ ical }}">iCal Feed</a>
+<li><a class="sub-nav-item" href="{{ ical }}">iCal Feed</a></li>
 {% endif %}
-<a class="sub-nav-item" href="{% url mobile %}">Mobile</a>
+<li><a class="sub-nav-item" href="{% url mobile %}">Mobile</a></li>
 {% endblock %}
 
 {% block content %}
-
+{% block side_bar %}{% endblock %}
 {% if schedule.date %}
     <div class="schedule-head">
     {% if summit.qr %}

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2012-03-07 14:11:34 +0000
+++ summit/schedule/templates/schedule/summit.html	2012-03-17 19:42:19 +0000
@@ -67,60 +67,39 @@
 {% block sub_nav_links %}
 
 {% ifequal summit.state "sponsor" %}
-    <a class="sub-nav-item" href="/{{ summit.name }}/sponsorship">Request Sponsorship</a>
+    <li><a class="sub-nav-item" href="/{{ summit.name }}/sponsorship">Request Sponsorship</a></li>
     {% if perms.sponsor.add_sponsorshipscore %}
-    <a class="sub-nav-item" href="/{{ summit.name }}/suggestsponsorship">Suggest Sponsorship</a>
+    <li><a class="sub-nav-item" href="/{{ summit.name }}/suggestsponsorship">Suggest Sponsorship</a></li>
     {% endif %}
 {% endifequal %}
 
 {% ifequal summit.state "review" %}
     {% if perms.sponsor.add_sponsorshipscore %}
-    <a class="sub-nav-item" href="/{{ summit.name }}/sponsorship/review">Review Sponsorship Requests</a>
+    <li><a class="sub-nav-item" href="/{{ summit.name }}/sponsorship/review">Review Sponsorship Requests</a></li>
     {% endif %}
 {% endifequal %}
 {% if create_meeting %}
-    <a class="sub-nav-item" href="/{{ summit.name }}/create_pm" title="Create Private Meeting">Create Private Meeting</a>
+    <li><a class="sub-nav-item" href="/{{ summit.name }}/create_pm" title="Create Private Meeting">Create Private Meeting</a></li>
 {% endif %}
-    <a class="sub-nav-item" href="/{{ summit.name }}/tracks" title="Tracks">Tracks</a>
-    <a class="sub-nav-item" href="/{{ summit.name }}.ical">All Sessions (iCal)</a>
+    <li><a class="sub-nav-item" href="/{{ summit.name }}/tracks" title="Tracks">Tracks</a></li>
+    <li><a class="sub-nav-item" href="/{{ summit.name }}.ical">All Sessions (iCal)</a></li>
     {% if attendee %}
-    <a class="sub-nav-item" href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">My Sessions (iCal)</a>
+    <li><a class="sub-nav-item" href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">My Sessions (iCal)</a></li>
     {% endif %}
-    <a class="sub-nav-item" href="{% url summit.schedule.views.past %}">Past Summits</a>
+    <li><a class="sub-nav-item" href="{% url summit.schedule.views.past %}">Past Summits</a></li>
 {% endblock %}
 
 {% block content %}
 
-<section class="double-side-content">
+<div class="row">
+<section class="span-9">
     <h1>{{ summit.title }}</h1>
     <p>
         {% include "schedule/summit_info.html" %}
     </p>
-    {% if attendee %}
-        <p>You are attending, you can update the days and times of your attendance in
-            <a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.
-        </p>
-        <p>Download your 
-            <a href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">Participation Schedule</a> to import into your Calendar.
-        </p>
-    {% else %}
-        {% if request.user.is_authenticated %}
-            <p><strong>You are not registered as attending.</strong></p>
-            <p>You can register your attendance in
-                <a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.
-                If you have recently done so, wait a few minutes and reload this page.
-            </p>
-        {% else %}
-            <p><strong>You are not logged in.</strong></p>
-            <p><a href="/openid/login?next={{login_next}}">Log in now</a></p>
-        {% endif %}
-    {% endif %}
-    <p>
-        {% include "schedule/schedule_list.html" %}
-    </p>
 </section>
-<article class="side-content alone">
-    <div class="share">
+<article class="span-3 last">
+    <div class="share alone">
         <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) {
@@ -138,12 +117,40 @@
         <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script>
     </div>
 </article>
+</div>
+<div class="row">
+<section class="span-8">
+    {% if attendee %}
+        <p>You are attending, you can update the days and times of your attendance <ins></ins>
+            <a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.
+        </p>
+        <p>Download your 
+            <a href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">Participation Schedule</a> to import into your Calendar.
+        </p>
+    {% else %}
+        {% if request.user.is_authenticated %}
+            <p><strong>You are not registered as attending.</strong></p>
+            <p>You can register your attendance in
+                <a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}/+attend"><img src="/media/img/gem-sm.png" /> Launchpad</a>.
+                If you have recently done so, wait a few minutes and reload this page.
+            </p>
+        {% else %}
+            <p><strong>You are not logged in.</strong></p>
+            <p><a href="/openid/login?next={{login_next}}">Log in now</a></p>
+        {% endif %}
+    {% endif %}
+    <p>
+        {% include "schedule/schedule_list.html" %}
+    </p>
+</section>
 {% if summit.hashtag %}
-    <article class="side-content alone">
-        <h3>Latest Tweets</h3>
-        <h4>using {{ summit.hashtag }}</h4>
+    <article class="span-4 last">
+    <div class="share alone">
+        <h4>Latest Tweets</h4>
+        <h5>using {{ summit.hashtag }}</h5>
         <div class="twidenash" id="{{ summit.hashtag }}"></div>
+    </div>
     </article>
+</div>
 {% endif %}
-
 {% endblock %}

=== modified file 'summit/schedule/templates/schedule/summit_info.html'
--- summit/schedule/templates/schedule/summit_info.html	2012-01-22 21:31:41 +0000
+++ summit/schedule/templates/schedule/summit_info.html	2012-03-17 19:42:19 +0000
@@ -6,4 +6,4 @@
 <strong>Ends:</strong> {{ summit.end|strftime:"%a, %d %b %Y %H:%M:%S %Z" }}</p>
 {% endif %}
 <p class="description">{{ summit.description|safe }}</p>
-<p><a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}"><img src="/media/img/gem-sm.png" /> {{ summit.title }} in Launchpad</a></p>
+<p><a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}"><img src="/media/img/gem-sm.png" /> {{ summit.title }} in Launchpad &rsaquo;</a></p>

=== modified file 'summit/schedule/templates/schedule/tracks.html'
--- summit/schedule/templates/schedule/tracks.html	2012-01-25 18:43:02 +0000
+++ summit/schedule/templates/schedule/tracks.html	2012-03-17 19:42:19 +0000
@@ -4,37 +4,34 @@
 {% block sub_nav %}{% endblock %}
 
 {% block content %}
-<article class="main-content">
+    <div class="row">
+        <div class="span-12">
+            <h1>{{ summit.title }} Tracks</h1>
+        </div>
+    </div>
     <h1>{{ summit.title }} Tracks</h1>
 
     {% for track in summit.track_set.all %}
         {% if forloop.counter == 1 %}
-            <div style="display:block;border-bottom-left-radius: 5px 5px;
-            border-bottom-right-radius: 5px 5px;clear: both;
-            padding: 5px;
-            margin-bottom: -3px;">
-                <ul class="tracks">
-        {% endif %}
-        <li>
-            <h3><a href="/{{ summit.name }}/track/{{ track.slug|lower }}">{{ track.title }}</a></h3>
-            <p>{{ track.description }}</p>
-            {% if track.lead_set %}
-                Lead: {% for lead in track.lead_set.all %}
-                    <a href="http://launchpad.net/~{{ lead.lead.user }}">{{ lead.lead.name }}</a>{% if not forloop.last %},{% endif %}
-                {% endfor %}
-            {% endif %}
-        </li>
-        {% if forloop.counter|divisibleby:"4" %}
-                </ul>
-            </div>
-            <div style="display:block;border-bottom-left-radius: 5px 5px;
-            border-bottom-right-radius: 5px 5px;clear: both;
-            padding: 5px;
-            margin-bottom: -3px;">
-                <ul class="tracks">
-       {% endif %}
+            <div class="row">
+        {% endif %}
+        {% if forloop.counter|divisibleby:"4" %}
+            <div class="span-3 last">
+        {% else %}
+            <div class="span-3">
+        {% endif %}
+
+        <h3><a href="/{{ summit.name }}/track/{{ track.slug|lower }}">{{ track.title }}</a></h3>
+        <p>{{ track.description }}</p>
+        {% if track.lead_set %}
+            Lead: {% for lead in track.lead_set.all %}
+                <a href="http://launchpad.net/~{{ lead.lead.user }}">{{ lead.lead.name }}</a>{% if not forloop.last %},{% endif %}{% endfor %}
+        {% endif %}
+        </div>
+        
+        {% if forloop.counter|divisibleby:"4" %}
+            <div class="row">
+        {% endif %}
     {% endfor %}
-        </ul>
-    </div>
-</article>
+
 {% endblock %}

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2012-03-08 04:12:17 +0000
+++ summit/schedule/views.py	2012-03-17 19:42:19 +0000
@@ -35,7 +35,7 @@
 
 from summit.schedule.render import schedule_factory, Schedule
 
-from summit.schedule.forms import CreatePrivateMeeting, EditPrivateMeeting
+from summit.schedule.forms import *
 
 __all__ = (
     'summit',
@@ -401,9 +401,9 @@
     if not summit.can_create_pm(attendee):
         return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
     else:
-        meeting = Meeting(summit=summit, approver=attendee, private=True)
+        meeting = Meeting(summit=summit, approver=attendee, private=True, approved='APPROVED')
     
-        if request.method == 'POST':		
+        if request.method == 'POST':        
             form = CreatePrivateMeeting(data=request.POST, instance=meeting)
             if form.is_valid():
                 form.save()
@@ -419,13 +419,33 @@
                           context, RequestContext(request))
 
 @summit_attendee_required
+def propose_meeting(request, summit, attendee):
+
+    meeting = Meeting(summit=summit, drafter=attendee, private=False, approved=False)
+
+    if request.method == 'POST':        
+        form = ProposeMeeting(data=request.POST, instance=meeting)
+        if form.is_valid():
+            form.save()
+            return HttpResponseRedirect(meeting.meeting_page_url)
+    else:
+        form = ProposeMeeting(instance=meeting)
+
+    context = {
+        'summit': summit,
+        'form': form,
+    }
+    return render_to_response('schedule/propose_meeting.html', 
+                          context, RequestContext(request))
+                          
+@summit_attendee_required
 def edit_private(request, summit, attendee, meeting_id, meeting_slug):
     meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
     
     if attendee != meeting.approver:
         return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
     else:
-        if request.method == 'POST':		
+        if request.method == 'POST':        
             form = EditPrivateMeeting(data=request.POST, instance=meeting)
             if form.is_valid():
                 form.save()
@@ -439,3 +459,69 @@
     }
     return render_to_response('schedule/edit_private.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,)))
+    else:
+        if request.method == 'POST':        
+            form = EditMeeting(data=request.POST, instance=meeting)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(meeting.meeting_page_url)
+        else:
+            form = EditMeeting(instance=meeting)
+
+    context = {
+        'summit': summit,
+        'form': form,
+    }
+    return render_to_response('schedule/edit_meeting.html', 
+                          context, RequestContext(request))
+
+@summit_required
+def review_pending(request, summit, attendee):
+    if not Lead.objects.filter(lead=attendee).exists():
+        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+    else:
+        schedule = SortedDict()
+
+        for track in summit.track_set.all():
+            if not track in schedule:
+                schedule[track] = list()
+
+            # Add meetings from this slot
+            for meeting in track.meeting_set.exclude(approved='APPROVED'):
+                schedule[track].append(meeting)
+
+    context = {
+        'summit': summit,
+        'schedule': schedule,
+    }
+    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 Lead.objects.filter(lead=attendee).exists():
+        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+    else:
+        if request.method == 'POST':
+            form = MeetingReview(data=request.POST, instance=meeting)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(meeting.meeting_page_url)
+        else:
+            form = MeetingReview(instance=meeting)
+
+    context = {
+        'summit': summit,
+        'form': form,
+    }
+    return render_to_response('schedule/meeting_review.html', 
+                          context, RequestContext(request))

=== modified file 'summit/ubuntu_settings.py'
--- summit/ubuntu_settings.py	2012-03-08 03:55:12 +0000
+++ summit/ubuntu_settings.py	2012-03-17 19:42:19 +0000
@@ -3,7 +3,8 @@
 
 from settings import *
 
-SITE_ROOT = 'http://summit.ubuntu.com'
+SITE_ROOT = 'http://summit.chrisjohnston.org'
+
 
 SITE_ID = 1
 

=== modified file 'summit/urls.py'
--- summit/urls.py	2012-03-08 03:55:12 +0000
+++ summit/urls.py	2012-03-17 19:42:19 +0000
@@ -67,6 +67,10 @@
     url(r'^mobile/', 'mobile', name='mobile'),
     url(r'^logout$', 'logout_view', name='logout'),
     (r'^(?P<summit_name>[\w-]+)/$', 'summit'),
+    (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-]+)/review/$', 'review_pending'),
+    (r'^(?P<summit_name>[\w-]+)/review_meeting/(?P<meeting_id>\d+)/$', 'meeting_review'),
     (r'^(?P<summit_name>[\w-]+)/create_pm/$', 'create_private'),
     (r'^(?P<summit_name>[\w-]+)/edit_pm/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'edit_private'),
     (r'^(?P<summit_name>[\w-]+)/tracks$', 'tracks'),