Bugzilla – Attachment 51657 Details for
Bug 16005
Standardize use of icons for delete and cancel operations
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16005 - Standardize use of icons for delete and cancel operations
Bug-16005---Standardize-use-of-icons-for-delete-an.patch (text/plain), 27.95 KB, created by
Marc Véron
on 2016-05-20 14:08:25 UTC
(
hide
)
Description:
Bug 16005 - Standardize use of icons for delete and cancel operations
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2016-05-20 14:08:25 UTC
Size:
27.95 KB
patch
obsolete
>From 93fcb7de8ccafad309aa9a99e4c6c25ea1529bd3 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 19 May 2016 12:28:08 -0400 >Subject: [PATCH] Bug 16005 - Standardize use of icons for delete and cancel > operations >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >This patch makes changes to Font Awesome icons in order to make icon >choice consistent for common actions. > ><i class="fa fa-trash"></i> where something is deleted, removed, or >emptied. > ><i class="fa fa-remove"></i> where an operation is cancelled (also where >selections are cancelled, as in checkboxes). > ><i class="fa fa-times-circle"></i> for "close," as in baskets and >windows. > >To test, apply the patch and view the following pages to confirm that >the correct icon is used: > >- Acquisitions -> Vendor -> Vendor delete button. >- Acquisitions -> Vendor -> Edit -> Delete contact button. >- Acquisitions -> Invoices -> Delete menu item. >- Cataloging -> Edit record -> Authority search pop-up (triggered from > the tag editor for a tag linked to an authority) -> Clear field button >- Authorities -> Authority detail -> Delete button. >- Tools -> Quotes editor -> Quotes delete button. >- Reports -> View saved report -> Delete button. >- Reports -> Saved reports -> Delete menu item. >- Serials -> Subscription details -> Subscription close button. >- Administration -> Budgets -> Delete menu item. >- Administration -> Item search fields -> Delete button. >- Administration -> Z39.50/SRU servers -> Delete menu item. >- Catalog -> Advanced search -> Clear fields link. >- Cataloging -> Advanced editor -> Macros -> Delete macro button. >- Circulation -> Checkout -> Check out an item which is on hold for > another patron. "Cancel checkout and place hold" button now uses the > icon used elsewhere for holds. >- Course reserves -> Course -> Delete course button. >- Patrons -> Patron lists -> Add patrons -> Remove selected button. >- Acquisitions -> Suggestions -> Suggestion details -> Delete button. >- Lists -> List contents -> Remove selected button. > >Followed test plan, works as expected. >Signed-off-by: Marc Véron <veron@veron.ch> >--- > .../intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc | 2 +- > .../intranet-tmpl/prog/en/includes/auth-finder-search.inc | 2 +- > .../intranet-tmpl/prog/en/includes/authorities-toolbar.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc | 2 +- > .../prog/en/includes/rotating-collections-toolbar.inc | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc | 10 +++++----- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt | 2 +- > .../intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt | 2 +- > .../prog/en/modules/admin/items_search_fields.tt | 2 +- > .../intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 2 +- > .../intranet-tmpl/prog/en/modules/catalogue/advsearch.tt | 2 +- > .../intranet-tmpl/prog/en/modules/cataloguing/editor.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- > .../prog/en/modules/course_reserves/course-details.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt | 2 +- > .../prog/en/modules/reports/guided_reports_start.tt | 2 +- > .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 2 +- > .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt | 2 +- > 20 files changed, 26 insertions(+), 26 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >index 41e9b5c..af24d52 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >@@ -28,7 +28,7 @@ function confirm_deletion() { > [% IF ( CAN_user_acquisition_vendors_manage ) %] > <div class="btn-group"><a class="btn btn-small" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=enter"><i class="fa fa-pencil"></i> Edit vendor</a></div> > [% UNLESS ( basketcount OR subscriptioncount ) %] >- <div class="btn-group"><a class="btn btn-small" id="deletesupplier" href="javascript:confirm_deletion()"><i class="fa fa-remove"></i> Delete vendor</a></div> >+ <div class="btn-group"><a class="btn btn-small" id="deletesupplier" href="javascript:confirm_deletion()"><i class="fa fa-trash"></i> Delete vendor</a></div> > [% END %] > [% END %] > [% IF CAN_user_acquisition_order_receive && basketcount %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >index bb2d3a8..fad1b4c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >@@ -106,7 +106,7 @@ function finderjumpfull(page) > </script> > > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="#" id="clear" class="btn btn-small"><i class="fa fa-times-circle"></i> Clear field</a></div> >+ <div class="btn-group"><a href="#" id="clear" class="btn btn-small"><i class="fa fa-trash"></i> Clear field</a></div> > <div class="btn-group"><a href="#" id="createnew" class="btn btn-small"><i class="fa fa-plus"></i> Create new authority</a></div> > </div> > <form name="f" method="get" action="auth_finder.pl"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >index 8270327..6001e43 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >@@ -31,7 +31,7 @@ > <div class="btn-group"><a class="btn btn-small" id="editAuth" href="authorities.pl?authid=[% authid %]"><i class="fa fa-pencil"></i> Edit</a></div> > <div class="btn-group"><a class="btn btn-small" id="dupAuth" href="authorities.pl?authid=[% authid %]&op=duplicate"><i class="fa fa-copy"></i> Duplicate</a></div> > [% UNLESS ( count ) %] >- <div class="btn-group"><a href="#" class="btn btn-small" id="delAuth"><i class="fa fa-remove"></i> Delete</a></div> >+ <div class="btn-group"><a href="#" class="btn btn-small" id="delAuth"><i class="fa fa-trash"></i> Delete</a></div> > [% END %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc >index af9262e..a0a5b96 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc >@@ -1,5 +1,5 @@ > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"><a class="btn btn-small" id="add_quote" href="#"><i class="fa fa-plus"></i> Add quote</a></div> >- <div class="btn-group"><a class="btn btn-small" id="delete_quote" href="#"><i class="fa fa-remove"></i> Delete quote(s)</a></div> >+ <div class="btn-group"><a class="btn btn-small" id="delete_quote" href="#"><i class="fa fa-trash"></i> Delete quote(s)</a></div> > <div class="btn-group"><a class="btn btn-small" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="fa fa-folder-open"></i> Import quotes</a></div> >-</div> >\ No newline at end of file >+</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >index 198a364..83c0d79 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >@@ -28,7 +28,7 @@ > [% IF ( CAN_user_reports_create_reports ) %] > <div class="btn-group"> > <a class="delete btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Delete%20Saved"> >- <i class="fa fa-remove"></i> Delete >+ <i class="fa fa-trash"></i> Delete > </a> > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc >index 5ff76fb..c4652ea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc >@@ -19,13 +19,13 @@ > > [% IF ( colId ) %] > <div class="btn-group"> >- <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId %]">Transfer</a> >+ <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId %]"><i class="fa fa-exchange"></i> Transfer</a> > </div> > <div class="btn-group"> > <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&colId=[% colId %]"><i class="fa fa-pencil"></i> Edit</a> > </div> > <div class="btn-group"> >- <a class="btn btn-small confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&colId=[% colId %]"><i class="fa fa-remove"></i> Delete</a> >+ <a class="btn btn-small confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&colId=[% colId %]"><i class="fa fa-trash"></i> Delete</a> > </div> > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >index 2581be2..729d2ee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >@@ -39,9 +39,9 @@ > <div id="toolbar" class="btn-toolbar"> > [% IF CAN_user_serials_create_subscription %] > [% IF biblionumber_for_new_subscription %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus fa-lg"></i> New subscription</a></div> >+ <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus"></i> New subscription</a></div> > [% ELSE %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus fa-lg"></i> New subscription</a></div> >+ <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div> > [% END %] > [% END %] > >@@ -76,7 +76,7 @@ > [% IF closed %] > <div class="btn-group"><a id="reopen" class="btn btn-small" href="#"><i class="fa fa-repeat"></i> Reopen</a></div> > [% ELSE %] >- <div class="btn-group"><a id="close" class="btn btn-small" href="#"><i class="fa fa-times-circle-o"></i> Close</a></div> >+ <div class="btn-group"><a id="close" class="btn btn-small" href="#"><i class="fa fa-times-circle"></i> Close</a></div> > [% END %] > [% END %] > [% END %] >@@ -84,9 +84,9 @@ > [% ELSIF CAN_user_serials_create_subscription %] > <div id="toolbar" class="btn-toolbar"> > [% IF ( biblionumber_for_new_subscription ) %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus fa-lg"></i> New subscription</a></div> >+ <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus"></i> New subscription</a></div> > [% ELSE %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus fa-lg"></i> New subscription</a></div> >+ <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >index ede13b9..e94f2c0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -158,7 +158,7 @@ $(document).ready(function() { > <li><a href="invoice.pl?op=close&invoiceid=[% invoice.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="fa fa-times-circle"></i> Close</a></li> > [% END %] > [% UNLESS invoice.receivedbiblios || invoice.receiveditems %] >- <li><a href="invoice.pl?op=delete&invoiceid=[% invoice.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="fa fa-remove"></i> Delete</a></li> >+ <li><a href="invoice.pl?op=delete&invoiceid=[% invoice.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="fa fa-trash"></i> Delete</a></li> > [% END %] > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index 2a62288..cca8bde 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -45,7 +45,7 @@ > [% END %] > <input type="hidden" class="contact_claimissues_hidden" name="contact_claimissues" value="[% contact.claimissues %]"></input> > </li> >- [% IF contact.id %]<li><button class="btn delete-contact"><i class="fa fa-remove"></i> Delete contact</li>[% END %] >+ [% IF contact.id %]<li><button class="btn delete-contact"><i class="fa fa-trash"></i> Delete contact</li>[% END %] > </ol> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >index 814354a..be70e70 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -11,7 +11,7 @@ > <a href="[% script_name %]?op=add_form&budget_period_id=[% block_budget_id |html %]"><i class="fa fa-pencil"></i> Edit</a> > </li> > <li> >- <a href="[% script_name %]?op=delete_confirm&budget_period_id=[% block_budget_id %]"><i class="fa fa-remove"></i> Delete</a> >+ <a href="[% script_name %]?op=delete_confirm&budget_period_id=[% block_budget_id %]"><i class="fa fa-trash"></i> Delete</a> > </li> > <li> > <a href="[% script_name %]?op=duplicate_form&budget_period_id=[% block_budget_id %]"><i class="fa fa-copy"></i> Duplicate</a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >index 411afa6..caaf1ae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >@@ -77,7 +77,7 @@ > <td>[% field.authorised_values_category %]</td> > <td> > <a class="btn btn-mini" href="/cgi-bin/koha/admin/items_search_field.pl?name=[% field.name %]" title="Edit [% field.name %] field"><i class="fa fa-pencil"></i> Edit</a> >- <a class="field-delete btn btn-mini" href="/cgi-bin/koha/admin/items_search_fields.pl?op=del&name=[% field.name %]"><i class="fa fa-remove"></i> Delete</a> >+ <a class="field-delete btn btn-mini" href="/cgi-bin/koha/admin/items_search_fields.pl?op=del&name=[% field.name %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index 7e8fdd2..dda1a0f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -249,7 +249,7 @@ > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id %]"> > <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&id=[% loo.id %]"><i class="fa fa-pencil"></i> Edit</a></li> > <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=add&id=[% loo.id %]"><i class="fa fa-copy"></i> Copy</a></li> >- <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=delete_confirmed&id=[% loo.id %]" class="delete" data-servername="[% loo.servername %]"><i class="fa fa-remove"></i> Delete</a></li> >+ <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=delete_confirmed&id=[% loo.id %]" class="delete" data-servername="[% loo.servername %]"><i class="fa fa-trash"></i> Delete</a></li> > </ul> > </div> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >index 7df062f..0496c4f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -49,7 +49,7 @@ > </div> > [% END %] > <div class="btn-group"> >- <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options %]" class="btn-small"><i class="fa fa-times"></i> Clear fields</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options %]" class="btn-small"><i class="fa fa-trash"></i> Clear fields</a> > </div> > </fieldset> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >index cbfbfe5..f94affa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -225,7 +225,7 @@ > <div class="span9" id="macro-editor"> > <div id="macro-toolbar" class="btn-toolbar"> > <button class="btn btn-small" id="run-macro" title="Run and edit macros"><i class="fa fa-play"></i> Run macro</button> >- <button class="btn btn-small" id="delete-macro" title="Delete macro"><i class="fa fa-remove"></i> Delete macro</button> >+ <button class="btn btn-small" id="delete-macro" title="Delete macro"><i class="fa fa-trash"></i> Delete macro</button> > <label for="macro-format">Format: </label> <select id="macro-format"></select> > <div id="macro-save-message"></div> > </div> >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 cd3fc35..5695dfb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -444,7 +444,7 @@ $(document).ready(function() { > > [% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %] > [% UNLESS noissues %] >- <button type="submit" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% borrowernumber %]'"><i class="fa fa-times-circle"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button> >+ <button type="submit" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% borrowernumber %]'"><i class="fa fa-sticky-note-o"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button> > [% END %] > [% END %] > </div></div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >index d1dd110..d90c32f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >@@ -47,7 +47,7 @@ > <ul class="toolbar"> > [% IF CAN_user_coursereserves_add_reserves %]<li><a class="btn btn-small" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]"><i class="fa fa-plus"></i> Add reserves</a></li>[% END %] > [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-small" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]"><i class="fa fa-pencil"></i> Edit course</a></li>[% END %] >- [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-small" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&action=del"><i class="fa fa-remove"></i> Delete course</a></li>[% END %] >+ [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-small" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&action=del"><i class="fa fa-trash"></i> Delete course</a></li>[% END %] > </ul> > </div><!-- /toolbar --> > [% END %] >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..d4df15e 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 >@@ -105,7 +105,7 @@ $(document).ready(function() { > <span class="checkall"><a id="CheckAll" href="#">Select all</a></span> | > <span class="clearall"><a id="CheckNone" href="#">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> >+ <button class="btn btn-mini list-remove" type="submit"><i class="fa fa-trash"></i> Remove selected</button> > </div> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index 066df5f..3a773fe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -373,7 +373,7 @@ canned reports and writing custom SQL reports.</p> > <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Run%20this%20report"><i class="fa fa-play"></i> Run</a></li> > <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]"><i class="fa fa-clock-o"></i> Schedule</a></li> > [% IF ( CAN_user_reports_create_reports ) %] >- <li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Delete%20Saved"><i class="fa fa-remove"></i> Delete</a></li> >+ <li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Delete%20Saved"><i class="fa fa-trash"></i> Delete</a></li> > [% END %] > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 7d6f88f..fd4f474 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -199,7 +199,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > > <div id="toolbar" class="btn-toolbar"> > <a class="btn btn-small" id="editsuggestion" href="suggestion.pl?op=edit&suggestionid=[% suggestionid %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-small" id="deletesuggestion" href="suggestion.pl?op=delete&edit_field=[% suggestionid %]"><i class="fa fa-remove"></i> Delete</a> >+ <a class="btn btn-small" id="deletesuggestion" href="suggestion.pl?op=delete&edit_field=[% suggestionid %]"><i class="fa fa-trash"></i> Delete</a> > </div> > > <fieldset class="rows"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index b408039..f948d60 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -399,7 +399,7 @@ function placeHold () { > <div class="btn-group"><button class="btn btn-mini placehold"><i class="fa fa-sticky-note-o"></i> Place hold</button></div> > [% END %] > [% IF can_remove_biblios %] >- <div class="btn-group"><button type="submit" class="btn btn-mini list-remove"><i class="fa fa-times-circle"></i> Remove selected</button></div> >+ <div class="btn-group"><button type="submit" class="btn btn-mini list-remove"><i class="fa fa-trash"></i> Remove selected</button></div> > [% END %] > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<div class="btn-group"><button type="submit" class="btn btn-mini merge-items"><i class="fa fa-compress"></i> Merge selected</button></div>[% END %] > </div> >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16005
:
51630
|
51657
|
51686