From 143dbbce2891be043c6acbcd794f09ed03eadbc4 Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Wed, 29 Aug 2012 19:53:15 -0600
Subject: [PATCH 01/46] added schedule models (not fully complete)

---
 symposion/schedule/__init__.py |  0
 symposion/schedule/models.py   | 59 ++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 symposion/schedule/__init__.py
 create mode 100644 symposion/schedule/models.py

diff --git a/symposion/schedule/__init__.py b/symposion/schedule/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py
new file mode 100644
index 00000000..b51c7814
--- /dev/null
+++ b/symposion/schedule/models.py
@@ -0,0 +1,59 @@
+from django.db import models
+
+from symposion.conference.models import Section
+
+
+class Schedule(models.Model):
+    
+    section = models.OneToOneField(Section)
+
+
+class Day(models.Model):
+    
+    date = models.DateField()
+
+
+class Track(models.Model):
+    
+    name = models.CharField(max_length=65)
+    room = models.CharField(max_length=100)
+
+
+class Slot(models.Model):
+    
+    day = models.ForeignKey(Day)
+    track_set = models.TextField(db_column="tracks")
+    start = models.TimeField()
+    end = models.TimeField()
+    
+    @property
+    def tracks(self):
+        attr = "_tracks"
+        if not hasattr(self, attr):
+            slot = self
+            class TrackSet(object):
+                
+                def __init__(self, data, delimiter):
+                    self.data = set(data.split(delimiter))
+                
+                def __iter__(self):
+                    return Track.objects.filter(pk__in=self.data)
+                
+                def add(self, track, commit=True):
+                    """
+                    Add given track to the set, but check if it can exist
+                    before adding it.
+                    """
+                    self.data.add(track.pk)
+                    self._update_model(commit=commit)
+                
+                def remove(self, track, commit=True):
+                    self.data.remove(track.pk)
+                    self._update_model(commit=commit)
+                
+                def _update_model(self, commit=True):
+                    slot.track_set += self.delimiter.join(self.data)
+                    if commit:
+                        slot.save(force_update=True)
+            setattr(self, attr, TrackSet(self.track_set, delimiter=" "))
+        return getattr(self, attr)

From 77dc781e0d8b742956678bd5dd6577d23cd7753c Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Wed, 29 Aug 2012 23:58:03 -0600
Subject: [PATCH 02/46] Improved schedule models and behavior

This allows for full slot creation now.
---
 symposion/schedule/models.py | 58 ++++++++++++++++--------------------
 symposion/schedule/utils.py  | 34 +++++++++++++++++++++
 2 files changed, 59 insertions(+), 33 deletions(-)
 create mode 100644 symposion/schedule/utils.py

diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py
index b51c7814..2e885bd9 100644
--- a/symposion/schedule/models.py
+++ b/symposion/schedule/models.py
@@ -1,6 +1,7 @@
 from django.db import models
 
 from symposion.conference.models import Section
+from symposion.schedule.utils import InlineSet
 
 
 class Schedule(models.Model):
@@ -10,50 +11,41 @@ class Schedule(models.Model):
 
 class Day(models.Model):
     
+    schedule = models.ForeignKey(Schedule)
     date = models.DateField()
-
-
-class Track(models.Model):
     
+    class Meta:
+        unique_together = [("schedule", "date")]
+
+
+class Room(models.Model):
+    
+    schedule = models.ForeignKey(Schedule)
     name = models.CharField(max_length=65)
-    room = models.CharField(max_length=100)
+    order = models.PositiveIntegerField()
+
+
+class SlotKind(models.Model):
+    """
+    A slot kind represents what kind a slot is. For example, a slot can be a
+    break, lunch, or X-minute talk.
+    """
+    
+    schedule = models.ForeignKey(Schedule)
+    label = models.CharField(max_length=50)
 
 
 class Slot(models.Model):
     
     day = models.ForeignKey(Day)
-    track_set = models.TextField(db_column="tracks")
+    room_set = models.TextField(db_column="rooms")
+    kind = models.ForeignKey(SlotKind)
     start = models.TimeField()
     end = models.TimeField()
     
     @property
-    def tracks(self):
-        attr = "_tracks"
+    def rooms(self):
+        attr = "_rooms"
         if not hasattr(self, attr):
-            slot = self
-            class TrackSet(object):
-                
-                def __init__(self, data, delimiter):
-                    self.data = set(data.split(delimiter))
-                
-                def __iter__(self):
-                    return Track.objects.filter(pk__in=self.data)
-                
-                def add(self, track, commit=True):
-                    """
-                    Add given track to the set, but check if it can exist
-                    before adding it.
-                    """
-                    self.data.add(track.pk)
-                    self._update_model(commit=commit)
-                
-                def remove(self, track, commit=True):
-                    self.data.remove(track.pk)
-                    self._update_model(commit=commit)
-                
-                def _update_model(self, commit=True):
-                    slot.track_set += self.delimiter.join(self.data)
-                    if commit:
-                        slot.save(force_update=True)
-            setattr(self, attr, TrackSet(self.track_set, delimiter=" "))
+            setattr(self, attr, InlineSet(obj=self, field="room_set", delimiter=" "))
         return getattr(self, attr)
diff --git a/symposion/schedule/utils.py b/symposion/schedule/utils.py
new file mode 100644
index 00000000..341d44d7
--- /dev/null
+++ b/symposion/schedule/utils.py
@@ -0,0 +1,34 @@
+class InlineSet(object):
+    
+    def __init__(self, obj, field, delimiter):
+        self.obj = obj
+        self.field = field
+        self.data = set([x for x in getattr(obj, field).split(delimiter) if x])
+        self.delimiter = delimiter
+    
+    def __iter__(self):
+        return iter(self.queryset())
+    
+    def __len__(self):
+        return self.queryset().count()
+    
+    def queryset(self):
+        return self.obj.__class__._default_manager.filter(pk__in=self.data)
+    
+    def add(self, obj, commit=True):
+        """
+        Add given room to the set, but check if it can exist
+        before adding it.
+        """
+        self.data.add(obj.pk)
+        self._update_model(commit=commit)
+    
+    def remove(self, obj, commit=True):
+        self.data.remove(obj.pk)
+        self._update_model(commit=commit)
+    
+    def _update_model(self, commit=True):
+        value = self.delimiter.join([str(x) for x in self.data])
+        setattr(self.obj, self.field, value)
+        if commit:
+            self.obj.save(force_update=True)
\ No newline at end of file

From 0a4e626dfe9b5887291259849368dabf6c7d4043 Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Thu, 30 Aug 2012 00:21:48 -0600
Subject: [PATCH 03/46] Started detail and edit views with slug field to
 Schedule

---
 symposion/schedule/models.py |  1 +
 symposion/schedule/urls.py   |  9 +++++++++
 symposion/schedule/views.py  | 31 +++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 symposion/schedule/urls.py
 create mode 100644 symposion/schedule/views.py

diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py
index 2e885bd9..151ecab2 100644
--- a/symposion/schedule/models.py
+++ b/symposion/schedule/models.py
@@ -7,6 +7,7 @@ from symposion.schedule.utils import InlineSet
 class Schedule(models.Model):
     
     section = models.OneToOneField(Section)
+    slug = models.SlugField(unique=True)
 
 
 class Day(models.Model):
diff --git a/symposion/schedule/urls.py b/symposion/schedule/urls.py
new file mode 100644
index 00000000..8b0450b0
--- /dev/null
+++ b/symposion/schedule/urls.py
@@ -0,0 +1,9 @@
+from django.conf.urls.defaults import url, patterns
+
+
+urlpatterns = patterns("symposion.schedule.views",
+    url(r"^$", "schedule_detail", name="schedule_detail_singleton"),
+    url(r"^edit/$", "schedule_edit", name="schedule_edit_singleton"),
+    url(r"^(\w+)/edit/$", "schedule_detail", name="schedule_detail"),
+    url(r"^(\w+)/edit/$", "schedule_edit", name="schedule_edit"),
+)
diff --git a/symposion/schedule/views.py b/symposion/schedule/views.py
new file mode 100644
index 00000000..248db247
--- /dev/null
+++ b/symposion/schedule/views.py
@@ -0,0 +1,31 @@
+from django.shortcuts import render, get_object_or_404
+
+from symposion.schedule.models import Schedule
+
+
+def schedule_detail(request, slug=None):
+    qs = Schedule.objects.all()
+    if pk is None:
+        schedule = next(iter(qs), None)
+        if schedule is None:
+            raise Http404()
+    else:
+        schedule = get_object_or_404(qs, slug=slug)
+    ctx = {
+        "schedule": schedule,
+    }
+    return render(request, "schedule/schedule_detail.html")
+
+
+def schedule_edit(request, slug=None):
+    qs = Schedule.objects.all()
+    if pk is None:
+        schedule = next(iter(qs), None)
+        if schedule is None:
+            raise Http404()
+    else:
+        schedule = get_object_or_404(qs, slug=slug)
+    ctx = {
+        "schedule": schedule,
+    }
+    return render(request, "schedule/schedule_edit.html")

From bec6903ca1c9570a014e7676fceaf0b081eec637 Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Thu, 30 Aug 2012 00:23:49 -0600
Subject: [PATCH 04/46] Fixed slug bug

---
 symposion/schedule/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/symposion/schedule/views.py b/symposion/schedule/views.py
index 248db247..a22ae976 100644
--- a/symposion/schedule/views.py
+++ b/symposion/schedule/views.py
@@ -5,7 +5,7 @@ from symposion.schedule.models import Schedule
 
 def schedule_detail(request, slug=None):
     qs = Schedule.objects.all()
-    if pk is None:
+    if slug is None:
         schedule = next(iter(qs), None)
         if schedule is None:
             raise Http404()
@@ -19,7 +19,7 @@ def schedule_detail(request, slug=None):
 
 def schedule_edit(request, slug=None):
     qs = Schedule.objects.all()
-    if pk is None:
+    if slug is None:
         schedule = next(iter(qs), None)
         if schedule is None:
             raise Http404()

From f3e9cc9a5db391e2d45a15ebd85d2463794671cb Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Thu, 30 Aug 2012 00:51:07 -0600
Subject: [PATCH 05/46] Added TimeTable

---
 symposion/schedule/models.py    |  6 +++++-
 symposion/schedule/timetable.py | 37 +++++++++++++++++++++++++++++++++
 symposion/schedule/views.py     |  3 +++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 symposion/schedule/timetable.py

diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py
index 151ecab2..962027fd 100644
--- a/symposion/schedule/models.py
+++ b/symposion/schedule/models.py
@@ -48,5 +48,9 @@ class Slot(models.Model):
     def rooms(self):
         attr = "_rooms"
         if not hasattr(self, attr):
-            setattr(self, attr, InlineSet(obj=self, field="room_set", delimiter=" "))
+            class RoomInlineSet(InlineSet):
+                def consective_count(self):
+                    return len(self)
+            value = RoomInlineSet(obj=self, field="room_set", delimiter=" ")
+            setattr(self, attr, value)
         return getattr(self, attr)
diff --git a/symposion/schedule/timetable.py b/symposion/schedule/timetable.py
new file mode 100644
index 00000000..8c9f072e
--- /dev/null
+++ b/symposion/schedule/timetable.py
@@ -0,0 +1,37 @@
+import itertools
+
+
+class Timetable(object):
+    
+    def __init__(self, day):
+        self.day = day
+    
+    def slots_qs(self):
+        return Slot.objects.filter(day=self.day)
+    
+    def rooms(self):
+        return Room.objects.filter(day=self.day.schedule)
+    
+    def __iter__(self):
+        times = sorted(set(itertools.chain(*self.slots_qs().values_list("start", "end"))))
+        slots = list(self.slots_qs().order_by("start"))
+        row = []
+        for time, next_time in pairwise(times):
+            row = {"time": time, "slots": []}
+            for slot in slots:
+                if slot.start == time:
+                    slot.rowspan = Timetable.rowspan(times, slot.start, slot.end)
+                    row["slots"].append(slot)
+            row["colspan"] = self.rooms.consecutive_count()
+            if row["slots"] or next_time is None:
+                yield row
+    
+    @staticmethod
+    def rowspan(times, start, end):
+        return times.index(end) - times.index(start)
+
+
+def pairwise(iterable):
+    a, b = itertools.tee(iterable)
+    b.next()
+    return itertools.izip_longest(a, b)
diff --git a/symposion/schedule/views.py b/symposion/schedule/views.py
index a22ae976..4e968d3f 100644
--- a/symposion/schedule/views.py
+++ b/symposion/schedule/views.py
@@ -25,7 +25,10 @@ def schedule_edit(request, slug=None):
             raise Http404()
     else:
         schedule = get_object_or_404(qs, slug=slug)
+    days_qs = Day.objects.filter(schedule=schedule)
+    days = [TimeTable(day) for day in days_qs]
     ctx = {
         "schedule": schedule,
+        "days": days,
     }
     return render(request, "schedule/schedule_edit.html")

From 7601791e8cd008790b94767fff46f7ca1b26459e Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Thu, 30 Aug 2012 00:52:50 -0600
Subject: [PATCH 06/46] Fixed tons of little bugs

---
 symposion/schedule/timetable.py | 2 ++
 symposion/schedule/views.py     | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/symposion/schedule/timetable.py b/symposion/schedule/timetable.py
index 8c9f072e..bd6354ac 100644
--- a/symposion/schedule/timetable.py
+++ b/symposion/schedule/timetable.py
@@ -1,5 +1,7 @@
 import itertools
 
+from symposion.schedule.models import Room, Slot
+
 
 class Timetable(object):
     
diff --git a/symposion/schedule/views.py b/symposion/schedule/views.py
index 4e968d3f..d9cd2fa6 100644
--- a/symposion/schedule/views.py
+++ b/symposion/schedule/views.py
@@ -1,6 +1,8 @@
+from django.http import Http404
 from django.shortcuts import render, get_object_or_404
 
-from symposion.schedule.models import Schedule
+from symposion.schedule.models import Schedule, Day
+from symposion.schedule.timetable import TimeTable
 
 
 def schedule_detail(request, slug=None):
@@ -14,7 +16,7 @@ def schedule_detail(request, slug=None):
     ctx = {
         "schedule": schedule,
     }
-    return render(request, "schedule/schedule_detail.html")
+    return render(request, "schedule/schedule_detail.html", ctx)
 
 
 def schedule_edit(request, slug=None):
