Merge branch 'fresh-start' into cms-features

.gitignore

@@ -1 +1,3 @@
 _build
+*.pyc
+dev.db

symposion_project/apps/conference/admin.py

@@ -0,0 +1,7 @@
+from django.contrib import admin
+
+from conference.models import Conference, Section
+
+
+admin.site.register(Conference, list_display=("title", "start_date", "end_date"))
+admin.site.register(Section, list_display=("name", "conference", "start_date", "end_date"))

symposion_project/apps/conference/models.py

@@ -0,0 +1,40 @@
+from django.db import models
+
+from timezones.fields import TimeZoneField
+
+
+class Conference(models.Model):
+    """
+    the full conference for a specific year, e.g. US PyCon 2012.
+    """
+    
+    title = models.CharField(max_length=100)
+    
+    # when the conference runs
+    start_date = models.DateField(null=True, blank=True)
+    end_date = models.DateField(null=True, blank=True)
+    
+    # timezone the conference is in
+    timezone = TimeZoneField(blank=True)
+    
+    def __unicode__(self):
+        return self.title
+
+
+class Section(models.Model):
+    """
+    a section of the conference such as "Tutorials", "Workshops",
+    "Talks", "Expo", "Sprints", that may have its own review and
+    scheduling process.
+    """
+    
+    conference = models.ForeignKey(Conference)
+    
+    name = models.CharField(max_length=100)
+    
+    # when the section runs
+    start_date = models.DateField(null=True, blank=True)
+    end_date = models.DateField(null=True, blank=True)
+    
+    def __unicode__(self):
+        return self.name

symposion_project/settings.py

@@ -170,6 +170,7 @@ INSTALLED_APPS = [
     
     # project
     "about",
+    "conference",
 ]
 
 FIXTURE_DIRS = [