Merge lp:~dholbach/loco-team-portal/profile into lp:loco-team-portal

[Daniel Holbach]

I realise that this proposal is probably not quite there yet, but I need all the testing and all the eyeballs we have.

[Daniel Holbach (dholbach)]

Open questions:
 - when do we update timezones (for somebody who moved to another country)
 - when do we get a list of all team members, so admin/owner can pick the loco contacts in the team

Answers and merge proposals into this branch are much appreciated. :-)

[Chris Johnston (cjohnston)]

I mentioned it on IRC one day, and I'll ask here also. Why do we need to pull a users TZ?

Use case: We pull my TZ. It's -4. I am over in Germany, and while I'm there I decide to go to an event with Daniel. I go to LD, register to attend the event, and it shows me the time in a -4 TZ. What good will that do me? I now have to convert the time from my local TZ to the correct TZ in Germany.

The event time should be based upon the TZ the the event is located in (the venue's location) and not upon the TZ of the user. There could possibly be two entries, the TZ in which the event is located and the users home TZ, but that just seems to be adding extra things that don't need to be there. I may be way off with my thinking and would enjoy seeing more feedback, but this is how I understand the way the new system is going to work, and I dont think it's the best way for it to work.

[Daniel Holbach (dholbach)]

> I mentioned it on IRC one day, and I'll ask here also. Why do we need to pull
> a users TZ?

That's a question that Michael can answer best. How about the rest of the merge proposal?

[Chris Johnston (cjohnston)]

Questions:
 - After selecting team contacts, they don't display on the team details page.
 - Can we remove LP team owner and LP team admins as they may not reflect what is accurate.

[Dave Walker (davewalker)]

> Open questions:
> - when do we update timezones (for somebody who moved to another country)

It's my understanding that the profile is generated at login time. We could have "on login", do checks..

Or cronjob based.. At the moment, that wouldn't be intensive as there aren't that many authenticated users, but as LD gets more popular this could be a real bottleneck.

> - when do we get a list of all team members, so admin/owner can pick the loco
> contacts in the team
>

Do we *want* a list of all members, or stick to generating profile on login?

[Daniel Holbach (dholbach)]

> - After selecting team contacts, they don't display on the team details page.

That's a bug.

> - Can we remove LP team owner and LP team admins as they may not reflect what
> is accurate.

Why not accurate? We never say that LP team owner and LP team admins are LoCo contacts.

[Daniel Holbach (dholbach)]

> Or cronjob based.. At the moment, that wouldn't be intensive as there aren't
> that many authenticated users, but as LD gets more popular this could be a
> real bottleneck.

Not only on login, but also when a userprofile is created (admin/owners through lpupdate management command).

> Do we *want* a list of all members, or stick to generating profile on login?

The problem we have right now is that loco contacts can only be chosen from the list of existing profiles (logged in people + lp admins + lp owner).

[Daniel Holbach (dholbach)]

> > - After selecting team contacts, they don't display on the team details
> page.
>
> That's a bug.

Fixed.

[lp:~dholbach/loco-team-portal/profile]

259. By Daniel Holbach on 2010-08-26

show loco contacts on team page

260. By Daniel Holbach on 2010-08-26

make list of profiles more readable

261. By Daniel Holbach on 2010-08-26

merge from trunk

Unmerged revisions

=== modified file 'loco_directory/common/launchpad.py'
--- loco_directory/common/launchpad.py	2010-08-20 13:05:47 +0000
+++ loco_directory/common/launchpad.py	2010-08-26 14:42:47 +0000
@@ -50,9 +50,9 @@
 
 def is_admin_or_owner(username, team):
     # check just using the LD data
-    if username == team.owner:
+    if username == team.owner_profile.user.username:
         return True
-    if team.admins.filter(lpid=username):
+    if team.admin_profiles.filter(user__username=username):
         return True
     if is_debug_user(username):
         return True
@@ -80,3 +80,19 @@
     except HTTPError:
        # 404 or some other issue that means we should default to False
        return "https://edge.launchpad.net/api/beta/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 'loco_directory/events/forms.py'
--- loco_directory/events/forms.py	2010-08-02 14:43:27 +0000
+++ loco_directory/events/forms.py	2010-08-26 14:42:47 +0000
@@ -112,7 +112,7 @@
 
     class Meta:
         model = Attendee
-        exclude = ('attendee', 'team_event')
+        exclude = ('attendee_profile', 'team_event')
 
 class TeamEventCommentForm(forms.ModelForm):
     """
@@ -120,7 +120,7 @@
     """
     class Meta:
         model = TeamEventComment
-        exclude = ('team_event', 'date_created', 'comment_by')
+        exclude = ('team_event', 'date_created', 'commenter_profile')
 
 class EventSearchForm(forms.Form):
     """

=== added file 'loco_directory/events/migrations/0002_add_profile_fields.py'
--- loco_directory/events/migrations/0002_add_profile_fields.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/migrations/0002_add_profile_fields.py	2010-08-26 14:42:47 +0000
@@ -0,0 +1,170 @@
+
+from south.db import db
+from django.db import models
+from events.models import *
+
+class Migration:
+    depends_on = (
+        ("userprofiles", "0001_initial"),
+                )
+
+    def forwards(self, orm):
+        
+        # Adding field 'TeamEventComment.commenter_profile'
+        db.add_column('events_teameventcomment', 'commenter_profile', orm['events.TeamEventComment:commenter_profile'])
+        
+        # Adding field 'Attendee.attendee_profile'
+        db.add_column('events_attendee', 'attendee_profile', orm['events.Attendee:attendee_profile'])
+        
+    
+    
+    def backwards(self, orm):
+        
+        # Deleting field 'TeamEventComment.commenter_profile'
+        db.delete_column('events_teameventcomment', 'commenter_profile_id')
+        
+        # Deleting field 'Attendee.attendee_profile'
+        db.delete_column('events_attendee', 'attendee_profile_id')
+        
+    
+    
+    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'})
+        },
+        'events.attendee': {
+            'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
+        },
+        'events.baseevent': {
+            'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 9, 53, 607179)', 'db_index': 'True'}),
+            'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+        },
+        'events.globalevent': {
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
+        },
+        'events.teamevent': {
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
+            'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True'}),
+            'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
+        },
+        'events.teameventcomment': {
+            'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}),
+            'comment_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 9, 53, 613146)', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
+        },
+        'teams.continent': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+        },
+        'teams.country': {
+            'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+        },
+        'teams.language': {
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
+        },
+        'teams.team': {
+            'Meta': {'db_table': "'teams'"},
+            'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
+            'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
+            'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}),
+            'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}),
+            'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
+            'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
+            'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        'userprofiles.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'}),
+            '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'})
+        },
+        'venues.venue': {
+            'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"},
+            'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        }
+    }
+    
+    complete_apps = ['events']

=== added file 'loco_directory/events/migrations/0003_migrate_profile_data.py'
--- loco_directory/events/migrations/0003_migrate_profile_data.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/migrations/0003_migrate_profile_data.py	2010-08-26 14:42:47 +0000
@@ -0,0 +1,173 @@
+
+from south.db import db
+from django.db import models
+from events.models import *
+
+class Migration:
+
+    def forwards(self, orm):
+        for comment in orm['events.TeamEventComment'].objects.all():
+            if not comment.commenter_profile:
+                commenter_profile, created = orm['userprofiles.UserProfile'].objects.get_or_create(user=comment.comment_by)
+                if created:
+                    commenter_profile.save()
+                comment.commenter_profile = commenter_profile
+                comment.save()
+        for attendee in orm['events.Attendee'].objects.all():
+            if not attendee.attendee_profile:
+                attendee_profile, created = orm['userprofiles.UserProfile'].objects.get_or_create(user=attendee.attendee)
+                if created:
+                    attendee_profile.save()
+                attendee.attendee_profile = attendee_profile
+                attendee.save()
+    
+    def backwards(self, orm):
+        for comment in orm['events.TeamEventComment'].objects.all():
+            if not comment.comment_by:
+                comment.comment_by = comment.commenter_profile.user
+                comment.save()
+        for attendee in orm['events.Attendee'].objects.all():
+            if not attendee.attendee:
+                attendee.attendee = attendee.attendee_profile.user
+                attendee.save()
+    
+    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'})
+        },
+        'events.attendee': {
+            'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}),
+            'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
+        },
+        'events.baseevent': {
+            'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 10, 3, 333840)', 'db_index': 'True'}),
+            'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+        },
+        'events.globalevent': {
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
+        },
+        'events.teamevent': {
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
+            'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True'}),
+            'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
+        },
+        'events.teameventcomment': {
+            'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}),
+            'comment_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}),
+            'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 10, 3, 336191)', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
+        },
+        'teams.continent': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+        },
+        'teams.country': {
+            'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+        },
+        'teams.language': {
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
+        },
+        'teams.team': {
+            'Meta': {'db_table': "'teams'"},
+            'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
+            'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
+            'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}),
+            'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}),
+            'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
+            'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
+            'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        'userprofiles.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'}),
+            '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'})
+        },
+        'venues.venue': {
+            'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"},
+            'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        }
+    }
+    
+    complete_apps = ['events']

=== added file 'loco_directory/events/migrations/0004_remove_user.py'
--- loco_directory/events/migrations/0004_remove_user.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/migrations/0004_remove_user.py	2010-08-26 14:42:47 +0000
@@ -0,0 +1,181 @@
+
+from south.db import db
+from django.db import models
+from events.models import *
+
+class Migration:
+    
+    def forwards(self, orm):
+        
+        # Deleting field 'TeamEventComment.comment_by'
+        db.delete_column('events_teameventcomment', 'comment_by_id')
+        
+        # Deleting field 'Attendee.attendee'
+        db.delete_column('events_attendee', 'attendee_id')
+        
+        # Changing field 'BaseEvent.date_created'
+        # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2010, 8, 18, 10, 11, 17, 963571), db_index=True))
+        db.alter_column('events_baseevent', 'date_created', orm['events.baseevent:date_created'])
+        
+        # Changing field 'TeamEventComment.date_created'
+        # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2010, 8, 18, 10, 11, 17, 966242), db_index=True))
+        db.alter_column('events_teameventcomment', 'date_created', orm['events.teameventcomment:date_created'])
+        
+    
+    
+    def backwards(self, orm):
+        
+        # Adding field 'TeamEventComment.comment_by'
+        db.add_column('events_teameventcomment', 'comment_by', orm['events.teameventcomment:comment_by'])
+        
+        # Adding field 'Attendee.attendee'
+        db.add_column('events_attendee', 'attendee', orm['events.attendee:attendee'])
+        
+        # Changing field 'BaseEvent.date_created'
+        # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2010, 8, 18, 10, 10, 3, 333840), db_index=True))
+        db.alter_column('events_baseevent', 'date_created', orm['events.baseevent:date_created'])
+        
+        # Changing field 'TeamEventComment.date_created'
+        # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2010, 8, 18, 10, 10, 3, 336191), db_index=True))
+        db.alter_column('events_teameventcomment', 'date_created', orm['events.teameventcomment:date_created'])
+        
+    
+    
+    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'})
+        },
+        'events.attendee': {
+            'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"},
+            'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
+        },
+        'events.baseevent': {
+            'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 11, 17, 963571)', 'db_index': 'True'}),
+            'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+        },
+        'events.globalevent': {
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})
+        },
+        'events.teamevent': {
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
+            'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True'}),
+            'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
+        },
+        'events.teameventcomment': {
+            'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}),
+            'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 11, 17, 966242)', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"})
+        },
+        'teams.continent': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+        },
+        'teams.country': {
+            'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+        },
+        'teams.language': {
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
+        },
+        'teams.team': {
+            'Meta': {'db_table': "'teams'"},
+            'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
+            'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
+            'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}),
+            'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}),
+            'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
+            'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
+            'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        'userprofiles.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'}),
+            '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'})
+        },
+        'venues.venue': {
+            'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"},
+            'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        }
+    }
+    
+    complete_apps = ['events']

=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2010-08-18 16:18:41 +0000
+++ loco_directory/events/models.py	2010-08-26 14:42:47 +0000
@@ -1,5 +1,5 @@
 from django.db import models
-from django.contrib.auth.models import User
+from userprofiles.models import UserProfile
 from teams.models import *
 from venues.models import Venue
 from django.utils.translation import ugettext_lazy as _
@@ -120,7 +120,7 @@
 
     def is_attending(self, user):
         if user.is_authenticated():
-            return self.attendee_set.filter(attendee=user).count() > 0
+            return self.attendee_set.filter(attendee_profile__user=user).count() > 0
         else:
             return False
 
@@ -145,7 +145,7 @@
     """
     team_event = models.ForeignKey(TeamEvent, help_text=_('the Team Event'))
     date_created = models.DateTimeField(help_text=_('the date and time when the event comment was created'), default=datetime.datetime.now(), db_index=True)
-    comment_by = models.ForeignKey(User) 
+    commenter_profile = models.ForeignKey(UserProfile, null=True)
     comment = models.TextField(help_text=_('Comment this Event'), db_index=True)
     
     def __unicode__(self):
@@ -158,14 +158,14 @@
     a event attendee
     """
     class Meta:
-        unique_together = ('team_event', 'attendee')
+        unique_together = ('team_event', 'attendee_profile')
         
     team_event = models.ForeignKey(TeamEvent, help_text=_('the Team Event'))
-    attendee = models.ForeignKey(User, help_text=_('the name of the attendee'))
+    attendee_profile = models.ForeignKey(UserProfile, help_text=_('the name of the attendee'), null=True)
     promise = models.CharField(verbose_name=_('Attending Status'), max_length=50, choices=ATTENDEE_PROMISE_CHOICES)
     guests = models.PositiveSmallIntegerField(verbose_name=_('Additional Guests'))
     
     def __unicode__(self):
-        return self.attendee
+        return self.attendee_profile.user.username
 
 

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2010-08-17 14:40:36 +0000
+++ loco_directory/events/views.py	2010-08-26 14:42:47 +0000
@@ -304,9 +304,11 @@
     """
     team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
     if team_event_object.is_attending(request.user):
-        attendee_object = team_event_object.attendee_set.get(attendee=request.user)
+        attendee_object = team_event_object.attendee_set.get(attendee_profile__user=request.user)
     else:
-        attendee_object = Attendee(team_event=team_event_object, attendee=request.user)
+        from userprofiles.models import create_profile
+        profile = create_profile(request.user.username)
+        attendee_object = Attendee(team_event=team_event_object, attendee_profile=profile)
         
     if request.method == 'POST':        
         form = AttendeeRegistrationForm(instance=attendee_object, data=request.POST)
@@ -341,7 +343,9 @@
         if form.is_valid():
             team_event_comment = form.save(commit=False)
             team_event_comment.team_event = team_event_object
-            team_event_comment.comment_by = request.user
+            from userprofiles.models import create_profile
+            profile = create_profile(request.user.username)
+            team_event_comment.commenter_profile = profile
             team_event_comment.save()
             request.user.message_set.create(message=_('Comment saved.'))
             return redirect( team_event_object )

=== modified file 'loco_directory/services/urls.py'
--- loco_directory/services/urls.py	2010-07-15 16:47:45 +0000
+++ loco_directory/services/urls.py	2010-08-26 14:42:47 +0000
@@ -17,7 +17,7 @@
     url(r'^venues/(.*)$', 'services.views.venue_service', name='venue_service'),
     url(r'^users/(.*)$', 'services.views.user_service', name='user_service'),
     url(r'^groups/(.*)$', 'services.views.group_service', name='group_service'),
-    url(r'^admins/(.*)$', 'services.views.admin_service', name='admin_service'),
+    url(r'^profiles/(.*)$', 'services.views.profile_service', name='profile_service'),
     url(r'^languages/(.*)$', 'services.views.language_service', name='language_service'),
 )
 

