From be529c2b2b45070293bb88bcaf30e32bcd0bdb80 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 16 May 2016 11:56:04 +0100
Subject: [PATCH] Bug 16400: Use the fa-times icon for Cancel
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f9d239dabad5459bf08dbf135f57d8186ff11e3c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 .../prog/en/modules/members/memberentrygen.tt | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 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 9786cf325d..616c48a830 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -181,19 +181,14 @@ $(document).ready(function() {
 [% END %]
 <div id="toolbar" class="btn-toolbar">
 [% UNLESS ( check_member ) %]
-    <div class="btn-group">
-        <button class="btn btn-small" id="saverecord" type="submit" name="save" onclick="return check_form_borrowers();"><i class="fa fa-save"></i> Save</button>
-    </div>
+    <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 %]
-            <a class="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a>
-            <div class="btn-group">
-                <a class="btn btn-small cancel" id="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a>
-            </div>
-       [% ELSE %]
-            <div class="btn-group">
-                <a class="btn btn-small cancel" id="cancel" href="/cgi-bin/koha/members/member.pl?borrowernumber=[% borrowernumber %]">Cancel</a>
-            </div>
-        [% END %]
+    <button class="btn btn-small cancel" onclick="/cgi-bin/koha/members/member.pl">
+    [% ELSE %]
+    <a class='btn btn-small cancel" onclick="/cgi-bin/koha/members/member.pl?borrowernumber=[% borrowernumber %]">
+    [% END %]
+        <i class="fa fa-times"></i> Cancel
+    </button>
 [% END %]
 </div>
 
-- 
2.39.5