Merge lp:~daker/loco-team-portal/fix.777098 into lp:loco-team-portal

[Adnane Belmadiaf]

[Adnane Belmadiaf (daker)]

This is a WIP please do not merge it!

[Chris Johnston (cjohnston)]

I'd rather just get up to 1.4

[Adnane Belmadiaf (daker)]

I'll look into it

[Pablo Rubianes (pablorubianes-uy)]

Daker: I can't change the status of this merge request.
Pablo

Unmerged revisions

617. By Adnane Belmadiaf on 2013-03-04

Work in progress

=== added file 'loco_directory/common/timezone.py'
--- loco_directory/common/timezone.py	1970-01-01 00:00:00 +0000
+++ loco_directory/common/timezone.py	2013-03-04 23:07:27 +0000
@@ -0,0 +1,58 @@
+"""
+Taken from django 1.4
+
+Timezone helper functions.
+
+This module uses pytz when it's available and fallbacks when it isn't.
+"""
+
+from datetime import timedelta, tzinfo
+
+try:
+    import pytz
+except ImportError:
+    pytz = None
+
+
+__all__ = [
+    'utc', 'get_timezone',
+]
+
+
+# UTC and local time zones
+
+ZERO = timedelta(0)
+
+
+class UTC(tzinfo):
+    """
+    UTC implementation taken from Python's docs.
+
+    Used only when pytz isn't available.
+    """
+
+    def __repr__(self):
+        return "<UTC>"
+
+    def utcoffset(self, dt):
+        return ZERO
+
+    def tzname(self, dt):
+        return "UTC"
+
+    def dst(self, dt):
+        return ZERO
+
+utc = pytz.utc if pytz else UTC()
+"""UTC time zone as a tzinfo instance."""
+
+
+def get_timezone(value):
+    "Convert to pytz timezone object"
+
+    # Obtain a tzinfo instance
+    try:
+        tz = pytz.timezone(value)
+    except pytz.UnknownTimeZoneError:
+        tz = utc
+    return tz

=== modified file 'loco_directory/common/utils.py'
--- loco_directory/common/utils.py	2012-12-15 03:12:04 +0000
+++ loco_directory/common/utils.py	2013-03-04 23:07:27 +0000
@@ -2,7 +2,6 @@
 
 import subprocess
 import datetime
-import email
 import os
 from copy import deepcopy
 from django.conf import settings
@@ -84,10 +83,10 @@
     for dirnames in os.listdir(globalpath):
         if dirnames == lang_code:
             for dirpath_local, dirnames_local, filenames in os.walk(os.path.join(globalpath, dirnames, 'LC_MESSAGES')):
-                 if 'django.mo' in filenames:
-                     return True
-                 else:
-                     return False
+                if 'django.mo' in filenames:
+                    return True
+                else:
+                    return False
 
 
 def get_languages():
@@ -100,8 +99,8 @@
         languages = {}
         Languages = Language.objects.order_by('name')
         for language in Languages:
-           if check_for_language(language.code):
+            if check_for_language(language.code):
                 languages[language.code] = language.name
         languages['en_US'] = 'English'
-        languages = sorted([(value,key) for (key,value) in languages.items()])
+        languages = sorted([(value, key) for (key, value) in languages.items()])
     return languages

=== modified file 'loco_directory/events/__init__.py'
--- loco_directory/events/__init__.py	2009-12-21 20:45:43 +0000
+++ loco_directory/events/__init__.py	2013-03-04 23:07:27 +0000
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+import listeners

=== modified file 'loco_directory/events/admin.py'
--- loco_directory/events/admin.py	2012-12-25 22:00:46 +0000
+++ loco_directory/events/admin.py	2013-03-04 23:07:27 +0000
@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 from django.contrib import admin
-from .models import (Venue, GlobalEvent, TeamEvent, Attendee)
+from .models import (Venue, GlobalEvent, TeamEvent, Attendee, Occurrence)
 
 
 class TeamEventAdmin(admin.ModelAdmin):
     list_filter = ('global_event',)
     raw_id_fields = ('venue', 'contact', 'teams', 'global_event')
+    search_fields = ('name', )
 
 admin.site.register(Venue)
 admin.site.register(GlobalEvent)
 admin.site.register(TeamEvent, TeamEventAdmin)
 admin.site.register(Attendee)
+admin.site.register(Occurrence)

=== modified file 'loco_directory/events/fields.py'
--- loco_directory/events/fields.py	2012-12-26 22:41:16 +0000
+++ loco_directory/events/fields.py	2013-03-04 23:07:27 +0000
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.db.models import PositiveSmallIntegerField
+from django import forms
 
 
 class GuestsField(PositiveSmallIntegerField):
@@ -12,8 +13,37 @@
 
     def formfield(self, **kwargs):
         """
-        Set maximum value in *formfield* to 100.
+        Set maximum value in *formfield* to 100 and minmum to 0.
         """
         defaults = {'min_value': 0, 'max_value': 100}
         defaults.update(kwargs)
         return super(PositiveSmallIntegerField, self).formfield(**defaults)
+
+
+class MultipleIntegerField(forms.MultipleChoiceField):
+    """
+    A form field for handling multiple integers
+    """
+    def __init__(self, choices, size=None, label=None, widget=None):
+        if widget is None:
+            widget = forms.SelectMultiple(attrs={'size': size or len(choices)})
+        super(MultipleIntegerField, self).__init__(
+            required=False,
+            choices=choices,
+            label=label,
+            widget=widget,
+        )
+
+    def clean(self, value):
+        return [int(i) for i in super(MultipleIntegerField, self).clean(value)]
+
+    def render(self, name, value, attrs=None, choices=()):
+        """
+        Convert comma separated integer string to a list,
+        since the checkbox rendering code expects a list (not a string)
+        """
+        if value:
+            value = value.split(',')
+        return super(MultipleIntegerField, self).render(
+            name, value, attrs=attrs, choices=choices
+        )

=== modified file 'loco_directory/events/forms.py'
--- loco_directory/events/forms.py	2013-02-17 01:44:52 +0000
+++ loco_directory/events/forms.py	2013-03-04 23:07:27 +0000
@@ -4,14 +4,27 @@
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
 
-from .models import BaseEvent, GlobalEvent, TeamEvent, Attendee, TeamEventComment
 from venues.models import Venue
 from common.forms import RenderableMixin
 from userprofiles.models import UserProfile
+
+from .models import BaseEvent, GlobalEvent, TeamEvent, Attendee, TeamEventComment
 from .widgets import DateTimeWidget
+from .fields import MultipleIntegerField
 
+from dateutil import rrule
 import itertools
 
+WEEKDAY_SHORT = (
+    (7, _(u'Sun')),
+    (1, _(u'Mon')),
+    (2, _(u'Tue')),
+    (3, _(u'Wed')),
+    (4, _(u'Thu')),
+    (5, _(u'Fri')),
+    (6, _(u'Sat'))
+)
+
 
 def grouped_user_list(teams):
     other_members, team_members = [], []
@@ -68,13 +81,23 @@
     """
     a form to create/update a TeamEvent
     """
+
     class Meta(BaseEventForm.Meta):
         model = TeamEvent
+        fields = ('name', 'date_begin', 'date_end', 'frequency', 'interval',
+            'week_days', 'repetitions', 'until', 'description', 'announce',
+            'date_created', 'created_by', 'teams', 'contact',
+            'global_event', 'venue', 'channel', 'registration')
         exclude = ('teams', 'date_created', 'created_by')
 
     def __init__(self, teams=[], *args, **kargs):
         super(TeamEventForm, self).__init__(*args, **kargs)
         self.teams = teams
+        self.fields['week_days'] = MultipleIntegerField(
+                                    WEEKDAY_SHORT,
+                                    label=_(u'Repeats on'),
+                                    widget=forms.CheckboxSelectMultiple
+                                    )
         self.fields['contact'].choices = grouped_user_list(self.teams)
         self.fields['venue'].choices = self.grouped_venue_list()
         from common.widgets import PopupRelatedFieldWidgetWrapper
@@ -85,19 +108,24 @@
         self.initial['date_end'] = self.instance.local_date_end
 
     def clean(self):
+        begin = self.cleaned_data.get('date_begin', None)
+        end = self.cleaned_data.get('date_end', None)
+        frequency = self.cleaned_data.get('frequency', -1)
+        week_days = self.cleaned_data.get('week_days')
         venue = self.cleaned_data.get('venue')
+
+        if begin and end and begin > end:
+            raise forms.ValidationError(_("Events can not end before they start."))
         if venue is not None:
-            begin = self.cleaned_data.get('date_begin', None)
-            end = self.cleaned_data.get('date_end', None)
             if begin is not None and end is not None:
                 self.cleaned_data['date_begin'] = venue.fromlocaltime(begin)
                 self.cleaned_data['date_end'] = venue.fromlocaltime(end)
         elif self.teams:
-            begin = self.cleaned_data.get('date_begin', None)
-            end = self.cleaned_data.get('date_end', None)
             if begin is not None and end is not None:
                 self.cleaned_data['date_begin'] = self.teams[0].fromlocaltime(begin)
                 self.cleaned_data['date_end'] = self.teams[0].fromlocaltime(end)
+        if frequency == rrule.WEEKLY:
+            self.cleaned_data['week_days'] = u','.join([str(i) for i in week_days])
         return self.cleaned_data
 
     def grouped_venue_list(self):

=== added file 'loco_directory/events/listeners.py'
--- loco_directory/events/listeners.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/listeners.py	2013-03-04 23:07:27 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from django.db.models.signals import post_save, post_delete
+from django.conf import settings
+
+
+from .models import TeamEvent
+
+MAX_PAST = getattr(settings, 'EVENTS_MAX_PAST_OCCURRENCES', 10)
+MAX_FUTURE = getattr(settings, 'EVENTS_MAX_FUTURE_OCCURRENCES', 20)
+
+
+def update_event(sender, instance, **kwargs):
+    if instance.repetitions or instance.until:
+        occurrences = instance.get_occurrences()
+    else:
+        occurrences = instance.get_past_occurrences(MAX_PAST) +\
+            instance.get_future_occurrences(MAX_FUTURE)
+    instance.update_occurrences_set(occurrences)
+
+
+def delete_event(sender, instance, **kwargs):
+    for occurrence in instance.occurrence_set.all():
+        occurrence.delete()
+
+post_save.connect(update_event, sender=TeamEvent)
+post_delete.connect(delete_event, sender=TeamEvent)

=== added directory 'loco_directory/events/management'
=== added file 'loco_directory/events/management/__init__.py'
=== added directory 'loco_directory/events/management/commands'
=== added file 'loco_directory/events/management/commands/__init__.py'
=== added file 'loco_directory/events/management/commands/update_occurrences_set.py'
--- loco_directory/events/management/commands/update_occurrences_set.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/management/commands/update_occurrences_set.py	2013-03-04 23:07:27 +0000
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+from django.core.management.base import BaseCommand
+from django.db.models import Q
+
+from events.models import TeamEvent, Occurrence
+
+
+class Command(BaseCommand):
+    def handle(self, *args, **kwargs):
+        """q = Q(date_end__isnull=True)
+        q |= Q(repetitions__isnull=True)
+        for event in TeamEvent.objects.filter(q):
+            print('Updating occurrences set for %s' % event)
+            event.save()"""
+
+        for event in TeamEvent.objects.all():
+            print event
+            try:
+                Occurrence(
+                    pk=event.pk,
+                    event=event,
+                    title=event.name.strip(),
+                    date_begin=event.date_begin,
+                    date_end=event.date_end,
+                    original_date_begin=event.date_begin,
+                    original_date_end=event.date_end
+                ).save()
+            except:
+                pass
+
+        """for event in Occurrence.objects.all():
+            print event
+            event.delete()"""