=== modified file 'loco_directory/services/views.py'
--- loco_directory/services/views.py	2010-07-15 16:32:07 +0000
+++ loco_directory/services/views.py	2010-08-26 14:42:47 +0000
@@ -1,6 +1,7 @@
 from teams.models import Team, Continent, Country, Language
-from events.models import GlobalEvent, TeamEvent, TeamEventComment, Attendee, TeamAdministrator
+from events.models import GlobalEvent, TeamEvent, TeamEventComment, Attendee
 from venues.models import Venue
+from userprofiles.models import UserProfile
 from django.contrib.auth.models import User, Group
 
 from services import model_service
@@ -35,8 +36,8 @@
 def group_service(request, url):
     return model_service(Group, request, url, exclude=['permissions'])
 
-def admin_service(request, url):
-    return model_service(TeamAdministrator, request, url)
+def profile_service(request, url):
+    return model_service(UserProfile, request, url, exclude=['user'])
 
 def language_service(request, url):
     return model_service(Language, request, url)

=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2010-08-20 13:05:47 +0000
+++ loco_directory/settings.py	2010-08-26 14:42:47 +0000
@@ -115,6 +115,7 @@
     'teams',
     'venues',
     'events',
+    'userprofiles',
     'django_openid_auth',
     'south',
 )
