From a2bd9211757a383a6fa0352dca6c3edae71cf0af Mon Sep 17 00:00:00 2001 From: Aleisha Date: Mon, 15 Feb 2016 22:14:43 +0000 Subject: [PATCH] Bug 15821: Use Font Awesome icons in confirmation dialogs - Circulation To test, apply the patch and test deletion in the following cases. Test both confirmation and cancel actions. Circulation -> Check out -> An item that is checked out by someone else -> An item that is on hold to someone else -> To a patron that has more than noisuescharge in fines (Allow AllowFineOverride syspref) -> To a patron that has reached the max amount of checkouts (Allow AllowTooManyOverride syspref) -> To a patron that has more than noissuescharge in fines (Allow AllowFineOverride syspref and set noissuescharge syspref) -> Renew -> An item that is on hold to someone else -> To a patron that is at max renewals (Allow AllowRenewalLimitOverride syspref) -> An item that is not checked out by anyone -> Check in -> An item that is in transit to another branch And look for other confirmation dialogs and check if I've missed any Sponsored-by: Catalyst IT --- .../prog/en/modules/circ/circulation.tt | 18 +++++------ .../en/modules/circ/circulation_batch_checkouts.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/renew.tt | 12 ++++---- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 32 +++++++++----------- 4 files changed, 31 insertions(+), 33 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 6fd722c..c321861 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -363,9 +363,9 @@ $(document).ready(function() { [% IF ( RENEW_ISSUE ) %] - + [% ELSE %] - + [% END %] @@ -377,7 +377,7 @@ $(document).ready(function() { - + [% END %] @@ -387,7 +387,7 @@ $(document).ready(function() { - + [% END %] @@ -399,18 +399,18 @@ $(document).ready(function() { [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %] [% IF ( RENEW_ISSUE ) %] - + [% ELSE %] - + [% END %] [% ELSE %] - + [% END %] [% END %] @@ -451,7 +451,7 @@ $(document).ready(function() { - + [% END %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt index d73348c..bd3067f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt @@ -275,7 +275,7 @@ $(document).ready(function() { - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt index 5a33706..011ca67 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -49,7 +49,7 @@
- + [% END %] @@ -61,7 +61,7 @@
- +
[% END %] @@ -73,7 +73,7 @@
- +
[% END %] @@ -85,7 +85,7 @@
- +
[% END %] @@ -97,7 +97,7 @@ - + [% ELSIF error == "patron_restricted" %] @@ -111,7 +111,7 @@ [% END %]
- +
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index a56b8e6..13b7aaf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -181,7 +181,7 @@ $(document).ready(function () {

Please return item to: [% Branches.GetName( TransferWaitingAt ) %]

[% itembarcode |html %]: [% title |html %]

- + [% IF ( wborcnum ) %]
Hold for:
  • [% borsurname %], [% borfirstname %] ([% borcnum %])
  • @@ -196,11 +196,11 @@ $(document).ready(function () { - + - + @@ -234,10 +234,8 @@ $(document).ready(function () { [% END %]
    - - - - + + [% FOREACH inputloo IN inputloop %] @@ -283,11 +281,11 @@ $(document).ready(function () { [% END %] - + - + [% FOREACH inputloo IN inputloop %] @@ -320,10 +318,10 @@ $(document).ready(function () { Transfer now?
    [% IF itemnumber %] - + [% END %] - - + + @@ -396,13 +394,13 @@ $(document).ready(function () { [% IF ( transfertodo ) %] - - + + + [% END %] - + [% FOREACH inputloo IN inputloop %] -- 1.7.10.4