@@ -31,4 +33,4 @@ def schedule_edit(request, slug=None):
         "schedule": schedule,
         "days": days,
     }
-    return render(request, "schedule/schedule_edit.html")
+    return render(request, "schedule/schedule_edit.html", ctx)

From 14f43da962a838b03224d05e9d8f7b121cd9802a Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Thu, 30 Aug 2012 00:53:31 -0600
Subject: [PATCH 07/46] Corrected naming

---
 symposion/schedule/timetable.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/symposion/schedule/timetable.py b/symposion/schedule/timetable.py
index bd6354ac..5f3946fb 100644
--- a/symposion/schedule/timetable.py
+++ b/symposion/schedule/timetable.py
@@ -3,7 +3,7 @@ import itertools
 from symposion.schedule.models import Room, Slot
 
 
-class Timetable(object):
+class TimeTable(object):
     
     def __init__(self, day):
         self.day = day
@@ -22,7 +22,7 @@ class Timetable(object):
             row = {"time": time, "slots": []}
             for slot in slots:
                 if slot.start == time:
-                    slot.rowspan = Timetable.rowspan(times, slot.start, slot.end)
+                    slot.rowspan = TimeTable.rowspan(times, slot.start, slot.end)
                     row["slots"].append(slot)
             row["colspan"] = self.rooms.consecutive_count()
             if row["slots"] or next_time is None:

From 69097d86c9064887f27d3502cf9bcda1f9953213 Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Thu, 30 Aug 2012 00:57:02 -0600
Subject: [PATCH 08/46] Fixed rooms queryset to be ordered

---
 symposion/schedule/timetable.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symposion/schedule/timetable.py b/symposion/schedule/timetable.py
index 5f3946fb..adcaf5ad 100644
--- a/symposion/schedule/timetable.py
+++ b/symposion/schedule/timetable.py
@@ -12,7 +12,7 @@ class TimeTable(object):
         return Slot.objects.filter(day=self.day)
     
     def rooms(self):
-        return Room.objects.filter(day=self.day.schedule)
+        return Room.objects.filter(day=self.day.schedule).order_by("order")
     
     def __iter__(self):
         times = sorted(set(itertools.chain(*self.slots_qs().values_list("start", "end"))))

From d7b3696c6e07ccd94995e4eea10c02d6848a0ab7 Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Thu, 30 Aug 2012 00:58:16 -0600
Subject: [PATCH 09/46] Fixed room lookup bug

---
 symposion/schedule/timetable.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symposion/schedule/timetable.py b/symposion/schedule/timetable.py
index adcaf5ad..0f3767e5 100644
--- a/symposion/schedule/timetable.py
+++ b/symposion/schedule/timetable.py
@@ -12,7 +12,7 @@ class TimeTable(object):
         return Slot.objects.filter(day=self.day)
     
     def rooms(self):
-        return Room.objects.filter(day=self.day.schedule).order_by("order")
+        return Room.objects.filter(schedule=self.day.schedule).order_by("order")
     
     def __iter__(self):
         times = sorted(set(itertools.chain(*self.slots_qs().values_list("start", "end"))))

From 44d0ea6f2b8ea6535cd9c41e68222696222e94d1 Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Thu, 30 Aug 2012 01:02:49 -0600
Subject: [PATCH 10/46] Moved colspan to slot in TimeTable

---
 symposion/schedule/timetable.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symposion/schedule/timetable.py b/symposion/schedule/timetable.py
index 0f3767e5..87ffeacf 100644
--- a/symposion/schedule/timetable.py
+++ b/symposion/schedule/timetable.py
@@ -23,8 +23,8 @@ class TimeTable(object):
             for slot in slots:
                 if slot.start == time:
                     slot.rowspan = TimeTable.rowspan(times, slot.start, slot.end)
+                    slot.colspan = slot.rooms.consecutive_count()
                     row["slots"].append(slot)
-            row["colspan"] = self.rooms.consecutive_count()
             if row["slots"] or next_time is None:
                 yield row
     

From 3ade1c5516ad828f6d23e14d9c228ce99da7d28e Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Thu, 30 Aug 2012 01:04:08 -0600
Subject: [PATCH 11/46] Fixed typo in method name

---
 symposion/schedule/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py
index 962027fd..fa1c9ba9 100644
--- a/symposion/schedule/models.py
+++ b/symposion/schedule/models.py
@@ -49,7 +49,7 @@ class Slot(models.Model):
         attr = "_rooms"
         if not hasattr(self, attr):
             class RoomInlineSet(InlineSet):
-                def consective_count(self):
+                def consecutive_count(self):
                     return len(self)
             value = RoomInlineSet(obj=self, field="room_set", delimiter=" ")
             setattr(self, attr, value)

From 746e34cf3c4094649f399bdfad9a6c5eda211f34 Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Thu, 30 Aug 2012 03:14:46 -0400
Subject: [PATCH 12/46] work in progress on schedule edit template

---
 symposion/templates/schedule/_grid.html       |  38 +++++++
 .../templates/schedule/schedule_edit.html     | 100 ++++++++++++++++++
 2 files changed, 138 insertions(+)
 create mode 100644 symposion/templates/schedule/_grid.html
 create mode 100644 symposion/templates/schedule/schedule_edit.html

diff --git a/symposion/templates/schedule/_grid.html b/symposion/templates/schedule/_grid.html
new file mode 100644
index 00000000..722b0b7f
--- /dev/null
+++ b/symposion/templates/schedule/_grid.html
@@ -0,0 +1,38 @@
+<table class="table">
+    <tr>
+        <th>&nbsp;</th>
+        {% for room in timetable.rooms %}
+            <th>{{ room.name }}</th>
+        {% endfor %}
+    </tr>
+    {% for row in timetable %}
+        <tr>
+            <td class="time">{{ row.time|date:"h:iA" }}</td>
+            {% for slot in row.slots %}
+                <td colspan="{{ slot.colspan }}" rowspan="{{ slow.rowspan }}">
+                        <span class="controls"><b>add</b>: <a href="{# url schedule_slot_add slot.pk "plenary" #}" rel="facebox">plenary</a> | <a href="{# url schedule_slot_add slot.pk "break" #}" rel="facebox">break</a> | <a href="{# url schedule_slot_add slot.pk "presentation" #}" rel="facebox">presentation</a></span>
+                </td>
+                {% comment %}
+                <td colspan="{{ slot.colspan }}" rowspan="{{ slot.rowspan }}" class="slot {{ slot.kind.name }} rowspan-{{ slot.rowspan }} colspan-{{ slot.colspan }}">
+                    {% if not slot.content %}
+                        <span class="controls"><b>add</b>: <a href="{# url schedule_slot_add slot.pk "plenary" #}" rel="facebox">plenary</a> | <a href="{# url schedule_slot_add slot.pk "break" #}" rel="facebox">break</a> | <a href="{# url schedule_slot_add slot.pk "presentation" #}" rel="facebox">presentation</a>/span>
+                    {% else %}
+                        {% if slot.kind.name == "recess" %}
+                            <div class="title">{{ slot.content.title }}</div>
+                        {% else %}
+                            {% if slot.kind.name == "plenary" %}
+                                <div class="title">{{ slot.content.title }}</div>
+                                <div class="speaker">{{ slot.content.speaker }}</div>
+                            {% else %}
+                                <div class="title">{{ slot.content.title }}</div>
+                                <div class="speaker">{{ slot.content.speaker }}</div>
+                            {% endif %}
+                        {% endif %}
+                        <span class="controls"><b>actions</b>: <a href="{# url schedule_slot_edit slot.pk #}" rel="facebox">edit</a><a href="{#url schedule_slot_remove slot.pk #}" rel="facebox">remove</a></span>
+                    {% endif %}
+                </td>
+                {% endcomment %}
+            {% endfor %}
+        </tr>
+    {% endfor %}
+</table>
\ No newline at end of file
diff --git a/symposion/templates/schedule/schedule_edit.html b/symposion/templates/schedule/schedule_edit.html
new file mode 100644
index 00000000..cb0673d6
--- /dev/null
+++ b/symposion/templates/schedule/schedule_edit.html
@@ -0,0 +1,100 @@
+{% extends "site_base.html" %}
+
+{% block head_title %}Conference Schedule Edit{% endblock %}
+
+{% block body_class %}full{% endblock %}
+
+{% block right %}
+{% endblock %}
+
+{% block extra_head %}
+    <link rel="stylesheet" href="{{ STATIC_URL }}css/facebox.css" />
+    <style>
+    /*
+        body {
+            font-family: "Helvetica Neue", Arial, "Helvetica";
+        }
+        #wrapper {
+            width: 960px;
+        }
+        table {
+            border-collapse: collapse;
+            font-weight: normal;
+            line-height: 1.1em;
+        }
+        td {
+            padding: 4px 8px;
+            border: 1px solid #666;
+            vertical-align: top;
+        }
+        td.slot {
+            text-align: center;
+            background: #FFF;
+            font-size: 10pt;
+            width: 180px;
+        }
+        td.slot.recess,
+        td.slot.recess.colspan-1.rowspan-1,
+        td.slot.recess.colspan-1.rowspan-2 {
+            background: #ECFFFF;
+        }
+        td.slot.plenary {
+            background: #DCDCFF;
+        }
+        td.slot div.title {
+            font-weight: bold;
+        }
+        td.slot div.speaker {
+            font-style: italic;
+            font-size: 8pt;
+        }
+        th {
+            font-size: 12pt;
+            background: #FFF;
+            padding: 2px 4px;
+            border: none;
+            border-right: 1px solid #666;
+        }
+        td.time {
+            width: 50px;
+            font-size: 9pt;
+            border: none;
+            border-top: 1px solid #666;
+        }
+        td.colspan-1.rowspan-1 {
+            background: #FFFCC9;
+        }
+        td.colspan-1.rowspan-2 {
+            background: #FDA;
+        }
+        td.slot:hover .controls {
+            display: block;
+        }
+        .controls {
+            display: none;
+            font-size: 8pt;
+        }
+        .controls a {
+            text-decoration: none;
+            color: #000;
+        }
+        .controls a:hover {
+            color: #999;
+        }
+        #facebox h3 {
+            margin-top: 0;
+        }
+    */
+    </style>
+{% endblock %}
+
+{% block body %}
+    <h1>Schedule Edit</h1>
+    
+    {% for timetable in days %}
+        <h2>{{ timetable.day.date }}</h2>
+            
+        {% include "schedule/_grid.html" %}
+    {% endfor %}
+    
+{% endblock %}

From 95d182e5285487d4b2e331332ca42e2603e17751 Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Thu, 30 Aug 2012 12:17:10 -0400
Subject: [PATCH 13/46] use full span12 on schedule edit

---
 .../templates/schedule/schedule_edit.html     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/symposion/templates/schedule/schedule_edit.html b/symposion/templates/schedule/schedule_edit.html
index cb0673d6..e5cd80f1 100644
--- a/symposion/templates/schedule/schedule_edit.html
+++ b/symposion/templates/schedule/schedule_edit.html
@@ -88,13 +88,16 @@
     </style>
 {% endblock %}
 
-{% block body %}
-    <h1>Schedule Edit</h1>
-    
-    {% for timetable in days %}
-        <h2>{{ timetable.day.date }}</h2>
+{% block body_outer %}
+    <div class="row">
+        <div class="span12">
+            <h1>Schedule Edit</h1>
             
-        {% include "schedule/_grid.html" %}
-    {% endfor %}
-    
+            {% for timetable in days %}
+                <h2>{{ timetable.day.date }}</h2>
+                    
+                {% include "schedule/_grid.html" %}
+            {% endfor %}
+        </div>
+    </div>
 {% endblock %}

From 38e2124c646e5086288dccfb02d4803672e61e32 Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Thu, 30 Aug 2012 12:26:41 -0400
Subject: [PATCH 14/46] work in progress improvements to schedule edit styling

---
 symposion/templates/schedule/_grid.html       |  6 +-
 .../templates/schedule/schedule_edit.html     | 68 +++++++------------
 2 files changed, 26 insertions(+), 48 deletions(-)

diff --git a/symposion/templates/schedule/_grid.html b/symposion/templates/schedule/_grid.html
index 722b0b7f..b4592343 100644
--- a/symposion/templates/schedule/_grid.html
+++ b/symposion/templates/schedule/_grid.html
@@ -1,4 +1,4 @@
-<table class="table">
+<table class="table table-bordered table-condensed">
     <tr>
         <th>&nbsp;</th>
         {% for room in timetable.rooms %}
@@ -9,8 +9,8 @@
         <tr>
             <td class="time">{{ row.time|date:"h:iA" }}</td>
             {% for slot in row.slots %}
-                <td colspan="{{ slot.colspan }}" rowspan="{{ slow.rowspan }}">
-                        <span class="controls"><b>add</b>: <a href="{# url schedule_slot_add slot.pk "plenary" #}" rel="facebox">plenary</a> | <a href="{# url schedule_slot_add slot.pk "break" #}" rel="facebox">break</a> | <a href="{# url schedule_slot_add slot.pk "presentation" #}" rel="facebox">presentation</a></span>
+                <td class="slot" colspan="{{ slot.colspan }}" rowspan="{{ slow.rowspan }}">
+                    <span class="schedule-controls"><b>add</b>: <a href="{# url schedule_slot_add slot.pk "plenary" #}" rel="facebox">plenary</a> | <a href="{# url schedule_slot_add slot.pk "break" #}" rel="facebox">break</a> | <a href="{# url schedule_slot_add slot.pk "presentation" #}" rel="facebox">presentation</a></span>
                 </td>
                 {% comment %}
                 <td colspan="{{ slot.colspan }}" rowspan="{{ slot.rowspan }}" class="slot {{ slot.kind.name }} rowspan-{{ slot.rowspan }} colspan-{{ slot.colspan }}">
diff --git a/symposion/templates/schedule/schedule_edit.html b/symposion/templates/schedule/schedule_edit.html
index e5cd80f1..75c5f799 100644
--- a/symposion/templates/schedule/schedule_edit.html
+++ b/symposion/templates/schedule/schedule_edit.html
@@ -10,29 +10,34 @@
 {% block extra_head %}
     <link rel="stylesheet" href="{{ STATIC_URL }}css/facebox.css" />
     <style>
