From f580488fb5914b309a15396611d9b3a9177c65a0 Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Wed, 13 Feb 2013 09:45:12 +0100
Subject: Fix Cancel link positioning, fix watermark error reply (seems to have
 already been broken in v3.0.4...)

---
 lib/gallery.dialog.js            | 7 +++++++
 themes/admin_wind/css/screen.css | 2 +-
 themes/wind/css/screen.css       | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index b1442390..b4557493 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -139,6 +139,13 @@
          },
          success: function(data) {
            if (data.html) {
+             if (data.result == "error") {
+               // This is an odd case that arises from the watermarks module.  This is because we
+               // have a fake xhr, and we rawurlencode the results because the JS code that uploads
+               // the file buffers it in an iframe which entitizes the HTML and makes it difficult
+               // for the JS to process.  See ticket #797.
+               data.html = unescape(data.html);
+             }
              $("#g-dialog").html(data.html);
              $("#g-dialog").dialog("option", "position", "center");
              $("#g-dialog form :submit").removeClass("ui-state-disabled")
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 58942387..23d319b2 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -989,7 +989,7 @@ div#g-action-status {
 }
 
 #g-dialog .g-cancel {
-  margin: .4em 1em;
+  margin: .59em 1em;
 }
 
 #g-panel {
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 0e4819ee..e19427f3 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -1048,7 +1048,7 @@ div#g-action-status {
 }
 
 #g-dialog .g-cancel {
-  margin: .4em 1em;
+  margin: .59em 1em;
 }
 
 #g-panel {
-- 
cgit v1.2.3