@@ -124,6 +125,8 @@
     'django.contrib.auth.backends.ModelBackend',
 )
 
+AUTH_PROFILE_MODULE = 'userprofiles.UserProfile'
+
 # Should users be created when new OpenIDs are used to log in?
 OPENID_CREATE_USERS = True
 

=== modified file 'loco_directory/teams/admin.py'
--- loco_directory/teams/admin.py	2010-07-09 10:56:49 +0000
+++ loco_directory/teams/admin.py	2010-08-26 14:42:47 +0000
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from django.contrib import admin
-from teams.models import Team, TeamAdministrator, Continent, Country, Language
+from teams.models import Team, Continent, Country, Language
 
 class TeamAdmin(admin.ModelAdmin):
     search_fields = ('name',)
@@ -12,10 +12,6 @@
             field.widget.attrs['rows'] = '4'
         return field
     
-class TeamAdministratorAdmin(admin.ModelAdmin):
-    search_fields = ('lpid',)
-    list_display = ('lpid',)
-    
 class ContinentAdmin(admin.ModelAdmin):
     search_fields = ('name',)
 
@@ -26,7 +22,6 @@
     search_fields = ('name',)
 
 admin.site.register(Team, TeamAdmin)
-admin.site.register(TeamAdministrator, TeamAdministratorAdmin)
 admin.site.register(Continent, ContinentAdmin)
 admin.site.register(Country, CountryAdmin)
 admin.site.register(Language, LanguageAdmin)