-    /*
-        body {
-            font-family: "Helvetica Neue", Arial, "Helvetica";
-        }
-        #wrapper {
-            width: 960px;
-        }
-        table {
-            border-collapse: collapse;
-            font-weight: normal;
-            line-height: 1.1em;
-        }
         td {
-            padding: 4px 8px;
-            border: 1px solid #666;
-            vertical-align: top;
+            font-size: 9pt;
         }
         td.slot {
             text-align: center;
-            background: #FFF;
-            font-size: 10pt;
-            width: 180px;
+            vertical-align: middle;
         }
+        td.time {
+            vertical-align: top;
+            width: 50px;
+            font-size: 8pt;
+            padding-top: 0;
+        }
+        td.slot:hover .schedule-controls {
+            display: block;
+        }
+        .schedule-controls {
+            display: none;
+            font-size: 8pt;
+        }
+        .schedule-controls a {
+            text-decoration: none;
+            color: #000;
+        }
+        .schedule-controls a:hover {
+            color: #999;
+        }
+    /*
         td.slot.recess,
         td.slot.recess.colspan-1.rowspan-1,
         td.slot.recess.colspan-1.rowspan-2 {
@@ -48,39 +53,12 @@
             font-style: italic;
             font-size: 8pt;
         }
-        th {
-            font-size: 12pt;
-            background: #FFF;
-            padding: 2px 4px;
-            border: none;
-            border-right: 1px solid #666;
-        }
-        td.time {
-            width: 50px;
-            font-size: 9pt;
-            border: none;
-            border-top: 1px solid #666;
-        }
         td.colspan-1.rowspan-1 {
             background: #FFFCC9;
         }
         td.colspan-1.rowspan-2 {
             background: #FDA;
         }
-        td.slot:hover .controls {
-            display: block;
-        }
-        .controls {
-            display: none;
-            font-size: 8pt;
-        }
-        .controls a {
-            text-decoration: none;
-            color: #000;
-        }
-        .controls a:hover {
-            color: #999;
-        }
         #facebox h3 {
             margin-top: 0;
         }

From 2c954c3a055b42dbdade76f9031aa44c4ca35389 Mon Sep 17 00:00:00 2001
From: Brian Rosner <brosner@gmail.com>
Date: Thu, 30 Aug 2012 11:52:11 -0600
Subject: [PATCH 15/46] Fixed slot rooms by using database more natively

---
 symposion/schedule/models.py    | 23 +++++++++++-----------
 symposion/schedule/timetable.py | 20 ++++++++++++++-----
 symposion/schedule/utils.py     | 34 ---------------------------------
 3 files changed, 26 insertions(+), 51 deletions(-)
 delete mode 100644 symposion/schedule/utils.py

diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py
index fa1c9ba9..c97d9335 100644
--- a/symposion/schedule/models.py
+++ b/symposion/schedule/models.py
@@ -1,7 +1,6 @@
 from django.db import models
 
 from symposion.conference.models import Section
-from symposion.schedule.utils import InlineSet
 
 
 class Schedule(models.Model):
@@ -39,18 +38,18 @@ class SlotKind(models.Model):
 class Slot(models.Model):
     
     day = models.ForeignKey(Day)
-    room_set = models.TextField(db_column="rooms")
     kind = models.ForeignKey(SlotKind)
     start = models.TimeField()
     end = models.TimeField()
+
+
+class SlotRoom(models.Model):
+    """
+    Links a slot with a room.
+    """
     
-    @property
-    def rooms(self):
-        attr = "_rooms"
-        if not hasattr(self, attr):
-            class RoomInlineSet(InlineSet):
-                def consecutive_count(self):
-                    return len(self)
-            value = RoomInlineSet(obj=self, field="room_set", delimiter=" ")
-            setattr(self, attr, value)
-        return getattr(self, attr)
+    slot = models.ForeignKey(Slot)
+    room = models.ForeignKey(Room)
+    
+    class Meta:
+        unique_together = [("slot", "room")]
diff --git a/symposion/schedule/timetable.py b/symposion/schedule/timetable.py
index 87ffeacf..dd32e23c 100644
--- a/symposion/schedule/timetable.py
+++ b/symposion/schedule/timetable.py
@@ -1,6 +1,9 @@
 import itertools
+import operator
 
-from symposion.schedule.models import Room, Slot
+from django.db.models import Count
+
+from symposion.schedule.models import Room, Slot, SlotRoom
 
 
 class TimeTable(object):
@@ -9,21 +12,28 @@ class TimeTable(object):
         self.day = day
     
     def slots_qs(self):
-        return Slot.objects.filter(day=self.day)
+        qs = Slot.objects.all()
+        qs = qs.filter(day=self.day)
+        return qs
     
     def rooms(self):
-        return Room.objects.filter(schedule=self.day.schedule).order_by("order")
+        qs = Room.objects.all()
+        qs = qs.filter(schedule=self.day.schedule)
+        qs = qs.filter(pk__in=SlotRoom.objects.filter(slot__in=self.slots_qs().values("pk")).values("room"))
+        qs = qs.order_by("order")
+        return qs
     
     def __iter__(self):
         times = sorted(set(itertools.chain(*self.slots_qs().values_list("start", "end"))))
-        slots = list(self.slots_qs().order_by("start"))
+        slots = Slot.objects.filter(pk__in=self.slots_qs().order_by("start", "slotroom__room__order").values("pk"))
+        slots = slots.annotate(room_count=Count("slotroom"))
         row = []
         for time, next_time in pairwise(times):
             row = {"time": time, "slots": []}
             for slot in slots:
                 if slot.start == time:
                     slot.rowspan = TimeTable.rowspan(times, slot.start, slot.end)
-                    slot.colspan = slot.rooms.consecutive_count()
+                    slot.colspan = slot.room_count
                     row["slots"].append(slot)
             if row["slots"] or next_time is None:
                 yield row
diff --git a/symposion/schedule/utils.py b/symposion/schedule/utils.py
deleted file mode 100644
index 341d44d7..00000000
--- a/symposion/schedule/utils.py
+++ /dev/null
@@ -1,34 +0,0 @@
-class InlineSet(object):
-    
-    def __init__(self, obj, field, delimiter):
-        self.obj = obj
-        self.field = field
-        self.data = set([x for x in getattr(obj, field).split(delimiter) if x])
-        self.delimiter = delimiter
-    
-    def __iter__(self):
-        return iter(self.queryset())
-    
-    def __len__(self):
-        return self.queryset().count()
-    
-    def queryset(self):
-        return self.obj.__class__._default_manager.filter(pk__in=self.data)
-    
-    def add(self, obj, commit=True):
-        """
-        Add given room to the set, but check if it can exist
-        before adding it.
-        """
-        self.data.add(obj.pk)
-        self._update_model(commit=commit)
-    
-    def remove(self, obj, commit=True):
-        self.data.remove(obj.pk)
-        self._update_model(commit=commit)
-    
-    def _update_model(self, commit=True):
-        value = self.delimiter.join([str(x) for x in self.data])
-        setattr(self.obj, self.field, value)
-        if commit:
-            self.obj.save(force_update=True)
\ No newline at end of file

From b4ec8dc29bb745ed145588254d60ce620c8b8f0e Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Thu, 30 Aug 2012 22:26:37 -0400
Subject: [PATCH 16/46] only show add if the slot is for a talk

---
 symposion/templates/schedule/_grid.html | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/symposion/templates/schedule/_grid.html b/symposion/templates/schedule/_grid.html
index b4592343..c10efb7a 100644
--- a/symposion/templates/schedule/_grid.html
+++ b/symposion/templates/schedule/_grid.html
@@ -10,28 +10,12 @@
             <td class="time">{{ row.time|date:"h:iA" }}</td>
             {% for slot in row.slots %}
                 <td class="slot" colspan="{{ slot.colspan }}" rowspan="{{ slow.rowspan }}">
-                    <span class="schedule-controls"><b>add</b>: <a href="{# url schedule_slot_add slot.pk "plenary" #}" rel="facebox">plenary</a> | <a href="{# url schedule_slot_add slot.pk "break" #}" rel="facebox">break</a> | <a href="{# url schedule_slot_add slot.pk "presentation" #}" rel="facebox">presentation</a></span>
-                </td>
-                {% comment %}
-                <td colspan="{{ slot.colspan }}" rowspan="{{ slot.rowspan }}" class="slot {{ slot.kind.name }} rowspan-{{ slot.rowspan }} colspan-{{ slot.colspan }}">
-                    {% if not slot.content %}
-                        <span class="controls"><b>add</b>: <a href="{# url schedule_slot_add slot.pk "plenary" #}" rel="facebox">plenary</a> | <a href="{# url schedule_slot_add slot.pk "break" #}" rel="facebox">break</a> | <a href="{# url schedule_slot_add slot.pk "presentation" #}" rel="facebox">presentation</a>/span>
+                    {% if slot.kind.label == "talk" %}
+                        <span class="schedule-controls"><b>add</b>: <a href="{# url schedule_slot_add slot.pk "talk" #}" rel="facebox">talk</a></span>
                     {% else %}
-                        {% if slot.kind.name == "recess" %}
-                            <div class="title">{{ slot.content.title }}</div>
-                        {% else %}
-                            {% if slot.kind.name == "plenary" %}
-                                <div class="title">{{ slot.content.title }}</div>
-                                <div class="speaker">{{ slot.content.speaker }}</div>
-                            {% else %}
-                                <div class="title">{{ slot.content.title }}</div>
-                                <div class="speaker">{{ slot.content.speaker }}</div>
-                            {% endif %}
-                        {% endif %}
-                        <span class="controls"><b>actions</b>: <a href="{# url schedule_slot_edit slot.pk #}" rel="facebox">edit</a><a href="{#url schedule_slot_remove slot.pk #}" rel="facebox">remove</a></span>
+                        {{ slot.kind.label }}
                     {% endif %}
                 </td>
-                {% endcomment %}
             {% endfor %}
         </tr>
     {% endfor %}

From 5c1916352cd94010243aec54785345cb806b8806 Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Thu, 30 Aug 2012 22:31:59 -0400
Subject: [PATCH 17/46] include class indicating slot kind

---
 symposion/templates/schedule/_grid.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symposion/templates/schedule/_grid.html b/symposion/templates/schedule/_grid.html
index c10efb7a..f546fd00 100644
--- a/symposion/templates/schedule/_grid.html
+++ b/symposion/templates/schedule/_grid.html
@@ -9,7 +9,7 @@
         <tr>
             <td class="time">{{ row.time|date:"h:iA" }}</td>
             {% for slot in row.slots %}
-                <td class="slot" colspan="{{ slot.colspan }}" rowspan="{{ slow.rowspan }}">
+                <td class="slot slot-{{ slot.kind.label }}" colspan="{{ slot.colspan }}" rowspan="{{ slow.rowspan }}">
                     {% if slot.kind.label == "talk" %}
                         <span class="schedule-controls"><b>add</b>: <a href="{# url schedule_slot_add slot.pk "talk" #}" rel="facebox">talk</a></span>
                     {% else %}

From 7324d03031621b719baf4283c45bba31f285ff4e Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Thu, 30 Aug 2012 22:36:24 -0400
Subject: [PATCH 18/46] add presentation model

---
 symposion/schedule/models.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py
index c97d9335..b7f08b68 100644
--- a/symposion/schedule/models.py
+++ b/symposion/schedule/models.py
@@ -2,6 +2,8 @@ from django.db import models
 
 from symposion.conference.models import Section
 
+from markitup.fields import MarkupField
+
 
 class Schedule(models.Model):
     
@@ -53,3 +55,25 @@ class SlotRoom(models.Model):
     
     class Meta:
         unique_together = [("slot", "room")]
+
+
+class Presentation(models.Model):
+    
+    slot = models.OneToOneField(Slot, null=True, blank=True, related_name="presentation")
+    
+    title = models.CharField(max_length=100)
+    description = models.MarkupField()
+    abstract = models.MarkupField()
+    
+    speaker = models.ForeignKey("speakers.Speaker", related_name="presentations")
+    additional_speakers = models.ManyToManyField("speakers.Speaker", blank=True)
+    
+    cancelled = models.BooleanField(default=False)
+    
+    def speakers(self):
+        yield self.speaker
+        for speaker in self.additional_speakers.all():
+            yield speaker
+    
+    def __unicode__(self):
+        return self.title

From 82754d23426cdbb084397c8ecb3116f4c8944793 Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Thu, 30 Aug 2012 22:36:47 -0400
Subject: [PATCH 19/46] enable proposal acceptance

---
 symposion/templates/reviews/review_detail.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/symposion/templates/reviews/review_detail.html b/symposion/templates/reviews/review_detail.html
index 4cdda154..8a42fa61 100644
--- a/symposion/templates/reviews/review_detail.html
+++ b/symposion/templates/reviews/review_detail.html
@@ -16,7 +16,6 @@
 {% endblock %}
 
 {% block body %}
-    {% comment %}
     <div class="pull-right">
         <form class="result-form form-inline" method="POST" action="">
             {% csrf_token %}
@@ -34,7 +33,6 @@
             {% endif %}
         </form>
     </div>
-    {% endcomment %}
     
     <h3>#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }}, Track: {{ proposal.track }})</h3>
     

From 5b7087f478294a14245cdbca712faa9e03f83546 Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Thu, 30 Aug 2012 22:43:43 -0400
Subject: [PATCH 20/46] add proposal base to presentation

---
 symposion/schedule/models.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py
index b7f08b68..688756d3 100644
--- a/symposion/schedule/models.py
+++ b/symposion/schedule/models.py
@@ -1,9 +1,10 @@
 from django.db import models
 
-from symposion.conference.models import Section
-
 from markitup.fields import MarkupField
 
+from symposion.proposals.models import ProposalBase
+from symposion.conference.models import Section
+
 
 class Schedule(models.Model):
     
@@ -60,15 +61,20 @@ class SlotRoom(models.Model):
 class Presentation(models.Model):
     
     slot = models.OneToOneField(Slot, null=True, blank=True, related_name="presentation")
-    
     title = models.CharField(max_length=100)
     description = models.MarkupField()
     abstract = models.MarkupField()
-    
     speaker = models.ForeignKey("speakers.Speaker", related_name="presentations")
     additional_speakers = models.ManyToManyField("speakers.Speaker", blank=True)
-    
     cancelled = models.BooleanField(default=False)
+    _proposal = models.ForeignKey(ProposalBase, related_name="presentation")
+    
+    @property
+    def proposal(self):
+        if self._proposal:
+            proposal = ProposalBase.objects.get_subclass(pk=self._proposal.pk)
+            return proposal
+        return None
     
     def speakers(self):
         yield self.speaker

From 4ecb2272dff4ec1cc70efea726cc2aad16445cd0 Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Thu, 30 Aug 2012 22:46:23 -0400
Subject: [PATCH 21/46] change to onetoone

---
 symposion/schedule/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py
index 688756d3..24092de1 100644
--- a/symposion/schedule/models.py
+++ b/symposion/schedule/models.py
@@ -67,7 +67,7 @@ class Presentation(models.Model):
     speaker = models.ForeignKey("speakers.Speaker", related_name="presentations")
     additional_speakers = models.ManyToManyField("speakers.Speaker", blank=True)
     cancelled = models.BooleanField(default=False)
-    _proposal = models.ForeignKey(ProposalBase, related_name="presentation")
+    _proposal = models.OneToOneField(ProposalBase, related_name="presentation")
     
     @property
     def proposal(self):

From 7e7d85c7e7bbd79f7bc04d2660e1e1fd30422765 Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Thu, 30 Aug 2012 22:55:20 -0400
Subject: [PATCH 22/46] add section property to proposalbase

---
 symposion/proposals/models.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/symposion/proposals/models.py b/symposion/proposals/models.py
index 7695f341..382c3095 100644
--- a/symposion/proposals/models.py
+++ b/symposion/proposals/models.py
@@ -106,6 +106,10 @@ class ProposalBase(models.Model):
     def can_edit(self):
         return True
     
+    @property
+    def section(self):
+        return self.kind.section
+    
     @property
     def speaker_email(self):
         return self.speaker.email

From 40aede0839a023cc17c1183dd00c6f812b9740fd Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Thu, 30 Aug 2012 22:55:44 -0400
Subject: [PATCH 23/46] add foreign key to presentation

---
 symposion/schedule/models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py
index 24092de1..36a7fb45 100644
--- a/symposion/schedule/models.py
+++ b/symposion/schedule/models.py
@@ -68,6 +68,7 @@ class Presentation(models.Model):
     additional_speakers = models.ManyToManyField("speakers.Speaker", blank=True)
     cancelled = models.BooleanField(default=False)
     _proposal = models.OneToOneField(ProposalBase, related_name="presentation")
+    section = models.ForeignKey(Section, related_name="presentations")
     
     @property
     def proposal(self):

From fe29c708b91170b203461b76b02eae4543f2f49c Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Thu, 30 Aug 2012 22:57:58 -0400
Subject: [PATCH 24/46] no models in markupfield land

---
 symposion/schedule/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py
index 36a7fb45..f48954ed 100644
--- a/symposion/schedule/models.py
+++ b/symposion/schedule/models.py
@@ -62,8 +62,8 @@ class Presentation(models.Model):
     
     slot = models.OneToOneField(Slot, null=True, blank=True, related_name="presentation")
     title = models.CharField(max_length=100)
-    description = models.MarkupField()
-    abstract = models.MarkupField()
+    description = MarkupField()
+    abstract = MarkupField()
     speaker = models.ForeignKey("speakers.Speaker", related_name="presentations")
     additional_speakers = models.ManyToManyField("speakers.Speaker", blank=True)
     cancelled = models.BooleanField(default=False)

From 6d2cc584cfaea2c57deb03d658565db3091191bd Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Thu, 30 Aug 2012 23:24:08 -0400
Subject: [PATCH 25/46] form for slot scheduling

---
 symposion/schedule/forms.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 symposion/schedule/forms.py

diff --git a/symposion/schedule/forms.py b/symposion/schedule/forms.py
new file mode 100644
index 00000000..b7aefc7c
--- /dev/null
+++ b/symposion/schedule/forms.py
@@ -0,0 +1,24 @@
+from django import forms
+
+from symposion.schedule.models import Slot, Presentation
+
+
+class SlotEditForm(forms.Form):
+    
+    presentation = forms.ModelChoiceField(
+        queryset=Presentation.objects.filter(slot__isnull=True),
+        required=True,
+    )
+    slot_pk = forms.CharField(
+        max_length=10,
+        widget=forms.HiddenInput,
+        required=True,
+    )
+    
+    def clean_slot_pk(self):
+        value = self.cleaned_data["slot_pk"]
+        try:
+            Slot.objects.get(pk=value)
+        except Slot.DoesNotExist:
+            raise forms.ValidationError("Invalid slot.")
+        return value

From 37c976c2f798886ae1abd6d64be8b906b8fca6d3 Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Fri, 31 Aug 2012 00:30:53 -0400
Subject: [PATCH 26/46] hooked up presentation promotion

---
 symposion/reviews/models.py | 41 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/symposion/reviews/models.py b/symposion/reviews/models.py
index cc57f38f..b6829e2f 100644
--- a/symposion/reviews/models.py
+++ b/symposion/reviews/models.py
@@ -11,7 +11,7 @@ from django.contrib.auth.models import User
 from markitup.fields import MarkupField
 
 from symposion.proposals.models import ProposalBase
-# from symposion.schedule.models import Presentation
+from symposion.schedule.models import Presentation
 
 
 class ProposalScoreExpression(object):
@@ -279,26 +279,25 @@ class Comment(models.Model):
 
 
 def promote_proposal(proposal):
-    raise NotImplementedError()
-    # presentation, created = Presentation.objects.get_or_create(
-    #     pk=proposal.pk,
-    #     defaults=dict(
-    #         title=proposal.title,
-    #         description=proposal.description,
-    #         kind=proposal.kind,
-    #         category=proposal.category,
-    #         duration=proposal.duration,
-    #         abstract=proposal.abstract,
-    #         audience_level=proposal.audience_level,
-    #         submitted=proposal.submitted,
-    #         speaker=proposal.speaker,
-    #     )
-    # )
-    # if created:
-    #     for speaker in proposal.additional_speakers.all():
-    #         presentation.additional_speakers.add(speaker)
-    #         presentation.save()
-    # return presentation
+    
+    if hasattr(proposal, "presentation") and proposal.presentation:
+        # already promoted
+        presentation = proposal.presentation
+    else:
+        presentation = Presentation(
+            title = proposal.title,
+            description = proposal.description,
+            abstract = proposal.abstract,
+            speaker = proposal.speaker,
+            section = proposal.section,
+            _proposal = proposal,
+        )
+        presentation.save()
+        for speaker in proposal.additional_speakers.all():
+            presentation.additional_speakers.add(speaker)
+            presentation.save()
+    
+    return presentation
 
 
 def accepted_proposal(sender, instance=None, **kwargs):

From 69877075c7cd83dbe01f2ca79038ed8f903af2ad Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Fri, 31 Aug 2012 00:31:10 -0400
Subject: [PATCH 27/46] use button dropdown to convey accept/reject state as
 well as actions

---
 .../templates/reviews/review_detail.html      | 47 ++++++++++++-------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/symposion/templates/reviews/review_detail.html b/symposion/templates/reviews/review_detail.html
index 8a42fa61..9f94a73e 100644
--- a/symposion/templates/reviews/review_detail.html
+++ b/symposion/templates/reviews/review_detail.html
@@ -16,23 +16,36 @@
 {% endblock %}
 
 {% block body %}
-    <div class="pull-right">
-        <form class="result-form form-inline" method="POST" action="">
-            {% csrf_token %}
-            {% if proposal.result.get_accepted_display == "accepted" %}
-                <input type="submit" name="result_submit" value="reject" class="btn btn-danger" />
-                <input type="submit" name="result_submit" value="undecide" class="btn" />
-            {% else %}
-                {% if proposal.result.get_accepted_display == "rejected" %}
-                    <input type="submit" name="result_submit" value="accept" class="btn btn-success" />
-                    <input type="submit" name="result_submit" value="undecide" class="btn" />
-                {% else %}
-                    <input type="submit" name="result_submit" value="accept" class="btn btn-success" />
-                    <input type="submit" name="result_submit" value="reject" class="btn btn-danger" />
-                {% endif %}
-            {% endif %}
-        </form>
-    </div>
+    {% if request.user.is_staff %}
+        <div class="pull-right">
+            <form class="result-form form-inline" method="POST" action="">
+                {% csrf_token %}
+                <div class="btn-group">
+                    {% if proposal.result.get_accepted_display == "accepted" %}
+                        <a class="btn dropdown-toggle btn-success" data-toggle="dropdown" href="#">Accepted <span class="caret"></span></a>
+                        <ul class="dropdown-menu pull-right">
+                            <li><input type="submit" name="result_submit" value="reject" class="btn btn-danger" /></li>
+                            <li><input type="submit" name="result_submit" value="undecide" class="btn" /></li>
+                        </ul>
+                    {% else %}
+                        {% if proposal.result.get_accepted_display == "rejected" %}
+                            <a class="btn dropdown-toggle btn-danger" data-toggle="dropdown" href="#">Rejected <span class="caret"></span></a>
+                            <ul class="dropdown-menu pull-right">
+                                <li><input type="submit" name="result_submit" value="accept" class="btn btn-success" /></li>
+                                <li><input type="submit" name="result_submit" value="undecide" class="btn" /></li>
+                            </ul>
+                        {% else %}
+                            <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Undecided <span class="caret"></span></a>
+                            <ul class="dropdown-menu pull-right">
+                                <li><input type="submit" name="result_submit" value="accept" class="btn btn-success" /></li>
+                                <li><input type="submit" name="result_submit" value="reject" class="btn btn-danger" /></li>
+                            </ul>
+                        {% endif %}
+                    {% endif %}
+                </div>
+            </form>
+        </div>
+    {% endif %}
     
     <h3>#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }}, Track: {{ proposal.track }})</h3>
     

From d4b53263950c6d5752770d68db40cc8b6aa3b5d2 Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Fri, 31 Aug 2012 00:41:12 -0400
Subject: [PATCH 28/46] unpromote a proposal if undecided or rejected

---
 symposion/reviews/models.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/symposion/reviews/models.py b/symposion/reviews/models.py
index b6829e2f..a8b04a74 100644
--- a/symposion/reviews/models.py
+++ b/symposion/reviews/models.py
@@ -300,9 +300,17 @@ def promote_proposal(proposal):
     return presentation
 
 
+def unpromote_proposal(proposal):
+    
+    if hasattr(proposal, "presentation") and proposal.presentation:
+        proposal.presentation.delete()
+
+
 def accepted_proposal(sender, instance=None, **kwargs):
     if instance is None:
         return
     if instance.accepted == True:
         promote_proposal(instance.proposal)
+    else:
+        unpromote_proposal(instance.proposal)
 post_save.connect(accepted_proposal, sender=ProposalResult)

From 39d0faac7c4088c020f6526695237804ccb34bdc Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Fri, 31 Aug 2012 00:44:59 -0400
Subject: [PATCH 29/46] added schedule admin

---
 symposion/schedule/admin.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 symposion/schedule/admin.py

diff --git a/symposion/schedule/admin.py b/symposion/schedule/admin.py
new file mode 100644
index 00000000..87ad6b07
--- /dev/null
+++ b/symposion/schedule/admin.py
@@ -0,0 +1,12 @@
+from django.contrib import admin
+
+from symposion.schedule.models import Schedule, Day, Room, SlotKind, Slot, SlotRoom, Presentation
+
+
+admin.site.register(Schedule)
+admin.site.register(Day)
+admin.site.register(Room)
+admin.site.register(SlotKind)
+admin.site.register(Slot)
+admin.site.register(SlotRoom)
+admin.site.register(Presentation)

From db908372fffb727ddfff99099607e90c57ab2486 Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Fri, 31 Aug 2012 00:55:37 -0400
Subject: [PATCH 30/46] add view for editing slots

---
 symposion/schedule/urls.py  |  1 +
 symposion/schedule/views.py | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/symposion/schedule/urls.py b/symposion/schedule/urls.py
index 8b0450b0..8954189d 100644
--- a/symposion/schedule/urls.py
+++ b/symposion/schedule/urls.py
@@ -6,4 +6,5 @@ urlpatterns = patterns("symposion.schedule.views",
     url(r"^edit/$", "schedule_edit", name="schedule_edit_singleton"),
     url(r"^(\w+)/edit/$", "schedule_detail", name="schedule_detail"),
     url(r"^(\w+)/edit/$", "schedule_edit", name="schedule_edit"),
+    url(r"^edit/slot/(?P<slot_pk>\d+)/", "schedule_slot_edit", name="schedule_slot_edit"),
 )
diff --git a/symposion/schedule/views.py b/symposion/schedule/views.py
index d9cd2fa6..6ba1abfb 100644
--- a/symposion/schedule/views.py
+++ b/symposion/schedule/views.py
@@ -1,7 +1,8 @@
 from django.http import Http404
-from django.shortcuts import render, get_object_or_404
+from django.shortcuts import render, get_object_or_404, redirect
 
-from symposion.schedule.models import Schedule, Day
+from symposion.schedule.forms import SlotEditForm
+from symposion.schedule.models import Schedule, Day, Slot
 from symposion.schedule.timetable import TimeTable
 
 
@@ -29,8 +30,21 @@ def schedule_edit(request, slug=None):
         schedule = get_object_or_404(qs, slug=slug)
     days_qs = Day.objects.filter(schedule=schedule)
     days = [TimeTable(day) for day in days_qs]
+    form = SlotEditForm()
     ctx = {
         "schedule": schedule,
         "days": days,
+        "form": form,
     }
     return render(request, "schedule/schedule_edit.html", ctx)
+
+
+def schedule_slot_edit(request, slot_pk):
+    slot = get_object_or_404(Slot, pk=slot_pk)
+    form = SlotEditForm(request.POST)
+    
+    if form.is_valid():
+        presentation = form.presentation
+        presentation.slot = slot
+        presentation.save()
+    return redirect("schedule_edit")

From bea34fa689e9103f961bbfb3edeffc6917326ad4 Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Fri, 31 Aug 2012 00:56:01 -0400
Subject: [PATCH 31/46] slots not required

---
 symposion/schedule/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symposion/schedule/forms.py b/symposion/schedule/forms.py
index b7aefc7c..6a1c3525 100644
--- a/symposion/schedule/forms.py
+++ b/symposion/schedule/forms.py
@@ -12,7 +12,7 @@ class SlotEditForm(forms.Form):
     slot_pk = forms.CharField(
         max_length=10,
         widget=forms.HiddenInput,
-        required=True,
+        required=False,
     )
     
     def clean_slot_pk(self):

From 09bce70aed479feb5ad3013f19c34d30476293f9 Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Fri, 31 Aug 2012 00:57:25 -0400
Subject: [PATCH 32/46] edit schedule templates

---
 symposion/templates/schedule/_grid.html       | 11 ++++++-
 .../templates/schedule/schedule_edit.html     | 30 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/symposion/templates/schedule/_grid.html b/symposion/templates/schedule/_grid.html
index f546fd00..de8b51d0 100644
--- a/symposion/templates/schedule/_grid.html
+++ b/symposion/templates/schedule/_grid.html
@@ -11,7 +11,16 @@
             {% for slot in row.slots %}
                 <td class="slot slot-{{ slot.kind.label }}" colspan="{{ slot.colspan }}" rowspan="{{ slow.rowspan }}">
                     {% if slot.kind.label == "talk" %}
-                        <span class="schedule-controls"><b>add</b>: <a href="{# url schedule_slot_add slot.pk "talk" #}" rel="facebox">talk</a></span>
+                        {% if not slot.presentation %}
+                            <a class="btn btn-mini edit-slot" data-action="{% url schedule_slot_edit slot.pk %}" href="#">+</a>
+                        {% else %}
+                            <div class="title">{{ slot.presentation.title }}</div>
+                            <div class="speaker">{{ slot.presentation.speaker }}</div>
+
+                            <span class="schedule-controls">
+                                <a class="btn btn-mini" onClick="modalEdit({% url schedule_slot_edit slot.pk %})" href="#">Edit</a>
+                            </span>
+                        {% endif %}
                     {% else %}
                         {{ slot.kind.label }}
                     {% endif %}
diff --git a/symposion/templates/schedule/schedule_edit.html b/symposion/templates/schedule/schedule_edit.html
index 75c5f799..2c6589a8 100644
--- a/symposion/templates/schedule/schedule_edit.html
+++ b/symposion/templates/schedule/schedule_edit.html
@@ -1,5 +1,8 @@
 {% extends "site_base.html" %}
 
+{% load i18n %}
+{% load bootstrap_tags %}
+
 {% block head_title %}Conference Schedule Edit{% endblock %}
 
 {% block body_class %}full{% endblock %}
@@ -77,5 +80,32 @@
                 {% include "schedule/_grid.html" %}
             {% endfor %}
         </div>
+        
+        <div class="modal fade hide" id="slotEditModal">
+            <form id="slotEditForm" class="modal-form" method="POST">
+                <div class="modal-header">
+                    <a class="close" data-dismiss="modal">&times;</a>
+                    <h3>{% trans "Edit Slot" %}</h3>
+                </div>
+                <div class="modal-body">
+                    {% csrf_token %}
+                    {{ form|as_bootstrap }}
+                </div>
+                <div class="modal-footer">
+                    <button type="submit">Save</button>
+                </div>
+            </form>
+        </div>
     </div>
 {% endblock %}
+
+{% block extra_script %}
+    <script type="text/javascript">
+        $(function() {
+            $("a.edit-slot").click(function() {
+                $("#slotEditForm").get(0).setAttribute("action", $(this).data("action"));
+                $("#slotEditModal").modal("show");
+            });
+        });
+    </script>
+{% endblock %}

From d8732836673f06f3655e26cbc80026cdffc23967 Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Fri, 31 Aug 2012 01:00:43 -0400
Subject: [PATCH 33/46] add class to form button

---
 symposion/templates/schedule/schedule_edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symposion/templates/schedule/schedule_edit.html b/symposion/templates/schedule/schedule_edit.html
index 2c6589a8..4ecdbb21 100644
--- a/symposion/templates/schedule/schedule_edit.html
+++ b/symposion/templates/schedule/schedule_edit.html
@@ -92,7 +92,7 @@
                     {{ form|as_bootstrap }}
                 </div>
                 <div class="modal-footer">
-                    <button type="submit">Save</button>
+                    <button type="submit" class="btn btn-primary">Save</button>
                 </div>
             </form>
         </div>

From 224b9c8d57bf3bb1853aa28334c4c9daa834ecd2 Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Fri, 31 Aug 2012 01:00:56 -0400
Subject: [PATCH 34/46] remove slot pk from form

---
 symposion/schedule/forms.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/symposion/schedule/forms.py b/symposion/schedule/forms.py
index 6a1c3525..7e2de633 100644
--- a/symposion/schedule/forms.py
+++ b/symposion/schedule/forms.py
@@ -9,16 +9,3 @@ class SlotEditForm(forms.Form):
         queryset=Presentation.objects.filter(slot__isnull=True),
         required=True,
     )
-    slot_pk = forms.CharField(
-        max_length=10,
-        widget=forms.HiddenInput,
-        required=False,
-    )
-    
-    def clean_slot_pk(self):
-        value = self.cleaned_data["slot_pk"]
-        try:
-            Slot.objects.get(pk=value)
-        except Slot.DoesNotExist:
-            raise forms.ValidationError("Invalid slot.")
-        return value

From 3039880b76f1bc3040eca246878f5ebfeb5259fb Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Fri, 31 Aug 2012 01:07:30 -0400
Subject: [PATCH 35/46] fix form error

---
 symposion/schedule/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symposion/schedule/views.py b/symposion/schedule/views.py
index 6ba1abfb..b9cdcf3a 100644
--- a/symposion/schedule/views.py
+++ b/symposion/schedule/views.py
@@ -44,7 +44,7 @@ def schedule_slot_edit(request, slot_pk):
     form = SlotEditForm(request.POST)
     
     if form.is_valid():
-        presentation = form.presentation
+        presentation = form.cleaned_data["presentation"]
         presentation.slot = slot
         presentation.save()
     return redirect("schedule_edit")

From c9be115166e85d604ecaf83eab61ce9a53381e12 Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Fri, 31 Aug 2012 01:07:38 -0400
Subject: [PATCH 36/46] fix redirect

---
 symposion/schedule/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symposion/schedule/views.py b/symposion/schedule/views.py
index b9cdcf3a..9a51a9cd 100644
--- a/symposion/schedule/views.py
+++ b/symposion/schedule/views.py
@@ -47,4 +47,4 @@ def schedule_slot_edit(request, slot_pk):
         presentation = form.cleaned_data["presentation"]
         presentation.slot = slot
         presentation.save()
-    return redirect("schedule_edit")
+    return redirect("schedule_edit_singleton")

From 06ff53e73c8bd5bb43ae91b7729ecfff0febc48c Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Fri, 31 Aug 2012 01:12:15 -0400
Subject: [PATCH 37/46] remove unused import

---
 symposion/schedule/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symposion/schedule/forms.py b/symposion/schedule/forms.py
index 7e2de633..1ab7de0f 100644
--- a/symposion/schedule/forms.py
+++ b/symposion/schedule/forms.py
@@ -1,6 +1,6 @@
 from django import forms
 
-from symposion.schedule.models import Slot, Presentation
+from symposion.schedule.models import Presentation
 
 
 class SlotEditForm(forms.Form):

From d6a59f2e4f3bfa41c573465c93c69cf809227663 Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Fri, 31 Aug 2012 01:16:30 -0400
Subject: [PATCH 38/46] protect schedule edit views

---
 symposion/schedule/views.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/symposion/schedule/views.py b/symposion/schedule/views.py
index 9a51a9cd..59aecba6 100644
--- a/symposion/schedule/views.py
+++ b/symposion/schedule/views.py
@@ -1,6 +1,8 @@
 from django.http import Http404
 from django.shortcuts import render, get_object_or_404, redirect
 
+from django.contrib.auth.decorators import login_required
+
 from symposion.schedule.forms import SlotEditForm
 from symposion.schedule.models import Schedule, Day, Slot
 from symposion.schedule.timetable import TimeTable
@@ -8,26 +10,35 @@ from symposion.schedule.timetable import TimeTable
 
 def schedule_detail(request, slug=None):
     qs = Schedule.objects.all()
+    
     if slug is None:
         schedule = next(iter(qs), None)
         if schedule is None:
             raise Http404()
     else:
         schedule = get_object_or_404(qs, slug=slug)
+    
     ctx = {
         "schedule": schedule,
     }
     return render(request, "schedule/schedule_detail.html", ctx)
 
 
+@login_required
 def schedule_edit(request, slug=None):
+    
+    if not request.user.is_staff:
+        raise Http404()
+    
     qs = Schedule.objects.all()
+    
     if slug is None:
         schedule = next(iter(qs), None)
         if schedule is None:
             raise Http404()
     else:
         schedule = get_object_or_404(qs, slug=slug)
+    
     days_qs = Day.objects.filter(schedule=schedule)
     days = [TimeTable(day) for day in days_qs]
     form = SlotEditForm()
@@ -39,7 +50,12 @@ def schedule_edit(request, slug=None):
     return render(request, "schedule/schedule_edit.html", ctx)
 
 
+@login_required
 def schedule_slot_edit(request, slot_pk):
+    
+    if not request.user.is_staff:
+        raise Http404()
+    
     slot = get_object_or_404(Slot, pk=slot_pk)
     form = SlotEditForm(request.POST)
     

From 9bcfcb62e4814dd6099db0f42322c46b5daf164b Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Fri, 31 Aug 2012 01:52:04 -0400
Subject: [PATCH 39/46] improved styling of schedule edit

---
 .../templates/schedule/schedule_edit.html     | 26 ++-----------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/symposion/templates/schedule/schedule_edit.html b/symposion/templates/schedule/schedule_edit.html
index 4ecdbb21..ebc2cf21 100644
--- a/symposion/templates/schedule/schedule_edit.html
+++ b/symposion/templates/schedule/schedule_edit.html
@@ -40,32 +40,10 @@
         .schedule-controls a:hover {
             color: #999;
         }
-    /*
-        td.slot.recess,
-        td.slot.recess.colspan-1.rowspan-1,
-        td.slot.recess.colspan-1.rowspan-2 {
-            background: #ECFFFF;
-        }
-        td.slot.plenary {
-            background: #DCDCFF;
-        }
-        td.slot div.title {
+        td.slot .title {
             font-weight: bold;
+            line-height: 10pt;
         }
-        td.slot div.speaker {
-            font-style: italic;
-            font-size: 8pt;
-        }
-        td.colspan-1.rowspan-1 {
-            background: #FFFCC9;
-        }
-        td.colspan-1.rowspan-2 {
-            background: #FDA;
-        }
-        #facebox h3 {
-            margin-top: 0;
-        }
-    */
     </style>
 {% endblock %}
 

