From 09b9b5f0d6c3c133aeddc6b5b96e7560f9510cd2 Mon Sep 17 00:00:00 2001
From: Owen Leonard
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.
where something is deleted, removed, or
emptied.
where an operation is cancelled (also where
selections are cancelled, as in checkboxes).
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
Signed-off-by: Jonathan Druart
---
.../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 +-
.../intranet-tmpl/prog/en/modules/admin/items_search_fields.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt | 2 +-
koha-tmpl/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 ) %]
[% UNLESS ( basketcount OR subscriptioncount ) %]
-
+
[% 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)
Run
Schedule
[% IF ( CAN_user_reports_create_reports ) %]
- Delete
+ Delete
[% END %]
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