From feabd6e38648b5f4efefd50772d78eebe6261d5c 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=utf8 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 Signed-off-by: Brendan Gallagher (cherry picked from commit ed449a5b5be4da03443d214de5806f4a0273227b) Signed-off-by: Frédéric Demians --- .../prog/en/includes/acquisitions-toolbar.inc | 2 +- .../prog/en/includes/auth-finder-search.inc | 2 +- .../prog/en/includes/authorities-toolbar.inc | 2 +- .../intranet-tmpl/prog/en/includes/quotes-toolbar.inc | 4 ++-- .../intranet-tmpl/prog/en/includes/reports-toolbar.inc | 2 +- .../prog/en/includes/rotating-collections-toolbar.inc | 4 ++-- .../intranet-tmpl/prog/en/includes/serials-toolbar.inc | 10 +++++----- .../intranet-tmpl/prog/en/modules/acqui/invoices.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/supplier.tt | 2 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/admin/items_search_fields.tt | 2 +- .../prog/en/modules/admin/z3950servers.tt | 2 +- .../prog/en/modules/catalogue/advsearch.tt | 2 +- .../prog/en/modules/cataloguing/editor.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/course_reserves/course-details.tt | 2 +- .../intranet-tmpl/prog/en/modules/patron_lists/list.tt | 2 +- .../prog/en/modules/reports/guided_reports_start.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 2 +- .../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 41e9b5c65f..af24d52ddf 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 ) %]
Edit vendor
[% UNLESS ( basketcount OR subscriptioncount ) %] -
Delete vendor
+
Delete vendor
[% 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 bb2d3a8d15..fad1b4cfb1 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)
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 82703272fa..6001e43f92 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 @@
Edit
Duplicate
[% UNLESS ( count ) %] -
Delete
+
Delete
[% 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 af9262ee99..a0a5b96ce9 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 @@ \ No newline at end of file + 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 09298ea2a3..25f848aa8a 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 ) %]
- Delete + Delete
[% 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 5ff76fb2cf..c4652ea425 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 ) %]
- Transfer + Transfer
Edit
- Delete + Delete
[% END %] 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 2581be27bf..729d2eed01 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 @@
[% IF CAN_user_serials_create_subscription %] [% IF biblionumber_for_new_subscription %] -
New subscription
+
New subscription
[% ELSE %] -
New subscription
+
New subscription
[% END %] [% END %] @@ -76,7 +76,7 @@ [% IF closed %]
Reopen
[% ELSE %] -
Close
+
Close
[% END %] [% END %] [% END %] @@ -84,9 +84,9 @@ [% ELSIF CAN_user_serials_create_subscription %]
[% IF ( biblionumber_for_new_subscription ) %] -
New subscription
+
New subscription
[% ELSE %] -
New subscription
+
New subscription
[% END %]
[% 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 ede13b93e5..e94f2c013d 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() {
  • Close
    • [% END %] [% UNLESS invoice.receivedbiblios || invoice.receiveditems %] -
  • Delete
    • +
  • Delete
    • [% END %]
    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 d36d7897a5..72302da81d 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 %] - [% IF contact.id %]
    • [% END %] + [% IF contact.id %]
    • [% END %] [% 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 bc468a1f29..ecedbea395 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 @@ Edit
  • - Delete + Delete
  • Duplicate 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 411afa66c1..caaf1ae0fa 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 @@ [% field.authorised_values_category %] Edit - Delete + Delete [% 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 7e8fdd20e5..dda1a0f2d3 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 @@ 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 7df062faef..0496c4f1e5 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 @@ [% END %]
    - Clear fields + Clear fields
    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 cbfbfe5b3f..f94affaf10 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 @@
    - +
    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 b6537620e3..2cd368f71c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -424,7 +424,7 @@ $(document).ready(function() { [% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %] [% UNLESS noissues %] - + [% END %] [% END %]
    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 d1dd1107eb..d90c32fa9b 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 @@
      [% IF CAN_user_coursereserves_add_reserves %]
    • Add reserves
      • [% END %] [% IF ( CAN_user_coursereserves_manage_courses ) %]
    • Edit course
      • [% END %] - [% IF ( CAN_user_coursereserves_manage_courses ) %]
    • Delete course
      • [% END %] + [% IF ( CAN_user_coursereserves_manage_courses ) %]
    • Delete course
      • [% END %]
    [% 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 fb6415c1b3..d4df15efb1 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() { Select all | Clear all |
    - +
    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 b01d579e72..16752ccc4c 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.

  • 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 7d6f88f7d3..fd4f4741c8 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
    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 6b4856b178..2efcdc1d0b 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 () {
    [% END %] [% IF can_remove_biblios %] -
    +
    [% END %] [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
    [% END %] -- 2.20.1