Merge lp:~cjohnston/summit/add-user-profiles into lp:summit

[Chris Johnston]

[lp:~cjohnston/summit/add-user-profiles]

233. By Chris Johnston on 2011-12-11

[r=nigelbabu] Adds a sponsorship reviews state to summit so that links only show up when needed.

234. By Chris Johnston on 2011-12-11

[r=nigelbabu] Removes videographer and adds video fields.

235. By Chris Johnston on 2011-12-15

[r=nigelbabu] Adds track page with info about tracks.

236. By Chris Johnston on 2011-12-23

[r=chrisjohnston] Fixes token problems

237. By Данило Шеган on 2012-01-06

[r=chrisjohnston] Changes meeting name to 100 chars

238. By Chris Johnston on 2012-01-11

[r=nigelbabu,danilo] Adds manager and scheduler user roles to summit

239. By Michael Hall on 2012-01-15

[r=chrisjohnston] Adds private meeting urls for sharing access via emailed links

240. By Chris Johnston on 2012-01-16

[r=mhall119] Adds the ability for admins to add participants to a meeting

241. By Michael Hall on 2012-01-16

[r=nigelbabu] Sort attendees by user.username first, and summit second, to allow easier searching

242. By Chris Johnston on 2012-01-19

Fixes plenaries showing up on wrong days

243. By Michael Hall on 2012-01-20

[r=chrisjohnston] Removes obsolete tests and fix others

244. By Michael Hall on 2012-01-20

[r=chrisjohnston] Adds links to quickly add or remove yourself as a participant in a meeting.

245. By Chris Johnston on 2012-01-20

[r=mhall119] Adds ability for track leads, managers and schedulers to create private meetings from the UI

246. By Michael Hall on 2012-01-20

[r=chrisjohnston] Adds a new display for daily schedules that is more convenient for viewing on a desktop

247. By Michael Hall on 2012-01-21

[r=chrisjohnston] Add icecast urls to the new schedule

248. By Chris Johnston on 2012-01-21

[r=mhall119] This removes the images from the meeting fields on the widescreen page as well as changing the text to direct to the meeting page.

249. By Michael Hall on 2012-01-21

[r=chrisjohnston] Removed Linaro hacks

250. By Michael Hall on 2012-01-21

[r=chrisjohnston] Hide plenary room from room list unless the user can edit the schedule

251. By Chris Johnston on 2012-01-21

[r=mhall119] Adds can change agenda to create and edit PM

252. By Michael Hall on 2012-01-22

[r=chrisjohnston] Display time headers in 24-hour time, add end time

253. By Michael Hall on 2012-01-22

[r=chrisjohnston] Add management command to import summit schedule data.

254. By Chris Johnston on 2012-01-22

[r=james-w] Moves templates to common app

255. By Chris Johnston on 2012-01-22

[r=james-w] Remove remaining i18n stuff

256. By Chris Johnston on 2012-01-23

[r=james-w] Fixes spelling issue

257. By Michael Hall on 2012-01-24

[r=chrisjohnston] Fix localtime conversion issues

258. By Michael Hall on 2012-01-24

[r=chrisjohnston] Fix wide schedule links and tests

259. By Chris Johnston on 2012-01-24

[r=mhall119] Renames the app to "The Summit Scheduler" and adds/fixes page titles across the board.

260. By Chris Johnston on 2012-01-24

[r=mhall119] This removes the rest of the hacks for having multiple plenaries at the same time which was breaking the widescreen and daily displays.

261. By Chris Johnston on 2012-01-24

Starts adding social media to summit by adding opengraph

262. By Данило Шеган on 2012-01-24

Do not crash when multiple agendas are returned for the same time slot (eg. due to multiple plenary rooms)

263. By Chris Johnston on 2012-01-24

Add lunch and plenary labels to the new schedule

264. By Chris Johnston on 2012-01-25

Adds twitter hash tag to the summit model, displays twidenash on the main summit page

