Merge lp:~cjohnston/summit/mobile-display into lp:~sil/summit/redo-mobile-summit

[Chris Johnston]

Makes some changes to make some things work... Removes the logo, removes the header text.. Moves CSS/JS to the closure block at the bottom of the page.

[lp:~cjohnston/summit/mobile-display]

330. By Chris Johnston on 2012-03-31

[r=chrisjohnston] Updates the revno for the Ubuntu theme again

331. By Chris Johnston on 2012-03-31

[r=chrisjohnston] Makes the table look a little better on the main Summit page

332. By Chris Johnston on 2012-04-02

[r=chrisjohnston] Makes changes to what is displayed in the admin view area

333. By Chris Johnston on 2012-04-02

[r=chrisjohnston] Fixes the traceback we are getting via email

334. By Chris Johnston on 2012-04-02

Version 1.0.9 release

335. By Chris Johnston on 2012-04-05

Moves mobile CSS out of template pages

336. By Chris Johnston on 2012-04-05

Further mobile changes

Unmerged revisions

336. By Chris Johnston on 2012-04-05

Further mobile changes

335. By Chris Johnston on 2012-04-05

Moves mobile CSS out of template pages

334. By Chris Johnston on 2012-04-02

Version 1.0.9 release

333. By Chris Johnston on 2012-04-02

[r=chrisjohnston] Fixes the traceback we are getting via email

332. By Chris Johnston on 2012-04-02

[r=chrisjohnston] Makes changes to what is displayed in the admin view area

331. By Chris Johnston on 2012-03-31

[r=chrisjohnston] Makes the table look a little better on the main Summit page

330. By Chris Johnston on 2012-03-31

[r=chrisjohnston] Updates the revno for the Ubuntu theme again

329. By Chris Johnston on 2012-03-31

[r=chrisjohnston] Fixes a couple of HTML issues that need to be cleaned up.

328. By Chris Johnston on 2012-03-31

[r=chrisjohnston] Allows a meeting to be copied and create a second duplicate meeting.

327. By Chris Johnston on 2012-03-31

[r=chrisjohnston] Updates Django version in setup.py

=== modified file '.bzrignore'
--- .bzrignore	2012-03-13 18:44:45 +0000
+++ .bzrignore	2012-04-05 23:27:19 +0000
@@ -10,5 +10,3 @@
 www
 README
 env
-ubuntu_settings.py
-django.wsgi

=== modified file 'setup.py'
--- setup.py	2011-05-13 07:46:55 +0000
+++ setup.py	2012-04-05 23:27:19 +0000
@@ -41,7 +41,7 @@
     packages = packages,
     zip_safe = False,
     install_requires = [
-        "Django==1.1.1",
+        "Django==1.3.1",
         "psycopg2>=2.0.9",
         "pytz",
         "BeautifulSoup",

=== modified file 'summit/common/templates/base.html'
--- summit/common/templates/base.html	2012-03-23 16:28:03 +0000
+++ summit/common/templates/base.html	2012-04-05 23:27:19 +0000
@@ -6,26 +6,11 @@
     Developer Summit
 {% endblock %}
 
-{% block extrahead %}
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+{% block extrastyles %}
   <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 head %}
-  <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', 'UA-26810861-1']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
-  </script>
-{% endblock %}
-
+  <link rel="stylesheet" type="text/css" media="screen" href="/media/css/twidenash.css" />
+  <link rel="stylesheet" type="text/css" media="screen" href="/media/css/site.css" />
+  <link rel="stylesheet" type="text/css" media="handheld" href="/media/css/mobile.css"  />
 {% endblock %}
 
 {% block top_nav_login_links %}
@@ -47,7 +32,7 @@
     {% menu main_menu %}
     <ul class="clearfix">
     {% for item in menuitems %}
-        <li{% if item.current %} class='active'{% endif %}><a class="main-nav-item" href="{{ item.url }}" title="{{ item.title|escape }}">{{ item.title }}</a></li>
+        <li{% if item.current %} class='active'{% endif %} id="main-nav"><a class="main-nav-item" href="{{ item.url }}" title="{{ item.title|escape }}">{{ item.title }}</a></li>
     {% endfor %}
     </ul>
 {% endblock %}
@@ -59,11 +44,11 @@
 
 
 {% block messages %}
-	{% if messages %}
-	  {% for message in messages %}
-	    <div class = 'message' ><div class = 'content-shim' >{{ message }}</div></div>
-	  {% endfor %}
-	{% endif %}
+    {% if messages %}
+      {% for message in messages %}
+        <div class = 'message' ><div class = 'content-shim' >{{ message }}</div></div>
+      {% endfor %}
+    {% endif %}
 {% endblock %}
 
 {% block content %}

=== modified file 'summit/common/templates/common/index.html'
--- summit/common/templates/common/index.html	2012-03-23 23:51:49 +0000
+++ summit/common/templates/common/index.html	2012-04-05 23:27:19 +0000
@@ -2,26 +2,7 @@
 {% load datetime %}
 
 {% block page_name %}Home{%endblock %}
-{% block head %}
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-{{ block.super }}
-<style>
-/* Mobile-friendly styles */
-@media screen and (max-width: 481px) {
-    aside#top-nav, header#page-header, aside#page-related, footer#page-footer, section#main-section .container, article.main-content, .container, #main-nav, .minor-content, #page-footer div.container, .wrapper, .inner-wrapper { 
-        width: auto;
-        margin: 0; padding: 0;
-    }
-    #page-header { text-align: center; }
-    #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
-    #top-logo { display: none; }
-    .minor-content {
-        text-align: center;
-    }
-}
-
-</style>
-{% endblock %}
+{% block extrahead %}{{ block.super }}{% endblock %}
 
 {% block sub_nav %}{% endblock %}
 
@@ -30,9 +11,7 @@
 <article class="span-12">
     {% if summit %}
     <h1><a href="/{{ summit.name }}">{{ summit.title }} &rsaquo;</a></h1>
-    <p>
       {% include "schedule/summit_info.html" %}
-    </p>
     {% else %}
     <p>No summits registered.</p>
     {% endif %}

