From f132a76b9d9eb532a7a77f7b621b0922249fa3a9 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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=UTF-8 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 Signed-off-by: Jonathan Druart --- koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css | 1 + koha-tmpl/intranet-tmpl/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 e6116ce..25a940c 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 d470166..3a8f7c3 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 ) %]

Duplicate patron record?

-

View existing record

+

View existing record

- +
- +
[% END %] -- 2.7.0