265. By Michael Hall on 2012-01-25

force available times on test rooms so that they will be on the schedule when they should be

266. By Chris Johnston on 2012-01-25

Version 1.0.0 Release

267. By Chris Johnston on 2012-01-25

Adds fixes from mhall119

268. By Chris Johnston on 2012-01-25

Adds url fix from danilos

269. By Chris Johnston on 2012-01-25

Release version 1.0.1

270. By Chris Johnston on 2012-01-25

[r=danilo] Removes "Private:" from the schedule list if there are no private rooms

271. By Данило Шеган on 2012-01-25

[r=chrisjohnston] Makes it possible for the creator of a private meeting to add required participants.

272. By Chris Johnston on 2012-01-25

[r=danilo] Removes "Lead:" if there is no track lead set

273. By Chris Johnston on 2012-01-25

[r=danilo] Removes empty subnav from meeting pages

274. By Chris Johnston on 2012-01-26

[r=chrisjohnston,danilo] Removes the requirement to set participants for a private meeting, adds help text.

275. By Chris Johnston on 2012-01-26

Version 1.0.2 release

276. By Michael Hall on 2012-01-27

[r=chrisjohnston] A quick and dirty monkey patching to give Users a sane order, added users real name in addition to their launchpad id, on meeting page also added real name in addition to launchpad id for participants.

277. By Michael Hall on 2012-01-27

[r=chrisjohnston] Fixes reverse lookup errors on meetings with no name and past summits page

278. By Chris Johnston on 2012-01-27

[r=mhall119] Makes the leads display on the track display smaller

279. By Chris Johnston on 2012-01-27

Allows etherpad url to be defined in the summit model

280. By Chris Johnston on 2012-01-27

Version 1.0.3 release

281. By Stuart Langridge on 2012-01-28

[r=mhall119] Custom styles for devices less than 480px wide; tiny bit of JS to override the hover stuff and toggle the details div on and off; one extra class added as a convenience hook.

282. By Chris Johnston on 2012-01-31

[r=alanbell,mhall119] Fixes the issue where etherpad SSO breaks summit.

283. By Stuart Langridge on 2012-02-01

[r=mhall119] More mobile tweaks!

284. By Michael Hall on 2012-02-01

[r=chrisjohnston] Replaces jorge with mhall119 as email contact.

285. By Michael Hall on 2012-02-01

[r=chrisjohnston] Show multi-slot meetings in subsequent slots in the new schedule. Show track names in normal display, but not in mobile, on the new schedule

286. By Chris Johnston on 2012-02-01

Version 1.0.4 release

287. By Chris Johnston on 2012-02-02

[r=mhall119] Removes an empty if statement

288. By Chris Johnston on 2012-02-02

[r=chrisjohnston,mhall119] Changes the links to match the links on connect when viewed at summit.linaro.org

289. By Chris Johnston on 2012-02-02

[r=danilo] Adds custom QR codes for displaying links to different apps per summit

290. By Chris Johnston on 2012-02-02

[r=danilo] Adds a link to the blueprint (if there is on) in the sub-nav of the meeting page

291. By Chris Johnston on 2012-02-02

Makes it to where links on a page viewed _popup=1 contain _popup=1 in their url

292. By Chris Johnston on 2012-02-02

Makes the meeting page open up in a new window on s.l.o agenda page

293. By Chris Johnston on 2012-02-02

Version 1.0.5 release

294. By Michael Hall on 2012-02-05

[r=chrisjohnston] * Removes broken javascript for "Hide talks that aren't for me"
* Fixes schedule layout on the summit page to avoid excessive scrolling

295. By Michael Hall on 2012-02-06

[r=chrisjohnston] Limit the list of attendees the participant inline to those for the same summit as the meeting being viewed

296. By Chris Johnston on 2012-02-07

Displays everything on the user page

297. By Chris Johnston on 2012-02-07

