From b95bdb4354b7a9245b6db258f28d711fc00d089f Mon Sep 17 00:00:00 2001 From: Hector Castro Date: Wed, 4 May 2016 15:49:58 -0600 Subject: [PATCH] Bug 16456: Add Font Awesome icons to some buttons in Tools module, section Patrons and circulation Add Font Awesome Icons to section Patrons and circulation in Tools module (Save, Upload, Filter, Import) To test goto: -Patron lists -> New patron List -> Save -Patron list -> my_list_saved -> Add patrons -> Remove selected patrons, Clear all, Select all -Comments -> Approve, delete and, unapprove -Import patrons -> Import -Overdue notice/status triggers -> Save changes -Batch patron modification -> Save, Select all and Clear all -Upload patron images -> Upload -Tags -> Apply filter(s), Test, Approved, Reject, Select all, Clear all, Select all pending. Set TagsModeration to Require. -Verify that all tools work as expected NOTE: The Tag and Comments tools has been revised to fit with others interfaces in Koha. --- .../prog/en/modules/patron_lists/add-modify.tt | 2 +- .../prog/en/modules/patron_lists/list.tt | 6 +- .../prog/en/modules/reviews/reviewswaiting.tt | 4 +- .../intranet-tmpl/prog/en/modules/tags/review.tt | 58 ++++++++++---------- .../prog/en/modules/tools/import_borrowers.tt | 2 +- .../prog/en/modules/tools/modborrowers.tt | 4 +- .../prog/en/modules/tools/overduerules.tt | 2 +- .../prog/en/modules/tools/picture-upload.tt | 9 ++- 8 files changed, 43 insertions(+), 44 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt index 6f8408d..50d3e8c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt @@ -57,7 +57,7 @@
- + Cancel
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt index fb6415c..b828c3c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt @@ -102,8 +102,8 @@ $(document).ready(function() {
- Select all | - Clear all | + Select all | + Clear all |
@@ -152,7 +152,7 @@ $(document).ready(function() { - +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt index b609d83..65cb829 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt @@ -53,8 +53,8 @@ [% review.review |html %] - [% IF ( status ) %]Unapprove[% ELSE %]Approve[% END %] | - Delete + [% IF ( status ) %] Unapprove[% ELSE %] Approve[% END %] + Delete [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt index 430a2a5..55a2e21 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt @@ -74,11 +74,11 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } var success_test_call = function() { $('#test_button').prop('disabled', false); - $('#test_button').attr("value",_("Test")); + $('#test_button').html("" +_(" Test")); }; $(document).ready(function() { $('.ajax_buttons' ).css({visibility:"visible"}); - $("p.check").html(""+_("Select:")+" <\/strong>"+_("All")+"<\/a> "+_("Pending")+"<\/a> "+_("None")+"<\/a>"); + $("p.check").html(""); $("#CheckAll").click(function(){ $(".checkboxed").checkCheckboxes(); return false; @@ -99,8 +99,8 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } "data": {ok: $(event.target).attr("title")}, "success": count_approve // success_approve }); - $(event.target).next(".rej").prop('disabled', false).attr("value",_("Reject")).css("color","#000"); - $(event.target).attr( "value",_("Approved")).prop('disabled', true).css("color","#666"); + $(event.target).next(".rej").prop('disabled', false).text(_("Reject")).css("color","#000"); + $(event.target).text(_("Approved")).prop('disabled', true).css("color","#666"); return false; // cancel submit } if ($(event.target).is('.rej')) { @@ -108,12 +108,12 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } "data": {rej: $(event.target).attr("title")}, "success": count_reject // success_reject }); - $(event.target).prev(".ok").prop('disabled', false).attr("value",_("Approve")).css("color","#000"); - $(event.target).attr( "value",_("Rejected")).prop('disabled', true).css("color","#666"); + $(event.target).prev(".ok").prop('disabled', false).text(_("Approve")).css("color","#000"); + $(event.target).text(_("Rejected")).prop('disabled', true).css("color","#666"); return false; // cancel submit } if ($(event.target).is('#test_button')) { - $(event.target).attr( "value",_("Testing...")).prop('disabled', true); + $(event.target).text(_("Testing...")).prop('disabled', true); $.ajax({ "data": {test: $('#test').attr("value")}, "success": success_test_call // success_reject @@ -253,11 +253,11 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } [% IF ( tagloo.approved ) %] @@ -265,8 +265,8 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } [% ELSE %] [% UNLESS ( filter_approved_pending ) %] [% END %] @@ -280,8 +280,8 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } [% END %] [% IF ( tagloop ) %]
- - + +
[% END %] @@ -289,18 +289,18 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }

Terms summary

 
@@ -309,7 +309,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
Enter a word or phrase to check against approved/rejected lists:
-
+
[% IF ( test_term ) %] [% IF ( verdict_ok ) %] @@ -360,7 +360,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
[% INCLUDE 'date-format.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt index f31d7da..0e0d055 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt @@ -191,7 +191,7 @@ [% END %] -
+
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt index 8d50d70..47ffa76 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -216,7 +216,7 @@
[% IF ( borrowers ) %] - + [% END %] [% END %] [% IF borrowers %] @@ -363,7 +363,7 @@
- + Cancel
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt index 190949a..863e1ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt @@ -163,7 +163,7 @@ $(document).ready(function() { -
+
[% ELSE %]
You don't have patron categories defined, or the patron categories are not set to receive overdue notices.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt index 3b1305f..cdf5f40 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt @@ -141,15 +141,14 @@ Required - +
- - Cancel + + Cancel
- - + [% END %]
-- 1.7.10.4