Merge lp:~mhall119/summit/ubuntu_website_theme into lp:summit

[Michael Hall]

Converted to new theme.
Screenshots: http://img80.imageshack.us/g/summitlist.png/

Will need to "bzr branch lp:ubuntu-website/light_django_theme ubuntu_website" in the project directory.

Also adds a migration to add start/end dates to the summit itself, independent of the schedule.

[Martin Meredith (mez)]

Text conflict - please resolve.

review: Disapprove

[Martin Meredith (mez)]

Text is TINY for stuff like:-

"This field is required."
http://people.ubuntu.com/~mez/summit/tinyerror.jpg

Time markers on schedules are cut off...
http://people.ubuntu.com/~mez/summit/stuntedmarkers.jpg

review: Needs Fixing

[Dave Walker (davewalker)]

Whilst this in indeed true, for an imminent deployment that is something that can be fixed post release as it's not required just yet. This branch is better than what is currently there. :)

review: Approve

=== added file 'summit/media/css/twidenash.css'
--- summit/media/css/twidenash.css	1970-01-01 00:00:00 +0000
+++ summit/media/css/twidenash.css	2010-08-30 14:41:04 +0000
@@ -0,0 +1,20 @@
+ul.twidenash li {
+    list-style-type: none;
+    clear: both;
+    padding: 3px;
+    font-size: 100%;
+}
+ul.twidenash li img {
+    float: left;
+    vertical-align: top;
+    padding-right: 10px;
+}
+ul.twidenash li .comment {
+    margin-left: 5px;
+    display: block;
+}
+
+ul.twidenash li .nick {
+    font-weight: bold;
+}
+

