From 48b7ae350250e54180ecb9b7b595002e1d9bde30 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 16 May 2016 14:01:34 -0400
Subject: [PATCH] Bug 16400 [Follow-up] Proposal to uniform the placement of
 submit buttons
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This follow-up makes some corrections to the markup of the cancel
button:

- Use <a> instead of <button> to eliminate the need for an "onclick"
  attribute.
- Remove the "cancel" class which adds unwanted padding.
- Correct the destination of the cancel button when cancelling during an
  edit (should redirect to the patron detail page).

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b77bd31fbf9c3a1b1feaa29a61e9d0805a1dec2d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 616c48a830..17eeb5ba54 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -183,12 +183,12 @@ $(document).ready(function() {
 [% UNLESS ( check_member ) %]
     <button class="btn btn-small" id="saverecord" type="submit" name="save" onclick="return check_form_borrowers();"><i class="fa fa-save"></i> Save</button>
     [% IF opadd %]
-    <button class="btn btn-small cancel" onclick="/cgi-bin/koha/members/member.pl">
+        <a class="btn btn-small" href="/cgi-bin/koha/members/member.pl">
     [% ELSE %]
-    <a class='btn btn-small cancel" onclick="/cgi-bin/koha/members/member.pl?borrowernumber=[% borrowernumber %]">
+        <a class="btn btn-small" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
     [% END %]
         <i class="fa fa-times"></i> Cancel
-    </button>
+    </a>
 [% END %]
 </div>
 
-- 
2.39.5