From 13bc9ffacb95c78160c923c032fa6929f9f131db Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Fri, 31 Aug 2012 01:50:00 -0400
Subject: [PATCH 40/46] add schedule list

---
 symposion/schedule/urls.py                    |  1 +
 symposion/schedule/views.py                   | 10 +++++++++-
 .../templates/schedule/schedule_list.html     | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 symposion/templates/schedule/schedule_list.html

diff --git a/symposion/schedule/urls.py b/symposion/schedule/urls.py
index 8954189d..d259a016 100644
--- a/symposion/schedule/urls.py
+++ b/symposion/schedule/urls.py
@@ -7,4 +7,5 @@ urlpatterns = patterns("symposion.schedule.views",
     url(r"^(\w+)/edit/$", "schedule_detail", name="schedule_detail"),
     url(r"^(\w+)/edit/$", "schedule_edit", name="schedule_edit"),
     url(r"^edit/slot/(?P<slot_pk>\d+)/", "schedule_slot_edit", name="schedule_slot_edit"),
+    url(r"^list/$", "schedule_list", name="schedule_list"),
 )
diff --git a/symposion/schedule/views.py b/symposion/schedule/views.py
index 59aecba6..08a96227 100644
--- a/symposion/schedule/views.py
+++ b/symposion/schedule/views.py
@@ -4,7 +4,7 @@ from django.shortcuts import render, get_object_or_404, redirect
 from django.contrib.auth.decorators import login_required
 
 from symposion.schedule.forms import SlotEditForm