=== added file 'summit/media/twidenash.js'
--- summit/media/twidenash.js	1970-01-01 00:00:00 +0000
+++ summit/media/twidenash.js	2010-08-30 14:41:04 +0000
@@ -0,0 +1,122 @@
+/*
+* 
+* Copyright (c) 2010 Stuart Langridge
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*
+* Website: http://code.google.com/p/twidenash/
+*/
+
+/*
+* With modification by Michael Hall for use in loco.ubuntu.com
+*/
+
+twidenash = {
+    init: function() {
+        if (!twidenash.hashtag) return;
+        // request hashtag search values for both twitter and identica
+        twidenash.callbacks = 0;
+        twidenash.items = [];
+        twidenash.add_script("http://locoteams.status.net/api/search.json?" +
+           "callback=twidenash.cb&rpp=10&q=%23" + twidenash.hashtag);
+        twidenash.add_script("http://identi.ca/api/search.json?" +
+           "callback=twidenash.cb&rpp=10&q=%23" + twidenash.hashtag);
+        twidenash.add_script("http://search.twitter.com/search.json?" +
+           "callback=twidenash.cb&rpp=10&q=%23" + twidenash.hashtag);
+        twidenash.printed = 0;
+    },
+    add_script: function(url) {
+        var scr = document.createElement("script");
+        scr.src = url;
+        document.getElementsByTagName("head")[0].appendChild(scr);
+    },
+    cb: function(data) {
+        for (var i=0; i<data.results.length; i++) {
+            var dupe = false;
+            for (var j=0; j<twidenash.items.length; j++) {
+                // Strip characters that may be specific to networks
+                var comp1 = data.results[i].text.replace(/[♺\!\#\@]/g, '');
+                var comp2 = twidenash.items[j].text.replace(/[♺\!\#\@]/g, '');
+                var compdate = Date.parse(data.results[i].created_at);
+                var datediff = Math.abs(Date.parse(data.results[i].created_at) - twidenash.items[j].dt)
+                if (comp1 == comp2 && datediff < 120000) {
+                    dupe = true;
+                    break;
+                }
+            }
+            if (dupe) continue;
+            twidenash.items.push({ text: data.results[i].text, 
+                img: data.results[i].profile_image_url, 
+                dt: Date.parse(data.results[i].created_at),
+                user: data.results[i].from_user })
+        }
+        twidenash.callbacks += 1;
+        if (twidenash.callbacks == 2) {
+            twidenash.items.sort(function(a,b) { return b.dt - a.dt });
+            var ul = document.createElement("ul");
+            ul.className = "twidenash";
+            for (i=0; i<twidenash.items.length && twidenash.printed < 5; i++) {
+                var li = document.createElement("li");
+                var img = document.createElement("img");
+                img.src = twidenash.items[i].img;
+                img.width = 48;
+                var span = document.createElement("span");
+                span.className = 'comment';
+                var nick = document.createElement("span");
+                nick.className = 'nick';
+                nick.appendChild(document.createTextNode(twidenash.items[i].user + 
+                    ": "));
+                var exp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi;
+                span.innerHTML = twidenash.items[i].text.replace(exp,"<a href='$1' target='_blank'>$1</a>");
+                li.appendChild(img);
+                li.appendChild(nick);
+                li.appendChild(span);
+                ul.appendChild(li);
+                twidenash.printed++;
+            }
+            twidenash.scriptelement.parentNode.insertBefore(ul, twidenash.scriptelement);
+        }
+    },
+    cache_scriptname: function() {
+        // called before page load so we can find our own name
+        var scr = document.getElementsByTagName("script");
+        var url = scr[scr.length-1].getAttribute("src");
+        if (!url) {
+            var twidenash_script = document.getElementById("twidenash_script");
+            if (twidenash_script) url = twidenash_script.getAttribute("src");
+        }
+        if (url && url.lastIndexOf('?') != -1) {
+            twidenash.hashtag = url.substr(url.lastIndexOf('?')+1);
+            if (twidenash_script) {
+                twidenash.scriptelement = twidenash_script;
+            } else {
+                twidenash.scriptelement = scr[scr.length-1];
+            }
+        }
+    }
+};
+(function(i) {var u =navigator.userAgent;var e=/*@cc_on!@*/false; var st = 
+setTimeout;if(/webkit/i.test(u)){st(function(){var dr=document.readyState;
+if(dr=="loaded"||dr=="complete"){i()}else{st(arguments.callee,10);}},10);}
+else if((/mozilla/i.test(u)&&!/(compati)/.test(u)) || (/opera/i.test(u))){
+document.addEventListener("DOMContentLoaded",i,false); } else if(e){     (
+function(){var t=document.createElement('doc:rdy');try{t.doScroll('left');
+i();t=null;}catch(e){st(arguments.callee,0);}})();}else{window.onload=i;}})(twidenash.init);
+twidenash.cache_scriptname();
+

=== added file 'summit/schedule/context_processors.py'
--- summit/schedule/context_processors.py	1970-01-01 00:00:00 +0000
+++ summit/schedule/context_processors.py	2010-08-30 14:41:04 +0000
@@ -0,0 +1,4 @@
+from schedule.models.summitmodel import Summit
+
+def next_summit(request):
+    return {'next_summit': Summit.objects.next() }

=== added file 'summit/schedule/migrations/0002_add_summit_dates.py'
--- summit/schedule/migrations/0002_add_summit_dates.py	1970-01-01 00:00:00 +0000
+++ summit/schedule/migrations/0002_add_summit_dates.py	2010-08-30 14:41:04 +0000
@@ -0,0 +1,162 @@
+
+from south.db import db
+from django.db import models
+from summit.schedule.models import *
+
+class Migration:
+    
+    def forwards(self, orm):
+        
+        # Adding field 'Summit.date_end'
+        db.add_column('schedule_summit', 'date_end', orm['schedule.summit:date_end'])
+        
+        # Adding field 'Summit.date_start'
+        db.add_column('schedule_summit', 'date_start', orm['schedule.summit:date_start'])
+        
+    
+    
+    def backwards(self, orm):
+        
+        # Deleting field 'Summit.date_end'
+        db.delete_column('schedule_summit', 'date_end')
+        
+        # Deleting field 'Summit.date_start'
+        db.delete_column('schedule_summit', 'date_start')
+        
+    
+    
+    models = {
+        'auth.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']", 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'unique_together': "(('content_type', 'codename'),)"},
+            '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': {
+            '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']", 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            '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']", 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'unique_together': "(('app_label', 'model'),)", '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': {'unique_together': "(('slot', 'room'),)"},
+            'auto': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            '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': {
+            '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']"}),
+            'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'blank': 'True'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'schedule.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.meeting': {
+            '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': '50', 'blank': 'True'}),
+            'participants': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Attendee']", 'blank': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'private': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            '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']", 'blank': 'True'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'blueprint'", 'max_length': '15'}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'schedule.participant': {
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}),
+            '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', 'blank': 'True'})
+        },
+        'schedule.room': {
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'end'", 'blank': 'True'}),
+            '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']", 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
+        },
+        'schedule.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': {
+            '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': {
+            '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'}),
+            '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'}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
+            '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.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': {
+            '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'})
+        }
+    }
+    
+    complete_apps = ['schedule']

