From 5b93b39f67e068aa00e55fec8a7f669058775b91 Mon Sep 17 00:00:00 2001
From: Joel Addison <joel@addison.net.au>
Date: Sun, 5 Jan 2020 14:07:34 +1000
Subject: [PATCH] Improve slot editing

Fix placement of form to allow submit button to work again.
Display information about slot on the edit popup.
---
 .../symposion/schedule/_slot_edit.html        | 48 ++++++++++++-------
 vendor/symposion/schedule/forms.py            |  1 +
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/pinaxcon/templates/symposion/schedule/_slot_edit.html b/pinaxcon/templates/symposion/schedule/_slot_edit.html
index c5818acf..137eeede 100644
--- a/pinaxcon/templates/symposion/schedule/_slot_edit.html
+++ b/pinaxcon/templates/symposion/schedule/_slot_edit.html
@@ -1,22 +1,34 @@
 {% load i18n bootstrap %}
-<div class="modal-dialog modal-dialog-centered" role="document">
-  <div class="modal-content">
-    <div class="modal-header">
-      <h5 class="modal-title">{% trans "Edit Slot" %}</h5>
-      <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-        <span aria-hidden="true">&times;</span>
-      </button>
-    </div>
+<form class="form-horizontal" id="slotEditForm" class="modal-form" method="POST" action="{% url "schedule_slot_edit" slug slot.pk %}">
+  <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">{% trans "Edit Slot" %}</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
 
-    <div class="modal-body">
-      <form class="form-horizontal" id="slotEditForm" class="modal-form" method="POST" action="{% url "schedule_slot_edit" slug slot.pk %}">
+      <div class="modal-body">
         {% csrf_token %}
-        {{ form|bootstrap }}
-      </form>
-    </div>
+        <div class="mb-3">
+          <h5>Slot Details</h5>
+          <ul>
+            <li>Name: {{ slot.name }}</li>
+            <li>Kind: {{ slot.kind.label }}</li>
+            <li>Date: {{ slot.day.date }}</li>
+            <li>Start: {{ slot.start }}</li>
+            <li>End: {{ slot.end }}</li>
+            <li>Room(s): {{ slot.rooms|join:", " }}</li>
+          </ul>
+        </div>
 
-    <div class="modal-footer">
-      <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-      <button type="submit" class="btn btn-primary">Save changes</button>
-    </div>
-</div>
+        {{ form|bootstrap }}
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+        <button type="submit" class="btn btn-primary">Save changes</button>
+      </div>
+  </div>
+</form>
diff --git a/vendor/symposion/schedule/forms.py b/vendor/symposion/schedule/forms.py
index e39407b3..898906d9 100644
--- a/vendor/symposion/schedule/forms.py
+++ b/vendor/symposion/schedule/forms.py
@@ -46,6 +46,7 @@ class SlotEditForm(forms.Form):
             "label": "Content",
             "required": False,
             "initial": self.slot.content_override,
+            "widget": forms.Textarea,
         }
         return forms.CharField(**kwargs)