=== modified file 'loco_directory/teams/management/commands/lpupdate.py'
--- loco_directory/teams/management/commands/lpupdate.py	2010-08-12 09:59:25 +0000
+++ loco_directory/teams/management/commands/lpupdate.py	2010-08-26 14:42:47 +0000
@@ -5,20 +5,33 @@
 from common import launchpad
 from teams import models
 from django.contrib.auth.models import Group
+from userprofiles.models import create_profile
 
 from datetime import datetime
 import sys
 
-def update_admins(ld_team, lp_team):
-    ld_admin_names = set([a.lpid for a in ld_team.admins.all()])
-    lp_admin_names = set([a.name for a in lp_team.getMembersByStatus(status='Administrator')])
-    for admin_name in ld_admin_names.difference(lp_admin_names):
-        admin = ld_team.admins.get(lpid=admin_name)
-        admin.delete()
-    for admin_name in lp_admin_names.difference(ld_admin_names):
-        admin = models.TeamAdministrator(lpid=admin_name)
+def create_admin_dict(admins):
+    admin_dict = {}
+    for (lpid, realname) in admins:
+        admin_dict[lpid] = realname
+    return admin_dict
+
+def update_admins(ld_team, lp_team, lp):
+    ld_admin_names = create_admin_dict([(a.user.username, a.realname) \
+                                           for a in ld_team.admin_profiles.all()])
+    lp_admin_names = create_admin_dict([(a.name, a.display_name) \
+                                           for a in lp_team.getMembersByStatus(status='Administrator')])
+    ld_admin_set = set(ld_admin_names.keys())
+    lp_admin_set = set(lp_admin_names.keys())
+    for admin_name in ld_admin_set.difference(lp_admin_set):
+        admin = ld_team.admin_profiles.get(user__username=admin_name)
+	admin.delete()
+    for admin_name in lp_admin_set.difference(ld_admin_set):
+        admin = create_profile(admin_name)
+        admin.realname = lp_admin_names[admin_name]
+        admin.tz = launchpad.get_user_timezone(admin_name, lp)
         admin.save()