=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py	2010-05-05 08:49:24 +0000
+++ summit/schedule/models/summitmodel.py	2010-08-30 14:41:04 +0000
@@ -35,6 +35,10 @@
     'Summit',
 )
 
+class SummitManager(models.Manager):
+    
+    def next(self):
+        return self.order_by('-date_start')[0]
 
 class Summit(models.Model):
     STATE_CHOICES = (
@@ -52,7 +56,11 @@
     last_update = models.DateTimeField(null=True, blank=True)
     state = models.CharField(max_length=10, choices=STATE_CHOICES,
                              default=STATE_CHOICES[0][0])
-
+    date_start = models.DateField(blank=False, null=True)
+    date_end = models.DateField(blank=False, null=True)
+    
+    objects = SummitManager()
+    
     class Meta:
         app_label = 'schedule'
         ordering = ('name', )

=== modified file 'summit/schedule/templates/schedule/index.html'
--- summit/schedule/templates/schedule/index.html	2010-03-05 10:33:36 +0000
+++ summit/schedule/templates/schedule/index.html	2010-08-30 14:41:04 +0000
@@ -1,16 +1,21 @@
 {% extends "base.html" %}
 {% load datetime %}
+{% load i18n %}
 
+{% block sub_nav %}{% endblock %}
 {% block content %}
-{% if summit_list %}
-    <ul class="summit_list">
-      {% for summit in summit_list %}
-        <li><h1><a href="/{{ summit.name }}">{{ summit.title }}</a></h1>
-          {% include "schedule/summit_info.html" %}
-        </li>
-    {% endfor %}
-    </ul>
-{% else %}
+<article class="minor-content">
+    {% if summit %}
+    <h1><a href="/{{ summit.name }}">{{ summit.title }}</a></h1>
+    <p>
+      {% include "schedule/summit_info.html" %}
+    </p>
+    {% else %}
     <p>No summits registered.</p>
-{% endif %}
+    {% endif %}
+</article>
+<article class="minor-content alone">
+    <h2>{% trans "Microblogging" %} #UDS</h2>
+    <p><script src="/media/twidenash.js?uds"></script></p>
+</article>
 {% endblock %}

=== modified file 'summit/schedule/templates/schedule/schedule_list.html'
--- summit/schedule/templates/schedule/schedule_list.html	2010-03-05 10:33:36 +0000
+++ summit/schedule/templates/schedule/schedule_list.html	2010-08-30 14:41:04 +0000
@@ -1,6 +1,5 @@
 {% load datetime %}
 
-<p><img src="/media/img/rule.png" width="690" height="1" alt="" class="rule" /></p>
 <h2>Schedule</h2>
 <table class="column">
 <tr>

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2010-03-05 10:33:36 +0000
+++ summit/schedule/templates/schedule/summit.html	2010-08-30 14:41:04 +0000
@@ -1,35 +1,35 @@
 {% extends "base.html" %}
 {% load datetime %}
+{% load i18n %}
 
 {% block title %}{{ summit.title }}{% endblock %}
 
-{% block content %}
-<h1>{{ summit.title }}</h1>
-{% include "schedule/summit_info.html" %}
+{% block sub_nav_links %}
 
 {% ifequal summit.state "sponsor" %}
-<p><img src="/media/img/rule.png" width="690" height="1" alt="" class="rule" /></p>
-
-<p class="request" style="font-size: 150%">
-  <a href="/{{ summit.name }}/sponsorship">Request Sponsorship</a>
-</p>
-{% if perms.sponsor.add_sponsorshipscore %}
-<p class="suggest" style="font-size: 150%">
-  <a href="/{{ summit.name }}/suggestsponsorship">Suggest Sponsorship</a>
-</p>
-{% endif %}
+    <a class="sub-nav-item" href="/{{ summit.name }}/sponsorship">{% trans 'Request Sponsorship' %}</a>
+    {% if perms.sponsor.add_sponsorshipscore %}
+    <a class="sub-nav-item" href="/{{ summit.name }}/suggestsponsorship">{% trans 'Suggest Sponsorship' %}</a>
+    {% endif %}
 {% endifequal %}
 
 {% ifnotequal summit.state "public" %}
-{% if perms.sponsor.add_sponsorshipscore %}
-<p><img src="/media/img/rule.png" width="690" height="1" alt="" class="rule" /></p>
-
-<p><a href="/{{ summit.name }}/sponsorship/review">Review Sponsorship Requests</a></p>
-{% endif %}
+    {% if perms.sponsor.add_sponsorshipscore %}
+    <a class="sub-nav-item" href="/{{ summit.name }}/sponsorship/review">{% trans 'Review Sponsorship Requests' %}</a>
+    {% endif %}
 {% endifnotequal %}
-
-<p><img src="/media/img/rule.png" width="690" height="1" alt="" class="rule" /></p>
-
+{% endblock %}
+
+{% block content %}
+
+<article class="main-content">
+<h1>{{ summit.title }}</h1>
+<p>
+{% include "schedule/summit_info.html" %}
+</p>
+</article>
+
+<article class="main-content">
 {% 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>
@@ -46,7 +46,11 @@
 <p><a href="/openid/login">Log in now</a></p>
 {% endif %}
 {% endif %}
+</article>
 
+<article class="main-content">
+<p>
 {% include "schedule/schedule_list.html" %}
-
+</p>
+</article>
 {% endblock %}

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2010-03-05 10:33:36 +0000
+++ summit/schedule/views.py	2010-08-30 14:41:04 +0000
@@ -42,14 +42,10 @@
 
 
 def index(request):
-    summit_list = Summit.objects.all()
-
-    if len(summit_list) == 1 \
-            and 'hack' not in request.GET:
-        return HttpResponseRedirect("/%s" % summit_list[0].name)
+    summit = Summit.objects.next()
 
     context = {
-        'summit_list': summit_list,
+        'summit': summit,
     }
     return render_to_response("schedule/index.html", context,
                               context_instance=RequestContext(request))

=== modified file 'summit/settings.py'
--- summit/settings.py	2010-04-08 16:56:52 +0000
+++ summit/settings.py	2010-08-30 14:41:04 +0000
@@ -83,10 +83,12 @@
     "django.core.context_processors.i18n",
     "django.core.context_processors.media",
     "django.core.context_processors.request",
+    "schedule.context_processors.next_summit",
 )
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
 )
