Added Slot.content_override

Slots can now be controlled through content_override if custom content is
needed in non-talk slots.

symposion/schedule/models.py

@@ -48,6 +48,7 @@ class Slot(models.Model):
     kind = models.ForeignKey(SlotKind)
     start = models.TimeField()
     end = models.TimeField()
+    content_override = models.TextField(blank=True)
     
     def assign(self, content):
         """

symposion/templates/schedule/_edit_grid.html

@@ -17,9 +17,13 @@
                             <div class="title"><a class="edit-slot" data-action="{% url schedule_slot_edit schedule.section.slug slot.pk %}" href="#">{{ slot.content.title }}</a></div>
                             <div class="speaker">{{ slot.content.speaker }}</div>
                         {% endif %}
+                    {% else %}
+                        {% if slot.content_override %}
+                            {{ slot.content_override|safe }}
                         {% else %}
                             {{ slot.kind.label }}
                         {% endif %}
+                    {% endif %}
                 </td>
             {% endfor %}
         </tr>

symposion/templates/schedule/_grid.html

@@ -16,9 +16,13 @@
                             <div class="title"><a href="{% url schedule_presentation_detail slot.content.pk %}">{{ slot.content.title }}</a></div>
                             <div class="speaker">{{ slot.content.speaker }}</div>
                         {% endif %}
+                    {% else %}
+                        {% if slot.content_override %}
+                            {{ slot.content_override|safe }}
                         {% else %}
                             {{ slot.kind.label }}
                         {% endif %}
+                    {% endif %}
                 </td>
             {% endfor %}
         </tr>