=== modified file 'summit/media/css/layout.css'
--- summit/media/css/layout.css	2012-03-02 22:03:57 +0000
+++ summit/media/css/layout.css	2012-04-05 23:27:19 +0000
@@ -32,6 +32,3 @@
     float: left;
     list-style-type: none;
 }
-
-
-

=== added file 'summit/media/css/mobile.css'
--- summit/media/css/mobile.css	1970-01-01 00:00:00 +0000
+++ summit/media/css/mobile.css	2012-04-05 23:27:19 +0000
@@ -0,0 +1,31 @@
+    aside#top-nav, header#page-header, aside#page-related, article.main-content, .wrapper, .inner-wrapper article { 
+        width: 100%;
+        margin: 0; padding: 0; margin-left: 3px; margin-right: 3px;
+    }
+    .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary { display: none; }
+    #page-header { text-align: center; }
+    #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
+    .span-8, .span-9, .span-3, .span-12 { width: 100%; }
+    table.schedule { width: 100%; margin: 0; padding: 0; border-width: 0; }
+    table.column { width: 100%; margin: 0; padding: 0; border-width: 0; }
+    table.column td { display: block; width: 100%; margin: 0; padding: 0; border-width: 0; }
+    table.column td ul {
+        width: 100%;
+        margin: 0;
+        padding: 0;
+    }
+    table.column td ul li {
+        background: #efefef;
+        border-bottom: 1px solid black;
+        list-style: none;
+        text-align: center;
+        font-size: 24px;
+        line-height: 24px;
+        min-height: 24px;
+        width: 100%;
+        display: block;
+        padding: 4px 0;
+        margin: 0;
+    }
+    #fb-root * { width: auto; }
+