@@ -100,6 +102,18 @@
     os.path.join(THIS_DIR, 'templates'),
 )
 
+try:
+    import ubuntu_website
+    TEMPLATE_CONTEXT_PROCESSORS += (
+        "ubuntu_website.media_processor",
+        "ubuntu_website.popup_check",
+    )
+    TEMPLATE_DIRS += (
+        ubuntu_website.TEMPLATE_DIR,
+    )
+except ImportError:
+    print "You will need to include lp:ubuntu-website/light-django-theme into ./ubuntu_website for the theme to fully work."
+
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',

=== modified file 'summit/sponsor/templates/sponsor/done.html'
--- summit/sponsor/templates/sponsor/done.html	2010-08-26 09:20:57 +0000
+++ summit/sponsor/templates/sponsor/done.html	2010-08-30 14:41:04 +0000
@@ -1,10 +1,14 @@
 {% extends "base.html" %}
 
+{% block sub_nav %}{% endblock %}
+
 {% block content %}
+<article class="main-content alone">
 <h1>Request Sponsorship</h1>
 <p>
 Thanks very much for requesting sponsorship to {{ summit.name }}.  If you
 have any queries about your request, please e-mail
 <a href="mailto:[e-mail]">[e-mail]</a>.
 </p>
+</article>
 {% endblock %}