=== modified file 'loco_directory/events/managers.py'
--- loco_directory/events/managers.py	2012-11-28 00:46:29 +0000
+++ loco_directory/events/managers.py	2013-03-04 23:07:27 +0000
@@ -34,3 +34,25 @@
 
     def has_location(self):
         return self.filter(venue__longitude__isnull=False, venue__latitude__isnull=False)
+
+
+class OccurrenceManager(models.Manager):
+    """ manager for a team event """
+    def next_3_events(self):
+        """ a list with the next 3 events """
+        return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')[:3]
+
+    def next_5_events(self):
+        """ a list with the next 5 events """
+        return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')[:5]
+
+    def next_events(self):
+        """ a list with all upcoming team events """
+        return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')
+
+    def history_events(self):
+        """ all team events in history """
+        return self.filter(date_end__lt=datetime.datetime.now()).order_by('-date_end')
+
+    def has_location(self):
+        return self.filter(venue__longitude__isnull=False, venue__latitude__isnull=False)

=== added file 'loco_directory/events/migrations/0012_auto__add_occurrence.py'
--- loco_directory/events/migrations/0012_auto__add_occurrence.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/migrations/0012_auto__add_occurrence.py	2013-03-04 23:07:27 +0000
@@ -0,0 +1,206 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding model 'Occurrence'
+        db.create_table('events_occurrence', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('event', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['events.TeamEvent'])),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('date_begin', self.gf('django.db.models.fields.DateTimeField')()),
+            ('date_end', self.gf('django.db.models.fields.DateTimeField')()),
+            ('cancelled', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('original_date_begin', self.gf('django.db.models.fields.DateTimeField')()),
+            ('original_date_end', self.gf('django.db.models.fields.DateTimeField')()),
+        ))
+        db.send_create_signal('events', ['Occurrence'])
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'Occurrence'
+        db.delete_table('events_occurrence')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'events.attendee': {
+            'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)", 'object_name': 'Attendee'},
+            'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'guests': ('events.fields.GuestsField', [], {}),
+            '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': {
+            'Meta': {'object_name': '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(2013, 2, 23, 17, 33, 45, 669344)', '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': {
+            'Meta': {'object_name': 'GlobalEvent', '_ormbases': ['events.BaseEvent']},
+            'activities': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': '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.occurrence': {
+            'Meta': {'object_name': 'Occurrence'},
+            'cancelled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'date_begin': ('django.db.models.fields.DateTimeField', [], {}),
+            'date_end': ('django.db.models.fields.DateTimeField', [], {}),
+            'event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'original_date_begin': ('django.db.models.fields.DateTimeField', [], {}),
+            'original_date_end': ('django.db.models.fields.DateTimeField', [], {}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'events.teamevent': {
+            'Meta': {'object_name': 'TeamEvent', '_ormbases': ['events.BaseEvent']},
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
+            'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}),
+            'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
+        },
+        'events.teameventcomment': {
+            'Meta': {'object_name': '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(2013, 2, 23, 17, 33, 45, 673049)', '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': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+        },
+        'teams.country': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
+            'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+        },
+        'teams.language': {
+            'Meta': {'ordering': "('name',)", 'object_name': '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': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+            'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            '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', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+            'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', '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']", 'symmetrical': 'False'}),
+            'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
+            'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': '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', [], {'default': "''", 'max_length': '80'}),
+            'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
+            'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
+            'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            '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': {
+            'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
+            'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
+            'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
+        },
+        'venues.venue': {
+            'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))", 'object_name': 'Venue'},
+            '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'}),
+            'continent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Continent']", 'null': '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'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['events']

=== added file 'loco_directory/events/migrations/0013_auto__add_field_teamevent_interval.py'
--- loco_directory/events/migrations/0013_auto__add_field_teamevent_interval.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/migrations/0013_auto__add_field_teamevent_interval.py	2013-03-04 23:07:27 +0000
@@ -0,0 +1,197 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'TeamEvent.interval'
+        db.add_column('events_teamevent', 'interval', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=1), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'TeamEvent.interval'
+        db.delete_column('events_teamevent', 'interval')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'events.attendee': {
+            'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)", 'object_name': 'Attendee'},
+            'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'guests': ('events.fields.GuestsField', [], {}),
+            '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': {
+            'Meta': {'object_name': '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(2013, 2, 23, 17, 34, 6, 224560)', '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': {
+            'Meta': {'object_name': 'GlobalEvent', '_ormbases': ['events.BaseEvent']},
+            'activities': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': '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.occurrence': {
+            'Meta': {'object_name': 'Occurrence'},
+            'cancelled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'date_begin': ('django.db.models.fields.DateTimeField', [], {}),
+            'date_end': ('django.db.models.fields.DateTimeField', [], {}),
+            'event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'original_date_begin': ('django.db.models.fields.DateTimeField', [], {}),
+            'original_date_end': ('django.db.models.fields.DateTimeField', [], {}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'events.teamevent': {
+            'Meta': {'object_name': 'TeamEvent', '_ormbases': ['events.BaseEvent']},
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
+            'interval': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
+            'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}),
+            'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
+        },
+        'events.teameventcomment': {
+            'Meta': {'object_name': '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(2013, 2, 23, 17, 34, 6, 227266)', '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': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+        },
+        'teams.country': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
+            'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+        },
+        'teams.language': {
+            'Meta': {'ordering': "('name',)", 'object_name': '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': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+            'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            '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', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+            'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', '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']", 'symmetrical': 'False'}),
+            'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
+            'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': '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', [], {'default': "''", 'max_length': '80'}),
+            'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
+            'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
+            'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            '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': {
+            'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
+            'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
+            'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
+        },
+        'venues.venue': {
+            'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))", 'object_name': 'Venue'},
+            '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'}),
+            'continent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Continent']", 'null': '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'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['events']

=== added file 'loco_directory/events/migrations/0014_auto__add_field_teamevent_frequency.py'
--- loco_directory/events/migrations/0014_auto__add_field_teamevent_frequency.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/migrations/0014_auto__add_field_teamevent_frequency.py	2013-03-04 23:07:27 +0000
@@ -0,0 +1,198 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding field 'TeamEvent.frequency'
+        db.add_column('events_teamevent', 'frequency', self.gf('django.db.models.fields.SmallIntegerField')(default=-1), keep_default=False)
+
+
+    def backwards(self, orm):
+
+        # Deleting field 'TeamEvent.frequency'
+        db.delete_column('events_teamevent', 'frequency')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'events.attendee': {
+            'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)", 'object_name': 'Attendee'},
+            'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'guests': ('events.fields.GuestsField', [], {}),
+            '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': {
+            'Meta': {'object_name': '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(2013, 2, 23, 17, 34, 19, 680514)', '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': {
+            'Meta': {'object_name': 'GlobalEvent', '_ormbases': ['events.BaseEvent']},
+            'activities': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': '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.occurrence': {
+            'Meta': {'object_name': 'Occurrence'},
+            'cancelled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'date_begin': ('django.db.models.fields.DateTimeField', [], {}),
+            'date_end': ('django.db.models.fields.DateTimeField', [], {}),
+            'event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'original_date_begin': ('django.db.models.fields.DateTimeField', [], {}),
+            'original_date_end': ('django.db.models.fields.DateTimeField', [], {}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'events.teamevent': {
+            'Meta': {'object_name': 'TeamEvent', '_ormbases': ['events.BaseEvent']},
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'frequency': ('django.db.models.fields.SmallIntegerField', [], {'default': '-1'}),
+            'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
+            'interval': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
+            'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}),
+            'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
+        },
+        'events.teameventcomment': {
+            'Meta': {'object_name': '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(2013, 2, 23, 17, 34, 19, 683130)', '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': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+        },
+        'teams.country': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
+            'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+        },
+        'teams.language': {
+            'Meta': {'ordering': "('name',)", 'object_name': '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': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+            'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            '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', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+            'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', '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']", 'symmetrical': 'False'}),
+            'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
+            'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': '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', [], {'default': "''", 'max_length': '80'}),
+            'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
+            'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
+            'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            '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': {
+            'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
+            'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
+            'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
+        },
+        'venues.venue': {
+            'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))", 'object_name': 'Venue'},
+            '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'}),
+            'continent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Continent']", 'null': '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'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['events']

=== added file 'loco_directory/events/migrations/0015_auto__add_field_teamevent_repetitions.py'
--- loco_directory/events/migrations/0015_auto__add_field_teamevent_repetitions.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/migrations/0015_auto__add_field_teamevent_repetitions.py	2013-03-04 23:07:27 +0000
@@ -0,0 +1,199 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding field 'TeamEvent.repetitions'
+        db.add_column('events_teamevent', 'repetitions', self.gf('django.db.models.fields.PositiveSmallIntegerField')(null=True, blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+
+        # Deleting field 'TeamEvent.repetitions'
+        db.delete_column('events_teamevent', 'repetitions')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'events.attendee': {
+            'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)", 'object_name': 'Attendee'},
+            'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'guests': ('events.fields.GuestsField', [], {}),
+            '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': {
+            'Meta': {'object_name': '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(2013, 2, 23, 17, 34, 29, 569337)', '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': {
+            'Meta': {'object_name': 'GlobalEvent', '_ormbases': ['events.BaseEvent']},
+            'activities': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': '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.occurrence': {
+            'Meta': {'object_name': 'Occurrence'},
+            'cancelled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'date_begin': ('django.db.models.fields.DateTimeField', [], {}),
+            'date_end': ('django.db.models.fields.DateTimeField', [], {}),
+            'event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'original_date_begin': ('django.db.models.fields.DateTimeField', [], {}),
+            'original_date_end': ('django.db.models.fields.DateTimeField', [], {}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'events.teamevent': {
+            'Meta': {'object_name': 'TeamEvent', '_ormbases': ['events.BaseEvent']},
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'frequency': ('django.db.models.fields.SmallIntegerField', [], {'default': '-1'}),
+            'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
+            'interval': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
+            'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'repetitions': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}),
+            'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
+        },
+        'events.teameventcomment': {
+            'Meta': {'object_name': '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(2013, 2, 23, 17, 34, 29, 573475)', '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': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+        },
+        'teams.country': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
+            'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+        },
+        'teams.language': {
+            'Meta': {'ordering': "('name',)", 'object_name': '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': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+            'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            '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', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+            'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', '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']", 'symmetrical': 'False'}),
+            'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
+            'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': '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', [], {'default': "''", 'max_length': '80'}),
+            'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
+            'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
+            'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            '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': {
+            'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
+            'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
+            'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
+        },
+        'venues.venue': {
+            'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))", 'object_name': 'Venue'},
+            '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'}),
+            'continent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Continent']", 'null': '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'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['events']

=== added file 'loco_directory/events/migrations/0016_auto__add_field_teamevent_until.py'
--- loco_directory/events/migrations/0016_auto__add_field_teamevent_until.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/migrations/0016_auto__add_field_teamevent_until.py	2013-03-04 23:07:27 +0000
@@ -0,0 +1,200 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding field 'TeamEvent.until'
+        db.add_column('events_teamevent', 'until', self.gf('django.db.models.fields.DateField')(null=True, blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+
+        # Deleting field 'TeamEvent.until'
+        db.delete_column('events_teamevent', 'until')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'events.attendee': {
+            'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)", 'object_name': 'Attendee'},
+            'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'guests': ('events.fields.GuestsField', [], {}),
+            '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': {
+            'Meta': {'object_name': '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(2013, 2, 23, 17, 34, 45, 629497)', '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': {
+            'Meta': {'object_name': 'GlobalEvent', '_ormbases': ['events.BaseEvent']},
+            'activities': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': '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.occurrence': {
+            'Meta': {'object_name': 'Occurrence'},
+            'cancelled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'date_begin': ('django.db.models.fields.DateTimeField', [], {}),
+            'date_end': ('django.db.models.fields.DateTimeField', [], {}),
+            'event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'original_date_begin': ('django.db.models.fields.DateTimeField', [], {}),
+            'original_date_end': ('django.db.models.fields.DateTimeField', [], {}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'events.teamevent': {
+            'Meta': {'object_name': 'TeamEvent', '_ormbases': ['events.BaseEvent']},
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'frequency': ('django.db.models.fields.SmallIntegerField', [], {'default': '-1'}),
+            'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
+            'interval': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
+            'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'repetitions': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}),
+            'until': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'})
+        },
+        'events.teameventcomment': {
+            'Meta': {'object_name': '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(2013, 2, 23, 17, 34, 45, 633781)', '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': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+        },
+        'teams.country': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
+            'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+        },
+        'teams.language': {
+            'Meta': {'ordering': "('name',)", 'object_name': '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': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+            'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            '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', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+            'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', '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']", 'symmetrical': 'False'}),
+            'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
+            'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': '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', [], {'default': "''", 'max_length': '80'}),
+            'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
+            'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
+            'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            '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': {
+            'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
+            'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
+            'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
+        },
+        'venues.venue': {
+            'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))", 'object_name': 'Venue'},
+            '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'}),
+            'continent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Continent']", 'null': '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'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['events']

=== added file 'loco_directory/events/migrations/0017_auto__add_field_teamevent_week_days.py'
--- loco_directory/events/migrations/0017_auto__add_field_teamevent_week_days.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/migrations/0017_auto__add_field_teamevent_week_days.py	2013-03-04 23:07:27 +0000
@@ -0,0 +1,201 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'TeamEvent.week_days'
+        db.add_column('events_teamevent', 'week_days', self.gf('django.db.models.fields.CommaSeparatedIntegerField')(max_length=14, null=True, blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'TeamEvent.week_days'
+        db.delete_column('events_teamevent', 'week_days')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'events.attendee': {
+            'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)", 'object_name': 'Attendee'},
+            'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'guests': ('events.fields.GuestsField', [], {}),
+            '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': {
+            'Meta': {'object_name': '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(2013, 3, 3, 13, 43, 30, 733598)', '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': {
+            'Meta': {'object_name': 'GlobalEvent', '_ormbases': ['events.BaseEvent']},
+            'activities': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': '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.occurrence': {
+            'Meta': {'object_name': 'Occurrence'},
+            'cancelled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'date_begin': ('django.db.models.fields.DateTimeField', [], {}),
+            'date_end': ('django.db.models.fields.DateTimeField', [], {}),
+            'event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'original_date_begin': ('django.db.models.fields.DateTimeField', [], {}),
+            'original_date_end': ('django.db.models.fields.DateTimeField', [], {}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'events.teamevent': {
+            'Meta': {'object_name': 'TeamEvent', '_ormbases': ['events.BaseEvent']},
+            'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}),
+            'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'frequency': ('django.db.models.fields.SmallIntegerField', [], {'default': '-1'}),
+            'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}),
+            'interval': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
+            'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'repetitions': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}),
+            'until': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'}),
+            'week_days': ('django.db.models.fields.CommaSeparatedIntegerField', [], {'max_length': '14', 'null': 'True', 'blank': 'True'})
+        },
+        'events.teameventcomment': {
+            'Meta': {'object_name': '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(2013, 3, 3, 13, 43, 30, 736555)', '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': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+        },
+        'teams.country': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
+            'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+        },
+        'teams.language': {
+            'Meta': {'ordering': "('name',)", 'object_name': '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': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+            'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            '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', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+            'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', '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']", 'symmetrical': 'False'}),
+            'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
+            'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': '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', [], {'default': "''", 'max_length': '80'}),
+            'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
+            'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
+            'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+            'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            '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': {
+            'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
+            'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
+            'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
+        },
+        'venues.venue': {
+            'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))", 'object_name': 'Venue'},
+            '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'}),
+            'continent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Continent']", 'null': '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'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            '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	2013-02-17 01:44:52 +0000
+++ loco_directory/events/models.py	2013-03-04 23:07:27 +0000
@@ -3,36 +3,63 @@
 from django.contrib.auth.models import User
 from django.template.defaultfilters import slugify
 from django.utils.translation import ugettext_lazy as _
+from django.conf import settings
 
 from userprofiles.models import UserProfile
 from teams.models import *
 from venues.models import Venue
 from common.shortcuts import queryset_sum, queryset_count
 from common.mixins import LocalTimeMixin
+from common.timezone import get_timezone
 
-from .managers import GlobalEventManager, TeamEventManager
+from .managers import GlobalEventManager, TeamEventManager, OccurrenceManager
 from .fields import GuestsField
 
+import pytz
+from itertools import islice, takewhile
+from dateutil import rrule
+from datetime import datetime
+
 ATTENDEE_PROMISE_CHOICES = (
     ('sure', _('attending')),
     ('maybe', _('might be attending')),
     ('not', _('not attending')),
 )
 
-import pytz
-import datetime
+FREQUENCIES_CHOICES = (
+    (-1, _('Single time')),
+    (rrule.DAILY, _('Daily')),
+    (rrule.WEEKLY, _('Weekly')),
+    (rrule.MONTHLY, _('Monthly')),
+    (rrule.YEARLY, _('Yearly')),
+)
+
+ISO_WEEKDAYS_MAP = (
+    None,
+    rrule.MO,
+    rrule.TU,
+    rrule.WE,
+    rrule.TH,
+    rrule.FR,
+    rrule.SA,
+    rrule.SU
+)
+
+INTERVAL_CHOICES = [(i + 1, "%2d" % (i + 1)) for i in range(0, 30)]
+MAX_PAST = getattr(settings, 'EVENTS_MAX_PAST_OCCURRENCES', 10)
+MAX_FUTURE = getattr(settings, 'EVENTS_MAX_FUTURE_OCCURRENCES', 20)
 
 
 class BaseEvent(models.Model):
     """
     a simple basic event
     """
-    name = models.CharField(max_length=150, verbose_name=_('Event Name'))
+    name = models.CharField(max_length=150, verbose_name=_('Event title'))
     date_begin = models.DateTimeField(help_text=_('Local date and time that the event starts'), verbose_name=_('Local Start Time'), db_index=True)
     date_end = models.DateTimeField(help_text=_('Local date and time that the event ends'), verbose_name=_('Local End Time'), db_index=True)
-    description = models.TextField(help_text=_('Description of the Event'), blank=True, null=True)
+    description = models.TextField(help_text=_('Description of the event'), blank=True, null=True)
     announce = models.URLField(verbose_name=_('Announcement'), help_text=_('URL for the announcement'), max_length=200, verify_exists=False, blank=True, null=True)
-    date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now(), db_index=True)
+    date_created = models.DateTimeField(help_text=_('The date and time when the event was created'), default=datetime.now(), db_index=True)
 
     def __unicode__(self):
         return self.name
@@ -50,17 +77,17 @@
         event.add('description').value = self.description or ''
 
     def is_past(self):
-        return self.date_end > datetime.datetime.today()
+        return self.date_end > datetime.today()
 
 
 class GlobalEvent(BaseEvent):
     """
     a global event. other events can attend to a global event
     """
-    microbloghashtag = models.CharField(max_length=50, help_text=_('Hash Tag used for microbloggers to mention this event'), verbose_name=_('Microblogging Hash Tag'), null=True, blank=True)
+    microbloghashtag = models.CharField(max_length=50, help_text=_('Hash Tag used for microbloggers to mention this event'), verbose_name=_('Microblogging Hashtag'), null=True, blank=True)
     pictag = models.CharField(max_length=50, help_text=_('tag used in web albums like; picasa, flickr, and more'), verbose_name=_('Picture Tag'), null=True, blank=True)
-    channel = models.CharField(help_text=_('Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-locoteams'), max_length=25, verbose_name=_('Event Channel'), blank=True, null=True)
-    activities = models.TextField(help_text=_('Activities to do during the Event'), blank=True, null=True)
+    channel = models.CharField(help_text=_('Channel for the event hosted on the freenode IRC network. Ex. #ubuntu-locoteams'), max_length=25, verbose_name=_('Event channel'), blank=True, null=True)
+    activities = models.TextField(help_text=_('Activities to do during the event'), blank=True, null=True)
 
     objects = GlobalEventManager()
 
@@ -82,6 +109,63 @@
                                                                                                                              'countries': countries})
 
 
+class Occurrence(models.Model, LocalTimeMixin):
+    event = models.ForeignKey('TeamEvent')
+    title = models.CharField(_("title"), max_length=255, blank=True, null=True)
+    date_begin = models.DateTimeField(_('start time'))
+    date_end = models.DateTimeField(_('end time'))
+    cancelled = models.BooleanField(_("cancelled"), default=False)
+    original_date_begin = models.DateTimeField(_("original start"))
+    original_date_end = models.DateTimeField(_("original end"))
+
+    objects = OccurrenceManager()
+
+    def __unicode__(self):
+        return u'%s - %s' % (self.title, self.date_begin)
+
+    @models.permalink
+    def get_absolute_url(self):
+        """
+        Builds and returns the entry's URL based on
+        the slug and the creation date.
+        """
+        return ('team-event-detail', (), {
+            'team_slug': getattr(self.event.first_team(), 'lp_name', 'no-team'),
+            'team_event_id': str(self.event.id),
+            'event_slug': slugify(self.event.name),
+            'year': self.date_begin.strftime('%Y'),
+            'month': self.date_begin.strftime('%m'),
+            'day': self.date_begin.strftime('%d')})
+
+    def get_title(self):
+        if self.title:
+            return self.title
+        else:
+            return self.event.name
+
+    def get_local_begin(self):
+        return self.tolocaltime(self.date_begin)
+
+    def set_local_begin(self, local_begin):
+        self.date_begin = self.fromlocaltime(local_begin)
+    local_date_begin = property(get_local_begin, set_local_begin)
+
+    def get_local_end(self):
+        return self.tolocaltime(self.date_end)
+
+    def set_local_end(self, local_end):
+        self.date_end = self.fromlocaltime(local_end)
+    local_date_end = property(get_local_end, set_local_end)
+
+    def cancel(self):
+        self.cancelled = True
+        self.save()
+
+    def uncancel(self):
+        self.cancelled = False
+        self.save()
+
+
 class TeamEvent(BaseEvent, LocalTimeMixin):
     """
     a event of one or more teams
@@ -89,19 +173,27 @@
     created_by = models.ForeignKey(User, null=True, blank=True)
     teams = models.ManyToManyField(Team, help_text=_('teams planning this event.'), verbose_name=_('Teams Participating'), db_index=True)
     contact = models.ForeignKey(UserProfile, verbose_name=_('Event Contact'), null=True, help_text=_('Contact person for this event.'))
-    global_event = models.ForeignKey(GlobalEvent, help_text=_('this team event is part of the selected global event'), verbose_name=_('Related Global Event'), blank=True, null=True)
-    venue = models.ForeignKey(Venue, help_text=_('Venue for the Event'), verbose_name=_('Event Venue'), blank=True, null=True)
-    channel = models.CharField(help_text=_('Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-us-fl'), max_length=25, verbose_name=_('Event Channel'), blank=True, null=True)
+    interval = models.PositiveSmallIntegerField(_('Repeat every'), choices=INTERVAL_CHOICES, default=1, help_text=_('Interval between frequencies'))
+    frequency = models.SmallIntegerField(_('Repeats'), choices=FREQUENCIES_CHOICES, default=-1)
+    week_days = models.CommaSeparatedIntegerField(_('Repeats on'), blank=True, null=True, max_length=14, help_text=_('Days of the week'))
+    repetitions = models.PositiveSmallIntegerField(_('Maximum repetitions'), blank=True, null=True, help_text=_('Endless if not defined'))
+    until = models.DateField(_("Ends on "), null=True, blank=True, help_text=_("This date is ignored for one time only events."))
+    global_event = models.ForeignKey(GlobalEvent, help_text=_('This event will be part of the selected global event'), verbose_name=_('Related Global Event'), blank=True, null=True)
+    venue = models.ForeignKey(Venue, help_text=_('Venue for the event'), verbose_name=_('Event venue'), blank=True, null=True)
+    channel = models.CharField(help_text=_('IRC channel for the event hosted on the freenode IRC network. Ex. #ubuntu-us-fl'), max_length=25, verbose_name=_('Event IRC channel'), blank=True, null=True)
     registration = models.URLField(verbose_name=_('Registration URL'), help_text=_('URL to register attendance (leave blank to use the built-in registration system)'), max_length=200, verify_exists=False, blank=True, null=True)
 
     objects = TeamEventManager()
 
     def __unicode__(self):
-        return "%s %s %s" % (self.name, self.venue, self.date_begin or "")
+        return u"%s %s-%s" % (self.name, self.date_begin, self.date_end)
 
     @models.permalink
     def get_absolute_url(self):
-        return ('team-event-detail', [getattr(self.first_team(), 'lp_name', 'no-team'), str(self.id), slugify(self.name)])
+        return ('team-event-detail-old', [
+            getattr(self.first_team(), 'lp_name', 'no-team'),
+            str(self.id), slugify(self.name)]
+        )
 
     def as_ical(self, cal):
         """
@@ -112,16 +204,29 @@
         event.add('uid').value = str(self.id)
         event.add('dtstart').value = pytz.utc.localize(self.date_begin)
         event.add('dtend').value = pytz.utc.localize(self.date_end)
+        #event.add('rrule').value = self.get_occurrences()
         event.add('categories').value = ['Ubuntu Loco Team Event']
         event.add('summary').value = self.name or ''
         event.add('description').value = self.description or ''
-        event.add('location').value = "%s" % self.venue or ''
+        event.add('location').value = u"%s" % self.venue or ''
         event.add('url').value = "http://loco.ubuntu.com%s" % self.get_absolute_url()
         if self.venue:
             event.add('geo').value = "%s;%s" % (self.venue.latitude, self.venue.longitude)
 
+    def get_tzinfo(self):
+        if self.venue:
+            timezone = self.venue.tz
+        else:
+            try:
+                timezone = self.teams.exclude(tz='UTC')[0].tz
+            except IndexError:
+                # There is not team with timezone set other than the default 'UTC'
+                pass
+        return get_timezone(timezone)
+    tzinfo = property(get_tzinfo)
+
     def get_tz(self):
-        timezone = 'UTC'
+        timezone = "UTC"
         if self.venue:
             timezone = self.venue.tz
         else:
@@ -175,18 +280,91 @@
         return total_attending_guests + total_attending_registered
 
     def total_maybe_attending(self):
-
         total_maybe_attending_guests = queryset_sum('guests', Attendee.objects.filter(team_event__id__exact=self.id).filter(promise="maybe"))
         total_maybe_attending_registered = queryset_count('attendee_profile', Attendee.objects.filter(team_event__id__exact=self.id).filter(promise="maybe"))
         return total_maybe_attending_guests + total_maybe_attending_registered
 
+    def get_occurrences(self):
+        if self.frequency is -1:
+            return [self.date_begin.replace(tzinfo=self.tzinfo)]
+        until = datetime.combine(self.until, self.date_end.time())
+        until = until.replace(tzinfo=self.date_end.tzinfo)
+        if self.frequency == rrule.WEEKLY:
+            days = []
+            for i in self.week_days.split(','):
+                days.append(ISO_WEEKDAYS_MAP[int(i)])
+            return rrule.rrule(
+                self.frequency,
+                dtstart=self.date_begin,
+                interval=self.interval,
+                byweekday=days,
+                count=self.repetitions,
+                until=until
+                )
+        if self.frequency == rrule.MONTHLY:
+            return rrule.rrule(
+                self.frequency,
+                dtstart=self.date_begin,
+                interval=self.interval,
+                bymonthday=self.date_begin.date().day,
+                count=self.repetitions,
+                until=until
+                )
+        if self.frequency == rrule.YEARLY:
+            return rrule.rrule(
+                self.frequency,
+                dtstart=self.date_begin,
+                interval=self.interval,
+                bymonth=self.date_begin.date().month,
+                bymonthday=self.date_begin.date().day,
+                count=self.repetitions,
+                until=until
+                )
+        return rrule.rrule(
+                self.frequency,
+                dtstart=self.date_begin,
+                interval=self.interval,
+                count=self.repetitions,
+                until=until
+                )
+
+    def get_past_occurrences(self, num=None):
+        past = list(takewhile(
+                lambda occurrence: occurrence < datetime.utcnow().replace(tzinfo=self.tzinfo),
+                self.get_occurrences(),
+            ))
+        if num:
+            return past[:-num:-1]
+        return past[::-1]
+
+    def get_future_occurrences(self, num):
+        future = (occurrence for occurrence in self.get_occurrences()\
+                if occurrence > datetime.utcnow().replace(tzinfo=self.tzinfo))
+        return list(islice(future, None, num))
+
+    def update_occurrences_set(self, occurrences):
+        #delete old ones
+        for occurrence in self.occurrence_set.exclude(date_begin__in=occurrences):
+            occurrence.delete()
+        #add new ones
+        for occurrence in occurrences:
+            if not self.occurrence_set.filter(date_begin=occurrence):
+                Occurrence(
+                    event=self,
+                    title=self.name.strip(),
+                    date_begin=occurrence,
+                    date_end=datetime.combine(occurrence.date(), self.date_end.time()),
+                    original_date_begin=occurrence,
+                    original_date_end=datetime.combine(occurrence.date(), self.date_end.time())
+                ).save()
+
 
 class TeamEventComment(models.Model):
     """
     a model for comments about a team event
     """
     team_event = models.ForeignKey(TeamEvent, help_text=_('the Team Event'))
-    date_created = models.DateTimeField(help_text=_('Comment date and time'), default=datetime.datetime.now(), db_index=True)
+    date_created = models.DateTimeField(help_text=_('Comment date and time'), default=datetime.now(), db_index=True)
     commenter_profile = models.ForeignKey(UserProfile, null=True)
     comment = models.TextField(help_text=_('Enter your comment for this event.'), db_index=True)
 

=== modified file 'loco_directory/events/urls.py'
--- loco_directory/events/urls.py	2012-12-22 23:22:32 +0000
+++ loco_directory/events/urls.py	2013-03-04 23:07:27 +0000
@@ -22,16 +22,29 @@
     #team events
     url(r'^locations/$', 'events.views.team_event_locations', name='team-event-locations'),
     url(r'^ical/$', 'events.views.teams_event_list_ical', name='teams-event-list-ical'),
-    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)-(?P<event_slug>[a-zA-Z0-9\-\_\.\+?]+)/$', 'events.views.team_event_detail', name='team-event-detail'),
-    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/detail/ical/$', 'events.views.event_ical', name='event-ical'),
-    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/register/$', 'events.views.team_event_register', name='team-event-register'),
-    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/detail/$', 'events.views.team_event_detail', name='team-event-detail-old'),
-    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/delete/$', 'events.views.team_event_delete', name='team-event-delete'),
-    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/update/$', 'events.views.team_event_update', name='team-event-update'),
-    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/copy/$', 'events.views.team_event_copy', name='team-event-copy'),
-    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/add/$', 'events.views.team_event_new', name='team-event-new'),
-    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/rss/$', 'events.views.team_events_rss', name='team-events-rss'),
-    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/ical/$', 'events.views.team_event_list_ical', name='team-event-list-ical'),
+
+
+
+
+    url(r'^(?P<team_slug>[-\w]+)/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/(?P<team_event_id>\d+)-(?P<event_slug>[-\w]+)/', 'events.views.team_event_detail', name='team-event-detail'),
+    # Old url notations
+    url(r'^(?P<team_slug>[-\w]+)/(?P<team_event_id>\d+)-(?P<event_slug>[-\w]+)/$', 'events.views.team_event_detail_old', name='team-event-detail-old'),
+    url(r'^(?P<team_slug>[-\w]+)/(?P<team_event_id>\d+)/detail/$', 'events.views.team_event_detail_old', name='team-event-detail-old-old'),
+    # End Old url notations
+
+
+
+    url(r'^(?P<team_slug>[-\w]+)/(?P<team_event_id>\d+)/detail/ical/$', 'events.views.event_ical', name='event-ical'),
+    url(r'^(?P<team_slug>[-\w]+)/(?P<team_event_id>\d+)/register/$', 'events.views.team_event_register', name='team-event-register'),
+    url(r'^(?P<team_slug>[-\w]+)/(?P<team_event_id>\d+)/delete/$', 'events.views.team_event_delete', name='team-event-delete'),
+    url(r'^(?P<team_slug>[-\w]+)/(?P<team_event_id>\d+)/update/$', 'events.views.team_event_update', name='team-event-update'),
+    url(r'^(?P<team_slug>[-\w]+)/(?P<team_event_id>\d+)/copy/$', 'events.views.team_event_copy', name='team-event-copy'),
+    url(r'^(?P<team_slug>[-\w]+)/add/$', 'events.views.team_event_new', name='team-event-new'),
+    url(r'^(?P<team_slug>[-\w]+)/rss/$', 'events.views.team_events_rss', name='team-events-rss'),
+    url(r'^(?P<team_slug>[-\w]+)/ical/$', 'events.views.team_event_list_ical', name='team-event-list-ical'),
+
+
+
     url(r'^add/$', 'events.views.team_event_select', name='team-event-select'),
     url(r'^comment-update/$', 'events.views.team_event_comment_edit', name='team-event-comment-edit'),
     url(r'^comment-delete/(?P<pk>\d+)/$', 'events.views.team_event_comment_delete', name='team-event-comment-delete'),

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2013-02-18 22:16:11 +0000
+++ loco_directory/events/views.py	2013-03-04 23:07:27 +0000
@@ -7,13 +7,12 @@
 from django.utils.translation import ugettext as _
 from django.db.models import Count
 
-from .models import (TeamEvent, GlobalEvent, Attendee, TeamEventComment)
-from teams.models import Team, Country, Continent
+from .models import (TeamEvent, GlobalEvent, Attendee, TeamEventComment, Occurrence)
+from teams.models import Team
 
 from .forms import (TeamEventForm, TeamEventCommentForm,
                     GlobalEventForm, AttendeeRegistrationForm)
 
-from common.utils import simple_iterator
 from common.forms import FilterHistoryList
 from common import launchpad
 
@@ -25,7 +24,7 @@
     """
     a list with all events (teamevents and globalevents)
     """
-    team_event_list = TeamEvent.objects.next_events()
+    team_event_list = Occurrence.objects.next_events()
     global_event_list = GlobalEvent.objects.next_events().annotate(num_teamevents=Count('teamevent'))
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
     context = {
@@ -59,8 +58,8 @@
     """
     Return a ical list with a single events in ical format.
     """
-    team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
-    return event_list_ical([team_event_object], team_event_object.name)
+    team_event = get_object_or_404(TeamEvent, pk=team_event_id)
+    return event_list_ical([team_event], team_event.name)
 
 
 def team_event_list_ical(request, team_slug):
@@ -90,30 +89,29 @@
     """
     a list with all historical events (teamevents and globalevents)
     """
-    team_event_list = TeamEvent.objects.history_events().select_related('global_event', 'venue')
+    team_event_list = Occurrence.objects.history_events().select_related('global_event', 'venue')
 
     if request.method == 'POST':
         form = FilterHistoryList(request.POST)
         if form.is_valid():
 
             filtering = form.cleaned_data['filtering']
-
             scope = form.cleaned_data['scope']
 
             if u'my' in scope:
                 filtering_date = datetime.datetime.strptime(filtering, "%Y-%m")
 
-                team_event_list = TeamEvent.objects.history_events().filter(date_begin__year=filtering_date.year, date_begin__month=filtering_date.month)
+                team_event_list = Occurrence.objects.history_events().filter(date_begin__year=filtering_date.year, date_begin__month=filtering_date.month)
             elif u'y' in scope:
                 filtering_date = datetime.datetime.strptime(filtering, "%Y-%m")
 
-                team_event_list = TeamEvent.objects.history_events().filter(date_begin__year=filtering_date.year)
+                team_event_list = Occurrence.objects.history_events().filter(date_begin__year=filtering_date.year)
         else:
-            team_event_list = TeamEvent.objects.history_events().select_related('global_event', 'venue')
+            team_event_list = Occurrence.objects.history_events().select_related('global_event', 'venue')
 
     else:
         form = FilterHistoryList()
-        team_event_list = TeamEvent.objects.history_events().select_related('global_event', 'venue')
+        team_event_list = Occurrence.objects.history_events().select_related('global_event', 'venue')
 
     global_event_list = GlobalEvent.objects.history_events().annotate(num_teamevents=Count('teamevent'))
 
@@ -129,33 +127,43 @@
 #################################################################
 # Team Events
 #################################################################
-def team_event_detail(request, team_slug, team_event_id, event_slug=None):
+def team_event_detail(request, team_slug, team_event_id, year=None, month=None, day=None, event_slug=None):
     """
     detailed view for a team event
     """
-    team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
+    if year and month and day:
+        occurrence = get_object_or_404(
+                            Occurrence,
+                            event__pk=team_event_id,
+                            date_begin__year=year,
+                            date_begin__month=month,
+                            date_begin__day=day)
+    else:
+        occurrence = get_object_or_404(Occurrence, pk=team_event_id)
+    team_event = occurrence.event
     is_member = False
-    for team_object in team_event_object.teams.all():
-        is_member = is_member or launchpad.is_team_member(request.user, team_object)
+    for team in team_event.teams.all():
+        is_member = is_member or launchpad.is_team_member(request.user, team)
 
     if request.user.is_authenticated():
         if request.method == 'POST':
             form = TeamEventCommentForm(data=request.POST)
             if form.is_valid():
                 team_event_comment = form.save(commit=False)
-                team_event_comment.team_event = team_event_object
+                team_event_comment.team_event = team_event
                 team_event_comment.commenter_profile = request.user.get_profile()
                 team_event_comment.save()
                 request.user.message_set.create(message=_('Your comment has been saved.'))
-                return redirect(team_event_object)
+                return redirect(team_event)
         else:
             form = TeamEventCommentForm()
     else:
         form = None
 
     context = {
-        'team_event_object': team_event_object,
-        'user_is_attending': team_event_object.is_attending(request.user),
+        'occurrence': occurrence,
+        'team_event': team_event,
+        'user_is_attending': team_event.is_attending(request.user),
         'user_is_team_member': is_member,
         'form': form,
     }
@@ -163,32 +171,66 @@
                                          context, RequestContext(request))
 
 
+def team_event_detail_old(request, team_slug, team_event_id, event_slug=None):
+    """
+    detailed view for a team event for old urls
+    """
+    team_event = get_object_or_404(TeamEvent, pk=team_event_id)
+    is_member = False
+    for team in team_event.teams.all():
+        is_member = is_member or launchpad.is_team_member(request.user, team)
+
+    if request.user.is_authenticated():
+        if request.method == 'POST':
+            form = TeamEventCommentForm(data=request.POST)
+            if form.is_valid():
+                team_event_comment = form.save(commit=False)
+                team_event_comment.team_event = team_event
+                team_event_comment.commenter_profile = request.user.get_profile()
+                team_event_comment.save()
+                request.user.message_set.create(message=_('Your comment has been saved.'))
+                return redirect(team_event)
+        else:
+            form = TeamEventCommentForm()
+    else:
+        form = None
+
+    context = {
+        'team_event': team_event,
+        'user_is_attending': team_event.is_attending(request.user),
+        'user_is_team_member': is_member,
+        'form': form,
+    }
+    return render_to_response('events/team_event_detail_old.html',
+                                         context, RequestContext(request))
+
+
 @login_required
 def team_event_delete(request, team_slug, team_event_id):
     """
     delete a event
     """
-    team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
+    team_event = get_object_or_404(TeamEvent, pk=team_event_id)
 
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
     #check if user is admin or owner of a team
     is_contact = False
-    for team in team_event_object.teams.all():
+    for team in team_event.teams.all():
         if launchpad.is_admin_or_owner(request.user.username, team):
             is_contact = True
             break
 
     if is_on_lc or is_contact:
         if request.method == 'POST':
-            team_event_object.delete()
+            team_event.delete()
             request.user.message_set.create(message=_('Team Event removed.'))
             return redirect('event-list')
         else:
-            context = {'team_event_object': team_event_object}
+            context = {'team_event': team_event}
             return render_to_response('events/team_event_delete_confirm.html', context, RequestContext(request))
     else:
         request.user.message_set.create(message='%s %s' % (_('You can not remove this team event.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.')))
-        return redirect(team_event_object)
+        return redirect(team_event)
 
 
 @login_required

=== modified file 'loco_directory/media/css/styles.css'
--- loco_directory/media/css/styles.css	2013-02-21 20:31:16 +0000
+++ loco_directory/media/css/styles.css	2013-03-04 23:07:27 +0000
@@ -794,7 +794,7 @@
 }
 
 .team-actions a{
-    height: 26px;
+    height: 27px;
     padding-left: 5px;
     padding-right: 5px;
     margin-left: 5px;
@@ -809,7 +809,7 @@
     text-transform: uppercase;
 }
 
-.team-actions a:hover{
+.team-actions a:hover, .team-actions a.active{
     border-bottom-color: #DD4814;
 }
 
@@ -1746,3 +1746,18 @@
 #lc ul li:last-child {
     margin-bottom: 0;
 }
+
+#d_week_days ul {
+    overflow: auto;
+    margin-bottom: 0;
+}
+
+#d_week_days ul li {
+    float: left;
+    width: 50px;
+    margin-bottom: 0;
+}
+
+#id_interval {
+    width: 60px;
+}
\ No newline at end of file

=== modified file 'loco_directory/media/js/events-ui.js'
--- loco_directory/media/js/events-ui.js	2013-02-17 01:44:52 +0000
+++ loco_directory/media/js/events-ui.js	2013-03-04 23:07:27 +0000
@@ -1,6 +1,5 @@
 $(document).ready(function(){
-
-    $.datepicker.setDefaults({
+    /*$.datepicker.setDefaults({
         showOn: 'focus',
         dateFormat: 'yy-mm-dd',
     });
@@ -20,6 +19,5 @@
         var year = $("#ui-datepicker-div .ui-datepicker-year :selected").val();
         $(this).datepicker('setDate', new Date(year, month, 1));
       }
-    });
-
+    });*/
 });

=== modified file 'loco_directory/meetings/models.py'
--- loco_directory/meetings/models.py	2012-12-12 23:47:58 +0000
+++ loco_directory/meetings/models.py	2013-03-04 23:07:27 +0000
@@ -27,6 +27,9 @@
     def __unicode__(self):
         return self.name
 
+    def get_title(self):
+        return self.name
+
     def get_local_begin(self):
         return self.tolocaltime(self.date_begin)
 

=== added file 'loco_directory/teams/managers.py'
--- loco_directory/teams/managers.py	1970-01-01 00:00:00 +0000
+++ loco_directory/teams/managers.py	2013-03-04 23:07:27 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+from django.db import models
+
+from events.models import Occurrence
+from datetime import datetime
+
+
+class TeamManager(models.Manager):
+
+    def next_5_events_and_meetings(self):
+        """ a list with all upcoming team meetings """
+        events_and_meetings = []
+        events = Occurrence.objects.filter(
+                    date_begin__gte=datetime.utcnow().replace(tzinfo=self.tz),
+                    event__team=self
+                )[:5].iterator()
+        meetings = self.teammeeting_set.next_meetings()[:5].iterator()
+        for event in events:
+            events_and_meetings.append(event)
+        for meeting in meetings:
+            events_and_meetings.append(meeting)
+
+        events_and_meetings.sort(key=lambda event: event.date_begin)
+
+        if len(events_and_meetings) > 5:
+            events_and_meetings = events_and_meetings[:5]
+        return events_and_meetings

=== modified file 'loco_directory/teams/models.py'
--- loco_directory/teams/models.py	2013-02-19 22:23:46 +0000
+++ loco_directory/teams/models.py	2013-03-04 23:07:27 +0000
@@ -1,5 +1,5 @@
+# -*- coding: utf-8 -*-
 import pytz
-
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
@@ -17,10 +17,6 @@
         return u'%s' % (self.name)
 
 
-class TeamManager(models.Manager):
-    pass
-
-
 class Continent(models.Model):
     name = models.TextField(_("Name"), max_length=50)
 
@@ -124,8 +120,6 @@
     active = models.BooleanField(_("Active Team"), default=True)
     tz = models.CharField(max_length=32, verbose_name=_('Default Timezone'), default='UTC', choices=[(tz, tz) for tz in pytz.all_timezones], blank=False, null=False, help_text=_('The most commonly used timezone for this Team.'))
 
-    objects = TeamManager()
-
     class Meta:
         db_table = 'teams'
         ordering = ('approved', 'name',)
@@ -141,22 +135,6 @@
     def get_absolute_url(self):
         return ('team-detail', [str(self.lp_name)])
 
-    def next_5_events_and_meetings(self):
-        """ a list with all upcoming team meetings """
-        events_and_meetings = []
-        events = self.teamevent_set.next_5_events().iterator()
-        meetings = self.teammeeting_set.next_meetings()[:5].iterator()
-        for event in events:
-            events_and_meetings.append(event)
-        for meeting in meetings:
-            events_and_meetings.append(meeting)
-
-        events_and_meetings.sort(key=lambda event: event.date_begin)
-
-        if len(events_and_meetings) > 5:
-            events_and_meetings = events_and_meetings[:5]
-        return events_and_meetings
-
 
 def teams_without_country():
     return Team.objects.filter(countries__isnull=True).exclude(lp_name="ubuntu-lococouncil")

=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py	2013-02-19 22:23:46 +0000
+++ loco_directory/teams/views.py	2013-03-04 23:07:27 +0000
@@ -12,7 +12,7 @@
 from common import launchpad
 from teams.models import Continent, Team, countries_without_continent, countries_without_continent_have_teams, teams_without_country
 from teams.utils import merge_teams
-from events.models import TeamEvent
+from events.models import TeamEvent, Occurrence
 from meetings.models import TeamMeeting
 from articles.models import Article
 
@@ -210,15 +210,33 @@
 def team_detail(request, team_slug):
     if team_slug == 'ubuntu-lococouncil':
         return redirect('/loco-council/')
-    team_object = get_object_or_404(Team, lp_name=team_slug)
-    articles = Article.objects.filter(source__team=team_object)[:5]
+    team = get_object_or_404(Team, lp_name=team_slug)
+
+    events_and_meetings = []
+    events = Occurrence.objects.filter(
+                date_begin__gte=datetime.datetime.now(),
+                event__teams=team
+            )[:5].iterator()
+    meetings = team.teammeeting_set.next_meetings()[:5].iterator()
+    for event in events:
+        events_and_meetings.append(event)
+    for meeting in meetings:
+        events_and_meetings.append(meeting)
+
+    events_and_meetings.sort(key=lambda event: event.date_begin)
+
+    if len(events_and_meetings) > 5:
+        events_and_meetings = events_and_meetings[:5]
+
+    articles = Article.objects.filter(source__team=team)[:5]
     is_member = False
     is_admin = False
     if request.user.is_authenticated():
-        is_member = launchpad.is_team_member(request.user, team_object)
-        is_admin = launchpad.is_admin_or_owner(request.user.username, team_object) or launchpad.is_user_on_loco_council(request.user)
+        is_member = launchpad.is_team_member(request.user, team)
+        is_admin = launchpad.is_admin_or_owner(request.user.username, team) or launchpad.is_user_on_loco_council(request.user)
     context = {
-        'team': team_object,
+        'team': team,
+        'events_and_meetings': events_and_meetings,
         'articles': articles,
         'is_member': is_member,
         'is_admin': is_admin,

=== modified file 'loco_directory/templates/events/team_event_delete_confirm.html'
--- loco_directory/templates/events/team_event_delete_confirm.html	2012-12-26 17:23:50 +0000
+++ loco_directory/templates/events/team_event_delete_confirm.html	2013-03-04 23:07:27 +0000
@@ -4,20 +4,40 @@
 {% block page_name %}{% trans "Delete Team Event" %}{% endblock %}
 
 {% block extrahead %}{{ block.super }}
-{{form.media}}
+{{ form.media }}
+{% endblock %}
+
+{% block sub_nav_links %}
+
+{% for team in team_event.teams.all %}
+    <li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a></li>
+{% endfor %}
+
+{% if user.is_authenticated %}
+  {% if user_is_team_member %}
+    <li><a class="sub-nav-item" href="{% url team-event-update team_event.first_team.lp_name team_event.id %}">{% trans "Edit Details" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-event-delete team_event.first_team.lp_name team_event.id %}">{% trans "Delete Event" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-event-copy team_event.first_team.lp_name team_event.id %}">{% trans "Copy Event" %}</a></li>
+  {% endif %}
+{% endif %}
 {% endblock %}
 
 {% block content %}
 <div class="row">
-<section class="span-9">
-    <form action="." method="post">{% csrf_token %}
-        <fieldset>
-            <h3>{% trans "Delete Team Event" %}</h3>
-            <label>{% blocktrans with team_event_object.name as eventname %}Do you really want to delete the Team Event: {{eventname}}?{% endblocktrans %}</label>
-        </fieldset>
-	    <input type="submit" value="{% trans 'Delete' %}" />
-	    <a href="{{team_event_object.get_absolute_url}}">{% trans "Cancel" %}</a>
-    </form>
-</section>
+    <section class="span-9">
+        <div class="box_content">
+            <div class="pagelet">
+                <form action="." method="post" class="form">{% csrf_token %}
+                    <h2>{% trans "Delete event" %}</h2>
+                    <p>{% blocktrans with team_event.name as eventname %}By deleting the master event "{{ eventname }}", all events in the series will be deleted.{% endblocktrans %}</p>
+                    <p>{% blocktrans %}Do you really want to delete this event ?{% endblocktrans %}</p>
+
+                    {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
+                    <input type="submit" value="{% trans 'Yes' %}" class="btn"/> {% trans "Or" %} <a href="{{ team_event.get_absolute_url }}">{% trans "Cancel" %}</a>
+
+                </form>
+            </div>
+        </div>
+    </section>
 </div>
 {% endblock %}

=== modified file 'loco_directory/templates/events/team_event_detail.html'
--- loco_directory/templates/events/team_event_detail.html	2012-11-28 00:46:29 +0000
+++ loco_directory/templates/events/team_event_detail.html	2013-03-04 23:07:27 +0000
@@ -1,23 +1,23 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block page_name %}{% trans team_event_object.name %}{% endblock %}
+{% block page_name %}{{ occurrence.get_title }}{% endblock %}
 
 {% block extrahead %}{{ block.super }}
 <meta property="fb:app_id" content="127188230723188"/>
-<meta property="og:title" content="{{ team_event_object.name }}" />
-{% if team_event_object.description %}
-<meta property="og:description" content="{{ team_event_object.description|linebreaks|striptags }}" />
+<meta property="og:title" content="{{ occurrence.get_title }}" />
+{% if team_event.description %}
+<meta property="og:description" content="{{ team_event.description|linebreaks|striptags }}" />
 {% endif %}
-<meta property="og:url" content="http://loco.ubuntu.com{{ team_event_object.get_absolute_url }}"/>
+<meta property="og:url" content="http://loco.ubuntu.com{{ team_event.get_absolute_url }}"/>
 <meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/>
 <meta property="og:site_name" content="Loco Team Portal"/>
 <meta property="og:type" content="loco-team-portal:event"/>
-{% if team_event_object.venue %}
-<meta property="og:latitude" content="{{ team_event_object.venue.latitude }}"/>
-<meta property="og:longitude" content="{{ team_event_object.venue.longitude }}"/>
-<meta property="og:street-address" content="{{ team_event_object.venue.name }} "/>
-<meta property="og:locality" content="{% if team_event_object.venue.city %}{{ team_event_object.venue.city }}{% endif %}"/>
+{% if team_event.venue %}
+<meta property="og:latitude" content="{{ team_event.venue.latitude }}"/>
+<meta property="og:longitude" content="{{ team_event.venue.longitude }}"/>
+<meta property="og:street-address" content="{{ team_event.venue.name }} "/>
+<meta property="og:locality" content="{% if team_event.venue.city %}{{ team_event.venue.city }}{% endif %}"/>
 {% endif %}
 <script type="text/javascript" src="{{ MEDIA_URL }}js/comments.js"></script>
 {{form.media}}
@@ -31,18 +31,18 @@
 
 {% block sub_nav_links %}
 
-{% for team in team_event_object.teams.all %}
+{% for team in team_event.teams.all %}
     <li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a></li>
 {% endfor %}
 
 {% if user.is_authenticated %}
   {% if user_is_team_member %}
-    <li><a class="sub-nav-item" href="{% url team-event-update team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Edit Details" %}</a></li>
-    <li><a class="sub-nav-item" href="{% url team-event-delete team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Delete Event" %}</a></li>
-    <li><a class="sub-nav-item" href="{% url team-event-copy team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Copy Event" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-event-update team_event.first_team.lp_name team_event.id %}">{% trans "Edit Details" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-event-delete team_event.first_team.lp_name team_event.id %}">{% trans "Delete Event" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-event-copy team_event.first_team.lp_name team_event.id %}">{% trans "Copy Event" %}</a></li>
   {% endif %}
 {% endif %}
-<li><a class="sub-nav-item" href="{% url event-ical team_event_object.first_team.lp_name team_event_object.id %}">{% trans "iCal Feed" %}</a></li>
+<li><a class="sub-nav-item" href="{% url event-ical team_event.first_team.lp_name team_event.id %}">{% trans "iCal Feed" %}</a></li>
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/templates/events/team_event_detail.inc.html'
--- loco_directory/templates/events/team_event_detail.inc.html	2013-02-16 00:29:22 +0000
+++ loco_directory/templates/events/team_event_detail.inc.html	2013-03-04 23:07:27 +0000
@@ -3,11 +3,11 @@
     <section class="span-9">
         <div class="box_content">
             <div class="pagelet">
-                <h2>{{ team_event_object.name }}</h2>
-                {% if team_event_object.global_event %}
+                <h2>{{ occurrence.get_title }}</h2>
+                {% if team_event.global_event %}
                     <div class="event-partofglobal-event">
                         {% trans "This event is part of" %}
-                        <a href="{{ team_event_object.global_event.get_absolute_url }}">{{team_event_object.global_event.name }}</a>
+                        <a href="{{ team_event.global_event.get_absolute_url }}">{{team_event.global_event.name }}</a>
                     </div>
                 {% endif %}
                 <div class="share">
@@ -23,57 +23,57 @@
                     <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
                     <g:plusone size="medium"></g:plusone>
                     <a href="http://twitter.com/share" class="twitter-share-button" data-lang="en">Tweet</a>
-                    <div class="fb-like" data-href="http://loco.ubuntu.com{{ team_event_object.get_absolute_url }}" data-send="false" data-layout="button_count" data-width="40" data-show-faces="false" data-font="arial"></div>
+                    <div class="fb-like" data-href="http://loco.ubuntu.com{{ team_event.get_absolute_url }}" data-send="false" data-layout="button_count" data-width="40" data-show-faces="false" data-font="arial"></div>
                 </div>
 
                 <div>
                     <span class="pictogram calendar"></span>
                     <span class="pictogram-l">
-                    {% ifequal team_event_object.local_date_begin|date team_event_object.local_date_end|date %}
-                        {{ team_event_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.local_date_end|date:"H:i T" }}
+                    {% ifequal occurrence.local_date_begin|date occurrence.local_date_end|date %}
+                        {{ occurrence.local_date_begin|date:"D, d N Y H:i" }} - {{ occurrence.local_date_end|date:"H:i T" }}
                     {% else %}
-                    {{ team_event_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.local_date_end|date:"D, d N Y H:i T" }}
+                        {{ occurrence.local_date_begin|date:"D, d N Y H:i" }} - {{ occurrence.local_date_end|date:"D, d N Y H:i T" }}
                     {% endifequal %}
                     </span>
                 </div>
 
-                {% if team_event_object.description %}
-                    <p>{{ team_event_object.description|markdown:'safe'|linebreaks }}</p>
+                {% if team_event.description %}
+                    <p>{{ team_event.description|markdown:'safe'|linebreaks }}</p>
                 {% endif %}
 
-                {% if team_event_object.announce %}
+                {% if team_event.announce %}
                 <div>
                     <span class="pictogram announcement"></span>
-                    <a class="pictogram-l" href="{{ team_event_object.announce }}">{{team_event_object.announce }}</a>
+                    <a class="pictogram-l" href="{{ team_event.announce }}">{{team_event.announce }}</a>
                 </div>
                 {% endif %}
             </div>
 
             <div class="map">
-                <img class="map_img" src="http://maps.googleapis.com/maps/api/staticmap?center={% if team_event_object.venue.address %}{{ team_event_object.venue.address }}{% else %}{{ team_event_object.venue.latitude }},{{ team_event_object.venue.longitude }}{% endif %}&zoom=13&size=640x100&scale=1&maptype=roadmap&markers=color:orange%7Clabel:S%7C{{ team_event_object.venue.latitude }},{{ team_event_object.venue.longitude }}&sensor=false">
+                <img class="map_img" src="http://maps.googleapis.com/maps/api/staticmap?center={% if team_event.venue.address %}{{ team_event.venue.address }}{% else %}{{ team_event.venue.latitude }},{{ team_event.venue.longitude }}{% endif %}&zoom=13&size=640x100&scale=1&maptype=roadmap&markers=color:orange%7Clabel:S%7C{{ team_event.venue.latitude }},{{ team_event.venue.longitude }}&sensor=false">
             </div>
 
-            {% if team_event_object.venue %}
+            {% if team_event.venue %}
             <div class="event-venue">
-                <a title="{% trans "show venue details" %}" href="{{ team_event_object.venue.get_absolute_url }}">
+                <a title="{% trans "show venue details" %}" href="{{ team_event.venue.get_absolute_url }}">
                     <div class="event-venue-name">
-                        {{ team_event_object.venue.name }}
+                        {{ team_event.venue.name }}
                     </div>
                 </a>
 
                 <div class="event-venue-city">
-                    {% if team_event_object.venue.city %}{{ team_event_object.venue.city }}{% endif %}
+                    {% if team_event.venue.city %}{{ team_event.venue.city }}{% endif %}
                 </div>
 
                 <div class="event-venue-adress">
-                    {% if team_event_object.venue.address %}{{ team_event_object.venue.address }}{% endif %}
-                    {% if team_event_object.venue.address and team_event_object.venue.spr%} ,{% endif %}
-                    {% if team_event_object.venue.spr %}{{ team_event_object.venue.spr }}{% endif %}
+                    {% if team_event.venue.address %}{{ team_event.venue.address }}{% endif %}
+                    {% if team_event.venue.address and team_event.venue.spr%} ,{% endif %}
+                    {% if team_event.venue.spr %}{{ team_event.venue.spr }}{% endif %}
                 </div>
             </div>
             {% endif %}
             <div>
-            {% if team_event_object.teameventcomment_set.all %}
+            {% if team_event.teameventcomment_set.all %}
                 {% include "events/team_event_detail_comments.inc.html" %}
             {% endif %}
             {% include "events/team_event_comment_new.inc.html" %}
@@ -83,51 +83,51 @@
     <section class="span-3 box_content last">
         <div class="sidebar-inner">
             <div class="event-info">
-                {% if team_event_object %}
-                    {% if team_event_object.channel %}
+                {% if team_event %}
+                    {% if team_event.channel %}
                     <div>
                         <span class="pictogram comments"></span>
-                        {{ team_event_object.channel }}
+                        {{ team_event.channel }}
                     </div>
                     {% endif %}
 
-                    {% if team_event_object.contact %}
+                    {% if team_event.contact %}
                     <div>
                         <span class="pictogram personne"></span>
-                        <a class="pictogram-l" title="{{ team_event_object.contact.realname }}" href="{% url profile-detail team_event_object.contact.user %}">{{ team_event_object.contact.realname }}</a>
+                        <a class="pictogram-l" title="{{ team_event.contact.realname }}" href="{% url profile-detail team_event.contact.user %}">{{ team_event.contact.realname }}</a>
                     </div>
                     {% endif %}
 
-                    {% if team_event_object.teams.all %}
+                    {% if team_event.teams.all %}
                         <div>
                             <span class="pictogram team"></span>
-                            {% for team in team_event_object.teams.all %}<a  class="pictogram-l" title="{% trans "Get more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %},{% endif %}{% endfor %}
+                            {% for team in team_event.teams.all %}<a  class="pictogram-l" title="{% trans "Get more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %},{% endif %}{% endfor %}
                         </div>
                     {% endif %}
                 {% endif %}
             </div>
 
-            {% if team_event_object.registration %}
-                <a class="submit-button rsvp-link" href="{{team_event_object.registration}}" target="external_registration">{% trans 'Register' %}</a>
+            {% if team_event.registration %}
+                <a class="submit-button rsvp-link" href="{{team_event.registration}}" target="external_registration">{% trans 'Register' %}</a>
             {% else %}
                 {% if user.is_authenticated and user_is_attending %}
-                    <a class="submit-button rsvp-link" href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Update Registration' %}</a>
+                    <a class="submit-button rsvp-link" href="{% url team-event-register team_event.first_team.lp_name team_event.id %}">{% trans 'Update Registration' %}</a>
                 {% else %}
-                    <a class="submit-button rsvp-link" href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register' %}</a>
+                    <a class="submit-button rsvp-link" href="{% url team-event-register team_event.first_team.lp_name team_event.id %}">{% trans 'Register' %}</a>
                 {% endif %}
             {% endif %}
 
-            {% if team_event_object.created_by %}
+            {% if team_event.created_by %}
                 <h3 class="attendees-title">{% trans 'Created by' %}</h3>
                 <ul class="attendees">
                     <li class="attendee-cell">
                         <div class="attendee-mugshot">
-                            <a href="{% url profile-detail team_event_object.created_by.username %}">
-                              <img src="{% if team_event_object.created_by.get_profile.mugshot %}{{ team_event_object.created_by.get_profile.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" width="32px" height="32px" alt="{{ team_event_object.created_by.get_profile.realname }}">
+                            <a href="{% url profile-detail team_event.created_by.username %}">
+                              <img src="{% if team_event.created_by.get_profile.mugshot %}{{ team_event.created_by.get_profile.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" width="32px" height="32px" alt="{{ team_event.created_by.get_profile.realname }}">
                             </a>
                         </div>
                         <div class="attendee-infos">
-                            <a href="{% url profile-detail team_event_object.created_by.username %}">{{ team_event_object.created_by.get_profile.realname }}</a>
+                            <a href="{% url profile-detail team_event.created_by.username %}">{{ team_event.created_by.get_profile.realname }}</a>
                         </div>
                     </li>
                 </ul>

=== added file 'loco_directory/templates/events/team_event_detail_old.html'
--- loco_directory/templates/events/team_event_detail_old.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/events/team_event_detail_old.html	2013-03-04 23:07:27 +0000
@@ -0,0 +1,47 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block page_name %}{{ team_event.name }}{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+<meta property="fb:app_id" content="127188230723188"/>
+<meta property="og:title" content="{{ team_event.name }}" />
+{% if team_event.description %}
+<meta property="og:description" content="{{ team_event.description|linebreaks|striptags }}" />
+{% endif %}
+<meta property="og:url" content="http://loco.ubuntu.com{{ team_event.get_absolute_url }}"/>
+<meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/>
+<meta property="og:site_name" content="Loco Team Portal"/>
+<meta property="og:type" content="loco-team-portal:event"/>
+{% if team_event.venue %}
+<meta property="og:latitude" content="{{ team_event.venue.latitude }}"/>
+<meta property="og:longitude" content="{{ team_event.venue.longitude }}"/>
+<meta property="og:street-address" content="{{ team_event.venue.name }} "/>
+<meta property="og:locality" content="{% if team_event.venue.city %}{{ team_event.venue.city }}{% endif %}"/>
+{% endif %}
+<script type="text/javascript" src="{{ MEDIA_URL }}js/comments.js"></script>
+{{ form.media }}
+{% endblock %}
+
+
+{% block sub_nav_links %}
+
+{% for team in team_event.teams.all %}
+    <li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a></li>
+{% endfor %}
+
+{% if user.is_authenticated %}
+  {% if user_is_team_member %}
+    <li><a class="sub-nav-item" href="{% url team-event-update team_event.first_team.lp_name team_event.id %}">{% trans "Edit Details" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-event-delete team_event.first_team.lp_name team_event.id %}">{% trans "Delete Event" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url team-event-copy team_event.first_team.lp_name team_event.id %}">{% trans "Copy Event" %}</a></li>
+  {% endif %}
+{% endif %}
+<li><a class="sub-nav-item" href="{% url event-ical team_event.first_team.lp_name team_event.id %}">{% trans "iCal Feed" %}</a></li>
+{% endblock %}
+
+{% block content %}
+
+{% include "events/team_event_detail_old.inc.html" %}
+
+{% endblock %}

=== added file 'loco_directory/templates/events/team_event_detail_old.inc.html'
--- loco_directory/templates/events/team_event_detail_old.inc.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/events/team_event_detail_old.inc.html	2013-03-04 23:07:27 +0000
@@ -0,0 +1,138 @@
+{% load i18n markup %}
+<div class="row">
+    <section class="span-9">
+        <div class="box_content">
+            <div class="pagelet">
+                <h2>{{ team_event.name }}</h2>
+                {% if team_event.global_event %}
+                    <div class="event-partofglobal-event">
+                        {% trans "This event is part of" %}
+                        <a href="{{ team_event.global_event.get_absolute_url }}">{{team_event.global_event.name }}</a>
+                    </div>
+                {% endif %}
+                <div class="share">
+                    <div id="fb-root"></div>
+                    <script>(function(d, s, id) {
+                      var js, fjs = d.getElementsByTagName(s)[0];
+                      if (d.getElementById(id)) {return;}
+                      js = d.createElement(s); js.id = id;
+                      js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=127188230723188";
+                      fjs.parentNode.insertBefore(js, fjs);
+                    }(document, 'script', 'facebook-jssdk'));</script>
+                    <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
+                    <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+                    <g:plusone size="medium"></g:plusone>
+                    <a href="http://twitter.com/share" class="twitter-share-button" data-lang="en">Tweet</a>
+                    <div class="fb-like" data-href="http://loco.ubuntu.com{{ team_event.get_absolute_url }}" data-send="false" data-layout="button_count" data-width="40" data-show-faces="false" data-font="arial"></div>
+                </div>
+
+                <div>
+                    <span class="pictogram calendar"></span>
+                    <span class="pictogram-l">
+                    {% ifequal team_event.local_date_begin|date team_event.local_date_end|date %}
+                        {{ team_event.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event.local_date_end|date:"H:i T" }}
+                    {% else %}
+                        {{ team_event.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event.local_date_end|date:"D, d N Y H:i T" }}
+                    {% endifequal %}
+                    </span>
+                </div>
+
+                {% if team_event.description %}
+                    <p>{{ team_event.description|markdown:'safe'|linebreaks }}</p>
+                {% endif %}
+
+                {% if team_event.announce %}
+                <div>
+                    <span class="pictogram announcement"></span>
+                    <a class="pictogram-l" href="{{ team_event.announce }}">{{team_event.announce }}</a>
+                </div>
+                {% endif %}
+            </div>
+
+            <div class="map">
+                <img class="map_img" src="http://maps.googleapis.com/maps/api/staticmap?center={% if team_event.venue.address %}{{ team_event.venue.address }}{% else %}{{ team_event.venue.latitude }},{{ team_event.venue.longitude }}{% endif %}&zoom=13&size=640x100&scale=1&maptype=roadmap&markers=color:orange%7Clabel:S%7C{{ team_event.venue.latitude }},{{ team_event.venue.longitude }}&sensor=false">
+            </div>
+
+            {% if team_event.venue %}
+            <div class="event-venue">
+                <a title="{% trans "show venue details" %}" href="{{ team_event.venue.get_absolute_url }}">
+                    <div class="event-venue-name">
+                        {{ team_event.venue.name }}
+                    </div>
+                </a>
+
+                <div class="event-venue-city">
+                    {% if team_event.venue.city %}{{ team_event.venue.city }}{% endif %}
+                </div>
+
+                <div class="event-venue-adress">
+                    {% if team_event.venue.address %}{{ team_event.venue.address }}{% endif %}
+                    {% if team_event.venue.address and team_event.venue.spr%} ,{% endif %}
+                    {% if team_event.venue.spr %}{{ team_event.venue.spr }}{% endif %}
+                </div>
+            </div>
+            {% endif %}
+            <div>
+            {% if team_event.teameventcomment_set.all %}
+                {% include "events/team_event_detail_comments.inc.html" %}
+            {% endif %}
+            {% include "events/team_event_comment_new.inc.html" %}
+            </div>
+        </div>
+    </section>
+    <section class="span-3 box_content last">
+        <div class="sidebar-inner">
+            <div class="event-info">
+                {% if team_event %}
+                    {% if team_event.channel %}
+                    <div>
+                        <span class="pictogram comments"></span>
+                        {{ team_event.channel }}
+                    </div>
+                    {% endif %}
+
+                    {% if team_event.contact %}
+                    <div>
+                        <span class="pictogram personne"></span>
+                        <a class="pictogram-l" title="{{ team_event.contact.realname }}" href="{% url profile-detail team_event.contact.user %}">{{ team_event.contact.realname }}</a>
+                    </div>
+                    {% endif %}
+
+                    {% if team_event.teams.all %}
+                        <div>
+                            <span class="pictogram team"></span>
+                            {% for team in team_event.teams.all %}<a  class="pictogram-l" title="{% trans "Get more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %},{% endif %}{% endfor %}
+                        </div>
+                    {% endif %}
+                {% endif %}
+            </div>
+
+            {% if team_event.registration %}
+                <a class="submit-button rsvp-link" href="{{team_event.registration}}" target="external_registration">{% trans 'Register' %}</a>
+            {% else %}
+                {% if user.is_authenticated and user_is_attending %}
+                    <a class="submit-button rsvp-link" href="{% url team-event-register team_event.first_team.lp_name team_event.id %}">{% trans 'Update Registration' %}</a>
+                {% else %}
+                    <a class="submit-button rsvp-link" href="{% url team-event-register team_event.first_team.lp_name team_event.id %}">{% trans 'Register' %}</a>
+                {% endif %}
+            {% endif %}
+
+            {% if team_event.created_by %}
+                <h3 class="attendees-title">{% trans 'Created by' %}</h3>
+                <ul class="attendees">
+                    <li class="attendee-cell">
+                        <div class="attendee-mugshot">
+                            <a href="{% url profile-detail team_event.created_by.username %}">
+                              <img src="{% if team_event.created_by.get_profile.mugshot %}{{ team_event.created_by.get_profile.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" width="32px" height="32px" alt="{{ team_event.created_by.get_profile.realname }}">
+                            </a>
+                        </div>
+                        <div class="attendee-infos">
+                            <a href="{% url profile-detail team_event.created_by.username %}">{{ team_event.created_by.get_profile.realname }}</a>
+                        </div>
+                    </li>
+                </ul>
+            {% endif %}
+            {% include "events/team_event_detail_attendees.inc.html" %}
+        </div>
+    </section>
+</div>

=== modified file 'loco_directory/templates/events/team_event_list.inc.html'
--- loco_directory/templates/events/team_event_list.inc.html	2012-06-07 04:19:26 +0000
+++ loco_directory/templates/events/team_event_list.inc.html	2013-03-04 23:07:27 +0000
@@ -15,7 +15,7 @@
         {% for team_event in team_event_list %}
         <tr>
             <td class="event_name">
-                <a title="{% trans "more information about this event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
+                <a title="{% trans "more information about this event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.get_title }}</a>
             </td>
             <td class="event_teams no-wrap">
                 {% for team in team_event.teams.all %}
@@ -25,8 +25,8 @@
                     {% endif %}
                 {% endfor %}
             </td>
-            <td class="event_begin no-wrap">{{team_event.local_date_begin|date:"N j, Y H:i T"}}</td>
-            <td class="event_end no-wrap">{{ team_event.local_date_end|date:"N j, Y H:i T"}}</td>
+            <td class="event_begin no-wrap">{{ team_event.local_date_begin|date:"N j, Y H:i T" }}</td>
+            <td class="event_end no-wrap">{{ team_event.local_date_end|date:"N j, Y H:i T" }}</td>
             <td class="event_global no-wrap">
                 {% if team_event.global_event %}
                     <a href="{{ team_event.global_event.get_absolute_url }}">{{ team_event.global_event.name}}</a>

=== modified file 'loco_directory/templates/events/team_event_new.html'
--- loco_directory/templates/events/team_event_new.html	2013-02-17 01:44:52 +0000
+++ loco_directory/templates/events/team_event_new.html	2013-03-04 23:07:27 +0000
@@ -5,20 +5,63 @@
 
 {% block extrahead %}{{ block.super }}
 {{ form.media }}
-{% if global_event %}
 <script type="text/javascript">
+    $(document).ready(function () {
+        $("#d_interval").hide();
+        $("#d_repetitions").hide();
+        //$("#d_until").hide();
+        $("#d_week_days").hide();
+        $('<span id="lbl_interval"></span>').insertAfter("#id_interval");
+
+        $("#id_frequency").on('change', function() {
+            if ($(this).val() == '-1') {
+                $("#d_interval").hide();
+                $("#d_repetitions").hide();
+                $("#d_until").hide();
+                $("#d_week_days").hide();
+            }
+            if ($(this).val() == '3'){
+                $("#d_interval").hide();
+                $("#d_repetitions").hide();
+                //$("#d_until").hide();
+                $("#d_interval").show();
+                $("#d_week_days").hide();
+                $("#lbl_interval").html('<b>{% trans "Days" %}</b>')
+                console.log('daily');
+            }
+            if ($(this).val() == '2'){
+                $("#d_repetitions").hide();
+                //$("#d_until").hide();
+                $("#d_interval").show();
+                $("#d_week_days").show();
+                $("#lbl_interval").html('<b>{% trans "Weeks" %}</b>')
+                console.log('weekly');
+            }
+            if ($(this).val() == '1'){
+                console.log('monthly');
+                $("#lbl_interval").html('<b>{% trans "Months" %}</b>')
+            }
+            if ($(this).val() == '0'){
+                $("#lbl_interval").html('<b>{% trans "Years" %}</b>')
+                console.log('yearly');
+            }
+        });
+    });
+
+    {% if global_event %}
     $.datepicker.setDefaults({
         minDate: new Date({{ global_event.date_begin.year }}, {{ global_event.date_begin.month }}-1, {{ global_event.date_begin.day }} ),
         maxDate: new Date({{ global_event.date_end.year }}, {{ global_event.date_end.month }}-1, {{ global_event.date_end.day }} )
     });
+    {% endif %}
 </script>
-{% endif %}
 {% endblock %}
 
 {% block content %}
 <div class="row">
     <section class="span-9">
         <div class="box_content">
+            {{ form.non_field_errors }}
             <div class="pagelet">
                 <form action="." method="post" class="form">{% csrf_token %}
                     <h2>{% trans "Add new Team Event for " %}{{ team_object.name}}</h2>

=== modified file 'loco_directory/templates/form.html'
--- loco_directory/templates/form.html	2013-02-17 01:44:52 +0000
+++ loco_directory/templates/form.html	2013-03-04 23:07:27 +0000
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% for field in form.visible_fields %}
-    <div>
+    <div id="d_{{ field.name }}">
         {% if field.field.label %}<label for="id_{{ field.name }}"{% if field.field.required %} class="required"{% endif %}>{{ field.label }}</label>{% endif %}
         {% if field.errors %}
             <ul class="errorlist">

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2013-02-21 20:31:16 +0000
+++ loco_directory/templates/teams/team_detail.html	2013-03-04 23:07:27 +0000
@@ -15,25 +15,25 @@
 
 {% block extrahead %}{{ block.super }}
 {% if team.flickr_id or team.picasa_id or team.pixie_id %}
-<script type="text/javascript" src="{{MEDIA_URL}}js/jquery.lightbox-0.5.min.js"></script>
-<link rel="stylesheet" href="{{MEDIA_URL}}css/jquery.lightbox-0.5.css" type="text/css" media="screen" />
+<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.lightbox-0.5.min.js"></script>
+<link rel="stylesheet" href="{{ MEDIA_URL }}css/jquery.lightbox-0.5.css" type="text/css" media="screen" />
 {% endif %}
 
 {% if team.flickr_id %}
-<script type="text/javascript" src="{{MEDIA_URL}}js/jquery-flickr.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-flickr.js"></script>
 {% endif %}
 
 {% if team.picasa_id %}
-<script type="text/javascript" src="{{MEDIA_URL}}js/jquery-picasa.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-picasa.js"></script>
 {% endif %}
 
 {% if team.pixie_id %}
-<script type="text/javascript" src="{{MEDIA_URL}}js/jquery-pixie.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-pixie.js"></script>
 {% endif %}
 
 {% if team.microbloghashtag %}
-<link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/twidenash.css" />
-<script type="text/javascript" src="{{MEDIA_URL}}js/twidenash/jquery-twidenash.js"></script>
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/twidenash.css" />
+<script type="text/javascript" src="{{ MEDIA_URL }}js/twidenash/jquery-twidenash.js"></script>
 {% endif %}
 <script type="text/javascript">
 $(function() {
@@ -80,8 +80,7 @@
                                 {% for country in team.countries.all %}
                                     {% if not forloop.first %}, {% endif %}{{ country.name }}
                                 {% endfor %}
-                                {% if team.spr %}, {{ team.spr }}{% endif %}{% if team.city %}, {{ team.city }}
-                                {% endif %}
+                                {% if team.spr %}, {{ team.spr }}{% endif %}{% if team.city %}, {{ team.city }}{% endif %}
                             {% else %}
                                 {% trans "None Specified" %}
                             {% endif %}
@@ -189,10 +188,10 @@
                         </span>
                     </div>
                 </div>
-                {% if team.next_5_events_and_meetings %}
-                    {% for team_event in team.next_5_events_and_meetings %}
+                {% if events_and_meetings %}
+                    {% for team_event in events_and_meetings %}
                     <a href="{{ team_event.get_absolute_url }}" title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" class="event-meetings">
-                        <span class="title">{{ team_event.name }}</span>
+                        <span class="title">{{ team_event.get_title }}</span>
                         <small>{{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}</small>
                         <p>{{ team_event.description }}</p>
                     </a>
@@ -263,12 +262,12 @@
             {% for admin in team.admin_profiles.all %}
                 {% ifequal team.owner admin.user.username %}
                     <a href="{% url profile-detail admin.user.username %}">
-                        <img alt="" class="photo fn" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot">
+                        <img alt="" class="photo fn" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{ MEDIA_URL }}img/default-mugshot.png{% endif %}" class="mugshot">
                         <p>{{ admin.realname }}</p>
                     </a>
                 {% else %}
                     <a href="{% url profile-detail admin.user.username %}">
-                        <img alt="{{ admin.realname }}" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
+                        <img alt="{{ admin.realname }}" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{ MEDIA_URL }}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
                         <p>{{ admin.realname }}</p>
                     </a>
                 {% endifequal %}
@@ -279,7 +278,7 @@
                 {% if team.contact_profiles.all %}
                     {% for contact in team.contact_profiles.all %}
                         <a href="{% url profile-detail contact.user.username %}">
-                        <img alt="{{ contact.realname }}" src="{% if contact.mugshot %}{{ contact.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
+                        <img alt="{{ contact.realname }}" src="{% if contact.mugshot %}{{ contact.mugshot }}{% else %}{{ MEDIA_URL }}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
                         <p>{{ contact.realname }}</p>
                     </a>
                     {% endfor %}