From ad8e96b83b184fbd8b09253dee8c4ada088e4992 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 14 Mar 2016 11:07:14 -0400
Subject: [PATCH] Bug 16065 - Use Font Awesome icons in dialog when duplicate
 patron is suspected
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch updates the new patron template to use Font Awesome icons in
the dialog which is shown when a duplicate patron is suspected.

The patch modifies the CSS rules for a dialog button with "white-space:
pre-line" so that line breaks in button text markup are treated as line
breaks on display. Allowing the text to wrap prevents the buttons from
being too wide and stacking one below the other.

To test, apply the patch and go to Patrons -> New patron.

- Attempt to save a new patron with details matching an existing patron
  in order to trigger the duplicate patron warning.
- Confirm that the resulting dialog is styled correctly.
- Confirm the behavior of both the 'Edit existing' and 'Save as new'
  buttons.

Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
---
 koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css      | 1 +
 .../prog/en/modules/members/memberentrygen.tt             | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index e6116ce160..25a940c0e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1203,6 +1203,7 @@ div.alert strong {
     border-left-color: #666;
     margin : .4em;
     padding : .4em;
+    white-space: pre-line;
 }
 
 .dialog button:hover {
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 d470166b41..3a8f7c345d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -206,16 +206,18 @@ function select_user(borrowernumber, borrower) {
 	[% IF ( check_member ) %]
 			<div class="dialog alert">
 				<h3>Duplicate patron record?</h3>
-				<p><a class="popup" href="javascript:Dopop('moremember.pl?print=brief&amp;borrowernumber=[% check_member %]');" >View existing record</a></p>
+                <p><a class="popup" href="#" onclick="Dopop('moremember.pl?print=brief&amp;borrowernumber=[% check_member %]');return false;" >View existing record</a></p>
                 <form action="/cgi-bin/koha/members/memberentry.pl" method="get">
                     <input type="hidden" name="op" value="modify" />
                     <input type="hidden" name="borrowernumber" value="[% check_member %]" />
-                    <input class="edit" type="submit" value="It is a duplicate. Edit existing record" />
+                    <button type="submit" class="new"><i class="fa fa-pencil"></i> It is a duplicate.
+                    Edit existing record</button>
                 </form>
 
                 <form name="form_double" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off">
 				<input type="hidden" name="nodouble" value="1" />
-				<input class="new" type="submit" value="Not a duplicate. Save as new record" />
+                <button type="submit" class="new"><i class="fa fa-plus"></i> Not a duplicate.
+                Save as new record</button>
 			</div>
 	[% END %]
 
-- 
2.39.5