diff options
| -rw-r--r-- | lib/gallery.dialog.js | 7 | ||||
| -rw-r--r-- | themes/admin_wind/css/screen.css | 2 | ||||
| -rw-r--r-- | 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 { |