From 1b4cc91ec8f493df03c07640f0377bbd1766ca7b Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 31 Mar 2016 01:23:58 +0100
Subject: [PATCH 1/2] Added WYSIWYG editor. Works for notes & description,
 fails miserably for items :(

---
 RIGS/templates/RIGS/event_form.html | 20 ++++++++++++++------
 RIGS/templates/RIGS/item_modal.html |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html
index 282f3669..28e6be28 100644
--- a/RIGS/templates/RIGS/event_form.html
+++ b/RIGS/templates/RIGS/event_form.html
@@ -8,11 +8,13 @@
 {% block css %}
     <link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
     <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
+    <link rel="stylesheet" href="//cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
 {% endblock %}
 
 {% block preload_js %}
     <script src="{% static "js/bootstrap-select.js" %}"></script>
     <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
+    <script src="//cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>
 {% endblock %}
 
 {% block js %}
@@ -40,6 +42,15 @@
         }
 
         $(document).ready(function () {
+
+            $(".md-enabled").each(function(index){
+                editor = new SimpleMDE({ 
+                    element: $(".md-enabled")[index],
+                    toolbar: ["bold", "italic", "strikethrough", "|", "unordered-list", "ordered-list", "|", "link", "|", "preview", "guide"],
+                    status: false,
+                });
+            });
+
             {% if not object.pk and not form.errors %}
 
                 $('.form-hws').slideUp(function () {
@@ -225,11 +236,8 @@
             <div class="panel-heading">Event Description</div>
             <div class="panel-body">
                 <div class="form-group" data-toggle="tooltip" title="A short description of the event, shown on rigboard and on paperwork. MD enabled.">
-                    <label for="{{ form.description.id_for_label }}"
-                           class="col-sm-4 control-label">{{ form.description.label }}</label>
-
-                    <div class="col-sm-8">
-                        {% render_field form.description class+="form-control" %}
+                    <div class="col-sm-12">
+                        {% render_field form.description class+="form-control md-enabled" %}
                     </div>
                 </div>
             </div>
@@ -424,7 +432,7 @@
                 <div class="col-sm-12">
                     <div class="form-group" data-toggle="tooltip" title="Notes on the event. This is only visible to keyholders, and is not displayed on the paperwork. MD enabled.">
                         <label for="{{ form.notes.id_for_label }}">{{ form.notes.label }}</label>
-                        {% render_field form.notes class+="form-control" %}
+                        {% render_field form.notes class+="form-control md-enabled" %}
                     </div>
                 </div>
                 {% include "RIGS/item_table.html" %}
diff --git a/RIGS/templates/RIGS/item_modal.html b/RIGS/templates/RIGS/item_modal.html
index 6991c585..ddf20d59 100644
--- a/RIGS/templates/RIGS/item_modal.html
+++ b/RIGS/templates/RIGS/item_modal.html
@@ -27,7 +27,7 @@
                         <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"
+                            <textarea type="text" placeholder="Description" class="form-control md-enabled"
                                       id="item_description" rows="8"></textarea>
                         </div>
                     </div>

From 02c615a08ce7c38c0fe43c895173645f76910fdb Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Sat, 2 Apr 2016 02:42:37 +0100
Subject: [PATCH 2/2] Fixed for event items. Will probably fail tests because
 selenium can't type in simpleMDE :(

---
 RIGS/static/js/interaction.js       | 10 ++++++++++
 RIGS/templates/RIGS/event_form.html | 14 ++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/RIGS/static/js/interaction.js b/RIGS/static/js/interaction.js
index dffcf6bc..bc329724 100644
--- a/RIGS/static/js/interaction.js
+++ b/RIGS/static/js/interaction.js
@@ -36,6 +36,16 @@ function updatePrices() {
     $('#total').text(parseFloat(sum + vat).toFixed(2));
 }
 
+function setupMDE(selector) {
+    editor = new SimpleMDE({ 
+        element: $(selector)[0],
+        forceSync: true,
+        toolbar: ["bold", "italic", "strikethrough", "|", "unordered-list", "ordered-list", "|", "link", "|", "preview", "guide"],
+        status: true,
+    });
+    $(selector).data('mde_editor',editor);
+}
+
 $('#item-table').on('click', '.item-delete', function () {
     delete objectitems[$(this).data('pk')]
     $('#item-' + $(this).data('pk')).remove();
diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html
index 28e6be28..2ea1a931 100644
--- a/RIGS/templates/RIGS/event_form.html
+++ b/RIGS/templates/RIGS/event_form.html
@@ -43,12 +43,14 @@
 
         $(document).ready(function () {
 
-            $(".md-enabled").each(function(index){
-                editor = new SimpleMDE({ 
-                    element: $(".md-enabled")[index],
-                    toolbar: ["bold", "italic", "strikethrough", "|", "unordered-list", "ordered-list", "|", "link", "|", "preview", "guide"],
-                    status: false,
-                });
+            setupMDE('#id_description');
+            setupMDE('#id_notes');
+            setupMDE('#item_description');
+
+            $('#itemModal').on('shown.bs.modal', function (e) {
+                $('#item_description').data('mde_editor').value(
+                    $('#item_description').val()
+                    );
             });
 
             {% if not object.pk and not form.errors %}