From 5c236819f43bc453084910e5fee277376121f99b Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Thu, 22 Jan 2015 19:26:16 +0000
Subject: [PATCH] Fixed issue with item modals not displaying.

Moved item modal code to an includable file.
---
 RIGS/static/js/interaction.js       |  4 ++
 RIGS/templates/RIGS/event_form.html | 68 +-------------------------
 RIGS/templates/RIGS/item_modal.html | 74 +++++++++++++++++++++++++++++
 RIGS/templates/RIGS/item_row.html   |  1 +
 4 files changed, 80 insertions(+), 67 deletions(-)
 create mode 100644 RIGS/templates/RIGS/item_modal.html

diff --git a/RIGS/static/js/interaction.js b/RIGS/static/js/interaction.js
index 933179da..7d2617f4 100644
--- a/RIGS/static/js/interaction.js
+++ b/RIGS/static/js/interaction.js
@@ -42,6 +42,8 @@ $('#item-table').on('click', '.item-add', function () {
     $('#item_description').val('');
     $('#item_quantity').val('');
     $('#item_cost').val('');
+
+    $($(this).data('target')).modal('show');
 });
 
 $('#item-table').on('click', '.item-edit', function () {
@@ -55,6 +57,8 @@ $('#item-table').on('click', '.item-edit', function () {
     $('#item_description').val(fields.description);
     $('#item_quantity').val(fields.quantity);
     $('#item_cost').val(fields.cost);
+
+    $($(this).data('target')).modal('show');
 });
 
 $('body').on('submit', '#item-form', function (e) {
diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html
index 9349463b..1701cdb1 100644
--- a/RIGS/templates/RIGS/event_form.html
+++ b/RIGS/templates/RIGS/event_form.html
@@ -346,71 +346,5 @@
     </div>
     </form>
 
-    <div class="modal fade" id="itemModal" role="dialog" aria-labelledby="itemModal" aria-hidded="true">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal"><span
-                            aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                </div>
-                <form class="form-horizontal" id="item-form">
-                    <div class="modal-body">
-                        <div class="form-group">
-                            <label for="item_name" class="col-sm-2 control-label">Item Name</label>
-
-                            <div class="col-sm-10">
-                                <input type="text" placeholder="Item Name" class="form-control" required maxlength="255"
-                                       id="item_name"/>
-                            </div>
-                        </div>
-
-                        <div class="form-group">
-                            <label for="item_description" class="col-sm-2 control-label">Description</label>
-
-                            <div class="col-sm-10">
-                                <textarea type="text" placeholder="Description" class="form-control"
-                                          id="item_description"></textarea>
-                            </div>
-                        </div>
-
-                        <div class="row">
-
-                            <div class="col-sm-6">
-                                <div class="form-group">
-                                    <label for="item_quantity" class="col-sm-4 control-label">Quantity</label>
-
-                                    <div class="col-sm-8">
-                                        <input type="number" placeholder="Quantity" class="form-control" required
-                                               min="1" id="item_quantity"/>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="col-sm-6">
-                                <div class="form-group">
-                                    <label for="item_cost" class="col-sm-4 control-label">Cost</label>
-
-                                    <div class="col-sm-8">
-                                        <div class="input-group">
-                                            <div class="input-group-addon">£</div>
-                                            <input type="number" placeholder="Cost" class="form-control" required
-                                                   min="-99999999.99" max="99999999.99" step="0.01"
-                                                   id="item_cost"/>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <div class="col-sm-12">
-                            <div class="pull-right">
-                                <input type="submit" class="btn btn-primary">
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
+    {% include 'RIGS/item_modal.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/RIGS/templates/RIGS/item_modal.html b/RIGS/templates/RIGS/item_modal.html
new file mode 100644
index 00000000..602f24ef
--- /dev/null
+++ b/RIGS/templates/RIGS/item_modal.html
@@ -0,0 +1,74 @@
+<div class="modal fade" id="itemModal" role="dialog" aria-labelledby="itemModal" aria-hidded="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <div class="row">
+                    <div class="col-sm-8">
+                        <h4>{{ object.name|default:"New Event" }}</h4>
+                    </div>
+                    <div class="col-sm-4 text-right">
+                        <button type="button" class="close" data-dismiss="modal"><span
+                                aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                    </div>
+                </div>
+            </div>
+            <form class="form-horizontal" id="item-form">
+                <div class="modal-body">
+                    <div class="form-group">
+                        <label for="item_name" class="col-sm-2 control-label">Item Name</label>
+
+                        <div class="col-sm-10">
+                            <input type="text" placeholder="Item Name" class="form-control" required maxlength="255"
+                                   id="item_name"/>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="item_description" class="col-sm-2 control-label">Description</label>
+
+                        <div class="col-sm-10">
+                            <textarea type="text" placeholder="Description" class="form-control"
+                                      id="item_description" rows="8"></textarea>
+                        </div>
+                    </div>
+
+                    <div class="row">
+
+                        <div class="col-sm-6">
+                            <div class="form-group">
+                                <label for="item_quantity" class="col-sm-4 control-label">Quantity</label>
+
+                                <div class="col-sm-8">
+                                    <input type="number" placeholder="Quantity" class="form-control" required
+                                           min="1" id="item_quantity"/>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="col-sm-6">
+                            <div class="form-group">
+                                <label for="item_cost" class="col-sm-4 control-label">Cost</label>
+
+                                <div class="col-sm-8">
+                                    <div class="input-group">
+                                        <div class="input-group-addon">£</div>
+                                        <input type="number" placeholder="Cost" class="form-control" required
+                                               min="-99999999.99" max="99999999.99" step="0.01"
+                                               id="item_cost"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <div class="col-sm-12">
+                        <div class="pull-right">
+                            <input type="submit" class="btn btn-primary">
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/RIGS/templates/RIGS/item_row.html b/RIGS/templates/RIGS/item_row.html
index 1ceb6f9f..fd240fc5 100644
--- a/RIGS/templates/RIGS/item_row.html
+++ b/RIGS/templates/RIGS/item_row.html
@@ -1,3 +1,4 @@
+
 <tr id="item-{{item.pk}}" data-pk="{{item.pk}}" class="item_row">
 	<td>
 		<span class="name">{{ item.name }}</span>