-        ld_team.admins.add(admin)
+        ld_team.admin_profiles.add(admin)
 
 
 class Command(NoArgsCommand):
@@ -36,13 +49,14 @@
                        lp.people["locoteams"].members)
         for l in locos:
             if not existing_locos or l.name not in [b.lp_name for b in existing_locos]:
-                team = models.Team(lp_name=l.name, name=l.display_name, owner=l.team_owner.name)
+                team = models.Team(lp_name=l.name, name=l.display_name, 
+                                   owner_profile=create_profile(l.team_owner.name))
                 team.save()
             else:
                 team = filter(lambda a: a.lp_name == l.name, existing_locos)[0]
                 team.name = l.display_name
-                team.owner = l.team_owner.name
-            update_admins(team, l)
+                team.owner_profile = create_profile(l.team_owner.name)
+            update_admins(team, l, lp)
                 
             if not existing_groups or l.name not in [g.name for g in existing_groups]:
                 group = Group(name=l.name)

=== modified file 'loco_directory/teams/migrations/0002_add_mugshot_field.py'
--- loco_directory/teams/migrations/0002_add_mugshot_field.py	2010-02-04 00:39:29 +0000
+++ loco_directory/teams/migrations/0002_add_mugshot_field.py	2010-08-26 14:42:47 +0000
@@ -13,6 +13,7 @@
     
     
     def backwards(self, orm):
+        db.current_orm.models['teams'] = db.current_orm.models['teams.team']
         
         # Deleting field 'Team.mugshot_url'
         db.delete_column('teams', 'mugshot_url')