=== added file 'summit/media/css/site.css'
--- summit/media/css/site.css	1970-01-01 00:00:00 +0000
+++ summit/media/css/site.css	2012-04-05 23:27:19 +0000
@@ -0,0 +1,132 @@
+TABLE img.icon {
+    vertical-align: bottom;
+    width: 16px;
+    height: 16px;
+}
+
+table.basic span.main-agenda-item-tracks {
+    font-size: 0.8em;
+}
+
+table.schedule td {
+    border: 0;
+}
+
+table.schedule li {
+    margin-bottom: .2em;
+}
+
+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;
+}
+
+/* System messages */
+ul.messagelist {
+    margin-left: -30px;
+    font-size: 130%;
+
+    list-style: none;
+    padding-left: 0;
+
+    color: #c00000;
+}
+
+
+/* Error list inside a table data */
+td ul.errorlist {
+    border: 1px solid #c00000;
+    background-color: #ffc0c0;
+    padding: 4px;
+    padding-left: 2em;
+    margin-left: 0;
+    margin-bottom: 0;
+    font-size: 70%;
+}
+
+
+/* Don't make the first page list look like a list */
+ul.summit_list {
+    list-style: none;
+    padding-left: 0;
+    margin-left: 0;
+}
+
+/* Pad and bottom-align formsets */
+table.formset th {
+    padding: 4px;
+    vertical-align: bottom;
+}
+table.formset td {
+    padding: 4px;
+    vertical-align: bottom;
+}
+
+
+/* Launchpad links have no decoration, and a cute image which we don't
+ * border. */
+a.launchpad {
+   text-decoration: none;
+}
+a.launchpad img {
+   border: 0;
+}
+
+.double-side-content {
+    float: left;
+    margin: 5px 10px;
+    padding: 10px;
+    width: 600px;
+}
+
+.summit-columns { -webkit-box-shadow: 0px 1px 1px #CCC; -moz-box-shadow:0 1px 1px #CCC; }
+.summit-columns { clear: both; background-color: #F7F7F7; padding: 5px; margin-bottom: -3px; }
+.summit-columns h2 { color: #444; font-weight: normal; border-bottom: 1px solid #EDEDED; text-indent: 10px; margin-bottom: 0; }
+.summit-columns ul { list-style: none; margin: 0; border-top: 1px solid #FFF; }
+.summit-columns ul li { width: 23%; float: left; padding-left: 10px; }
+.summit-columns ul li h3,
+.summit-columns ul li h3 a { color: #DD4814; text-decoration: none; margin-bottom: 0; margin-top: 5px; }
+.summit-columns ul li h3 a:hover { text-decoration: underline; }
+.summit-columns ul li img { padding: 10px 0 5px; }
+.summit-columns p { margin-bottom: 5px; }

=== removed file 'summit/media/css/style.css'
--- summit/media/css/style.css	2012-01-22 18:36:40 +0000
+++ summit/media/css/style.css	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/* System messages */
-ul.messagelist {
-    margin-left: -30px;
-    font-size: 130%;
-
-    list-style: none;
-    padding-left: 0;
-
-    color: #c00000;
-}
-
-
-/* Error list inside a table data */
-td ul.errorlist {
-    border: 1px solid #c00000;
-    background-color: #ffc0c0;
-    padding: 4px;
-    padding-left: 2em;
-    margin-left: 0;
-    margin-bottom: 0;
-    font-size: 70%;
-}
-
-
-/* Don't make the first page list look like a list */
-ul.summit_list {
-    list-style: none;
-    padding-left: 0;
-    margin-left: 0;
-}
-
-/* Pad and bottom-align formsets */
-table.formset th {
-    padding: 4px;
-    vertical-align: bottom;
-}
-table.formset td {
-    padding: 4px;
-    vertical-align: bottom;
-}
-
-
-/* Launchpad links have no decoration, and a cute image which we don't
- * border. */
-a.launchpad {
-   text-decoration: none;
-}
-a.launchpad img {
-   border: 0;
-}
-
-.double-side-content {
-    float: left;
-    margin: 5px 10px;
-    padding: 10px;
-    width: 600px;
-}
-
-.summit-columns { -webkit-box-shadow: 0px 1px 1px #CCC; -moz-box-shadow:0 1px 1px #CCC; }
-.summit-columns { clear: both; background-color: #F7F7F7; padding: 5px; margin-bottom: -3px; }
-.summit-columns h2 { color: #444; font-weight: normal; border-bottom: 1px solid #EDEDED; text-indent: 10px; margin-bottom: 0; }
-.summit-columns ul { list-style: none; margin: 0; border-top: 1px solid #FFF; }
-.summit-columns ul li { width: 23%; float: left; padding-left: 10px; }
-.summit-columns ul li h3,
-.summit-columns ul li h3 a { color: #DD4814; text-decoration: none; margin-bottom: 0; margin-top: 5px; }
-.summit-columns ul li h3 a:hover { text-decoration: underline; }
-.summit-columns ul li img { padding: 10px 0 5px; }
-.summit-columns p { margin-bottom: 5px; }

=== added file 'summit/media/js/site.js'
=== modified file 'summit/schedule/admin/agendaadmin.py'
--- summit/schedule/admin/agendaadmin.py	2012-01-23 01:18:55 +0000
+++ summit/schedule/admin/agendaadmin.py	2012-04-05 23:27:19 +0000
@@ -22,7 +22,7 @@
 
 
 class AgendaAdmin(admin.ModelAdmin):
-    list_display = ('slot', 'room', 'meeting')
+    list_display = ('slot', 'room', 'meeting', 'auto')
     list_display_links = ('meeting', )
     list_filter = ('room', )
     search_fields = ('meeting__name', 'meeting__title')

=== modified file 'summit/schedule/admin/meetingadmin.py'
--- summit/schedule/admin/meetingadmin.py	2012-03-22 17:32:01 +0000
+++ summit/schedule/admin/meetingadmin.py	2012-04-05 23:27:19 +0000
@@ -132,7 +132,7 @@
 share.short_description = "Share Meetings (Private only)"
 
 class MeetingAdmin(admin.ModelAdmin):
-    list_display = ('summit', 'name', 'title', 'type', 'approved')
+    list_display = ('summit', 'slots', 'name', 'title', 'type', 'approved')
     list_display_links = ('name', 'title')
     list_filter = ('summit', 'type', 'tracks', 'topics', 'slots', 'private',
                    'status', 'priority')

=== modified file 'summit/schedule/admin/summitadmin.py'
--- summit/schedule/admin/summitadmin.py	2012-03-19 16:06:37 +0000
+++ summit/schedule/admin/summitadmin.py	2012-04-05 23:27:19 +0000
@@ -71,7 +71,7 @@
 
 
 class SummitAdmin(admin.ModelAdmin):
-    list_display = ('name', 'title', 'location')
+    list_display = ('name', 'title', 'location', 'state')
     search_fields = ('name', 'title', 'location')
 
     inlines = (TrackInline, TopicInline, SprintInline)

=== modified file 'summit/schedule/forms.py'
--- summit/schedule/forms.py	2012-03-23 14:20:31 +0000
+++ summit/schedule/forms.py	2012-04-05 23:27:19 +0000
@@ -65,67 +65,7 @@
                     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 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)
+        self.fields['tracks'].queryset = self.instance.summit.track_set.all()
 
         summit = self.instance.summit
         self.fields['participants'].queryset = Attendee.objects.filter(
@@ -162,28 +102,26 @@
 class CreateMeeting(MeetingFormBase, RenderableMixin):
     class Meta:
         model = Meeting
-        fields = ('title', 'description', 'tracks', 'type', 'spec_url', 'wiki_url',
-                  'pad_url', 'requires_dial_in', 'private')
+        fields = ('title', 'description', 'tracks', 'type', 'spec_url', 'wiki_url', 'pad_url',
+                  'requires_dial_in', 'private', 'slots', 'approved', 'video')
 
 
 class OrganizerEditMeeting(MeetingFormBase, RenderableMixin):
     class Meta:
         model = Meeting
         fields = ('title', 'description', 'tracks', 'type', 'spec_url', 'wiki_url', 'pad_url',
-                  'requires_dial_in', 'private', 'slots', 'approved', 'video', )
+                  'requires_dial_in', 'private', 'slots', 'approved', 'video')
 
 class ProposeMeeting(MeetingFormBase, RenderableMixin):
     class Meta:
         model = Meeting
-        fields = ('title', 'description', 'tracks', 'spec_url', 'wiki_url',
-                  'pad_url', 'requires_dial_in')
+        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',
-                  'requires_dial_in')
+        fields = ('title', 'description', 'tracks', 'spec_url', 'wiki_url', 'pad_url')
 
 class MeetingReview(forms.ModelForm, RenderableMixin):
     class Meta:

=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2012-02-02 15:04:05 +0000
+++ summit/schedule/render.py	2012-04-05 23:27:19 +0000
@@ -1024,7 +1024,7 @@
 END:VEVENT
 ''' % {'id':meeting.id, 'dtstart':dtstart, 'dtend':dtend, 'category':categories,
        'eventname':meeting.title, 'eventplace': room.title, 'type': meeting.type,
-       'roomname':room.name, 'description': meeting.description.replace('\r', '').replace('\n', '\N'),
+       'roomname':room.name, 'description': getattr(meeting, 'description', '').replace('\r', '').replace('\n', '\N'),
        'meeting_url':meeting.meeting_page_url,
        'base_url':getattr(settings, 'SITE_ROOT', 'http://summit.ubuntu.com')}
         ical += 'END:VCALENDAR'

=== modified file 'summit/schedule/templates/schedule/actions.html'
--- summit/schedule/templates/schedule/actions.html	2012-03-23 16:28:03 +0000
+++ summit/schedule/templates/schedule/actions.html	2012-04-05 23:27:19 +0000
@@ -35,6 +35,9 @@
             {% else %}
                 <li><a href="/{{ summit.name }}/propose_meeting">Propose a meeting</a></li>
             {% endif %}
+            {% if attendee %}
+                <li><a href="{% url summit.schedule.views.created_meetings summit.name attendee.user.username %}">My proposed meetings</a></li>
+            {% endif %}
         </ul>
     </div>
 {% endifequal %}

=== modified file 'summit/schedule/templates/schedule/create_meeting.html'
--- summit/schedule/templates/schedule/create_meeting.html	2012-03-21 16:50:31 +0000
+++ summit/schedule/templates/schedule/create_meeting.html	2012-04-05 23:27:19 +0000
@@ -8,7 +8,7 @@
     <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
 {% endblock %}
 
-{% block extrafooter %}
+{% block closure %}
 <script type="text/javascript"><!--
 $(document).ready(function(){
     $('span[rel*=help]').colorTip({color:'orange'});

=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html	2012-03-23 23:51:49 +0000
+++ summit/schedule/templates/schedule/daily.html	2012-04-05 23:27:19 +0000
@@ -5,180 +5,28 @@
 {{ viewdate|strftime:"%Y-%m-%d" }} Schedule - {{ summit.title }}
 {% endblock %}
 
-{% block head %}
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-{% 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;
-}
-
-/* Mobile view */
-@media screen and (max-width: 481px) {
-    /* turn off a bunch of stuff */
-    nav#top-related, header#page-header, aside#page-related, footer#page-footer { display: none; }
-    section#main-section .container, article.main-content, aside#top-nav, aside#top-nav .container, .wrapper, .inner-wrapper, .span-9 { 
-        width: auto; 
-        margin: 0; padding: 0;
-    }
-    #top-login { display: block; }
-    aside#top-nav {
-        display: block;
-        text-align: center;
-        font-size: 16px;
-        min-height: 24px;
-    }
-    .schedule-head > a { display: none; } /* qr code */
-    div.schedule-head .schedule-date { 
-        display: block;
-        overflow: auto;
-        font-size: 16px;
-        text-align: center;
-        margin: 0;
-    }
-    div.schedule-head .schedule-qrcode { display: none; }
-    div.schedule-head .schedule-date a {
-        display: block;
-        float: right;
-        background: #eee;
-        width: 33%;
-        text-align: center;
-    }
-    div.schedule-head .schedule-date a:nth-child(1) {
-        float: left;
-    }
-    table.basic {
-        margin-top: 0;
-        width: 100%;
-    }
-    table.basic span.main-agenda-item-tracks {
-        display: none;
-    }
-    div.agenda-details {
-        background-color: #eee;
-        border-width: 0;
-        color: black;
-        font-size: 1em;
-        position: static;
-        max-width: 100%;
-        min-width: 100%;
-        width: 100%;
-        padding: 5px;
-        margin: 0;
-        border-radius: 0;
-    }
-    div.agenda-details ul {
-        background: #101010;
-        padding-left: 4px;
-    }
-    .main-agenda-item-name {
-        display: block;
-        min-height: 24px;
-    }
-    .main-agenda-item-name img.icon {
-        height: 24px;
-        width: 24px;
-        float: left;
-        margin-right: 4px;
-    }
-
-    header a.logo-ubuntu img { display: none; }
-
-}
-
-</style>
-{% endblock %}
+{% block extrahead %}{% if linaro %}<base target="_blank" />{% endif %}{{ block.super }}{% endblock %}
 
 {% block sub_nav_links %}
 {% if ical %}
 <li><a class="sub-nav-item" href="{{ ical }}">iCal Feed</a></li>
 {% endif %}
 <li><a class="sub-nav-item" href="{% url mobile %}">Mobile</a></li>
-<li><a class="sub-nav-item" href="display">Wide Display</a></li>
+<li><a class="sub-nav-item" href="display">Wide display</a></li>
 {% endblock %}
 
 {% block content %}
 <div class="row">
-<article class="span-9">
+<article class="span-8">
 
 <div class="schedule-head">
 {% if summit.qr %}
-<img class="schedule-qrcode" src="{{summit.qr}}" />
+<img class="schedule-qrcode" src="{{summit.qr}}" alt="QR" />
 {% endif %}
 <span class="schedule-date"><a href="{% url summit.schedule.views.daily_schedule summit.name previousday|date:"Y-m-d" %}{% if is_popup %}?_popup=1{% endif %}" target="_self">&lt;</a> {{ viewdate.date|strftime:"%A" }} <a href="{% url summit.schedule.views.daily_schedule summit.name nextday|date:"Y-m-d" %}{% if is_popup %}?_popup=1{% endif %}" target="_self">&gt;</a></span>
 
 {% if schedule.crew %}
-<span class="schedule-crew">Crew: {% for c in crew %}<a href="https://launchpad.net/~{{crew.attendee.user}}">{{c.attendee.name}}</a>{% if forloop.last %}{% else %}, {% endif %}{% endfor %}
+<span class="schedule-crew">Crew: {% for c in crew %}<a href="https://launchpad.net/~{{crew.attendee.user.username}}">{{c.attendee.name}}</a>{% if forloop.last %}{% else %}, {% endif %}{% endfor %}
 </span>
 {% endif %}
 </div>
@@ -200,9 +48,9 @@
     <span onMouseOver="show_agenda_details({{agenda.id}}, {{slot.id}});" onMouseOut="hide_agenda_details({{agenda.id}}, {{slot.id}});">
     <a href="{{agenda.meeting.meeting_page_url}}" style="color: #000000;" class="main-agenda-item-name">
         {% if attendee in agenda.meeting.attendees %}
-            <img class="icon" src="/media/img/attending.png">
+            <img class="icon" src="/media/img/attending.png" alt="Attending">
         {% else %}
-            <img class="icon" src="/media/img/not_attending.png">
+            <img class="icon" src="/media/img/not_attending.png" alt="Not Attending">
         {% endif %}
         {{agenda.meeting.title}}
     </a>
@@ -220,7 +68,7 @@
             {% if participant.required %}
             <img class="icon" src="/media/img/required.png" title="required" alt="(required)">
             {% else %}
-            <img class="icon" src="/media/img/attending.png">
+            <img class="icon" src="/media/img/attending.png" alt="attending">
             {% endif %}{{ participant.attendee.user }}</div>
     {% endfor %}</div>
     {% endif %}
@@ -236,7 +84,7 @@
 <td width="25%">
     {{agenda.room.title}}
     {% if agenda.room.icecast_url %}
-        <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed", alt="(Audio Feed)"></a>
+        <a href="{{agenda.room.icecast_url}}"><img class="icon" src="/media/img/audio.png" title="Audio Feed" alt="(Audio Feed)"></a>
     {% endif %}
     {% if agenda.room.irc_channel %}
         <a href="irc://irc.freenode.net:6667/#{{agenda.room.irc_channel}}"><img class="icon" src="/media/img/chat.png" title="IRC Channel" alt="(IRC Channel)" /></a>
@@ -250,10 +98,100 @@
 {% endfor %}
 
 </article>
-<article class="span-3 last">
+<article class="span-4 last">
     {% include "schedule/actions.html" %}
 </article>
 </div>
+{% endblock %}
+{% block closure %}
+<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>
+<script>
+/* Mobile view */
+@media screen and (max-width: 481px) {
+    /* turn off a bunch of stuff */
+    footer { display: none; }
+    section#main-section .container, article.main-content, aside#top-nav, aside#top-nav .container, .wrapper, .inner-wrapper, .span-9 { 
+        width: auto; 
+        margin: 0; padding: 0;
+    }
+    #top-login { display: block; }
+    .header-text { display: none; }
+    aside#top-nav {
+        display: block;
+        text-align: center;
+        font-size: 16px;
+        min-height: 24px;
+    }
+    .schedule-head > a { display: none; } /* qr code */
+    div.schedule-head .schedule-date { 
+        display: block;
+        overflow: auto;
+        font-size: 16px;
+        text-align: center;
+        margin: 0;
+    }
+    div.schedule-head .schedule-qrcode { display: none; }
+    div.schedule-head .schedule-date a {
+        display: block;
+        float: right;
+        background: #eee;
+        width: 33%;
+        text-align: center;
+    }
+    div.schedule-head .schedule-date a:nth-child(1) {
+        float: left;
+    }
+    table.basic {
+        margin-top: 0;
+        width: 100%;
+    }
+    table.basic span.main-agenda-item-tracks {
+        display: none;
+    }
+    div.agenda-details {
+        background-color: #eee;
+        border-width: 0;
+        color: black;
+        font-size: 1em;
+        position: static;
+        max-width: 100%;
+        min-width: 100%;
+        width: 100%;
+        padding: 5px;
+        margin: 0;
+        border-radius: 0;
+    }
+    div.agenda-details ul {
+        background: #101010;
+        padding-left: 4px;
+    }
+    .main-agenda-item-name {
+        display: block;
+        min-height: 24px;
+    }
+    .main-agenda-item-name img.icon {
+        height: 24px;
+        width: 24px;
+        float: left;
+        margin-right: 4px;
+    }
+    header a.logo-ubuntu img { display: none; }
+}
+</style>
 <script>
 /* Mobile handler for clicking a link */
 /* put at the bottom of the page so that the relevant elements exist */
@@ -295,5 +233,4 @@
 };
 
 </script>
-
 {% endblock %}

=== modified file 'summit/schedule/templates/schedule/edit_meeting.html'
--- summit/schedule/templates/schedule/edit_meeting.html	2012-03-23 20:44:55 +0000
+++ summit/schedule/templates/schedule/edit_meeting.html	2012-04-05 23:27:19 +0000
@@ -8,7 +8,7 @@
     <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
 {% endblock %}
 
-{% block extrafooter %}
+{% block closure %}
 <script type="text/javascript"><!--
 $(document).ready(function(){
     $('span[rel*=help]').colorTip({color:'orange'});
@@ -35,12 +35,11 @@
 
         <form action="{{ request.path_info }}" method="POST">
             <fieldset>
-                <legend>Edit Meeting</legend>
+                <h3>Edit Meeting</h3>
                 {{ 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>
-</span>
 {% endblock %}

=== modified file 'summit/schedule/templates/schedule/meeting.html'
--- summit/schedule/templates/schedule/meeting.html	2012-03-23 17:56:14 +0000
+++ summit/schedule/templates/schedule/meeting.html	2012-04-05 23:27:19 +0000
@@ -26,17 +26,17 @@
         {% 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>
+            <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 %}
     {% else %}
         {% if summit_organizer %}
-            <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>
+            <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>
         {% else %}
             {% if drafter %}
-                <li><a class="sub-nav-item" href="{% url summit.schedule.views.edit_meeting summit.name, meeting.id, meeting.name|default:'-' %}">Edit Meeting</a></li>
+                <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 %}
         {% endif %}
     {% endif %}
@@ -47,7 +47,7 @@
         {% endif %}
     {% else %}
         {% if meeting.spec_url %}
-            <li><a class="sub-nav-item" href="{{ meeting.spec_url }}/+subscribe">Subscribe to Blueprint</a></li>
+            <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.register meeting.summit.name, meeting.id, meeting.name|default:'-' %}">Attend this meeting</a></li>
     {% endif %}
@@ -55,6 +55,9 @@
     {% if meeting.spec_url %}
         <li><a class="sub-nav-item" href="{{ meeting.spec_url }}">Blueprint</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 %}

=== modified file 'summit/schedule/templates/schedule/meeting_review.html'
--- summit/schedule/templates/schedule/meeting_review.html	2012-03-23 20:44:55 +0000
+++ summit/schedule/templates/schedule/meeting_review.html	2012-04-05 23:27:19 +0000
@@ -8,7 +8,7 @@
     <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
 {% endblock %}
 
-{% block extrafooter %}
+{% block closure %}
 <script type="text/javascript"><!--
 $(document).ready(function(){
     $('span[rel*=help]').colorTip({color:'orange'});
@@ -28,7 +28,7 @@
 
         <form action="{{ request.path_info }}" method="POST">
             <fieldset>
-                <legend>Review Meeting</legend>
+                <h3>Review Meeting</h3>
                 {{ form.as_template }}
             </fieldset>
                 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		

=== added file 'summit/schedule/templates/schedule/mine.html'
--- summit/schedule/templates/schedule/mine.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/mine.html	2012-04-05 23:27:19 +0000
@@ -0,0 +1,113 @@
+{% 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 %}
+<div class="row">
+<article class="span-12">
+
+<div class="schedule-head">
+    <h2>Meetings created by {{ drafter.name }}</h2>
+</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%">
+Status: {{ meeting.get_approved_display }}
+</td>
+</tr>
+{% endfor %}
+</table>
+</article>
+</div>
+{% endblock %}

=== modified file 'summit/schedule/templates/schedule/nextsession.html'
--- summit/schedule/templates/schedule/nextsession.html	2011-11-01 18:00:44 +0000
+++ summit/schedule/templates/schedule/nextsession.html	2012-04-05 23:27:19 +0000
@@ -3,7 +3,7 @@
 
 <head>
   <meta http-equiv="refresh" content="60">
-{% block head %}
+{% block extrahead %}
 
 {% endblock %}
     <style type="text/css">

=== modified file 'summit/schedule/templates/schedule/nosession.html'
--- summit/schedule/templates/schedule/nosession.html	2012-03-18 19:53:58 +0000
+++ summit/schedule/templates/schedule/nosession.html	2012-04-05 23:27:19 +0000
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block head %}
+{% block extrahead %}
 {{ block.super }}
 <script language="JavaScript">
 

=== modified file 'summit/schedule/templates/schedule/org_edit_meeting.html'
--- summit/schedule/templates/schedule/org_edit_meeting.html	2012-03-23 20:44:55 +0000
+++ summit/schedule/templates/schedule/org_edit_meeting.html	2012-04-05 23:27:19 +0000
@@ -8,7 +8,7 @@
     <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
 {% endblock %}
 
-{% block extrafooter %}
+{% block closure %}
 <script type="text/javascript"><!--
 $(document).ready(function(){
     $('span[rel*=help]').colorTip({color:'orange'});
@@ -35,7 +35,7 @@
 
         <form action="{{ request.path_info }}" method="POST">
             <fieldset>
-                <legend>Edit Meeting</legend>
+                <h3>Edit Meeting</h3>
                 {{ form.as_template }}
             </fieldset>
                 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		

=== modified file 'summit/schedule/templates/schedule/past_summit.html'
--- summit/schedule/templates/schedule/past_summit.html	2012-03-17 19:39:42 +0000
+++ summit/schedule/templates/schedule/past_summit.html	2012-04-05 23:27:19 +0000
@@ -4,7 +4,7 @@
 {% block page_name %}Previous Summits{%endblock %}
 
 {% block sub_nav_links %}
-    <li><a class="sub-nav-item" href="{% url summit.schedule.views.summit next_summit.name %}">Current Summit</a></li>
+    <li><a class="sub-nav-item" href="{% url summit.schedule.views.summit next_summit.name %}">Current summit</a></li>
 {% endblock %}
 
 {% block content %}
@@ -13,9 +13,7 @@
     <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 %}

=== modified file 'summit/schedule/templates/schedule/propose_meeting.html'
--- summit/schedule/templates/schedule/propose_meeting.html	2012-03-23 20:44:55 +0000
+++ summit/schedule/templates/schedule/propose_meeting.html	2012-04-05 23:27:19 +0000
@@ -8,7 +8,7 @@
     <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
 {% endblock %}
 
-{% block extrafooter %}
+{% block closure %}
 <script type="text/javascript"><!--
 $(document).ready(function(){
     $('span[rel*=help]').colorTip({color:'orange'});
@@ -35,7 +35,7 @@
 
         <form action="{{ request.path_info }}" method="POST">
             <fieldset>
-                <legend>Propose a Meeting</legend>
+                <h3>Propose a Meeting</h3>
                 {{ form.as_template }}
             </fieldset>
                 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		

=== modified file 'summit/schedule/templates/schedule/review.html'
--- summit/schedule/templates/schedule/review.html	2012-03-21 00:41:17 +0000
+++ summit/schedule/templates/schedule/review.html	2012-04-05 23:27:19 +0000
@@ -4,7 +4,7 @@
 Review Proposed Meetings - {{ summit.title }}
 {% endblock %}
 
-{% block head %}
+{% block extrahead %}
 {% if linaro %}
     <base target="_blank" />
 {% endif %}

=== modified file 'summit/schedule/templates/schedule/schedule.html'
--- summit/schedule/templates/schedule/schedule.html	2012-03-23 17:56:14 +0000
+++ summit/schedule/templates/schedule/schedule.html	2012-04-05 23:27:19 +0000
@@ -7,7 +7,7 @@
 {% if schedule.room %}{{ schedule.room.title }}{% endif %}
 {% endblock %}
 
-{% block head %}
+{% block extrahead %}
 {{ block.super }}
   <link rel="stylesheet" type="text/css" media="screen" href="/media/css/schedule.css" />
 {% if schedule.edit %}
@@ -38,19 +38,39 @@
 }
 window.addEventListener('load', starttimer());
 </script>
+
+<style>
+  div.wrapper, div.inner-wrapper {  
+    width: auto;
+  }
+
+  div.wrapper {
+    padding: 0px 0px;
+    clear: both;
+    display: inline;
+    float: left;
+    border: 0;
+    margin: 0;
+  }
+
+  #top-nav, header {
+    width: auto;
+  }
+</style>
+
 {% endblock %}
 {% block 960css %}{% endblock %}
 
 {% block sub_nav_links %}
 {% if schedule.edit %}
-    <li><a class="sub-nav-item" href="{{ request.url }}?">Read Only</a></li>
+    <li><a class="sub-nav-item" href="{{ request.url }}?">Read only</a></li>
 {% else %}
     {% if can_change_agenda %}
         <li><a class="sub-nav-item" href="{{ request.url }}?edit">Edit</a></li>
     {% endif %}
 {% endif %}
 {% if ical %}
-<li><a class="sub-nav-item" href="{{ ical }}">iCal Feed</a></li>
+<li><a class="sub-nav-item" href="{{ ical }}">iCal feed</a></li>
 {% endif %}
 <li><a class="sub-nav-item" href="{% url mobile %}">Mobile</a></li>
 {% endblock %}

=== modified file 'summit/schedule/templates/schedule/schedule_list.html'
--- summit/schedule/templates/schedule/schedule_list.html	2012-01-25 18:32:06 +0000
+++ summit/schedule/templates/schedule/schedule_list.html	2012-04-05 23:27:19 +0000
@@ -1,7 +1,7 @@
 {% load datetime %}
 
 <h2>Schedule</h2>
-<table class="column">
+<table class="column schedule">
 <tr>
 <td>
 By date:

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2012-03-23 23:51:49 +0000
+++ summit/schedule/templates/schedule/summit.html	2012-04-05 23:27:19 +0000
@@ -3,20 +3,9 @@
 
 {% block page_name %}{{ summit.title }} {{ summit.date_start|strftime:"%d %b" }} - {{ summit.date_end|strftime:"%d %b %Y" }} {%endblock %}
 
-{% block extrahead %}
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+{% block extrahead %}{{ block.super }}{% endblock %}
 
-{{ block.super }}
-    <script type="text/javascript" src="{{MEDIA_URL}}jquery/jquery.js"></script>
-    <script type="text/javascript" src="{{MEDIA_URL}}js/twidenash/jquery-twidenash.js"></script>
-    <script type="text/javascript"> 
-       //<![CDATA[
-           $(function() {
-               $('.twidenash').twidenash();
-           });
-       //]]>
-    </script>
-    <meta property="fb:app_id" content="310260202349342" />
+    {% block extrameta %}<meta property="fb:app_id" content="310260202349342" />
     <meta property="og:title" content="{{ summit.title }} {{ summit.date_start|strftime:"%d" }} - {{ summit.date_end|strftime:"%d, %b. %Y" }}" />
     {% if summit.description %}
         <meta property="og:description" content="{{ summit.description|safe }}" />
@@ -26,52 +15,7 @@
     <meta property="og:site_name" content="The Summit Scheduler"/>
     <meta property="og:type" content="summit-scheduler:meeting"/>
     <meta itemprop="name" content="{{ summit.title }} {{ summit.date_start|strftime:"%d" }} - {{ summit.date_end|strftime:"%d, %b. %Y" }}" />
-    <meta itemprop="description" content="{{ summit.description|linebreaks|striptags }}" />
-
-<style>
-/* Mobile-friendly styles */
-@media screen and (max-width: 481px) {
-    aside#top-nav, header#page-header, aside#page-related, footer#page-footer, section#main-section .container, article.main-content, .container, #main-nav, .double-side-content, #page-footer div.container, #sub-nav-container, .side-content, .wrapper, .inner-wrapper, .span-9, article { 
-        width: 100%;
-        margin: 0; padding: 0;
-    }
-    #page-header { text-align: center; }
-    #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
-    #top-logo { display: none; }
-    table.column { width: 100%; margin: 0; padding: 0; border-width: 0; }
-    table.column td { display: block; width: 100%; margin: 0; padding: 0; border-width: 0; }
-    table.column td ul {
-        width: 100%;
-        margin: 0;
-        padding: 0;
-    }
-    article.main-content { width: 100%; }
-    table.column td ul li {
-        background: #efefef;
-        border-bottom: 1px solid black;
-        list-style: none;
-        text-align: center;
-        font-size: 24px;
-        line-height: 24px;
-        min-height: 24px;
-        width: 100%;
-        display: block;
-        padding: 4px 0;
-        margin: 0;
-    }
-    .double-side-content {
-        text-align: center;
-    }
-    .side-content { display: none; }
-    #fb-root * { width: auto; }
-    header h2 a {
-        max-width: 85px;
-        margin-top: -10px;
-    }
-}
-</style>
-{% endblock %}
-
+    <meta itemprop="description" content="{{ summit.description|linebreaks|striptags }}" />{% endblock %}
 {% block sub_nav_links %}
     <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>
@@ -84,19 +28,17 @@
 {% block content %}
 
 <div class="row">
-    <section class="span-9">
+    <section class="span-8">
         <h1>{{ summit.title }}</h1>
-        <p>
             {% include "schedule/summit_info.html" %}
-        </p>
     </section>
-    <article class="span-3 last">
+    <article class="span-4 last actions">
         {% include "schedule/actions.html" %}
     </article>
 </div>
 
 <div class="row">
-    <section class="span-9">
+    <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>.
@@ -117,9 +59,9 @@
             {% endif %}
         {% endif %}
     </section>
-    <article class="span-3 last">
+    <article class="span-4 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 />
+            <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; border: 0;" src="http://www.reddit.com/static/spreddit7.gif" alt="submit to reddit" /></a><br />
             <div id="fb-root"></div>
             <script>(function(d, s, id) {
                 var js, fjs = d.getElementsByTagName(s)[0];
@@ -138,12 +80,10 @@
     </article>
 </div>
 <div class="row">
-    <article class="span-9 last">
-        <p>
+    <article class="span-8">
             {% include "schedule/schedule_list.html" %}
-        </p>
     </article>
-    <article class="span-3">
+    <article class="span-4 last">
             {% if summit.hashtag %}
             <div class="share alone">
                 <h4>Latest Tweets</h4>
@@ -155,3 +95,6 @@
     </article>    
 </div>
 {% endblock %}
+
+{% block closure %}<script type="text/javascript" src="/media/js/twidenash/jquery-twidenash.js"></script>{% endblock %}
+

=== modified file 'summit/schedule/templates/schedule/summit_info.html'
--- summit/schedule/templates/schedule/summit_info.html	2012-03-12 21:00:10 +0000
+++ summit/schedule/templates/schedule/summit_info.html	2012-04-05 23:27: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 &rsaquo;</a></p>
+<p><a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}"><img src="/media/img/gem-sm.png" alt="Launchpad" /> {{ summit.title }} in Launchpad &rsaquo;</a></p>

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2012-03-23 20:44:55 +0000
+++ summit/schedule/views.py	2012-04-05 23:27:19 +0000
@@ -285,6 +285,7 @@
         'tracks':tracks,
         'ETHERPAD_HOST': summit.etherpad,
         'summit_organizer': summit.is_organizer(attendee),
+        'scheduler': summit.can_change_agenda(attendee),
         'drafter': drafter,
     }
     #import pdb; pdb.set_trace()
@@ -399,7 +400,7 @@
     return render_to_response("schedule/mobile.html", {}, RequestContext(request))
 
 def past(request):
-    pastsummit = Summit.on_site.filter(date_end__lte=datetime.date.today()).order_by('-date_start')
+    pastsummit = Summit.on_site.filter(date_end__lte=datetime.date.today())
     context = {
         'past_summit': pastsummit,
     }
@@ -516,6 +517,7 @@
     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)
 
@@ -539,3 +541,50 @@
     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)
+    if attendee.id != drafter.id:
+        meetings = summit.meeting_set.filter(drafter=drafter).exclude(private=True)
+    else:
+        meetings = summit.meeting_set.filter(drafter=drafter)
+
+    context = {
+        'summit': summit,
+        'meetings': meetings,
+        'drafter': drafter,
+        'attendee': attendee,
+    }
+    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,)))
+    else:
+        if request.method == 'POST':
+            form = CreateMeeting(instance=meeting, data=request.POST)
+            meeting.id = meeting.pk = None
+            meeting.approver = attendee
+            meeting.drafter = attendee
+            meeting.approved = 'APPROVED'
+
+            if form.is_valid():
+                meeting = form.save()
+                meeting_id = meeting.id
+                return HttpResponseRedirect(meeting.meeting_page_url)
+                
+        else:
+            form = CreateMeeting(instance=meeting)
+
+    context = {
+        'summit': summit,
+        'form': form,
+    }
+    
+    return render_to_response('schedule/create_meeting.html', 
+                          context, RequestContext(request))

=== modified file 'summit/settings.py'
--- summit/settings.py	2012-03-08 21:54:53 +0000
+++ summit/settings.py	2012-04-05 23:27:19 +0000
@@ -172,14 +172,14 @@
 
 BZR_APPS = {
     ## ubuntu-django-foundations app management
-    'bzr_apps': ('http://code.launchpad.net/~django-foundations-dev/ubuntu-django-foundations/bzr_apps', '7'),
+    'bzr_apps': ('http://bazaar.launchpad.net/~django-foundations-dev/ubuntu-django-foundations/bzr_apps', '7'),
 
     ## ubuntu-website supplied templates and styles
-    'ubuntu_website': ('http://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '38'),
-    
+    'ubuntu_website': ('http://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '41'),
+
     ## linaro-website supplied templates and styles
-    'linaro_website': ('http://bazaar.launchpad.net/~linaro-infrastructure/ubuntu-community-webthemes/light-django-linaro-theme', '41'),
-    
+    'linaro_website': ('http://bazaar.launchpad.net/~linaro-infrastructure/ubuntu-community-webthemes/light-django-linaro-theme', '43'),
+
     ## twidenash supplied microblog embedding javascript
     'media/js/twidenash': ('http://bazaar.launchpad.net/~django-foundations-dev/twidenash/2.0/', '3'),
 }

=== modified file 'summit/sponsor/templates/sponsor/nonlaunchpadstep0.html'
--- summit/sponsor/templates/sponsor/nonlaunchpadstep0.html	2012-01-23 01:18:55 +0000
+++ summit/sponsor/templates/sponsor/nonlaunchpadstep0.html	2012-04-05 23:27:19 +0000
@@ -2,7 +2,7 @@
 
 {% block page_name %}Suggest Sponsorship{%endblock %}
 
-{% block head %}
+{% block extrahead %}
     {{ form.media }}
 {% endblock %}
 

=== modified file 'summit/sponsor/templates/sponsor/nonlaunchpadstep1.html'
--- summit/sponsor/templates/sponsor/nonlaunchpadstep1.html	2012-01-23 01:18:55 +0000
+++ summit/sponsor/templates/sponsor/nonlaunchpadstep1.html	2012-04-05 23:27:19 +0000
@@ -2,7 +2,7 @@
 
 {% block page_name %}Suggest Sponsorship{%endblock %}
 
-{% block head %}
+{% block extrahead %}
 {{ form.media }}
 {% endblock %}
 

=== modified file 'summit/sponsor/templates/sponsor/suggeststep0.html'
--- summit/sponsor/templates/sponsor/suggeststep0.html	2012-01-23 01:18:55 +0000
+++ summit/sponsor/templates/sponsor/suggeststep0.html	2012-04-05 23:27:19 +0000
@@ -2,7 +2,7 @@
 
 {% block page_name %}Suggest Sponsorship{%endblock %}
 
-{% block head %}
+{% block extrahead %}
     {{ form.media }}
 {% endblock %}
 

=== modified file 'summit/sponsor/templates/sponsor/suggeststep1.html'
--- summit/sponsor/templates/sponsor/suggeststep1.html	2012-01-23 01:18:55 +0000
+++ summit/sponsor/templates/sponsor/suggeststep1.html	2012-04-05 23:27:19 +0000
@@ -2,7 +2,7 @@
 
 {% block page_name %}Suggest Sponsorship{%endblock %}
 
-{% block head %}
+{% block extrahead %}
 {{ form.media }}
 {% endblock %}
 

=== modified file 'summit/ubuntu_settings.py'
--- summit/ubuntu_settings.py	2012-03-13 18:44:45 +0000
+++ summit/ubuntu_settings.py	2012-04-05 23:27:19 +0000
@@ -3,7 +3,7 @@
 
 from settings import *
 
-SITE_ROOT = 'http://summit.chrisjohnston.org'
+SITE_ROOT = 'http://summit.ubuntu.com'
 
 
 SITE_ID = 1

=== modified file 'summit/urls.py'
--- summit/urls.py	2012-03-23 14:20:31 +0000
+++ summit/urls.py	2012-04-05 23:27:19 +0000
@@ -75,6 +75,7 @@
     (r'^(?P<summit_name>[\w-]+)/edit_mtg/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'organizer_edit_meeting'),
     (r'^(?P<summit_name>[\w-]+)/tracks$', 'tracks'),
     (r'^(?P<summit_name>[\w-]+)/next$', 'next_session'),
+    (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'),
@@ -84,6 +85,7 @@
     (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/my_schedule_(?P<secret_key>[0-9a-f]{32})\.ical$', 'user_private_ical'),

=== modified file 'summit/version'
--- summit/version	2012-03-08 18:04:36 +0000
+++ summit/version	2012-04-05 23:27:19 +0000
@@ -1,2 +1,2 @@
-version: 1.0.7
-revno: 308
+version: 1.0.9
+revno: 334