From ba15fbead1b72ea7232db794f0bedd2fbaa97e1b Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Mon, 16 Jun 2014 13:06:02 +0100
Subject: [PATCH] added better comments. tweaked when modal is shown

---
 .../static/wagtailadmin/js/modal-workflow.js    | 17 +++++++++++------
 .../wagtailadmin/scss/components/modals.scss    |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/modal-workflow.js b/wagtail/wagtailadmin/static/wagtailadmin/js/modal-workflow.js
index 6a3cd317e..bba601468 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/modal-workflow.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/modal-workflow.js
@@ -16,7 +16,10 @@ function ModalWorkflow(opts) {
     /* remove any previous modals before continuing (closing doesn't remove them from the dom) */
     $('body > .modal').remove();
 
+    // set default contents of container
     var container = $('<div class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">\n    <div class="modal-dialog">\n        <div class="modal-content">\n            <button type="button" class="close icon text-replace icon-cross" data-dismiss="modal" aria-hidden="true">&times;</button>\n            <div class="modal-body"></div>\n        </div><!-- /.modal-content -->\n    </div><!-- /.modal-dialog -->\n</div>');
+    
+    // add container to body and hide it, so content can be added to it before display
     $('body').append(container);
     container.modal('hide');
 
@@ -51,15 +54,17 @@ function ModalWorkflow(opts) {
         var response = eval('(' + responseText + ')');
 
         self.loadBody(response);
-        container.modal('show');
     };
 
-    self.loadBody = function(body) {
-        if (body.html) {
-            self.body.html(body.html);
+    self.loadBody = function(response) {
+        if (response.html) {
+            // if the response is html
+            self.body.html(response.html);
+            container.modal('show');
         }
-        if (body.onload) {
-            body.onload(self);
+        if (response.onload) {
+            // if the response is a function
+            response.onload(self);
         }
     };
 
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/modals.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/modals.scss
index 6a3293552..053e0d2c8 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/modals.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/modals.scss
@@ -80,7 +80,7 @@ $zindex-modal-background: 500;
     background-color: black;
     // Fade for backdrop
     &.fade { opacity:0; }
-    &.in { opacity:0.7; }
+    &.in { opacity:0.5; }
 }
 
 .modal .close{