=== added file 'loco_directory/teams/migrations/0005_add_profile_fields.py'
--- loco_directory/teams/migrations/0005_add_profile_fields.py	1970-01-01 00:00:00 +0000
+++ loco_directory/teams/migrations/0005_add_profile_fields.py	2010-08-26 14:42:47 +0000
@@ -0,0 +1,142 @@
+
+from south.db import db
+from django.db import models
+from teams.models import *
+
+class Migration:
+    depends_on = (
+        ("userprofiles", "0001_initial"),
+                )
+
+    def forwards(self, orm):
+        
+        # Adding field 'Team.owner_profile'
+        db.add_column('teams', 'owner_profile', orm['teams.team:owner_profile'])
+        
+        # Adding ManyToManyField 'Team.admin_profiles'
+        db.create_table('teams_admin_profiles', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('team', models.ForeignKey(orm.Team, null=False)),
+            ('userprofile', models.ForeignKey(orm['userprofiles.UserProfile'], null=False))
+        ))
+        
+        # Adding ManyToManyField 'Team.contact_profiles'
+        db.create_table('teams_contact_profiles', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('team', models.ForeignKey(orm.Team, null=False)),
+            ('userprofile', models.ForeignKey(orm['userprofiles.UserProfile'], null=False))
+        ))
+        
+    
+    
+    def backwards(self, orm):
+        db.current_orm.models['teams'] = db.current_orm.models['teams.team']
+        
+        # Deleting field 'Team.owner_profile'
+        db.delete_column('teams', 'owner_profile_id')
+        
+        # Dropping ManyToManyField 'Team.admin_profiles'
+        db.delete_table('teams_admin_profiles')
+        
+        # Dropping ManyToManyField 'Team.contact_profiles'
+        db.delete_table('teams_contact_profiles')
+        
+    
+    
+    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'})
+        },
+        'teams.continent': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+        },
+        'teams.country': {
+            'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+        },
+        'teams.language': {
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
+        },
+        'teams.team': {
+            'Meta': {'db_table': "'teams'"},
+            'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
+            'admins': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.TeamAdministrator']"}),
+            'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
+            'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}),
+            'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}),
+            'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
+            'owner': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'null': 'True', 'db_index': 'True'}),
+            'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
+            'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        'teams.teamadministrator': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lpid': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'db_index': 'True'})
+        },
+        'userprofiles.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'}),
+            '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 = ['teams']

=== added file 'loco_directory/teams/migrations/0006_migrate_profile_fields.py'
--- loco_directory/teams/migrations/0006_migrate_profile_fields.py	1970-01-01 00:00:00 +0000
+++ loco_directory/teams/migrations/0006_migrate_profile_fields.py	2010-08-26 14:42:47 +0000
@@ -0,0 +1,140 @@
+
+from south.db import db
+from django.db import models
+from teams.models import *
+
+def _create_profile(orm, lpid):
+    user, created = orm['auth.User'].objects.get_or_create(username=lpid)
+    if created:
+        user.save()
+    profile, created = orm['userprofiles.UserProfile'].objects.get_or_create(user=user)
+    if created:
+        # set real name as lpid for now, we get the name later on via cronjob
+        profile.realname = lpid
+        profile.save()
+    return profile
+
+class Migration:
+    
+    def forwards(self, orm):
+        db.current_orm.models['teams'] = db.current_orm.models['teams.team']
+        for team in orm['teams.Team'].objects.all():
+            if not team.owner_profile:
+                team.owner_profile = _create_profile(orm, team.owner)
+            for admin in team.admins.all():
+                admin_profile = _create_profile(orm, admin.lpid)
+                team.admin_profiles.add(admin_profile)
+            team.save()
+    
+    
+    def backwards(self, orm):
+        db.current_orm.models['teams'] = db.current_orm.models['teams.team']
+        for team in orm['teams.Team'].objects.all():
+            if not team.owner:
+                team.owner = team.owner_profile.user.username
+            # for some reason TeamAdministrator was never unique
+            for admin_profile in team.admin_profiles.all():
+                if orm['teams.TeamAdministrator'].objects.filter(lpid=admin_profile.user.username):
+                    admin = orm['teams.TeamAdministrator'].objects.filter(lpid=admin_profile.user.username)[0]
+                else:
+                    admin = orm['teams.TeamAdministrator'].objects.create(lpid=admin_profile.user.username)
+                    admin.save()
+            team.save()
+    
+    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'})
+        },
+        'teams.continent': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+        },
+        'teams.country': {
+            'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+        },
+        'teams.language': {
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
+        },
+        'teams.team': {
+            'Meta': {'db_table': "'teams'"},
+            'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
+            'admins': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.TeamAdministrator']"}),
+            'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
+            'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}),
+            'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}),
+            'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
+            'owner': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'null': 'True', 'db_index': 'True'}),
+            'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
+            'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        'teams.teamadministrator': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lpid': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'db_index': 'True'})
+        },
+        'userprofiles.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'}),
+            '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 = ['teams']