=== modified file 'summit/sponsor/templates/sponsor/step0.html'
--- summit/sponsor/templates/sponsor/step0.html	2010-03-05 10:33:36 +0000
+++ summit/sponsor/templates/sponsor/step0.html	2010-08-30 14:41:04 +0000
@@ -1,10 +1,14 @@
 {% extends "base.html" %}
 
-{% block head %}
+{% block extrahead %}
+{{ block.super }}
 {{ form.media }}
 {% endblock %}
 
+{% block sub_nav %}{% endblock %}
+
 {% block content %}
+<article class="main-content alone">
 <h1>Request Sponsorship</h1>
 <p>
 To request sponsorship we need a few details off you, such as where you'll
@@ -12,11 +16,13 @@
 judge your request, we'll get some of that from Launchpad, but please take
 the time to tell us about yourself in your own words.
 </p>
-
 <p>
 If you have any problems with this app, please contact
 <a href="mailto:[e-mail]">[e-mail]</a>.
 </p>
+</article>
+
+<article class='main-content'>
 
 <form method="post">
 <table>
@@ -30,4 +36,5 @@
 {{ previous_fields|safe }}
 <input type="submit" value="Next"/>
 </form>
+</article>
 {% endblock %}

=== modified file 'summit/sponsor/templates/sponsor/step1.html'
--- summit/sponsor/templates/sponsor/step1.html	2010-03-05 10:33:36 +0000
+++ summit/sponsor/templates/sponsor/step1.html	2010-08-30 14:41:04 +0000
@@ -1,19 +1,26 @@
 {% extends "base.html" %}
 
-{% block head %}
+{% block extrahead %}
+{{ block.super }}
 {{ form.media }}
 {% endblock %}
 
+{% block sub_nav %}{% endblock %}
+
 {% block content %}
+<article class="main-content alone">
 <h1>Request Sponsorship</h1>
+
+<br />
 <h2>Further information</h2>
-
 <p>
 Almost done, there's just a few final details we need for your application;
 and you've a chance to add anything else that you think is important when
 judging your request.
 </p>
+</article>
 
+<article class="main-content">
 <form method="post">
 <table>
 {{ form }}
@@ -22,4 +29,5 @@
 {{ previous_fields|safe }}
 <input type="submit" value="Finish"/>
 </form>
+</article>
 {% endblock %}

=== modified file 'summit/templates/base.html'
--- summit/templates/base.html	2010-08-24 07:26:08 +0000
+++ summit/templates/base.html	2010-08-30 14:41:04 +0000
@@ -1,54 +1,68 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-  <title>{% block title %}Ubuntu Developer Summit{% endblock %}</title>
+{% extends "ubuntu_website_base.html" %}
+{% load i18n %}
+
+{% block title %}Ubuntu Developer Summit{% endblock %}
+
+{% block logo_text %}Ubuntu Developer Summit{% endblock %}
+
+{% block extrahead %}
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <link rel="stylesheet" type="text/css" media="screen" href="/media/css/chrome.css" />
-  <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/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 head %}{% endblock %}
-</head>
+{% endblock %}
 
-<body{% block body_extra %}{% endblock %}>
-<div id="container">
-  <div id="content">
-    <div id="topNav">
-      <p id="whoami">{% if user.is_authenticated %}
-      {{ user.get_full_name }}
-      &nbsp;
+{% block main_nav_links %}
+    <a class="main-nav-item" href="{% url summit.schedule.views.summit next_summit.name %}" title="{% trans "Summit" %}">{% trans "Summit" %}</a>
+    <a class="main-nav-item" href="{% url summit.sponsor.views.sponsorship next_summit.name %}" title="{% trans "Sponsorship" %}">{% trans "Sponsorship" %}</a>
+    {% if user.is_authenticated %}
       {% if user.is_staff %}
