From b83abf728fcc326d204e73ad7d0016b93e181269 Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Sat, 2 Mar 2013 12:28:49 +0100
Subject: #1639 - Make dialog "Cancel" links into buttons like "Submit" -
 modified gallery.dialog.js: made cancel a <button>, added same classes as
 submit - modified screen.css to size/position the cancel buttons correctly

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

diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 8fe85165..1c810171 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -96,11 +96,11 @@
     form_loaded: function(event, ui) {
       // Should be defined (and localized) in the theme
       MSG_CANCEL = MSG_CANCEL || 'Cancel';
-      var eCancel = '<a href="#" class="g-cancel g-left">' + MSG_CANCEL + '</a>';
+      var eCancel = '<button class="g-cancel ui-state-default ui-corner-all">' + MSG_CANCEL + '</button>';
       if ($("#g-dialog .submit").length) {
         $("#g-dialog .submit").addClass("ui-state-default ui-corner-all");
-        $.fn.gallery_hover_init();
         $("#g-dialog .submit").parent().append(eCancel);
+        $.fn.gallery_hover_init();
         $("#g-dialog .g-cancel").click(function(event) {
           $("#g-dialog").dialog("close");
           event.preventDefault();
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 23d319b2..be82fb39 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -989,7 +989,9 @@ div#g-action-status {
 }
 
 #g-dialog .g-cancel {
-  margin: .59em 1em;
+  margin: 0 .3em;
+  float: left;
+  padding: .2em;
 }
 
 #g-panel {
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index c088180d..8478f6ae 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -1039,7 +1039,9 @@ div#g-action-status {
 }
 
 #g-dialog .g-cancel {
-  margin: .59em 1em;
+  margin: 0 .3em;
+  float: left;
+  padding: .2em;
 }
 
 #g-panel {
-- 
cgit v1.2.3