Adds if around mugshot

298. By Chris Johnston on 2012-02-07

update

Unmerged revisions

298. By Chris Johnston on 2012-02-07

update

297. By Chris Johnston on 2012-02-07

Adds if around mugshot

296. By Chris Johnston on 2012-02-07

Displays everything on the user page

=== added file 'summit/common/forms.py'
--- summit/common/forms.py	1970-01-01 00:00:00 +0000
+++ summit/common/forms.py	2012-02-07 17:38:18 +0000
@@ -0,0 +1,40 @@
+from django.template import Context, loader
+from django import forms
+
+# Taken from http://djangosnippets.org/snippets/1732/
+class RenderableMixin(object):
+    """
+    Mixin to render forms from a predefined template
+    """
+    
+    @property
+    def form_class_name(self):
+        return '.'.join([self.__module__, self.__class__.__name__.lower()])
+
+    def as_template(self):
+        """
+        Renders a form from a template
+        """
+        self.template_name = self.__class__.__name__.lower()
+
+        if not getattr(self, 'tpl', None):
+            self.tpl = loader.get_template('form.html')
+
+        context_dict = dict(
+            non_field_errors=self.non_field_errors(),
+            fields=[ forms.forms.BoundField(self, field, name) for name, field in self.fields.iteritems()],
+            errors=self.errors,
+            data=self.data,
+            form=self,
+        )
+
+        if getattr(self, 'initial', None):
+            context_dict.update(dict(initial=self.initial))
+        if getattr(self, 'instance', None):
+            context_dict.update(dict(instance=self.instance))
+        if getattr(self, 'cleaned_data', None):
+            context_dict.update(dict(cleaned_data=self.cleaned_data))
+
+        return self.tpl.render(
+            Context(context_dict)
+        )

=== renamed file 'summit/common/forms.py' => 'summit/common/forms.py.moved'
=== renamed file 'summit/schedule/launchpad.py' => 'summit/common/launchpad.py'
--- summit/schedule/launchpad.py	2012-01-23 01:18:55 +0000
+++ summit/common/launchpad.py	2012-02-07 17:38:18 +0000
@@ -71,3 +71,30 @@
             openid_assoc.save()
             return True
     return False
+
+def get_mugshot_url(lp, identity):
+    # Not ideal, but until LP #336943
+    # or similar, we are in a hard spot.
+    # When this bug is fixed, this can be made cleaner.
+    try:
+       lp.people[identity].mugshot.open()
+       return lp.people[identity].mugshot_link or "https://api.launchpad.net/1.0/~%s/mugshot" % (identity)
+    except HTTPError:
+       # 404 or some other issue that means we should default to False
+       return "https://api.launchpad.net/1.0/ubuntu/mugshot"
+
+def get_user_timezone(username, lp=None):
+    timezone = 'UTC'
+    if username is None:
+        return timezone
+
+    if not lp:
+        lp = lp_login()
+        if not lp:
+            return timezone
+    try:
+        lp_user = lp.people[username]
+        timezone = lp_user.timezone
+    except:
+        pass
+    return timezone

=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py	2012-02-02 15:27:54 +0000
+++ summit/schedule/models/summitmodel.py	2012-02-07 17:38:18 +0000
@@ -33,7 +33,7 @@
 from django.contrib.auth.models import User
 
 from summit.schedule.fields import NameField
-from summit.schedule import launchpad
+from summit.common import launchpad
 
 __all__ = (
     'Summit',

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2012-01-25 08:32:48 +0000
+++ summit/schedule/tests.py	2012-02-07 17:38:18 +0000
@@ -33,8 +33,10 @@
 from summit.schedule.fields import NameField
 
 from summit.schedule.models import *
+
 from summit.schedule.render import Schedule
-from summit.schedule import launchpad
+
+from summit.common import launchpad
 
 # Monkey-patch our NameField into the types of fields that the factory
 # understands.  This is simpler than trying to subclass the Mommy

=== modified file 'summit/settings.py'
--- summit/settings.py	2012-02-02 14:16:45 +0000
+++ summit/settings.py	2012-02-07 17:38:18 +0000
@@ -153,6 +153,7 @@
     'summit.schedule',
     'summit.sponsor',
     'summit.common',
+    'summit.userprofiles',
     'south',
 ]
 