-      <a href="/admin">Admin</a>
-      &nbsp;
-      {% endif %}
-      <a href="/logout/">Log out</a>
-      {% else %}
-      <a href="/openid/login">Log in</a>
-      {% endif %}</p>
-      <a href="http://uds.ubuntu.com"><img id="ubuntulogo" src="/media/img/ubuntulogo.png" alt="Ubuntu" /></a>
-    </div>
-    <div id="body">
-      {% if messages %}
-      <ul class="messagelist">
-        {% for message in messages %}
-        <li>{{ message }}</li>
-        {% endfor %}
-      </ul>
-      {% endif %}
-      {% block content %}{% endblock %}
-    </div>
-    <div id="footer">
-      <div class="wrapper">
-	<img src="/media/img/rule.png" width="740" height="1" alt="" class="rule" />
-	<p>&copy; 2008 Canonical Ltd.  Ubuntu and Canonical are registered
-	trademarks of Canonical Ltd.</p>
-	{% block footer %}{% endblock %}
-      </div>
-    </div>
-    <div id="bg-right">&nbsp;</div><div id="bottom-right">&nbsp;</div>
-  </div>
-  <div id="bg-left">&nbsp;</div><div id="bottom-left">&nbsp;</div>
-</div>
-</body>
-
-</html>
+        <a class="main-nav-item" href="/admin" title="{% trans "Admin" %}">{% trans "Admin" %}</a>
+      {% endif %}
+        <a class="main-nav-item" href="/logout" title="{% trans "Log Out" %}: {{ user.username }}">{% trans "Log Out" %}</a>
+    {% else %}
+        <a class="main-nav-item" href="/openid/login?next={{login_next}}" title="{% trans "Log In" %}">{% trans "Log In" %}</a>
+    {% endif %}
+{% endblock %}
+
+{% block search %}{% endblock %}
+
+{% block sub_nav_links %}
+{% endblock %}
+
+{% block messages %}
+	{% if messages %}
+	  {% for message in messages %}
+	    <div class = 'message' ><div class = 'content-shim' >{{ message }}</div></div>
+	  {% endfor %}
+	{% endif %}
+{% endblock %}
+
+{% block content %}
+{% block body_extra %}{% endblock %}
+{% endblock %}
+
+{% block general %}
+{% endblock %}
+
+{% block footer %}
+<div style="height: 40px;">
+	<div class="loggedin">{% if user.is_authenticated %}{% trans "Logged in as" %}:  <a href="http://launchpad.net/~{{ user.username }}">{{ user.username }}</a>{% endif %}</div>
+</div>
+<div class="copyright">
+&copy; 2008-{% now "Y" %} Canonical Ltd., Ubuntu Community. Ubuntu is a registered trademark of Canonical Ltd.<br />
+</div>
+{% endblock %}
+
+{% block footer_list_1 %}
+{% endblock %}
+
+{% block footer_list_2 %}
+{% endblock %}
+
+{% block footer_list_3 %}
+{% endblock %}
+
+{% block footer_note %}
+{% endblock %}

=== modified file 'summit/urls.py'
--- summit/urls.py	2010-03-19 14:48:42 +0000
+++ summit/urls.py	2010-08-30 14:41:04 +0000
@@ -64,7 +64,12 @@
 )
 
 if settings.DEBUG:
+    import ubuntu_website
     urlpatterns += patterns('',
         (r'^media/(?P<path>.*)$', 'django.views.static.serve',
             {'document_root': settings.MEDIA_ROOT}),
+        (r'^(robots.txt)$', 'django.views.static.serve',
+            {'document_root': settings.MEDIA_ROOT}),
+        (r'^ubuntu-website/media/(?P<path>.*)$', 'django.views.static.serve',
+            {'document_root': ubuntu_website.MEDIA_ROOT}),
     )