From 8056a8ea214bf89464d2363991e82dc29ac81d99 Mon Sep 17 00:00:00 2001 From: Hector Castro Date: Fri, 8 Jul 2016 15:52:06 -0600 Subject: [PATCH] Bug 16888: Add Font Awesome Icons to Members Add Font Awesome Icons to: - "Select/Clear all" links to pay.tt (Pay fines tab) - "Filter icon" in "filter paid transactions" to Accout tab (boraccount.tt) - "Trash icon" to Remove option in "Manual restrictions" (borrower_debarments.inc) also add "Ban and plus icon" to "Add manual restriction" To test: -Apply patch -Select a patron who has fines -Go to "Fines->Pay fines" tabs and see the icons in "Select/Clear all" -Choose the "Account" tab and sse the icon in "Filter paid transactions" -Select the "Check out" tab and go to "Restrictions" -Add a manual restriction and notice about the two new icons fa-plus and fa-band -See the new button btn-mini and the fa-trash icon -Verify that all works as expected --- .../intranet-tmpl/prog/en/includes/borrower_debarments.inc | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc index b0e3230..a9d80cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc @@ -66,8 +66,8 @@ [% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] Indefinite [% END %] [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %] - - Remove + + Remove [% END %] @@ -77,12 +77,12 @@ [% END %] [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %] -

Add manual restriction

+

Add manual restriction

- Add manual restriction + Add manual restriction
  1. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index 5eb3c40..ca0a804 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -18,15 +18,15 @@ $(document).ready(function() { { "bSortable": false, "bSearchable": false, "aTargets": [-1] } ] })); - $("#filter_c").html('

    '+txtActivefilter+''); + $("#filter_c").html('

    '+txtActivefilter+''); $('#filter_transacs').click(function(e) { e.preventDefault(); if ($(this).hasClass('filtered')) { var filteredValue = ''; - $(this).text(txtActivefilter); + $(this).html(' '+txtActivefilter); } else { //Not filtered. Let's do it! var filteredValue = '^((?!0.00).*)$'; //Filter not matching 0.00 http://stackoverflow.com/a/406408 - $(this).text(txtInactivefilter); + $(this).html(' '+txtInactivefilter); } table_account_fines.fnFilter(filteredValue, 4, true, false); $(this).toggleClass('filtered'); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt index ee57b27..cb635b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -68,7 +68,7 @@ function enableCheckboxActions(){ [% IF ( accounts ) %] -

    Select all | Clear all

    +

    Select all | Clear all

    -- 1.7.10.4