=== modified file 'summit/urls.py'
--- summit/urls.py	2012-01-23 01:18:55 +0000
+++ summit/urls.py	2012-02-07 17:38:18 +0000
@@ -88,6 +88,11 @@
     (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[%+\.\w-]+).ical$', 'track_ical'),
 )
 
+urlpatterns += patterns('summit.userprofiles.views',
+    (r'^u/(?P<username>[%+\.\w-]+)/update$', 'update_profile'),
+    (r'^u/(?P<username>[%+\.\w-]+)', 'user_profile'),
+    )
+
 if settings.DEBUG or settings.SERVE_STATIC:
     urlpatterns += patterns('',
         (r'^media/(?P<path>.*)$', 'django.views.static.serve',

=== added directory 'summit/userprofiles'
=== added file 'summit/userprofiles/__init__.py'
=== added file 'summit/userprofiles/admin.py'
--- summit/userprofiles/admin.py	1970-01-01 00:00:00 +0000
+++ summit/userprofiles/admin.py	2012-02-07 17:38:18 +0000
@@ -0,0 +1,7 @@
+from django.contrib import admin
+from userprofiles.models import UserProfile
+
+class UserProfileAdmin(admin.ModelAdmin):
+    search_fields = ('realname',)
+
+admin.site.register(UserProfile, UserProfileAdmin)

=== added file 'summit/userprofiles/forms.py'
--- summit/userprofiles/forms.py	1970-01-01 00:00:00 +0000
+++ summit/userprofiles/forms.py	2012-02-07 17:38:18 +0000
@@ -0,0 +1,25 @@
+# Ubuntu Developer Summit web application
+# Copyright (C) 2008, 2009, 2010 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from django import forms
+
+from common.forms import RenderableMixin
+from summit.userprofiles.models import UserProfile
+
+class UpdateProfileForm(forms.ModelForm, RenderableMixin):
+    class Meta:
+        model = UserProfile
+        exclude = ('user', 'tz')

=== added directory 'summit/userprofiles/management'
=== added file 'summit/userprofiles/management/__init__.py'
=== added directory 'summit/userprofiles/management/commands'
=== added file 'summit/userprofiles/management/commands/__init__.py'
=== added file 'summit/userprofiles/management/commands/update-profiles.py'
--- summit/userprofiles/management/commands/update-profiles.py	1970-01-01 00:00:00 +0000
+++ summit/userprofiles/management/commands/update-profiles.py	2012-02-07 17:38:18 +0000
@@ -0,0 +1,39 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+from django.core.management.base import NoArgsCommand
+
+from common import launchpad
+from django.contrib.auth.models import User, Group
+from userprofiles.models import UserProfile, create_profile
+
+from datetime import datetime
+import sys
+
+class Command(NoArgsCommand):
+    help = "Updates user profiles with information from Launchpad."
+
+    def handle_noargs(self, **options):
+        lp = launchpad.lp_login()
+        if not lp:
+            sys.exit(1)
+        USER_BLACKLIST = (u"root", u"admin")
+        
+        summit_users = User.objects.all()
+
+        for summit_user in summit_users:
+            if not summit_user.username in USER_BLACKLIST:
+                profile, created = UserProfile.objects.get_or_create(user=summit_user)
+                try:
+                    lp_user = lp.people[summit_user.username]
+                    profile.tz = lp_user.time_zone or "UTC"
+                    profile.realname = lp_user.display_name or user.username
+                    if lp_user.logo_link.startswith("https://") :
+                       profile.mugshot = lp_user.logo_link
+                    else:
+                       profile.mugshot = "https://launchpad.net/@@/person-logo"
+                    profile.save()
+                except Exception, e:
+                    print "Error updating %s" % summit_user
+                    print e
+                    pass

=== added directory 'summit/userprofiles/migrations'
=== added file 'summit/userprofiles/migrations/0001_add_user_profiles.py'
--- summit/userprofiles/migrations/0001_add_user_profiles.py	1970-01-01 00:00:00 +0000
+++ summit/userprofiles/migrations/0001_add_user_profiles.py	2012-02-07 17:38:18 +0000
@@ -0,0 +1,93 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding model 'UserProfile'
+        db.create_table('userprofiles_userprofile', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)),
+            ('realname', self.gf('django.db.models.fields.CharField')(max_length=150, blank=True)),
+            ('tz', self.gf('django.db.models.fields.CharField')(default='UTC', max_length=32)),
+            ('mugshot', self.gf('django.db.models.fields.URLField')(max_length=150, null=True, blank=True)),
+            ('blog', self.gf('django.db.models.fields.URLField')(max_length=200, null=True, blank=True)),
+            ('twitter', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
+            ('identica', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
+            ('picasa', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
+            ('flickr', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
+            ('facebook', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
+            ('irc', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
+            ('aim', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
+            ('xmpp', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
+        ))
+        db.send_create_signal('userprofiles', ['UserProfile'])
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'UserProfile'
+        db.delete_table('userprofiles_userprofile')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'userprofiles.userprofile': {
+            'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
+            'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
+            'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['userprofiles']

=== added file 'summit/userprofiles/migrations/__init__.py'
=== added file 'summit/userprofiles/models.py'
--- summit/userprofiles/models.py	1970-01-01 00:00:00 +0000
+++ summit/userprofiles/models.py	2012-02-07 17:38:18 +0000
@@ -0,0 +1,82 @@
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+from django.contrib.auth import models as auth_models
+
+
+import pytz
+
+class UserProfile(models.Model):
+    " Store profile information about a user "
+
+    user = models.OneToOneField(auth_models.User)
+    realname = models.CharField(_("Real Name"), max_length=150, blank=True)
+    tz = models.CharField(verbose_name=_('Timezone'), max_length=32, default='UTC')
+    mugshot = models.URLField(verbose_name=_("Mugshot"), max_length=150, blank=True, verify_exists=False, null=True)
+    blog = models.URLField(verbose_name=_('Blog URL'), blank=True, null=True, verify_exists=False)
+    twitter = models.CharField(verbose_name=_('Twitter ID'), max_length=32, blank=True, null=True)
+    identica = models.CharField(verbose_name=_('Identi.ca ID'), max_length=32, blank=True, null=True)
+    picasa = models.CharField(verbose_name=_('Picasa ID'), max_length=32, blank=True, null=True)
+    flickr = models.CharField(verbose_name=_('Flickr ID'), max_length=32, blank=True, null=True)
+    facebook = models.CharField(verbose_name=_('Facebook ID'), max_length=32, blank=True, null=True)
+    irc = models.CharField(verbose_name=_('IRC Nick'), max_length=32, blank=True, null=True)
+    aim = models.CharField(verbose_name=_('AOL IM Nick'), max_length=32, blank=True, null=True)
+    xmpp = models.CharField(verbose_name=_('XMPP IM Nick'), max_length=32, blank=True, null=True)
+
+    class Meta:
+        ordering = ('user__username',)
+        
+    def __unicode__(self):
+        try:
+            if self.realname:
+                return "%s (%s)" % (self.user.username, self.realname)
+            return "%s" % self.user.username
+        except:
+            return "Unknown Profile"
+
+    def get_timezone(self):
+        try:
+            return pytz.timezone(self.tz)
+        except:
+            return pytz.utc
+    timezone = property(get_timezone)
+    
+    def tolocaltime(self, dt):
+        as_utc = pytz.utc.localize(dt)
+        return as_utc.astimezone(self.timezone)
+
+    def fromlocaltime(self, dt):
+        local = self.timezone.localize(dt)
+        return local.astimezone(pytz.utc)
+            
+def _getUserProfile(self):
+    if self.is_anonymous():
+         return UserProfile()
+             
+    profile, created = UserProfile.objects.get_or_create(user=self)
+    
+    if created:
+        from common.launchpad import get_user_timezone
+        profile.tz = get_user_timezone(self.username)
+        profile.save()
+        
+    return profile
+
+def _getAnonProfile(self):
+    return UserProfile()
+        
+auth_models.User.profile = property(_getUserProfile)
+auth_models.AnonymousUser.profile = property(_getAnonProfile)
+
+def create_profile(username):
+    user, created = auth_models.User.objects.get_or_create(username=username)
+    if created:
+        user.save()
+    from common import launchpad
+    launchpad.set_user_openid(user, force=True)
+    profile, created = UserProfile.objects.get_or_create(user=user)
+    if created:
+        # set real name as username for now, 
+        # we get the name later on via cronjob
+        profile.realname = username
+        profile.save()
+    return profile

=== added directory 'summit/userprofiles/templates'
=== added directory 'summit/userprofiles/templates/userprofiles'
=== added file 'summit/userprofiles/templates/userprofiles/profile.html'
--- summit/userprofiles/templates/userprofiles/profile.html	1970-01-01 00:00:00 +0000
+++ summit/userprofiles/templates/userprofiles/profile.html	2012-02-07 17:38:18 +0000
@@ -0,0 +1,43 @@
+{% extends "base.html" %} 
+
+{% block page_name %}
+{{ display_user.profile.realname }}
+{% endblock %}
+{% block sub_nav_links %}
+<a class="sub-nav-item" href="">Update</a>
+{% endblock %}
+{% block content %}
+<h3>User: {{ display_user.profile.realname }}</h3>
+{% if display_user.profile.mugshot %}<img src="{{ display_user.profile.mugshot }}" alt="{{ display_user.profile.realname }}" /><br />{% endif %}
+Launchpad ID: {{ display_user.profile.user }}<br />
+{% if display_user.profile.tz %}
+Timezone: {{ display_user.profile.tz }}<br />
+{% endif %}
+{% if display_user.profile.irc %}
+IRC Nick: {{ display_user.profile.irc }} <br />
+{% endif %}
+{% if display_user.profile.blog %}
+Blog: <a href="{{ display_user.profile.blog }}">{{ display_user.profile.blog }}</a><br />
+{% endif %}
+{% if display_user.profile.twitter %}
+Twitter: <a href="http://twitter.com/{{ display_user.profile.twitter }}">{{ display_user.profile.twitter }}</a><br />
+{% endif %}
+{% if display_user.profile.facebook %}
+Facebook: <a href="http://facebook.com/{{ display_user.profile.facebook }}">{{ display_user.profile.facebook }}</a><br />
+{% endif %}
+{% if display_user.profile.identia %}
+Identi.ca: {{ display_user.profile.identica }}<br />
+{% endif %}
+{% if display_user.profile.picasa %}
+Picasa: {{ display_user.profile.picasa }}<br />
+{% endif %}
+{% if display_user.profile.flickr %}
+Flickr: {{ display_user.profile.flickr }}<br />
+{% endif %}
+{% if display_user.profile.aim %}
+AOL IM: {{ display_user.profile.aim }}<br />
+{% endif %}
+{% if display_user.profile.xmpp %}
+XMPP: {{ display_user.profile.xmpp }}
+{% endif %}
+{% endblock %}

=== added file 'summit/userprofiles/templates/userprofiles/profile_update.html'
--- summit/userprofiles/templates/userprofiles/profile_update.html	1970-01-01 00:00:00 +0000
+++ summit/userprofiles/templates/userprofiles/profile_update.html	2012-02-07 17:38:18 +0000
@@ -0,0 +1,41 @@
+{% extends "base.html" %}
+
+{% block extrafooter %}
+<script type="text/javascript"><!--
+$(document).ready(function(){
+    $('span[rel*=help]').colorTip({color:'orange'});
+});
+--></script>
+{% endblock %}
+
+
+{% block content %}
+
+    <article id="form" class="main-content">
+        {% if form.errors %}
+            <p style="color: red;">
+                Please correct the error{{ form.errors|pluralize }} below.
+            </p>
+        {% endif %}
+
+        <form action="{{ request.path_info }}" method="POST">
+            <fieldset>
+                <legend>User information</legend>
+                <div>
+                    <div class="field"><label>Username:</label></div>
+                    <span class="extra">{{ display_user.profile.user }}</span>
+                </div>
+                    <div>
+                    <div class="field"><label>Timezone:</label></div>
+                    <span class="extra">{{ display_user.profile.tz }}</span>
+                </div>
+            </fieldset>
+            <fieldset>
+                <legend>Update profile information below</legend>
+                {{ form.as_template }}
+            </fieldset>
+                {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
+                <input type="submit" name="submit" value="Update!" class="submit-button" /> 
+        </form>
+    </article>
+{% endblock %}

=== added file 'summit/userprofiles/tests.py'
--- summit/userprofiles/tests.py	1970-01-01 00:00:00 +0000
+++ summit/userprofiles/tests.py	2012-02-07 17:38:18 +0000
@@ -0,0 +1,16 @@
+"""
+This file demonstrates writing tests using the unittest module. These will pass
+when you run "manage.py test".
+
+Replace this with more appropriate tests for your application.
+"""
+
+from django.test import TestCase
+
+
+class SimpleTest(TestCase):
+    def test_basic_addition(self):
+        """
+        Tests that 1 + 1 always equals 2.
+        """
+        self.assertEqual(1 + 1, 2)

=== added file 'summit/userprofiles/views.py'
--- summit/userprofiles/views.py	1970-01-01 00:00:00 +0000
+++ summit/userprofiles/views.py	2012-02-07 17:38:18 +0000
@@ -0,0 +1,66 @@
+# Ubuntu Developer Summit web application
+# Copyright (C) 2008, 2009, 2010 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from django.conf import settings
+from django.http import HttpResponse, HttpResponseRedirect
+from django.shortcuts import render_to_response, get_object_or_404
+from django.template import RequestContext
+from django.contrib.auth.models import User
+
+from common.utils import redirect
+
+import forms
+
+from summit.userprofiles.models import UserProfile
+
+__all__ = (
+    'user_profile',
+)
+
+def user_profile(request, username):
+    user = get_object_or_404(User, username=username)
+
+    context = {
+        'display_user': user,
+        'display_user_profile': user.profile,
+    }
+    return render_to_response("userprofiles/profile.html", context,
+                              context_instance=RequestContext(request))
+
+def update_profile(request, username):
+    user = get_object_or_404(User, username=username)
+    
+    if request.user.id != user.id:
+        request.user.message_set.create(message='You are not allowed to make changes to this profile.')
+        return redirect( user_profile, username )
+    
+    if request.method == "POST":
+        form = forms.UpdateProfileForm(data=request.POST, instance=user.profile)
+        if form.is_valid():
+            form.save()
+            request.user.message_set.create(message='User profile updated')
+            return redirect( user_profile, username )
+        else:
+            request.user.message_set.create(message='User profile could not be saved.')
+    else:
+        form = forms.UpdateProfileForm(instance=user.profile)
+
+
+    return render_to_response('userprofiles/profile_update.html', 
+                    {'form': form, 
+                     'display_user': user, 
+                     'display_user_profile': user.profile, 
+                    }, RequestContext(request))