=== added file 'loco_directory/teams/migrations/0007_remove_old_person_fields.py'
--- loco_directory/teams/migrations/0007_remove_old_person_fields.py	1970-01-01 00:00:00 +0000
+++ loco_directory/teams/migrations/0007_remove_old_person_fields.py	2010-08-26 14:42:47 +0000
@@ -0,0 +1,136 @@
+
+from south.db import db
+from django.db import models
+from teams.models import *
+
+class Migration:
+    
+    def forwards(self, orm):
+        db.current_orm.models['teams'] = db.current_orm.models['teams.team']
+        # Dropping ManyToManyField 'Team.admins'
+        db.delete_table('teams_admins')
+        
+        # Deleting field 'Team.owner'
+        db.delete_column('teams', 'owner')
+        
+        # Deleting model 'teamadministrator'
+        db.delete_table('teams_teamadministrator')
+        
+    
+    
+    def backwards(self, orm):
+        db.current_orm.models['teams'] = db.current_orm.models['teams.team']
+        # Adding ManyToManyField 'Team.admins'
+        db.create_table('teams_admins', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('team', models.ForeignKey(orm.Team, null=False)),
+            ('teamadministrator', models.ForeignKey(orm.teamadministrator, null=False))
+        ))
+        
+        # Adding field 'Team.owner'
+        db.add_column('teams', 'owner', orm['teams.team:owner'])
+        
+        # Adding model 'teamadministrator'
+        db.create_table('teams_teamadministrator', (
+            ('id', orm['teams.TeamAdministrator:id']),
+            ('lpid', orm['teams.TeamAdministrator:lpid']),
+        ))
+        db.send_create_signal('teams', ['teamadministrator'])
+        
+    
+    
+    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'})
+        },
+        'teams.continent': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+        },
+        'teams.country': {
+            'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+        },
+        'teams.language': {
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
+        },
+        'teams.team': {
+            'Meta': {'db_table': "'teams'"},
+            'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
+            'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
+            'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}),
+            'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}),
+            'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
+            'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
+            'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        'teams.teamadministrator': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key' : 'True'}),
+            'lpid': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'db_index': 'True'}),
+        },
+        'userprofiles.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'}),
+            '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 = ['teams']

=== modified file 'loco_directory/teams/models.py'
--- loco_directory/teams/models.py	2010-07-30 20:55:49 +0000
+++ loco_directory/teams/models.py	2010-08-26 14:42:47 +0000
@@ -2,6 +2,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from common.utils import flat_list
+from userprofiles.models import UserProfile
 
 class Language(models.Model):
     class Meta:
@@ -15,11 +16,6 @@
 class TeamManager(models.Manager):
     pass
 
-class TeamAdministrator(models.Model):
-    lpid = models.SlugField(_("Launchpad ID"), max_length=40, null=False, blank=False)
-    def __unicode__(self):
-       return u'%s' % (self.lpid)
-
 class Continent(models.Model):
     name = models.TextField(_("Name"), max_length=50)
     
@@ -84,8 +80,9 @@
     approved = models.BooleanField(_("Approved Team"), default=False)
     approved_date = models.DateField(_("Date Approved"), null=True, blank=True)
     expires_date = models.DateField(_("Date Expires"), null=True, blank=True)
-    owner = models.SlugField(_("Launchpad Team Owner"), null=True, blank=False)
-    admins = models.ManyToManyField(TeamAdministrator)
+    owner_profile = models.ForeignKey(UserProfile, related_name='owner', null=True)
+    admin_profiles = models.ManyToManyField(UserProfile, related_name='admins')
+    contact_profiles = models.ManyToManyField(UserProfile, related_name='contacts')
     mugshot_url = models.URLField(_("URL of mugshot"), verify_exists=False, null=True, blank=True)
     languages = models.ManyToManyField(Language)
     

=== modified file 'loco_directory/templates/events/team_event_detail_attendees.inc.html'
--- loco_directory/templates/events/team_event_detail_attendees.inc.html	2010-08-16 18:14:57 +0000
+++ loco_directory/templates/events/team_event_detail_attendees.inc.html	2010-08-26 14:42:47 +0000
@@ -27,7 +27,7 @@
     </tr>
     {% for registration in team_event_object.attendee_set.all %}
     <tr class="team_event_list_row {% cycle "odd" "even" %}">
-        <td align="center">{{registration.attendee.username}}</td>
+        <td align="center"><a href="https://launchpad.net/~{{registration.attendee_profile.user.username}}">{{registration.attendee_profile.realname}}</a></td>
         <td align="center">{{registration.get_promise_display}}</td>
         <td align="center">{{registration.guests}}</td>
     </tr>

=== modified file 'loco_directory/templates/events/team_event_detail_comments.inc.html'
--- loco_directory/templates/events/team_event_detail_comments.inc.html	2010-08-16 18:14:57 +0000
+++ loco_directory/templates/events/team_event_detail_comments.inc.html	2010-08-26 14:42:47 +0000
@@ -16,7 +16,7 @@
     </tr>
     {% for comment in comment_date.list %}
     <tr>