-from symposion.schedule.models import Schedule, Day, Slot
+from symposion.schedule.models import Schedule, Day, Slot, Presentation
 from symposion.schedule.timetable import TimeTable
 
 
@@ -24,6 +24,14 @@ def schedule_detail(request, slug=None):
     return render(request, "schedule/schedule_detail.html", ctx)
 
 
+def schedule_list(request):
+    presentations = Presentation.objects.order_by("id")
+    ctx = {
+        "presentations": presentations,
+    }
+    return render(request, "schedule/schedule_list.html", ctx)
+
+
 @login_required
 def schedule_edit(request, slug=None):
     
diff --git a/symposion/templates/schedule/schedule_list.html b/symposion/templates/schedule/schedule_list.html
new file mode 100644
index 00000000..a423050b
--- /dev/null
+++ b/symposion/templates/schedule/schedule_list.html
@@ -0,0 +1,19 @@
+{% extends "site_base.html" %}
+
+{% load i18n %}
+
+{% block head_title %}Presentation Listing{% endblock %}
+
+{% block body %}
+    {% for presentation in presentations %}
+        <div class="row">
+            <div class="span8 well">
+                <h3>{{ presentation.title }}</h3>
+                <h4>{{ presentation.speaker }} in {{ presentation.proposal.track }}</h4>
+                <p>
+                    {{ presentation.description }}
+                </p>
+            </div>
+        </div>
+    {% endfor %}
+{% endblock %}

From 36ceef63ed87bab882cab7d9e462adbc9ac844e8 Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Fri, 31 Aug 2012 01:50:16 -0400
Subject: [PATCH 41/46] no animation

---
 symposion/templates/schedule/schedule_edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symposion/templates/schedule/schedule_edit.html b/symposion/templates/schedule/schedule_edit.html
index ebc2cf21..f3210b9f 100644
--- a/symposion/templates/schedule/schedule_edit.html
+++ b/symposion/templates/schedule/schedule_edit.html
@@ -59,7 +59,7 @@
             {% endfor %}
         </div>
         
-        <div class="modal fade hide" id="slotEditModal">
+        <div class="modal fade hide in" id="slotEditModal">
             <form id="slotEditForm" class="modal-form" method="POST">
                 <div class="modal-header">
                     <a class="close" data-dismiss="modal">&times;</a>

