From 9e78e1ace31318f7e8b18adf5431d00891ffcd10 2012-02-06 03:04:54
From: James Tauber <jtauber@jtauber.com>
Date: 2012-02-06 03:04:54
Subject: [PATCH] Merge branch 'fresh-start' into sponsorship

Conflicts:
	symposion_project/settings.py

---

diff --git a/.gitignore b/.gitignore
index e35d8850c9688b1ce82711694692cc574a799396..f34d58c9ed42be04483fe3ba20cf509b9ddb0359 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 _build
+*.pyc
+dev.db
diff --git a/symposion_project/apps/conference/__init__.py b/symposion_project/apps/conference/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/symposion_project/apps/conference/admin.py b/symposion_project/apps/conference/admin.py
new file mode 100644
index 0000000000000000000000000000000000000000..e385acdf6b58d9d3895056a7eb77374b53cb7a3d
--- /dev/null
+++ b/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"))
diff --git a/symposion_project/apps/conference/models.py b/symposion_project/apps/conference/models.py
new file mode 100644
index 0000000000000000000000000000000000000000..b09c94bff2ff4d492bc43f26984597cf7548b855
--- /dev/null
+++ b/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
diff --git a/symposion_project/settings.py b/symposion_project/settings.py
index 4bef98ec3732b6b97d61a3dd3e2b5720a35ca744..bb2ffcc67d6d68b5f768d5eabc2ffc039edd45d1 100644
--- a/symposion_project/settings.py
+++ b/symposion_project/settings.py
@@ -166,6 +166,7 @@ INSTALLED_APPS = [
     # project
     "about",
     "sponsorship",
+    "conference",
 ]
 
 FIXTURE_DIRS = [