-        <th class="form-item-label" scope="row"><label>{{comment.comment_by}}:</label></th>
+        <th class="form-item-label" scope="row"><label><a href="https://launchpad.net/~{{comment.commenter_profile.user.username}}">{{comment.commenter_profile.realname}}</a>:</label></th>
         <td class="form-item-value">{{comment.comment}}</td>
     </tr>
     {% endfor %}

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2010-08-23 08:18:37 +0000
+++ loco_directory/templates/teams/team_detail.html	2010-08-26 14:42:47 +0000
@@ -50,7 +50,7 @@
 
         <tr>
           <th class="form-item-label" scope="row"><label>{% trans "Launchpad Team Owner:" %}</label></th>
-          <td class="form-item-value"><a href="https://launchpad.net/~{{ team.owner }}">{{ team.owner }}</a></td>
+          <td class="form-item-value"><a href="https://launchpad.net/~{{ team.owner_profile.user.username }}">{{ team.owner_profile.realname }}</a></td>
         </tr>
         
         {% if team.approved_date %}
@@ -71,8 +71,14 @@
         </tr>
         <tr>
           <th class="form-item-label" scope="row"><label>{% trans "Launchpad Team Admin(s):" %}</label></th>
-          <td class="form-item-value">{% for admin in team.admins.all %}
-				  <a href="https://launchpad.net/~{{ admin.lpid }}">{{ admin.lpid }}</a>{% if not forloop.last %},{% endif %}
+          <td class="form-item-value">{% for admin in team.admin_profiles.all %}
+				  <a href="https://launchpad.net/~{{ admin.user.username }}">{{ admin.realname }}</a>{% if not forloop.last %},{% endif %}
+          {% endfor %}</td>
+        </tr>
+        <tr>
+          <th class="form-item-label" scope="row"><label>{% trans "Loco Contacts(s):" %}</label></th>
+          <td class="form-item-value">{% for contact in team.contact_profiles.all %}
+				  <a href="https://launchpad.net/~{{ contact.user.username }}">{{ contact.realname }}</a>{% if not forloop.last %},{% endif %}
           {% endfor %}</td>
         </tr>
 

=== added directory 'loco_directory/userprofiles'
=== added file 'loco_directory/userprofiles/__init__.py'
=== added file 'loco_directory/userprofiles/admin.py'
--- loco_directory/userprofiles/admin.py	1970-01-01 00:00:00 +0000
+++ loco_directory/userprofiles/admin.py	2010-08-26 14:42:47 +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 directory 'loco_directory/userprofiles/migrations'
=== added file 'loco_directory/userprofiles/migrations/0001_initial.py'
--- loco_directory/userprofiles/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ loco_directory/userprofiles/migrations/0001_initial.py	2010-08-26 14:42:47 +0000
@@ -0,0 +1,89 @@
+
+from south.db import db
+from django.db import models
+from userprofiles.models import *
+
+class Migration:
+    
+    def forwards(self, orm):
+        
+        # Adding model 'UserProfile'
+        db.create_table('userprofiles_userprofile', (
+            ('id', orm['userprofiles.UserProfile:id']),
+            ('user', orm['userprofiles.UserProfile:user']),
+            ('realname', orm['userprofiles.UserProfile:realname']),
+            ('tz', orm['userprofiles.UserProfile:tz']),
+            ('blog', orm['userprofiles.UserProfile:blog']),
+            ('twitter', orm['userprofiles.UserProfile:twitter']),
+            ('identica', orm['userprofiles.UserProfile:identica']),
+            ('picasa', orm['userprofiles.UserProfile:picasa']),
+            ('flickr', orm['userprofiles.UserProfile:flickr']),
+            ('facebook', orm['userprofiles.UserProfile:facebook']),
+            ('irc', orm['userprofiles.UserProfile:irc']),
+            ('aim', orm['userprofiles.UserProfile:aim']),
+            ('xmpp', orm['userprofiles.UserProfile:xmpp']),
+        ))
+        db.send_create_signal('userprofiles', ['UserProfile'])
+        
+    
+    
+    def backwards(self, orm):
+        
+        # Deleting model 'UserProfile'
+        db.delete_table('userprofiles_userprofile')
+        
+    
+    
+    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'})
+        },
+        'userprofiles.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'}),
+            '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 'loco_directory/userprofiles/migrations/__init__.py'
=== added file 'loco_directory/userprofiles/models.py'
--- loco_directory/userprofiles/models.py	1970-01-01 00:00:00 +0000
+++ loco_directory/userprofiles/models.py	2010-08-26 14:42:47 +0000
@@ -0,0 +1,60 @@
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+from django.contrib.auth import models as auth_models
+# Create your models here.
+
+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')
+
+    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)
+
+    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 _getUserProfile(self):
+    if not self.is_authenticated():
+        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()
+    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