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...)

---
 themes/admin_wind/css/screen.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/admin_wind/css/screen.css')

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 {
-- 
cgit v1.2.3


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(-)

(limited to 'themes/admin_wind/css/screen.css')

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


From 73139982c7be10789c27360913b4bc4cbd5cd38e Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Sat, 2 Mar 2013 23:00:02 +0100
Subject: #2032 - Fix short form submit/cancel button formatting. - fixed the
 height of the submit buttons to match the input box - changed the cancel
 links into cancel buttons - added the hover effect to the buttons when used
 in in_place_edit (e.g. admin/tags)

---
 lib/gallery.common.js                        | 3 +++
 modules/gallery/views/in_place_edit.html.php | 2 +-
 themes/admin_wind/css/screen.css             | 7 ++++++-
 themes/wind/css/screen.css                   | 7 ++++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'themes/admin_wind/css/screen.css')

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index c3d1362c..5ff6b397 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -202,6 +202,9 @@
         $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
       }
 
+      // Add the hover effect to the buttons
+      $.fn.gallery_hover_init();
+
       // Set the input value equal to label text
       if (input.val() == "") {
         input.val(label.html());
diff --git a/modules/gallery/views/in_place_edit.html.php b/modules/gallery/views/in_place_edit.html.php
index 2d6cbe90..c2515a03 100644
--- a/modules/gallery/views/in_place_edit.html.php
+++ b/modules/gallery/views/in_place_edit.html.php
@@ -8,7 +8,7 @@
     <li>
       <?= form::submit(array("class" => "submit ui-state-default"), t("Save")) ?>
     </li>
-    <li><a href="#" class="g-cancel"><?= t("Cancel") ?></a></li>
+    <li><button class="g-cancel ui-state-default ui-corner-all"><?= t("Cancel") ?></button></li>
     <? if (!empty($errors["input"])): ?>
     <li>
       <p id="g-in-place-edit-message" class="g-error"><?= $errors["input"] ?></p>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 23d319b2..1deb3cda 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -255,6 +255,10 @@ input[readonly] {
   width: 100%;
 }
 
+.g-short-form .submit {
+  padding: .3em .6em;
+}
+
 .g-short-form .textbox.g-error {
   border: 1px solid #f00;
   color: #f00;
@@ -263,7 +267,8 @@ input[readonly] {
 
 .g-short-form .g-cancel {
   display: block;
-  margin: .3em .8em;
+  margin: 0em .8em;
+  padding: .3em .6em;
 }
 
 #g-sidebar .g-short-form li {
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index c088180d..7ef8e2e4 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -276,6 +276,10 @@ input[readonly] {
   width: 100%;
 }
 
+.g-short-form .submit {
+  padding: .3em .6em;
+}
+
 .g-short-form .textbox.g-error {
   border: 1px solid #f00;
   color: #f00;
@@ -284,7 +288,8 @@ input[readonly] {
 
 .g-short-form .g-cancel {
   display: block;
-  margin: .3em .8em;
+  margin: 0em .8em;
+  padding: .3em .6em;
 }
 
 #g-sidebar .g-short-form li {
-- 
cgit v1.2.3