From bb86f21e8ebff2e38ca388d17b393dfc2eb5f600 Mon Sep 17 00:00:00 2001 From: Hector Castro <hector.hecaxmmx@gmail.com> 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 | 46 ++++++++++---------- .../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, 37 insertions(+), 38 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 @@ <fieldset class="action"> <input type="hidden" name="patron_list_id" value="[% list.patron_list_id %]" /> - <input type="submit" value="Save" /> + <button type="submit" class="btn btn-small"><i class="fa fa-floppy-o" aria-hidden="true"></i> Save</button> <a href="lists.pl" class="cancel">Cancel</a> </fieldset> </form> 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() { <form action="list.pl" id="remove_patrons" method="post"> <div id="searchheader"> - <span class="checkall"><a id="CheckAll" href="#">Select all</a></span> | - <span class="clearall"><a id="CheckNone" href="#">Clear all</a></span> | + <span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | + <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span> | <div class="btn-group"> <button class="btn btn-mini list-remove" type="submit"><i class="fa fa-times-circle"></i> Remove selected</button> </div> @@ -152,7 +152,7 @@ $(document).ready(function() { </table> <input type="hidden" name="patron_list_id" value="[% list.patron_list_id %]" /> - <input type="submit" value="Remove selected patrons" /> + <button type="submit" class="btn btn-small"><i class="fa fa-times-circle" aria-hidden="true"></i> Remove selected patrons</button> </form> </div> 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..2020db0 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 %] </td> <td> - [% IF ( status ) %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=unapprove&reviewid=[% review.reviewid %]">Unapprove</a>[% ELSE %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&reviewid=[% review.reviewid %]">Approve</a>[% END %] | - <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=delete&reviewid=[% review.reviewid %]">Delete</a> + [% IF ( status ) %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=unapprove&reviewid=[% review.reviewid %]" class="btn btn-mini"><i class="fa fa-remove"></i> Unapprove</a>[% ELSE %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&reviewid=[% review.reviewid %]" class="btn btn-mini"><i class="fa fa-check"></i> Approve</a>[% END %] + <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=delete&reviewid=[% review.reviewid %]" class="btn btn-mini"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a> </td> </tr> [% END %]</tbody> 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..bb680a1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt @@ -78,7 +78,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } }; $(document).ready(function() { $('.ajax_buttons' ).css({visibility:"visible"}); - $("p.check").html("<strong>"+_("Select:")+" <\/strong><a id=\"CheckAll\" href=\"/cgi-bin/koha/tags/review.pl\">"+_("All")+"<\/a> <a id=\"CheckPending\" href=\"/cgi-bin/koha/tags/review.pl\">"+_("Pending")+"<\/a> <a id=\"CheckNone\" href=\"/cgi-bin/koha/tags/review.pl\">"+_("None")+"<\/a>"); + $("p.check").html("<div id='searchheader'><a id=\"CheckAll\" href=\"/cgi-bin/koha/tags/review.pl\"><i class='fa fa-check'></i>"+_(" Select all")+"<\/a> | <a id=\"CheckPending\" href=\"/cgi-bin/koha/tags/review.pl\"><i class='fa fa-clock-o'></i>"+_(" Select all pending")+"<\/a> | <a id=\"CheckNone\" href=\"/cgi-bin/koha/tags/review.pl\"><i class='fa fa-remove'></i>"+_(" Clear all")+"<\/a></div>"); $("#CheckAll").click(function(){ $(".checkboxed").checkCheckboxes(); return false; @@ -253,11 +253,11 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } [% IF ( tagloo.approved ) %] <td class="actions"><span class="ajax_buttons" style="visibility:hidden"> [% IF ( tagloo.approved == -1 ) %] - <input class="ok" type="submit" title="[% tagloo.term %]" value="Approve" name="approve" /> - <input class="rej" disabled="disabled" type="submit" title="[% tagloo.term %]" value="Rejected" name="reject" /> + <button class="ok btn btn-mini" type="submit" title="[% tagloo.term %]" value="Approve" name="approve"><i class="fa fa-check"></i> Approve</button> + <button class="rej btn btn-mini" disabled="disabled" type="submit" title="[% tagloo.term %]" value="Rejected" name="reject"><i class="fa fa-remove"></i> Rejected</button> [% ELSE %] - <input class="ok" disabled="disabled" type="submit" title="[% tagloo.term %]" value="Approved" name="approve" /> - <input class="rej" type="submit" title="[% tagloo.term %]" value="Reject" name="reject" /> + <button class="ok btn btn-mini" disabled="disabled" type="submit" title="[% tagloo.term %]" value="Approved" name="approve"><i class="fa fa-check"></i> Approved</button> + <button class="rej btn btn-mini" type="submit" title="[% tagloo.term %]" value="Reject" name="reject"><i class="fa fa-remove"></i> Reject</button> [% END %] </span> </td> @@ -265,8 +265,8 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } </td> [% ELSE %] <td class="actions"><span class="ajax_buttons" style="visibility:hidden"> - <input class="ok" type="submit" title="[% tagloo.term %]" value="Approve" name="approve" /> - <input class="rej" type="submit" title="[% tagloo.term %]" value="Reject" name="reject" /> + <button class="ok btn btn-mini" type="submit" title="[% tagloo.term %]" value="Approve" name="approve"><i class="fa fa-check"></i> Approve</button> + <button class="rej btn btn-mini" type="submit" title="[% tagloo.term %]" value="Reject" name="reject"><i class="fa fa-remove"></i> Reject</button> </span> </td> [% UNLESS ( filter_approved_pending ) %]<td> </td>[% END %] @@ -280,8 +280,8 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } </table> [% END %] [% IF ( tagloop ) %]<fieldset class="action"> - <input type="submit" value="Approve" id="approve_button" name="op-approve" /> - <input type="submit" value="Reject" id="reject_button" name="op-reject" /> + <button type="submit" value="Approve" class="btn btn-small" id="approve_button" name="op-approve"><i class="fa fa-check"></i> Approve</button> + <button type="submit" value="Reject" class="btn btn-small" id="reject_button" name="op-reject"><i class="fa fa-remove"></i> Reject</button> </fieldset>[% END %] </form> </div> @@ -289,18 +289,18 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } <fieldset class="brief"> <h4>Terms summary</h4> <ul> - <li><a href="/cgi-bin/koha/tags/review.pl?approved=1">Approved</a>: - <span id="terms_summary_approved_count">[% approved_count %]</span> - </li> - <li><a href="/cgi-bin/koha/tags/review.pl?approved=-1">Rejected</a>: - <span id="terms_summary_rejected_count">[% rejected_count %]</span> - </li> - <li><a href="/cgi-bin/koha/tags/review.pl?approved=0">Pending</a>: - <span id="terms_summary_unapproved_count">[% unapproved_count %]</span> - </li> - <li><a href="/cgi-bin/koha/tags/review.pl?approved=all">Total</a>: - <span id="terms_summary_approved_total">[% approved_total %]</span> - </li> + <li><a href="/cgi-bin/koha/tags/review.pl?approved=1"><i class="fa fa-check" aria-hidden="true"></i> Approved</a>: + <span id="terms_summary_approved_count">[% approved_count %]</span> + </li> + <li><a href="/cgi-bin/koha/tags/review.pl?approved=-1"><i class="fa fa-remove" aria-hidden="true"></i> Rejected</a>: + <span id="terms_summary_rejected_count">[% rejected_count %]</span> + </li> + <li><a href="/cgi-bin/koha/tags/review.pl?approved=0"><i class="fa fa-clock-o"></i> Pending</a>: + <span id="terms_summary_unapproved_count">[% unapproved_count %]</span> + </li> + <li><a href="/cgi-bin/koha/tags/review.pl?approved=all"><i class="fa fa-plus" aria-hidden="true"></i> Total</a>: + <span id="terms_summary_approved_total">[% approved_total %]</span> + </li> </ul> <span id="terms_summary_status"> </span> </fieldset> @@ -309,7 +309,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } <div class="description">Enter a word or phrase to check against approved/rejected lists: </div> <form method="post" action="/cgi-bin/koha/tags/review.pl"> <input type="text" size="14" name="test" id="test" /> - <fieldset class="action"><input type="submit" value="Test" id="test_button" name="op-test" /></fieldset> + <fieldset class="action"><button type="submit" value="Test" class="btn btn-small" id="test_button" name="op-test" ><i class="fa fa-check-square-o" aria-hidden="true"></i> Test</button></fieldset> <div id="verdict"> [% IF ( test_term ) %] [% IF ( verdict_ok ) %] @@ -360,7 +360,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } <div class="hint">[% INCLUDE 'date-format.inc' %]</div> </li> </ol> - <fieldset class="action"><input type="submit" value="Apply filter(s)" /></fieldset> + <fieldset class="action"><button type="submit" class="btn btn-small"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset> </fieldset> </form> </div> 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 @@ </ol> </fieldset> [% END %] - <fieldset class="action"><input type="submit" value="Import" /></fieldset> + <fieldset class="action"><button type="submit" class="btn btn-small"><i class="fa fa-database" aria-hidden="true"></i> Import</button></fieldset> </form> [% END %] </div> 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 @@ <form name="f" action="modborrowers.pl" method="post"> <input type="hidden" name="op" value="do" /> [% IF ( borrowers ) %] - <div id="toolbar"><a id="selectallbutton" href="#">Select all</a> | <a id="clearallbutton" href="#">Clear all</a></div> + <div id="toolbar"><a id="selectallbutton" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="clearallbutton" href="#"><i class="fa fa-remove"></i> Clear all</a></div> [% END %] [% END %] [% IF borrowers %] @@ -363,7 +363,7 @@ </ol> </fieldset> <fieldset class="action"> - <input type="submit" name="mainformsubmit" value="Save" /> + <button type="submit" name="mainformsubmit" class="btn btn-small"><i class="fa fa-floppy-o" aria-hidden="true"></i> Save</button> <a href="/cgi-bin/koha/tools/modborrowers.pl" class="cancel">Cancel</a> </fieldset> </div> 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() { </div> - <fieldset class="action"><input type="submit" value="Save changes" /></fieldset> + <fieldset class="action"><button type="submit" class="btn btn-small"><i class="fa fa-floppy-o" aria-hidden="true"></i> Save changes</button></fieldset> </form> [% ELSE %] <div class="warning">You don't have patron categories defined, or the patron categories are not set to receive overdue notices.</div> 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 @@ <span class="required">Required</span> </li> </ol> - </fieldset> + </fieldset> <fieldset class="action"> <input type="hidden" name="op" value="Upload" /> - <input type="submit" value="Upload" class="submit" /> - <a href="/cgi-bin/koha/tools/tools-home.pl" class="cancel">Cancel</a> + <button type="submit" class="btn btn-small"><i class="fa fa-upload" aria-hidden="true"></i> Upload</button> + <a href="/cgi-bin/koha/tools/tools-home.pl" class="cancel">Cancel</a> </fieldset> </form> - - </div> + </div> [% END %] </div> <div class="yui-b noprint"> -- 1.7.10.4