From 79e94d6f544996e35593adc7986b9977cc6b0206 Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Fri, 31 Aug 2012 01:50:24 -0400
Subject: [PATCH 42/46] fix edit

---
 symposion/templates/schedule/_grid.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/symposion/templates/schedule/_grid.html b/symposion/templates/schedule/_grid.html
index de8b51d0..2df4ede2 100644
--- a/symposion/templates/schedule/_grid.html
+++ b/symposion/templates/schedule/_grid.html
@@ -18,7 +18,7 @@
                             <div class="speaker">{{ slot.presentation.speaker }}</div>
 
                             <span class="schedule-controls">
-                                <a class="btn btn-mini" onClick="modalEdit({% url schedule_slot_edit slot.pk %})" href="#">Edit</a>
+                                <a class="btn btn-mini edit-slot" data-action="{% url schedule_slot_edit slot.pk %}" href="#">Edit</a>
                             </span>
                         {% endif %}
                     {% else %}

From 14870dd5b0ca96f750bf0467aa9d67f6bfa2ff07 Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Fri, 31 Aug 2012 01:54:21 -0400
Subject: [PATCH 43/46] removed old facebox reference

---
 symposion/templates/schedule/schedule_edit.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/symposion/templates/schedule/schedule_edit.html b/symposion/templates/schedule/schedule_edit.html
index f3210b9f..026d7c4a 100644
--- a/symposion/templates/schedule/schedule_edit.html
+++ b/symposion/templates/schedule/schedule_edit.html
@@ -11,7 +11,6 @@
 {% endblock %}
 
 {% block extra_head %}
-    <link rel="stylesheet" href="{{ STATIC_URL }}css/facebox.css" />
     <style>
         td {
             font-size: 9pt;

From 8ce14b799cea20192aad6922015b1b49d506334b Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Fri, 31 Aug 2012 02:04:35 -0400
Subject: [PATCH 44/46] add chosen

---
 symposion/static/chosen/chosen.css           | 384 +++++++++++++++++++
 symposion/static/chosen/chosen.jquery.min.js |  10 +
 2 files changed, 394 insertions(+)
 create mode 100755 symposion/static/chosen/chosen.css
 create mode 100755 symposion/static/chosen/chosen.jquery.min.js

diff --git a/symposion/static/chosen/chosen.css b/symposion/static/chosen/chosen.css
new file mode 100755
index 00000000..1ca56178
--- /dev/null
+++ b/symposion/static/chosen/chosen.css
@@ -0,0 +1,384 @@
+/* @group Base */
+.chzn-container {
+  font-size: 13px;
+  position: relative;
+  display: inline-block;
+  zoom: 1;
+  *display: inline;
+}
+.chzn-container .chzn-drop {
+  background: #fff;
+  border: 1px solid #aaa;
+  border-top: 0;
+  position: absolute;
+  top: 29px;
+  left: 0;
+  -webkit-box-shadow: 0 4px 5px rgba(0,0,0,.15);
+  -moz-box-shadow   : 0 4px 5px rgba(0,0,0,.15);
+  box-shadow        : 0 4px 5px rgba(0,0,0,.15);
+  z-index: 1010;
+}
+/* @end */
+
+/* @group Single Chosen */
+.chzn-container-single .chzn-single {
+  background-color: #ffffff;
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee', GradientType=0 );   
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4));
+  background-image: -webkit-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+  background-image: -moz-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+  background-image: -o-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+  background-image: linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%); 
+  -webkit-border-radius: 5px;
+  -moz-border-radius   : 5px;
+  border-radius        : 5px;
+  -moz-background-clip   : padding;
+  -webkit-background-clip: padding-box;
+  background-clip        : padding-box;
+  border: 1px solid #aaaaaa;
+  -webkit-box-shadow: 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
+  -moz-box-shadow   : 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
+  box-shadow        : 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
+  display: block;
+  overflow: hidden;
+  white-space: nowrap;
+  position: relative;
+  height: 23px;
+  line-height: 24px;
+  padding: 0 0 0 8px;
+  color: #444444;
+  text-decoration: none;
+}
+.chzn-container-single .chzn-default {
+  color: #999;
+}
+.chzn-container-single .chzn-single span {
+  margin-right: 26px;
+  display: block;
+  overflow: hidden;
+  white-space: nowrap;
+  -o-text-overflow: ellipsis;
+  -ms-text-overflow: ellipsis;
+  text-overflow: ellipsis;
+}
+.chzn-container-single .chzn-single abbr {
+  display: block;
+  position: absolute;
+  right: 26px;
+  top: 6px;
+  width: 12px;
+  height: 13px;
+  font-size: 1px;
+  background: url('chosen-sprite.png') right top no-repeat;
+}
+.chzn-container-single .chzn-single abbr:hover {
+  background-position: right -11px;
+}
+.chzn-container-single.chzn-disabled .chzn-single abbr:hover {
+  background-position: right top;
+}
+.chzn-container-single .chzn-single div {
+  position: absolute;
+  right: 0;
+  top: 0;
+  display: block;
+  height: 100%;
+  width: 18px;
+}
+.chzn-container-single .chzn-single div b {
+  background: url('chosen-sprite.png') no-repeat 0 0;
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+.chzn-container-single .chzn-search {
+  padding: 3px 4px;
+  position: relative;
+  margin: 0;
+  white-space: nowrap;
+  z-index: 1010;
+}
+.chzn-container-single .chzn-search input {
+  background: #fff url('chosen-sprite.png') no-repeat 100% -22px;
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -webkit-gradient(linear, 0 0, 0 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -webkit-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -moz-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, -o-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+  background: url('chosen-sprite.png') no-repeat 100% -22px, linear-gradient(#eeeeee 1%, #ffffff 15%);
+  margin: 1px 0;
+  padding: 4px 20px 4px 5px;
+  outline: 0;
+  border: 1px solid #aaa;
+  font-family: sans-serif;
+  font-size: 1em;
+}
+.chzn-container-single .chzn-drop {
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius   : 0 0 4px 4px;
+  border-radius        : 0 0 4px 4px;
+  -moz-background-clip   : padding;
+  -webkit-background-clip: padding-box;
+  background-clip        : padding-box;
+}
+/* @end */
+
+.chzn-container-single-nosearch .chzn-search input {
+  position: absolute;
+  left: -9000px;
+}
+
+/* @group Multi Chosen */
+.chzn-container-multi .chzn-choices {
+  background-color: #fff;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
+  background-image: -webkit-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+  background-image: -moz-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+  background-image: -o-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+  background-image: linear-gradient(#eeeeee 1%, #ffffff 15%);
+  border: 1px solid #aaa;
+  margin: 0;
+  padding: 0;
+  cursor: text;
+  overflow: hidden;
+  height: auto !important;
+  height: 1%;
+  position: relative;
+}
+.chzn-container-multi .chzn-choices li {
+  float: left;
+  list-style: none;
+}
+.chzn-container-multi .chzn-choices .search-field {
+  white-space: nowrap;
+  margin: 0;
+  padding: 0;
+}
+.chzn-container-multi .chzn-choices .search-field input {
+  color: #666;
+  background: transparent !important;
+  border: 0 !important;
+  font-family: sans-serif;
+  font-size: 100%;
+  height: 15px;
+  padding: 5px;
+  margin: 1px 0;
+  outline: 0;
+  -webkit-box-shadow: none;
+  -moz-box-shadow   : none;
+  box-shadow        : none;
+}
+.chzn-container-multi .chzn-choices .search-field .default {
+  color: #999;
+}
+.chzn-container-multi .chzn-choices .search-choice {
+  -webkit-border-radius: 3px;
+  -moz-border-radius   : 3px;
+  border-radius        : 3px;
+  -moz-background-clip   : padding;
+  -webkit-background-clip: padding-box;
+  background-clip        : padding-box;
+  background-color: #e4e4e4;
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f4f4', endColorstr='#eeeeee', GradientType=0 ); 
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
+  background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); 
+  -webkit-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+  -moz-box-shadow   : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+  box-shadow        : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+  color: #333;
+  border: 1px solid #aaaaaa;
+  line-height: 13px;
+  padding: 3px 20px 3px 5px;
+  margin: 3px 0 3px 5px;
+  position: relative;
+  cursor: default;
+}
+.chzn-container-multi .chzn-choices .search-choice-focus {
+  background: #d4d4d4;
+}
+.chzn-container-multi .chzn-choices .search-choice .search-choice-close {
+  display: block;
+  position: absolute;
+  right: 3px;
+  top: 4px;
+  width: 12px;
+  height: 13px;
+  font-size: 1px;
+  background: url('chosen-sprite.png') right top no-repeat;
+}
+.chzn-container-multi .chzn-choices .search-choice .search-choice-close:hover {
+  background-position: right -11px;
+}
+.chzn-container-multi .chzn-choices .search-choice-focus .search-choice-close {
+  background-position: right -11px;
+}
+/* @end */
+
+/* @group Results */
+.chzn-container .chzn-results {
+  margin: 0 4px 4px 0;
+  max-height: 240px;
+  padding: 0 0 0 4px;
+  position: relative;
+  overflow-x: hidden;
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
+}
+.chzn-container-multi .chzn-results {
+  margin: -1px 0 0;
+  padding: 0;
+}
+.chzn-container .chzn-results li {
+  display: none;
+  line-height: 15px;
+  padding: 5px 6px;
+  margin: 0;
+  list-style: none;
+}
+.chzn-container .chzn-results .active-result {
+  cursor: pointer;
+  display: list-item;
+}
+.chzn-container .chzn-results .highlighted {
+  background-color: #3875d7;
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#3875d7', endColorstr='#2a62bc', GradientType=0 );  
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc));
+  background-image: -webkit-linear-gradient(top, #3875d7 20%, #2a62bc 90%);
+  background-image: -moz-linear-gradient(top, #3875d7 20%, #2a62bc 90%);
+  background-image: -o-linear-gradient(top, #3875d7 20%, #2a62bc 90%);
+  background-image: linear-gradient(#3875d7 20%, #2a62bc 90%);
+  color: #fff;
+}
+.chzn-container .chzn-results li em {
+  background: #feffde;
+  font-style: normal;
+}
+.chzn-container .chzn-results .highlighted em {
+  background: transparent;
+}
+.chzn-container .chzn-results .no-results {
+  background: #f4f4f4;
+  display: list-item;
+}
+.chzn-container .chzn-results .group-result {
+  cursor: default;
+  color: #999;
+  font-weight: bold;
+}
+.chzn-container .chzn-results .group-option {
+  padding-left: 15px;
+}
+.chzn-container-multi .chzn-drop .result-selected {
+  display: none;
+}
+.chzn-container .chzn-results-scroll {
+  background: white;
+  margin: 0 4px;
+  position: absolute;
+  text-align: center;
+  width: 321px; /* This should by dynamic with js */
+  z-index: 1;
+}
+.chzn-container .chzn-results-scroll span {
+  display: inline-block;
+  height: 17px;
+  text-indent: -5000px;
+  width: 9px;
+}
+.chzn-container .chzn-results-scroll-down {
+  bottom: 0;
+}
+.chzn-container .chzn-results-scroll-down span {
+  background: url('chosen-sprite.png') no-repeat -4px -3px;
+}
+.chzn-container .chzn-results-scroll-up span {
+  background: url('chosen-sprite.png') no-repeat -22px -3px;
+}
+/* @end */
+
+/* @group Active  */
+.chzn-container-active .chzn-single {
+  -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
+  -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
+  box-shadow        : 0 0 5px rgba(0,0,0,.3);
+  border: 1px solid #5897fb;
+}
+.chzn-container-active .chzn-single-with-drop {
+  border: 1px solid #aaa;
+  -webkit-box-shadow: 0 1px 0 #fff inset;
+  -moz-box-shadow   : 0 1px 0 #fff inset;
+  box-shadow        : 0 1px 0 #fff inset;
+  background-color: #eee;
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0 );
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, color-stop(20%, #eeeeee), color-stop(80%, #ffffff));
+  background-image: -webkit-linear-gradient(top, #eeeeee 20%, #ffffff 80%);
+  background-image: -moz-linear-gradient(top, #eeeeee 20%, #ffffff 80%);
+  background-image: -o-linear-gradient(top, #eeeeee 20%, #ffffff 80%);
+  background-image: linear-gradient(#eeeeee 20%, #ffffff 80%);
+  -webkit-border-bottom-left-radius : 0;
+  -webkit-border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft : 0;
+  -moz-border-radius-bottomright: 0;
+  border-bottom-left-radius : 0;
+  border-bottom-right-radius: 0;
+}
+.chzn-container-active .chzn-single-with-drop div {
+  background: transparent;
+  border-left: none;
+}
+.chzn-container-active .chzn-single-with-drop div b {
+  background-position: -18px 1px;
+}
+.chzn-container-active .chzn-choices {
+  -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
+  -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
+  box-shadow        : 0 0 5px rgba(0,0,0,.3);
+  border: 1px solid #5897fb;
+}
+.chzn-container-active .chzn-choices .search-field input {
+  color: #111 !important;
+}
+/* @end */
+
+/* @group Disabled Support */
+.chzn-disabled {
+  cursor: default;
+  opacity:0.5 !important;
+}
+.chzn-disabled .chzn-single {
+  cursor: default;
+}
+.chzn-disabled .chzn-choices .search-choice .search-choice-close {
+  cursor: default;
+}
+
+/* @group Right to Left */
+.chzn-rtl { text-align: right; }
+.chzn-rtl .chzn-single { padding: 0 8px 0 0; overflow: visible; }
+.chzn-rtl .chzn-single span { margin-left: 26px; margin-right: 0; direction: rtl; }
+
+.chzn-rtl .chzn-single div { left: 3px; right: auto; }
+.chzn-rtl .chzn-single abbr {
+  left: 26px;
+  right: auto;
+}
+.chzn-rtl .chzn-choices .search-field input { direction: rtl; }
+.chzn-rtl .chzn-choices li { float: right; }
+.chzn-rtl .chzn-choices .search-choice { padding: 3px 5px 3px 19px; margin: 3px 5px 3px 0; }
+.chzn-rtl .chzn-choices .search-choice .search-choice-close { left: 4px; right: auto; background-position: right top;}
+.chzn-rtl.chzn-container-single .chzn-results { margin: 0 0 4px 4px; padding: 0 4px 0 0; }
+.chzn-rtl .chzn-results .group-option { padding-left: 0; padding-right: 15px; }
+.chzn-rtl.chzn-container-active .chzn-single-with-drop div { border-right: none; }
+.chzn-rtl .chzn-search input {
+  background: #fff url('chosen-sprite.png') no-repeat -38px -22px;
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -webkit-gradient(linear, 0 0, 0 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -webkit-linear-gradient(top, #eeeeee 1%, #ffffff 15%);  
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -moz-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, -o-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+  background: url('chosen-sprite.png') no-repeat -38px -22px, linear-gradient(#eeeeee 1%, #ffffff 15%);
+  padding: 4px 5px 4px 20px;
+  direction: rtl;
+}
+/* @end */
diff --git a/symposion/static/chosen/chosen.jquery.min.js b/symposion/static/chosen/chosen.jquery.min.js
new file mode 100755
index 00000000..b7806202
--- /dev/null
+++ b/symposion/static/chosen/chosen.jquery.min.js
@@ -0,0 +1,10 @@
+// Chosen, a Select Box Enhancer for jQuery and Protoype
+// by Patrick Filler for Harvest, http://getharvest.com
+// 
+// Version 0.9.8
+// Full source at https://github.com/harvesthq/chosen
+// Copyright (c) 2011 Harvest http://getharvest.com
+
+// MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
+// This file is generated by `cake build`, do not edit it by hand.
+(function(){var SelectParser;SelectParser=function(){function SelectParser(){this.options_index=0,this.parsed=[]}return SelectParser.prototype.add_node=function(child){return child.nodeName==="OPTGROUP"?this.add_group(child):this.add_option(child)},SelectParser.prototype.add_group=function(group){var group_position,option,_i,_len,_ref,_results;group_position=this.parsed.length,this.parsed.push({array_index:group_position,group:!0,label:group.label,children:0,disabled:group.disabled}),_ref=group.childNodes,_results=[];for(_i=0,_len=_ref.length;_i<_len;_i++)option=_ref[_i],_results.push(this.add_option(option,group_position,group.disabled));return _results},SelectParser.prototype.add_option=function(option,group_position,group_disabled){if(option.nodeName==="OPTION")return option.text!==""?(group_position!=null&&(this.parsed[group_position].children+=1),this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:option.value,text:option.text,html:option.innerHTML,selected:option.selected,disabled:group_disabled===!0?group_disabled:option.disabled,group_array_index:group_position,classes:option.className,style:option.style.cssText})):this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0}),this.options_index+=1},SelectParser}(),SelectParser.select_to_array=function(select){var child,parser,_i,_len,_ref;parser=new SelectParser,_ref=select.childNodes;for(_i=0,_len=_ref.length;_i<_len;_i++)child=_ref[_i],parser.add_node(child);return parser.parsed},this.SelectParser=SelectParser}).call(this),function(){var AbstractChosen,root;root=this,AbstractChosen=function(){function AbstractChosen(form_field,options){this.form_field=form_field,this.options=options!=null?options:{},this.set_default_values(),this.is_multiple=this.form_field.multiple,this.set_default_text(),this.setup(),this.set_up_html(),this.register_observers(),this.finish_setup()}return AbstractChosen.prototype.set_default_values=function(){var _this=this;return this.click_test_action=function(evt){return _this.test_active_click(evt)},this.activate_action=function(evt){return _this.activate_field(evt)},this.active_field=!1,this.mouse_on_container=!1,this.results_showing=!1,this.result_highlighted=null,this.result_single_selected=null,this.allow_single_deselect=this.options.allow_single_deselect!=null&&this.form_field.options[0]!=null&&this.form_field.options[0].text===""?this.options.allow_single_deselect:!1,this.disable_search_threshold=this.options.disable_search_threshold||0,this.disable_search=this.options.disable_search||!1,this.search_contains=this.options.search_contains||!1,this.choices=0,this.single_backstroke_delete=this.options.single_backstroke_delete||!1,this.max_selected_options=this.options.max_selected_options||Infinity},AbstractChosen.prototype.set_default_text=function(){return this.form_field.getAttribute("data-placeholder")?this.default_text=this.form_field.getAttribute("data-placeholder"):this.is_multiple?this.default_text=this.options.placeholder_text_multiple||this.options.placeholder_text||"Select Some Options":this.default_text=this.options.placeholder_text_single||this.options.placeholder_text||"Select an Option",this.results_none_found=this.form_field.getAttribute("data-no_results_text")||this.options.no_results_text||"No results match"},AbstractChosen.prototype.mouse_enter=function(){return this.mouse_on_container=!0},AbstractChosen.prototype.mouse_leave=function(){return this.mouse_on_container=!1},AbstractChosen.prototype.input_focus=function(evt){var _this=this;if(!this.active_field)return setTimeout(function(){return _this.container_mousedown()},50)},AbstractChosen.prototype.input_blur=function(evt){var _this=this;if(!this.mouse_on_container)return this.active_field=!1,setTimeout(function(){return _this.blur_test()},100)},AbstractChosen.prototype.result_add_option=function(option){var classes,style;return option.disabled?"":(option.dom_id=this.container_id+"_o_"+option.array_index,classes=option.selected&&this.is_multiple?[]:["active-result"],option.selected&&classes.push("result-selected"),option.group_array_index!=null&&classes.push("group-option"),option.classes!==""&&classes.push(option.classes),style=option.style.cssText!==""?' style="'+option.style+'"':"",'<li id="'+option.dom_id+'" class="'+classes.join(" ")+'"'+style+">"+option.html+"</li>")},AbstractChosen.prototype.results_update_field=function(){return this.is_multiple||this.results_reset_cleanup(),this.result_clear_highlight(),this.result_single_selected=null,this.results_build()},AbstractChosen.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},AbstractChosen.prototype.results_search=function(evt){return this.results_showing?this.winnow_results():this.results_show()},AbstractChosen.prototype.keyup_checker=function(evt){var stroke,_ref;stroke=(_ref=evt.which)!=null?_ref:evt.keyCode,this.search_field_scale();switch(stroke){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices>0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:evt.preventDefault();if(this.results_showing)return this.result_select(evt);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},AbstractChosen.prototype.generate_field_id=function(){var new_id;return new_id=this.generate_random_id(),this.form_field.id=new_id,new_id},AbstractChosen.prototype.generate_random_char=function(){var chars,newchar,rand;return chars="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ",rand=Math.floor(Math.random()*chars.length),newchar=chars.substring(rand,rand+1)},AbstractChosen}(),root.AbstractChosen=AbstractChosen}.call(this),function(){var $,Chosen,get_side_border_padding,root,__hasProp=Object.prototype.hasOwnProperty,__extends=function(child,parent){function ctor(){this.constructor=child}for(var key in parent)__hasProp.call(parent,key)&&(child[key]=parent[key]);return ctor.prototype=parent.prototype,child.prototype=new ctor,child.__super__=parent.prototype,child};root=this,$=jQuery,$.fn.extend({chosen:function(options){return!$.browser.msie||$.browser.version!=="6.0"&&$.browser.version!=="7.0"?this.each(function(input_field){var $this;$this=$(this);if(!$this.hasClass("chzn-done"))return $this.data("chosen",new Chosen(this,options))}):this}}),Chosen=function(_super){function Chosen(){Chosen.__super__.constructor.apply(this,arguments)}return __extends(Chosen,_super),Chosen.prototype.setup=function(){return this.form_field_jq=$(this.form_field),this.current_value=this.form_field_jq.val(),this.is_rtl=this.form_field_jq.hasClass("chzn-rtl")},Chosen.prototype.finish_setup=function(){return this.form_field_jq.addClass("chzn-done")},Chosen.prototype.set_up_html=function(){var container_div,dd_top,dd_width,sf_width;return this.container_id=this.form_field.id.length?this.form_field.id.replace(/[^\w]/g,"_"):this.generate_field_id(),this.container_id+="_chzn",this.f_width=this.form_field_jq.outerWidth(),container_div=$("<div />",{id:this.container_id,"class":"chzn-container"+(this.is_rtl?" chzn-rtl":""),style:"width: "+this.f_width+"px;"}),this.is_multiple?container_div.html('<ul class="chzn-choices"><li class="search-field"><input type="text" value="'+this.default_text+'" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chzn-drop" style="left:-9000px;"><ul class="chzn-results"></ul></div>'):container_div.html('<a href="javascript:void(0)" class="chzn-single chzn-default"><span>'+this.default_text+'</span><div><b></b></div></a><div class="chzn-drop" style="left:-9000px;"><div class="chzn-search"><input type="text" autocomplete="off" /></div><ul class="chzn-results"></ul></div>'),this.form_field_jq.hide().after(container_div),this.container=$("#"+this.container_id),this.container.addClass("chzn-container-"+(this.is_multiple?"multi":"single")),this.dropdown=this.container.find("div.chzn-drop").first(),dd_top=this.container.height(),dd_width=this.f_width-get_side_border_padding(this.dropdown),this.dropdown.css({width:dd_width+"px",top:dd_top+"px"}),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chzn-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chzn-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chzn-search").first(),this.selected_item=this.container.find(".chzn-single").first(),sf_width=dd_width-get_side_border_padding(this.search_container)-get_side_border_padding(this.search_field),this.search_field.css({width:sf_width+"px"})),this.results_build(),this.set_tab_index(),this.form_field_jq.trigger("liszt:ready",{chosen:this})},Chosen.prototype.register_observers=function(){var _this=this;return this.container.mousedown(function(evt){return _this.container_mousedown(evt)}),this.container.mouseup(function(evt){return _this.container_mouseup(evt)}),this.container.mouseenter(function(evt){return _this.mouse_enter(evt)}),this.container.mouseleave(function(evt){return _this.mouse_leave(evt)}),this.search_results.mouseup(function(evt){return _this.search_results_mouseup(evt)}),this.search_results.mouseover(function(evt){return _this.search_results_mouseover(evt)}),this.search_results.mouseout(function(evt){return _this.search_results_mouseout(evt)}),this.form_field_jq.bind("liszt:updated",function(evt){return _this.results_update_field(evt)}),this.form_field_jq.bind("liszt:activate",function(evt){return _this.activate_field(evt)}),this.form_field_jq.bind("liszt:open",function(evt){return _this.container_mousedown(evt)}),this.search_field.blur(function(evt){return _this.input_blur(evt)}),this.search_field.keyup(function(evt){return _this.keyup_checker(evt)}),this.search_field.keydown(function(evt){return _this.keydown_checker(evt)}),this.is_multiple?(this.search_choices.click(function(evt){return _this.choices_click(evt)}),this.search_field.focus(function(evt){return _this.input_focus(evt)})):this.container.click(function(evt){return evt.preventDefault()})},Chosen.prototype.search_field_disabled=function(){this.is_disabled=this.form_field_jq[0].disabled;if(this.is_disabled)return this.container.addClass("chzn-disabled"),this.search_field[0].disabled=!0,this.is_multiple||this.selected_item.unbind("focus",this.activate_action),this.close_field();this.container.removeClass("chzn-disabled"),this.search_field[0].disabled=!1;if(!this.is_multiple)return this.selected_item.bind("focus",this.activate_action)},Chosen.prototype.container_mousedown=function(evt){var target_closelink;if(!this.is_disabled)return target_closelink=evt!=null?$(evt.target).hasClass("search-choice-close"):!1,evt&&evt.type==="mousedown"&&!this.results_showing&&evt.stopPropagation(),!this.pending_destroy_click&&!target_closelink?(this.active_field?!this.is_multiple&&evt&&($(evt.target)[0]===this.selected_item[0]||$(evt.target).parents("a.chzn-single").length)&&(evt.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),$(document).click(this.click_test_action),this.results_show()),this.activate_field()):this.pending_destroy_click=!1},Chosen.prototype.container_mouseup=function(evt){if(evt.target.nodeName==="ABBR"&&!this.is_disabled)return this.results_reset(evt)},Chosen.prototype.blur_test=function(evt){if(!this.active_field&&this.container.hasClass("chzn-container-active"))return this.close_field()},Chosen.prototype.close_field=function(){return $(document).unbind("click",this.click_test_action),this.is_multiple||(this.selected_item.attr("tabindex",this.search_field.attr("tabindex")),this.search_field.attr("tabindex",-1)),this.active_field=!1,this.results_hide(),this.container.removeClass("chzn-container-active"),this.winnow_results_clear(),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},Chosen.prototype.activate_field=function(){return!this.is_multiple&&!this.active_field&&(this.search_field.attr("tabindex",this.selected_item.attr("tabindex")),this.selected_item.attr("tabindex",-1)),this.container.addClass("chzn-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val()),this.search_field.focus()},Chosen.prototype.test_active_click=function(evt){return $(evt.target).parents("#"+this.container_id).length?this.active_field=!0:this.close_field()},Chosen.prototype.results_build=function(){var content,data,_i,_len,_ref;this.parsing=!0,this.results_data=root.SelectParser.select_to_array(this.form_field),this.is_multiple&&this.choices>0?(this.search_choices.find("li.search-choice").remove(),this.choices=0):this.is_multiple||(this.selected_item.addClass("chzn-default").find("span").text(this.default_text),this.disable_search||this.form_field.options.length<=this.disable_search_threshold?this.container.addClass("chzn-container-single-nosearch"):this.container.removeClass("chzn-container-single-nosearch")),content="",_ref=this.results_data;for(_i=0,_len=_ref.length;_i<_len;_i++)data=_ref[_i],data.group?content+=this.result_add_group(data):data.empty||(content+=this.result_add_option(data),data.selected&&this.is_multiple?this.choice_build(data):data.selected&&!this.is_multiple&&(this.selected_item.removeClass("chzn-default").find("span").text(data.text),this.allow_single_deselect&&this.single_deselect_control_build()));return this.search_field_disabled(),this.show_search_field_default(),this.search_field_scale(),this.search_results.html(content),this.parsing=!1},Chosen.prototype.result_add_group=function(group){return group.disabled?"":(group.dom_id=this.container_id+"_g_"+group.array_index,'<li id="'+group.dom_id+'" class="group-result">'+$("<div />").text(group.label).html()+"</li>")},Chosen.prototype.result_do_highlight=function(el){var high_bottom,high_top,maxHeight,visible_bottom,visible_top;if(el.length){this.result_clear_highlight(),this.result_highlight=el,this.result_highlight.addClass("highlighted"),maxHeight=parseInt(this.search_results.css("maxHeight"),10),visible_top=this.search_results.scrollTop(),visible_bottom=maxHeight+visible_top,high_top=this.result_highlight.position().top+this.search_results.scrollTop(),high_bottom=high_top+this.result_highlight.outerHeight();if(high_bottom>=visible_bottom)return this.search_results.scrollTop(high_bottom-maxHeight>0?high_bottom-maxHeight:0);if(high_top<visible_top)return this.search_results.scrollTop(high_top)}},Chosen.prototype.result_clear_highlight=function(){return this.result_highlight&&this.result_highlight.removeClass("highlighted"),this.result_highlight=null},Chosen.prototype.results_show=function(){var dd_top;if(!this.is_multiple)this.selected_item.addClass("chzn-single-with-drop"),this.result_single_selected&&this.result_do_highlight(this.result_single_selected);else if(this.max_selected_options<=this.choices)return this.form_field_jq.trigger("liszt:maxselected",{chosen:this}),!1;return dd_top=this.is_multiple?this.container.height():this.container.height()-1,this.form_field_jq.trigger("liszt:showing_dropdown",{chosen:this}),this.dropdown.css({top:dd_top+"px",left:0}),this.results_showing=!0,this.search_field.focus(),this.search_field.val(this.search_field.val()),this.winnow_results()},Chosen.prototype.results_hide=function(){return this.is_multiple||this.selected_item.removeClass("chzn-single-with-drop"),this.result_clear_highlight(),this.form_field_jq.trigger("liszt:hiding_dropdown",{chosen:this}),this.dropdown.css({left:"-9000px"}),this.results_showing=!1},Chosen.prototype.set_tab_index=function(el){var ti;if(this.form_field_jq.attr("tabindex"))return ti=this.form_field_jq.attr("tabindex"),this.form_field_jq.attr("tabindex",-1),this.is_multiple?this.search_field.attr("tabindex",ti):(this.selected_item.attr("tabindex",ti),this.search_field.attr("tabindex",-1))},Chosen.prototype.show_search_field_default=function(){return this.is_multiple&&this.choices<1&&!this.active_field?(this.search_field.val(this.default_text),this.search_field.addClass("default")):(this.search_field.val(""),this.search_field.removeClass("default"))},Chosen.prototype.search_results_mouseup=function(evt){var target;target=$(evt.target).hasClass("active-result")?$(evt.target):$(evt.target).parents(".active-result").first();if(target.length)return this.result_highlight=target,this.result_select(evt)},Chosen.prototype.search_results_mouseover=function(evt){var target;target=$(evt.target).hasClass("active-result")?$(evt.target):$(evt.target).parents(".active-result").first();if(target)return this.result_do_highlight(target)},Chosen.prototype.search_results_mouseout=function(evt){if($(evt.target).hasClass("active-result"))return this.result_clear_highlight()},Chosen.prototype.choices_click=function(evt){evt.preventDefault();if(this.active_field&&!$(evt.target).hasClass("search-choice")&&!this.results_showing)return this.results_show()},Chosen.prototype.choice_build=function(item){var choice_id,link,_this=this;return this.is_multiple&&this.max_selected_options<=this.choices?(this.form_field_jq.trigger("liszt:maxselected",{chosen:this}),!1):(choice_id=this.container_id+"_c_"+item.array_index,this.choices+=1,this.search_container.before('<li class="search-choice" id="'+choice_id+'"><span>'+item.html+'</span><a href="javascript:void(0)" class="search-choice-close" rel="'+item.array_index+'"></a></li>'),link=$("#"+choice_id).find("a").first(),link.click(function(evt){return _this.choice_destroy_link_click(evt)}))},Chosen.prototype.choice_destroy_link_click=function(evt){return evt.preventDefault(),this.is_disabled?evt.stopPropagation:(this.pending_destroy_click=!0,this.choice_destroy($(evt.target)))},Chosen.prototype.choice_destroy=function(link){return this.choices-=1,this.show_search_field_default(),this.is_multiple&&this.choices>0&&this.search_field.val().length<1&&this.results_hide(),this.result_deselect(link.attr("rel")),link.parents("li").first().remove()},Chosen.prototype.results_reset=function(){this.form_field.options[0].selected=!0,this.selected_item.find("span").text(this.default_text),this.is_multiple||this.selected_item.addClass("chzn-default"),this.show_search_field_default(),this.results_reset_cleanup(),this.form_field_jq.trigger("change");if(this.active_field)return this.results_hide()},Chosen.prototype.results_reset_cleanup=function(){return this.selected_item.find("abbr").remove()},Chosen.prototype.result_select=function(evt){var high,high_id,item,position;if(this.result_highlight)return high=this.result_highlight,high_id=high.attr("id"),this.result_clear_highlight(),this.is_multiple?this.result_deactivate(high):(this.search_results.find(".result-selected").removeClass("result-selected"),this.result_single_selected=high,this.selected_item.removeClass("chzn-default")),high.addClass("result-selected"),position=high_id.substr(high_id.lastIndexOf("_")+1),item=this.results_data[position],item.selected=!0,this.form_field.options[item.options_index].selected=!0,this.is_multiple?this.choice_build(item):(this.selected_item.find("span").first().text(item.text),this.allow_single_deselect&&this.single_deselect_control_build()),(!evt.metaKey||!this.is_multiple)&&this.results_hide(),this.search_field.val(""),(this.is_multiple||this.form_field_jq.val()!==this.current_value)&&this.form_field_jq.trigger("change",{selected:this.form_field.options[item.options_index].value}),this.current_value=this.form_field_jq.val(),this.search_field_scale()},Chosen.prototype.result_activate=function(el){return el.addClass("active-result")},Chosen.prototype.result_deactivate=function(el){return el.removeClass("active-result")},Chosen.prototype.result_deselect=function(pos){var result,result_data;return result_data=this.results_data[pos],result_data.selected=!1,this.form_field.options[result_data.options_index].selected=!1,result=$("#"+this.container_id+"_o_"+pos),result.removeClass("result-selected").addClass("active-result").show(),this.result_clear_highlight(),this.winnow_results(),this.form_field_jq.trigger("change",{deselected:this.form_field.options[result_data.options_index].value}),this.search_field_scale()},Chosen.prototype.single_deselect_control_build=function(){if(this.allow_single_deselect&&this.selected_item.find("abbr").length<1)return this.selected_item.find("span").first().after('<abbr class="search-choice-close"></abbr>')},Chosen.prototype.winnow_results=function(){var found,option,part,parts,regex,regexAnchor,result,result_id,results,searchText,startpos,text,zregex,_i,_j,_len,_len2,_ref;this.no_results_clear(),results=0,searchText=this.search_field.val()===this.default_text?"":$("<div/>").text($.trim(this.search_field.val())).html(),regexAnchor=this.search_contains?"":"^",regex=new RegExp(regexAnchor+searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),zregex=new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),_ref=this.results_data;for(_i=0,_len=_ref.length;_i<_len;_i++){option=_ref[_i];if(!option.disabled&&!option.empty)if(option.group)$("#"+option.dom_id).css("display","none");else if(!this.is_multiple||!option.selected){found=!1,result_id=option.dom_id,result=$("#"+result_id);if(regex.test(option.html))found=!0,results+=1;else if(option.html.indexOf(" ")>=0||option.html.indexOf("[")===0){parts=option.html.replace(/\[|\]/g,"").split(" ");if(parts.length)for(_j=0,_len2=parts.length;_j<_len2;_j++)part=parts[_j],regex.test(part)&&(found=!0,results+=1)}found?(searchText.length?(startpos=option.html.search(zregex),text=option.html.substr(0,startpos+searchText.length)+"</em>"+option.html.substr(startpos+searchText.length),text=text.substr(0,startpos)+"<em>"+text.substr(startpos)):text=option.html,result.html(text),this.result_activate(result),option.group_array_index!=null&&$("#"+this.results_data[option.group_array_index].dom_id).css("display","list-item")):(this.result_highlight&&result_id===this.result_highlight.attr("id")&&this.result_clear_highlight(),this.result_deactivate(result))}}return results<1&&searchText.length?this.no_results(searchText):this.winnow_results_set_highlight()},Chosen.prototype.winnow_results_clear=function(){var li,lis,_i,_len,_results;this.search_field.val(""),lis=this.search_results.find("li"),_results=[];for(_i=0,_len=lis.length;_i<_len;_i++)li=lis[_i],li=$(li),li.hasClass("group-result")?_results.push(li.css("display","auto")):!this.is_multiple||!li.hasClass("result-selected")?_results.push(this.result_activate(li)):_results.push(void 0);return _results},Chosen.prototype.winnow_results_set_highlight=function(){var do_high,selected_results;if(!this.result_highlight){selected_results=this.is_multiple?[]:this.search_results.find(".result-selected.active-result"),do_high=selected_results.length?selected_results.first():this.search_results.find(".active-result").first();if(do_high!=null)return this.result_do_highlight(do_high)}},Chosen.prototype.no_results=function(terms){var no_results_html;return no_results_html=$('<li class="no-results">'+this.results_none_found+' "<span></span>"</li>'),no_results_html.find("span").first().html(terms),this.search_results.append(no_results_html)},Chosen.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},Chosen.prototype.keydown_arrow=function(){var first_active,next_sib;this.result_highlight?this.results_showing&&(next_sib=this.result_highlight.nextAll("li.active-result").first(),next_sib&&this.result_do_highlight(next_sib)):(first_active=this.search_results.find("li.active-result").first(),first_active&&this.result_do_highlight($(first_active)));if(!this.results_showing)return this.results_show()},Chosen.prototype.keyup_arrow=function(){var prev_sibs;if(!this.results_showing&&!this.is_multiple)return this.results_show();if(this.result_highlight)return prev_sibs=this.result_highlight.prevAll("li.active-result"),prev_sibs.length?this.result_do_highlight(prev_sibs.first()):(this.choices>0&&this.results_hide(),this.result_clear_highlight())},Chosen.prototype.keydown_backstroke=function(){return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.find("a").first()),this.clear_backstroke()):(this.pending_backstroke=this.search_container.siblings("li.search-choice").last(),this.single_backstroke_delete?this.keydown_backstroke():this.pending_backstroke.addClass("search-choice-focus"))},Chosen.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus"),this.pending_backstroke=null},Chosen.prototype.keydown_checker=function(evt){var stroke,_ref;stroke=(_ref=evt.which)!=null?_ref:evt.keyCode,this.search_field_scale(),stroke!==8&&this.pending_backstroke&&this.clear_backstroke();switch(stroke){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(evt),this.mouse_on_container=!1;break;case 13:evt.preventDefault();break;case 38:evt.preventDefault(),this.keyup_arrow();break;case 40:this.keydown_arrow()}},Chosen.prototype.search_field_scale=function(){var dd_top,div,h,style,style_block,styles,w,_i,_len;if(this.is_multiple){h=0,w=0,style_block="position:absolute; left: -1000px; top: -1000px; display:none;",styles=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"];for(_i=0,_len=styles.length;_i<_len;_i++)style=styles[_i],style_block+=style+":"+this.search_field.css(style)+";";return div=$("<div />",{style:style_block}),div.text(this.search_field.val()),$("body").append(div),w=div.width()+25,div.remove(),w>this.f_width-10&&(w=this.f_width-10),this.search_field.css({width:w+"px"}),dd_top=this.container.height(),this.dropdown.css({top:dd_top+"px"})}},Chosen.prototype.generate_random_id=function(){var string;string="sel"+this.generate_random_char()+this.generate_random_char()+this.generate_random_char();while($("#"+string).length>0)string+=this.generate_random_char();return string},Chosen}(AbstractChosen),get_side_border_padding=function(elmt){var side_border_padding;return side_border_padding=elmt.outerWidth()-elmt.width()},root.get_side_border_padding=get_side_border_padding}.call(this);
\ No newline at end of file

From 1871be41e96171a32854bb9cfac9baffb82ff60d Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Fri, 31 Aug 2012 02:30:22 -0400
Subject: [PATCH 45/46] empty label

---
 symposion/schedule/forms.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/symposion/schedule/forms.py b/symposion/schedule/forms.py
index 1ab7de0f..286b2b63 100644
--- a/symposion/schedule/forms.py
+++ b/symposion/schedule/forms.py
@@ -8,4 +8,5 @@ class SlotEditForm(forms.Form):
     presentation = forms.ModelChoiceField(
         queryset=Presentation.objects.filter(slot__isnull=True),
         required=True,
+        empty_label=None,
     )

From 240eb42df4114ebc507e9b9009c914f090840d3d Mon Sep 17 00:00:00 2001
From: Luke Hatcher <lukeman@gmail.com>
Date: Fri, 31 Aug 2012 02:30:40 -0400
Subject: [PATCH 46/46] add chosen

---
 symposion/templates/schedule/schedule_edit.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/symposion/templates/schedule/schedule_edit.html b/symposion/templates/schedule/schedule_edit.html
index 026d7c4a..19d78d8c 100644
--- a/symposion/templates/schedule/schedule_edit.html
+++ b/symposion/templates/schedule/schedule_edit.html
@@ -11,6 +11,7 @@
 {% endblock %}
 
 {% block extra_head %}
+    <link rel="stylesheet" href="{{ STATIC_URL }}chosen/chosen.css" />
     <style>
         td {
             font-size: 9pt;
@@ -43,6 +44,9 @@
             font-weight: bold;
             line-height: 10pt;
         }
+        #id_presentation {
+            width:400px;
+        }
     </style>
 {% endblock %}
 
@@ -64,7 +68,7 @@
                     <a class="close" data-dismiss="modal">&times;</a>
                     <h3>{% trans "Edit Slot" %}</h3>
                 </div>
-                <div class="modal-body">
+                <div class="modal-body" style="height:300px">
                     {% csrf_token %}
                     {{ form|as_bootstrap }}
                 </div>
@@ -77,12 +81,14 @@
 {% endblock %}
 
 {% block extra_script %}
+    <script src="{{ STATIC_URL }}chosen/chosen.jquery.min.js" type="text/javascript"></script>
     <script type="text/javascript">
         $(function() {
             $("a.edit-slot").click(function() {
                 $("#slotEditForm").get(0).setAttribute("action", $(this).data("action"));
                 $("#slotEditModal").modal("show");
             });
+            $("#id_presentation").chosen();
         });
     </script>
 {% endblock %}