From 81b2ee0eb0fc082dce463088cfc84f3abbf421ce Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 9 Feb 2023 13:01:39 +0000 Subject: [PATCH] Bug 32910: (follow-up) Replace v4 icon names with v6 This patch updates icons which are listed as having changed names in this document: https://fontawesome.com/docs/web/setup/upgrade/upgrade-from-v4 Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi --- .../lib/koha/cateditor/marc-editor.js | 2 +- .../prog/en/includes/acquisitions-search.inc | 2 +- .../prog/en/includes/acquisitions-toolbar.inc | 4 +- .../prog/en/includes/auth-finder-search.inc | 2 +- .../prog/en/includes/authorities-search.inc | 10 ++--- .../prog/en/includes/authorities-toolbar.inc | 2 +- .../batch_authority_record_deletion.inc | 2 +- .../batch_authority_record_modification.inc | 2 +- .../batch_biblio_record_deletion.inc | 2 +- .../batch_biblio_record_modification.inc | 2 +- .../background_jobs/batch_hold_cancel.inc | 2 +- .../batch_item_record_deletion.inc | 2 +- .../batch_item_record_modification.inc | 2 +- .../create_eholdings_from_biblios.inc | 2 +- .../background_jobs/update_elastic_index.inc | 2 +- .../update_holds_queue_for_biblios.inc | 2 +- .../prog/en/includes/branch-selector.inc | 2 +- .../prog/en/includes/budgets-admin-search.inc | 4 +- .../en/includes/budgets-admin-toolbar.inc | 4 +- .../prog/en/includes/calendar.inc | 2 +- .../prog/en/includes/cat-toolbar.inc | 8 ++-- .../prog/en/includes/catalogue-search-box.inc | 2 +- .../catalogue/itemsearch_item.json.inc | 2 +- .../prog/en/includes/cateditor-ui.inc | 2 +- .../intranet-tmpl/prog/en/includes/chart.inc | 2 +- .../prog/en/includes/circ-menu.inc | 10 ++--- .../prog/en/includes/cities-admin-search.inc | 2 +- .../prog/en/includes/clubs-table.inc | 4 +- .../prog/en/includes/columns_settings.inc | 2 +- .../en/includes/contracts-admin-search.inc | 2 +- .../en/includes/currencies-admin-search.inc | 2 +- .../prog/en/includes/doc-head-close.inc | 2 +- .../prog/en/includes/erm-search.inc | 2 +- .../prog/en/includes/holds_table.inc | 2 +- .../prog/en/includes/html_helpers.inc | 2 +- .../prog/en/includes/last-borrower.inc | 2 +- .../prog/en/includes/letters-search.inc | 2 +- .../mana/mana-report-search-result.inc | 4 +- .../prog/en/includes/member-search-box.inc | 2 +- .../prog/en/includes/members-toolbar.inc | 6 +-- .../en/includes/patron-restrictions-tab.inc | 2 +- .../prog/en/includes/patron-search.inc | 2 +- .../prog/en/includes/patron_messages.inc | 4 +- .../prog/en/includes/reports-toolbar.inc | 16 +++---- .../includes/rotating-collections-toolbar.inc | 6 +-- .../prog/en/includes/serials-toolbar.inc | 6 +-- .../en/includes/stockrotation-toolbar.inc | 4 +- .../prog/en/includes/subtypes_unimarc.inc | 4 +- .../en/includes/suggestions-add-search.inc | 2 +- .../en/includes/virtualshelves-toolbar.inc | 4 +- .../prog/en/includes/waiting_holds.inc | 4 +- .../prog/en/modules/acqui/addorder.tt | 2 +- .../prog/en/modules/acqui/basket.tt | 36 +++++++-------- .../prog/en/modules/acqui/basketgroup.tt | 4 +- .../prog/en/modules/acqui/booksellers.tt | 2 +- .../prog/en/modules/acqui/cancelorder.tt | 2 +- .../prog/en/modules/acqui/duplicate_orders.tt | 4 +- .../prog/en/modules/acqui/edifactmsgs.tt | 2 +- .../prog/en/modules/acqui/histsearch.tt | 2 +- .../prog/en/modules/acqui/invoice.tt | 4 +- .../prog/en/modules/acqui/invoices.tt | 8 ++-- .../prog/en/modules/acqui/lateorders.tt | 8 ++-- .../modules/acqui/neworderempty_duplicate.tt | 2 +- .../prog/en/modules/acqui/parcel.tt | 2 +- .../prog/en/modules/acqui/supplier.tt | 8 ++-- .../prog/en/modules/acqui/uncertainprice.tt | 2 +- .../prog/en/modules/acqui/z3950_search.tt | 8 ++-- .../en/modules/admin/additional-fields.tt | 4 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 8 ++-- .../prog/en/modules/admin/aqbudgets.tt | 14 +++--- .../prog/en/modules/admin/aqcontract.tt | 6 +-- .../prog/en/modules/admin/audio_alerts.tt | 4 +- .../modules/admin/auth_subfields_structure.tt | 8 ++-- .../en/modules/admin/auth_tag_structure.tt | 8 ++-- .../en/modules/admin/authorised_values.tt | 4 +- .../prog/en/modules/admin/authtypes.tt | 8 ++-- .../prog/en/modules/admin/background_jobs.tt | 4 +- .../prog/en/modules/admin/biblio_framework.tt | 10 ++--- .../modules/admin/branch_transfer_limits.tt | 4 +- .../prog/en/modules/admin/branches.tt | 8 ++-- .../prog/en/modules/admin/cash_registers.tt | 4 +- .../prog/en/modules/admin/categories.tt | 4 +- .../prog/en/modules/admin/cities.tt | 6 +-- .../prog/en/modules/admin/classsources.tt | 16 +++---- .../prog/en/modules/admin/credit_types.tt | 2 +- .../prog/en/modules/admin/curbside_pickup.tt | 2 +- .../prog/en/modules/admin/currency.tt | 6 +-- .../prog/en/modules/admin/debit_types.tt | 2 +- .../prog/en/modules/admin/desks.tt | 6 +-- .../prog/en/modules/admin/edi_accounts.tt | 4 +- .../prog/en/modules/admin/edi_ean_accounts.tt | 6 +-- .../admin/identity_provider_domains.tt | 4 +- .../en/modules/admin/identity_providers.tt | 4 +- .../en/modules/admin/items_search_fields.tt | 4 +- .../prog/en/modules/admin/itemtypes.tt | 8 ++-- .../prog/en/modules/admin/koha2marclinks.tt | 2 +- .../prog/en/modules/admin/library_groups.tt | 10 ++--- .../prog/en/modules/admin/localization.tt | 4 +- .../en/modules/admin/marc-overlay-rules.tt | 8 ++-- .../modules/admin/marc_subfields_structure.tt | 8 ++-- .../prog/en/modules/admin/marctagstructure.tt | 10 ++--- .../prog/en/modules/admin/matching-rules.tt | 6 +-- .../prog/en/modules/admin/oai_set_mappings.tt | 4 +- .../prog/en/modules/admin/oai_sets.tt | 8 ++-- .../en/modules/admin/patron-attr-types.tt | 6 +-- .../prog/en/modules/admin/preferences.tt | 2 +- .../prog/en/modules/admin/restrictions.tt | 4 +- .../prog/en/modules/admin/search_filters.tt | 4 +- .../searchengine/elasticsearch/mappings.tt | 6 +-- .../prog/en/modules/admin/smart-rules.tt | 18 ++++---- .../prog/en/modules/admin/sms_providers.tt | 4 +- .../prog/en/modules/admin/smtp_servers.tt | 4 +- .../en/modules/admin/systempreferences.tt | 2 +- .../prog/en/modules/admin/transfer_limits.tt | 6 +-- .../prog/en/modules/admin/z3950servers.tt | 4 +- .../en/modules/authorities/authorities.tt | 2 +- .../prog/en/modules/authorities/detail.tt | 2 +- .../authorities/searchresultlist-auth.tt | 2 +- .../modules/authorities/searchresultlist.tt | 6 +-- .../prog/en/modules/basket/basket.tt | 6 +-- .../prog/en/modules/catalogue/advsearch.tt | 4 +- .../prog/en/modules/catalogue/detail.tt | 20 ++++----- .../prog/en/modules/catalogue/imageviewer.tt | 2 +- .../prog/en/modules/catalogue/itemsearch.tt | 2 +- .../prog/en/modules/catalogue/moredetail.tt | 2 +- .../prog/en/modules/catalogue/results.tt | 10 ++--- .../en/modules/catalogue/search-history.tt | 16 +++---- .../en/modules/catalogue/stockrotation.tt | 4 +- .../prog/en/modules/cataloguing/addbiblio.tt | 8 ++-- .../prog/en/modules/cataloguing/addbooks.tt | 12 ++--- .../prog/en/modules/cataloguing/additem.tt | 4 +- .../en/modules/cataloguing/cataloging-home.tt | 16 +++---- .../prog/en/modules/cataloguing/concerns.tt | 2 +- .../prog/en/modules/cataloguing/editor.tt | 10 ++--- .../prog/en/modules/cataloguing/moveitem.tt | 4 +- .../value_builder/marc21_field_008.tt | 2 +- .../modules/cataloguing/z3950_auth_search.tt | 6 +-- .../en/modules/cataloguing/z3950_search.tt | 8 ++-- .../prog/en/modules/circ/article-requests.tt | 8 ++-- .../prog/en/modules/circ/checkout-notes.tt | 10 ++--- .../prog/en/modules/circ/circulation-home.tt | 32 +++++++------- .../prog/en/modules/circ/circulation.tt | 6 +-- .../prog/en/modules/circ/curbside_pickups.tt | 8 ++-- .../prog/en/modules/circ/overdue.tt | 6 +-- .../prog/en/modules/circ/returns.tt | 18 ++++---- .../prog/en/modules/clubs/clubs.tt | 4 +- .../prog/en/modules/clubs/patron-clubs-tab.tt | 2 +- .../en/modules/clubs/templates-add-modify.tt | 4 +- .../modules/course_reserves/course-details.tt | 8 ++-- .../prog/en/modules/course_reserves/course.tt | 4 +- .../prog/en/modules/ill/ill-requests.tt | 10 ++--- .../en/modules/labels/label-edit-batch.tt | 10 ++--- .../prog/en/modules/labels/label-manage.tt | 2 +- .../prog/en/modules/labels/result.tt | 2 +- .../prog/en/modules/members/apikeys.tt | 4 +- .../prog/en/modules/members/boraccount.tt | 8 ++-- .../prog/en/modules/members/deletemem.tt | 2 +- .../prog/en/modules/members/files.tt | 2 +- .../prog/en/modules/members/housebound.tt | 6 +-- .../prog/en/modules/members/member-flags.tt | 14 +++--- .../prog/en/modules/members/member.tt | 4 +- .../prog/en/modules/members/memberentrygen.tt | 10 ++--- .../prog/en/modules/members/merge-patrons.tt | 4 +- .../prog/en/modules/members/moremember.tt | 16 +++---- .../prog/en/modules/members/notices.tt | 4 +- .../prog/en/modules/members/pay.tt | 4 +- .../prog/en/modules/offline_circ/list.tt | 2 +- .../prog/en/modules/patron_lists/list.tt | 8 ++-- .../prog/en/modules/patron_lists/lists.tt | 8 ++-- .../prog/en/modules/patroncards/edit-batch.tt | 10 ++--- .../en/modules/patroncards/image-manage.tt | 2 +- .../prog/en/modules/patroncards/manage.tt | 4 +- .../prog/en/modules/plugins/plugins-home.tt | 4 +- .../intranet-tmpl/prog/en/modules/pos/pay.tt | 4 +- .../prog/en/modules/pos/register.tt | 12 ++--- .../prog/en/modules/pos/registers.tt | 6 +-- .../prog/en/modules/reports/dictionary.tt | 2 +- .../modules/reports/guided_reports_start.tt | 44 +++++++++---------- .../prog/en/modules/reports/itemslost.tt | 2 +- .../prog/en/modules/reports/reports-home.tt | 2 +- .../prog/en/modules/reserve/request.tt | 8 ++-- .../prog/en/modules/reviews/reviewswaiting.tt | 4 +- .../rotatingCollections.tt | 6 +-- .../en/modules/serials/checkexpiration.tt | 8 ++-- .../prog/en/modules/serials/claims.tt | 2 +- .../prog/en/modules/serials/routing.tt | 4 +- .../en/modules/serials/serials-collection.tt | 6 +-- .../prog/en/modules/serials/serials-search.tt | 12 ++--- .../en/modules/serials/subscription-add.tt | 8 ++-- .../en/modules/serials/subscription-detail.tt | 2 +- .../serials/subscription-frequencies.tt | 6 +-- .../serials/subscription-numberpatterns.tt | 6 +-- .../prog/en/modules/suggestion/suggestion.tt | 10 ++--- .../prog/en/modules/tags/list.tt | 2 +- .../prog/en/modules/tags/review.tt | 10 ++--- .../en/modules/tools/additional-contents.tt | 16 +++---- .../automatic_item_modification_by_age.tt | 16 +++---- .../en/modules/tools/batch_delete_records.tt | 4 +- .../modules/tools/batch_extend_due_dates.tt | 4 +- .../tools/batch_record_modification.tt | 8 ++-- .../prog/en/modules/tools/csv-profiles.tt | 4 +- .../prog/en/modules/tools/inventory.tt | 6 +-- .../prog/en/modules/tools/letter.tt | 12 ++--- .../en/modules/tools/manage-marc-import.tt | 6 +-- .../tools/marc_modification_templates.tt | 10 ++--- .../prog/en/modules/tools/modborrowers.tt | 6 +-- .../prog/en/modules/tools/problem-reports.tt | 10 ++--- .../prog/en/modules/tools/quotes-upload.tt | 2 +- .../prog/en/modules/tools/quotes.tt | 6 +-- .../en/modules/tools/stage-marc-import.tt | 2 +- .../prog/en/modules/tools/stockrotation.tt | 14 +++--- .../prog/en/modules/tools/upload-images.tt | 2 +- .../prog/en/modules/tools/upload.tt | 2 +- .../prog/en/modules/tools/viewlog.tt | 34 +++++++------- .../prog/en/modules/virtualshelves/shelves.tt | 6 +-- .../virtualshelves/tables/shelves_results.tt | 4 +- koha-tmpl/intranet-tmpl/prog/js/additem.js | 2 +- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 4 +- koha-tmpl/intranet-tmpl/prog/js/datatables.js | 2 +- .../intranet-tmpl/prog/js/pages/results.js | 2 +- .../prog/js/pages/tags-review.js | 8 ++-- .../intranet-tmpl/prog/js/subscription-add.js | 4 +- .../intranet-tmpl/prog/js/upload-images.js | 2 +- .../prog/js/vue/components/ERM/Main.vue | 4 +- .../opac-tmpl/bootstrap/css/src/opac.scss | 2 +- .../bootstrap/en/includes/calendar.inc | 2 +- .../en/includes/columns_settings.inc | 2 +- .../bootstrap/en/includes/doc-head-close.inc | 4 +- .../bootstrap/en/includes/holds-table.inc | 8 ++-- .../bootstrap/en/includes/masthead-sci.inc | 2 +- .../bootstrap/en/includes/masthead.inc | 6 +-- .../en/includes/opac-detail-sidebar.inc | 6 +-- .../en/includes/title-actions-menu.inc | 6 +-- .../en/includes/user-star-ratings.inc | 4 +- .../bootstrap/en/modules/clubs/clubs-tab.tt | 2 +- .../bootstrap/en/modules/opac-ISBDdetail.tt | 4 +- .../bootstrap/en/modules/opac-MARCdetail.tt | 4 +- .../en/modules/opac-auth-MARCdetail.tt | 2 +- .../bootstrap/en/modules/opac-auth-detail.tt | 2 +- .../bootstrap/en/modules/opac-auth.tt | 2 +- .../bootstrap/en/modules/opac-basket.tt | 4 +- .../bootstrap/en/modules/opac-detail.tt | 18 ++++---- .../bootstrap/en/modules/opac-main.tt | 2 +- .../bootstrap/en/modules/opac-reserve.tt | 2 +- .../bootstrap/en/modules/opac-results.tt | 4 +- .../en/modules/opac-search-history.tt | 2 +- .../bootstrap/en/modules/opac-shelves.tt | 6 +-- .../bootstrap/en/modules/opac-suggestions.tt | 2 +- .../bootstrap/en/modules/opac-user.tt | 6 +-- .../bootstrap/en/modules/sco/sco-main.tt | 4 +- .../opac-tmpl/bootstrap/js/datatables.js | 4 +- koha-tmpl/opac-tmpl/bootstrap/js/global.js | 2 +- 252 files changed, 719 insertions(+), 717 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js index 6d90176e0a..ea7fde2e70 100644 --- a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js +++ b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js @@ -761,7 +761,7 @@ define( [ 'marc-record', 'koha-backend', 'preferences', 'text-marc', 'widget' ], if ( found ) return; - var node = $( '
' + error + '
' )[0]; + var node = $( '
' + error + '
' )[0]; var widget = this.cm.addLineWidget( line, node, options ); widget.node = node; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc index 825fa6444b..bb7cfddd61 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -23,7 +23,7 @@
- +
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 294a777629..01be9dacfb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -20,14 +20,14 @@ [% IF ( CAN_user_acquisition_vendors_manage ) %]
- Edit vendor + Edit vendor
[% UNLESS ( basketcount OR subscriptioncount ) %]
- +
[% END %] 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 4f742e2b92..7546e21456 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 @@ -2,7 +2,7 @@ [% PROCESS 'form-blocks.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc index b03039519c..e8cffd5e3f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc @@ -86,7 +86,7 @@
- +
@@ -113,7 +113,7 @@
- +
@@ -138,7 +138,7 @@
- +
@@ -165,7 +165,7 @@
- +
@@ -190,7 +190,7 @@ All headings
  • - Entire record + Entire record
  • 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 5b11a98ba6..5fa550bdc9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc @@ -27,7 +27,7 @@ [% IF ( CAN_user_editauthorities ) %]
    • Edit record
      • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_deletion.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_deletion.inc index 5092f077fb..c254d97e85 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_deletion.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_deletion.inc @@ -23,7 +23,7 @@ [% IF m.type == 'success' %] [% ELSIF m.type == 'warning' %] - + [% ELSIF m.type == 'error' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc index 44d1d7e52f..83023bd3fa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc @@ -22,7 +22,7 @@ [% IF m.type == 'success' %] [% ELSIF m.type == 'warning' %] - + [% ELSIF m.type == 'error' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_deletion.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_deletion.inc index 0d2925f5be..6ff01a901f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_deletion.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_deletion.inc @@ -23,7 +23,7 @@ [% IF m.type == 'success' %] [% ELSIF m.type == 'warning' %] - + [% ELSIF m.type == 'error' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_modification.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_modification.inc index 534c9a9522..91c89e6f52 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_modification.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_modification.inc @@ -33,7 +33,7 @@ [% IF m.type == 'success' %] [% ELSIF m.type == 'warning' %] - + [% ELSIF m.type == 'error' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc index b2e45aee0a..d60bd8c90a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc @@ -22,7 +22,7 @@ [% IF m.type == 'success' %] [% ELSIF m.type == 'warning' %] - + [% ELSIF m.type == 'error' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc index 1c14b6d2b6..86def63815 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc @@ -34,7 +34,7 @@ [% IF m.type == 'success' %] [% ELSIF m.type == 'warning' %] - + [% ELSIF m.type == 'error' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_modification.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_modification.inc index d743d929cd..d8780f2656 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_modification.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_modification.inc @@ -23,7 +23,7 @@ [% IF m.type == 'success' %] [% ELSIF m.type == 'warning' %] - + [% ELSIF m.type == 'error' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/create_eholdings_from_biblios.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/create_eholdings_from_biblios.inc index 068108d319..9ea152a9aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/create_eholdings_from_biblios.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/create_eholdings_from_biblios.inc @@ -23,7 +23,7 @@ [% IF m.type == 'success' %] [% ELSIF m.type == 'warning' %] - + [% ELSIF m.type == 'error' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc index 0972c19b91..0e81e2e741 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc @@ -23,7 +23,7 @@ [% IF m.type == 'success' %] [% ELSIF m.type == 'warning' %] - + [% ELSIF m.type == 'error' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_holds_queue_for_biblios.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_holds_queue_for_biblios.inc index 2928785ffb..b1b0307774 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_holds_queue_for_biblios.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_holds_queue_for_biblios.inc @@ -22,7 +22,7 @@ [% IF m.type == 'success' %] [% ELSIF m.type == 'warning' %] - + [% ELSIF m.type == 'error' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc index 35421e930e..e70948314a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc @@ -1,6 +1,6 @@ [%# To select all include with selectall = 1 %]
      -

      Select all | Clear all

      +

      Select all | Clear all

      [% FOREACH branch IN branches %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc index 2b6bd0a431..2fd0daaf19 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc @@ -15,7 +15,7 @@
      - +
      @@ -47,7 +47,7 @@
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
      • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc index 05b0961bc7..b33fcf9ab0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc @@ -18,7 +18,7 @@
      - +
      - +
        [% IF ( CAN_user_acquisition_planning_manage ) %]
      • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc index 5acbac789b..5606e9956e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc @@ -60,7 +60,7 @@ e.preventDefault(); instance.clear(); }) - .addClass("fa fa-fw fa-remove") + .addClass("fa fa-fw fa-times") .attr("aria-hidden", true) .attr("aria-label", _("Clear date") ) ).keydown(function(e) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index b9a4c3184f..66f355eef9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -32,7 +32,7 @@ [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_tools_items_batchmod || CAN_user_tools_items_batchdel ) or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
        - +
          [% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
        • Edit record
          • @@ -179,7 +179,7 @@ [% IF ( holdfor ) %]
          @@ -189,13 +189,13 @@
        [% ELSE %] -
        Place hold
        +
        Place hold
        [% END %] [% END %] [% END %] [% IF Koha.Preference('ArticleRequests') %] -
        Request article
        +
        Request article
        [% END %] [% IF ( CAN_user_acquisition_order_manage ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc index 066e52f078..33764470a4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc @@ -20,7 +20,7 @@ [% END %] [% IF Koha.Preference('IntranetCatalogSearchPulldown') || Koha.Preference('IntranetAddMastheadLibraryPulldown') %] - + [% END %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc index b306384ed1..1569ed15da 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc @@ -32,6 +32,6 @@ "[% (item.issues || 0) | html %]", "[% IF item.checkout %][% item.checkout.date_due | $KohaDates %][% END %]", "[% FILTER escape_quotes ~%] -
      +
      [%~ END %]" ] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc index 4bb87d7a87..13322d92e1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc @@ -1132,7 +1132,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr } } ); - $( '#save-record' ).find('i').attr( 'class', 'fa fa-hdd-o' ); + $( '#save-record' ).find('i').attr( 'class', 'fa-solid fa-hard-drive' ); if ( result.error ) { // Reset backend info diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc index 553d3c0286..f2acd3897a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc @@ -55,7 +55,7 @@ Column [% column | html %] - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 9f78956dd3..eeb959972f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -18,7 +18,7 @@
      [% END %] [% IF ( patron_is_staff ) %] - + [% END %] [% IF ( patron_is_superlibrarian ) %] @@ -38,7 +38,7 @@ [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %]) [% IF ( CAN_user_tools_batch_upload_patron_images ) %]
      -
      Edit
      +
      Edit
      [% END %] [% ELSE %] @@ -224,7 +224,7 @@ [% IF ( patron.image ) %] Delete + class="btn btn-default btn-xs delete"> Delete [% END %]
      @@ -237,13 +237,13 @@
      - +
      - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc index dd0d582718..a689cc4b80 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc @@ -26,7 +26,7 @@
      [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc index f6df1bbc18..0d69134839 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc @@ -92,12 +92,12 @@ [% IF CAN_user_clubs_edit_clubs %]
    • - Edit + Edit
    • - Delete + Delete
      • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc index db3987bbdd..3da3511cf1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -124,7 +124,7 @@ function KohaTable(id_selector, dt_parameters, table_settings, add_filters) { className: "dt_button_clear_filter", titleAttr: _("Clear filter"), enabled: false, - text: ' ' + _("Clear filter") + '', + text: ' ' + _("Clear filter") + '', action: function ( e, dt, node, config ) { dt.search( "" ).draw("page"); node.addClass("disabled"); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc index ba68c9e241..2415d09f1b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc @@ -26,7 +26,7 @@
        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
      • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc index fb5a54732f..c6c7072831 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc @@ -26,7 +26,7 @@
          [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
        • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc index 93e88cf964..1c85f042a5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -22,7 +22,7 @@ [% Asset.css("lib/bootstrap/bootstrap.min.css") | $raw %] [% Asset.css("lib/bootstrap/bootstrap-theme.min.css") | $raw %] [% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %] -[% Asset.css("lib/fontawesome/css/brands.min.css.min.css") | $raw %] +[% Asset.css("lib/fontawesome/css/brands.min.css") | $raw %] [% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %] [% Asset.css("lib/datatables/datatables.min.css") | $raw %] [% Asset.css("css/print.css", { media = "print" }) | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc index 33551de90e..e281e7d535 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc @@ -62,7 +62,7 @@ Search packages
        • - Search titles + Search titles
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc index cf0e6b626c..3c116d0ace 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -216,7 +216,7 @@ [%- END -%] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc index f0d695bc9c..1b02377898 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc @@ -222,7 +222,7 @@ [% IF display_columns_selection %][%# Needs js/pages/batchMod.js %] [% IF checkboxes_edit OR checkboxes_delete %]
        - Select all | Clear all | Clear on loan + Select all | Clear all | Clear on loan
        [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc index dfc85910f9..61dec6b700 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc @@ -1,4 +1,4 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc index ebfec765b7..8112f72730 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc @@ -26,7 +26,7 @@
          [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
        • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc index f2eacf5518..9f5f304bfd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc @@ -67,11 +67,11 @@ [% IF report.notes.length > 200 %]
          - [% report.notes.substr(0,200) | html %]... Show more + [% report.notes.substr(0,200) | html %]... Show more
          [% report.notes | html %] - Show less + Show less
          [% ELSE %] [% report.notes | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc index 4857862509..05fcdd2537 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc @@ -23,7 +23,7 @@ [% END %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index 311044ad71..068198fbe7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -6,7 +6,7 @@ [% USE scalar %]
          [% IF CAN_user_borrowers_edit_borrowers %] - Edit + Edit [% END %] [% IF CAN_user_borrowers_edit_borrowers %] @@ -39,10 +39,10 @@ Search to hold [% END %] - Add message + Add message [% IF Koha.Preference('CurbsidePickup') %] - Schedule pickup + Schedule pickup [% END %]
          diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-restrictions-tab.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-restrictions-tab.inc index 1242dbf746..698dab7bcd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-restrictions-tab.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-restrictions-tab.inc @@ -35,7 +35,7 @@ [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %] - Remove + Remove [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc index 8cc465eead..ae95dfa909 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -620,7 +620,7 @@ [% CASE 'add' %] action_node += '' + _("Add") + ''; [% CASE 'edit' %] - action_node += ' ' + _("Edit") + ''; + action_node += ' ' + _("Edit") + ''; [% CASE 'checkout' %] [% IF CAN_user_circulate_circulate_remaining_permissions %] action_node += ' ' + _("Check out") + ''; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc index 183fd3f31b..259ab2a75a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc @@ -315,10 +315,10 @@ [% IF patron_message.branchcode == Branches.GetLoggedInBranchcode OR Koha.Preference('AllowAllMessageDeletion') %] [% IF moremember %] Edit - Delete + Delete [% ELSE %] Edit - Delete + Delete [% END %] [% END %]
          • 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 5291fda6f8..16c9e3fb28 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc @@ -17,7 +17,7 @@ [% IF ( CAN_user_reports_delete_reports && !CAN_user_reports_create_reports ) %]
          - Delete + Delete
          [% ELSE %] @@ -25,7 +25,7 @@
            [% IF ( CAN_user_reports_create_reports ) %] @@ -65,7 +65,7 @@
          - Schedule + Schedule
          [% END %] @@ -123,16 +123,16 @@
        -
        [% IF allresults.size %] - Create chart + Create chart [% ELSE %] - Create chart - Fetch all data for chart + Create chart + Fetch all data for chart [% 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 179f40e2c7..97ae79ceff 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 @@ -6,13 +6,13 @@ [% IF ( colId ) %]
        - Transfer + Transfer
        - Edit + 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 b9465d6e19..568e4f3ff8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -13,7 +13,7 @@ [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %] [% UNLESS ( cannotedit ) %]
        - +
          [% IF ( CAN_user_serials_edit_subscription ) %]
        • @@ -51,14 +51,14 @@ [% IF not cannotedit or CAN_user_serials_receive_serials %] [% IF CAN_user_serials_renew_subscription and not closed %] -
          Renew
          +
          Renew
          [% END %] [% IF CAN_user_serials_receive_serials and not closed %]
          Receive
          [% END %] [% UNLESS cannotedit %] [% IF closed %] -
          Reopen
          +
          Reopen
          [% ELSE %]
          Close
          [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc index a75408f0cf..e4c3ad8ff8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc @@ -4,11 +4,11 @@ New rota [% END %] [% IF op == 'manage_stages' %] - Edit rota + Edit rota Add stage [% END %] [% IF op == 'manage_items' %] - Edit rota + Edit rota Add items [% END %]
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc index d564f7803f..d3a57be25c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc @@ -1,6 +1,6 @@

        - Show coded information filters - + Show coded information filters +

          [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
        • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc index c5a6306a78..45d2511824 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc @@ -14,7 +14,7 @@ [% IF shelf AND op == 'view' %] [% IF can_manage_shelf %]
          - +
          -
          Send list
          +
          Send list
          Print list
          [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc index 2893d0acbb..484f1d609b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -73,9 +73,9 @@ [% IF ( reserveloo.item.homebranch != reserveloo.item.holdingbranch ) %] - + [% ELSE %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt index 6dc6ba94a8..90d07cf0ba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt @@ -27,7 +27,7 @@ [% END %]

          Do you want to confirm this order?

          - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index e7d4cbfaa0..5cd5d7b1b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -77,13 +77,13 @@ [% IF active %]
          Add to basket
          [% END %] -
          Edit basket
          +
          Edit basket
          [% IF CAN_user_acquisition_delete_baskets %] -
          Delete basket
          +
          Delete basket
          [% END %] [% IF ( unclosable ) %] [% ELSIF ( uncertainprices ) %] -
          Uncertain prices
          +
          Uncertain prices
          Close basket
          @@ -104,7 +104,7 @@
          - +
          [% END %] @@ -168,10 +168,10 @@
          [% IF grouped %]
          -
          Reopen basket
          +
          Reopen basket
          [% ELSE %] -
          Reopen basket
          +
          Reopen basket
          [% PROCESS csv_export %] [% END %] @@ -311,7 +311,7 @@ [% FOREACH user IN users %]
        • [% user.firstname | html %] [% user.surname | html %] - Delete user + Delete user
          • [% END %]
        • @@ -332,10 +332,10 @@ Managing library: [% IF basketbranchcode %] [% Branches.GetName( basketbranchcode ) | html %] - Change library + Change library [% ELSE %] No library - Set library + Set library [% END %]
          • [% IF branches_loop.size %] @@ -389,10 +389,10 @@ [% basketgroup.name | html %] - Change basket group + Change basket group [% ELSE %] No group - Set basket group + Set basket group [% END %] [% END %] [% END %] @@ -446,7 +446,7 @@ [% IF ( duplinbatch ) %]

          Duplicate warning

          -

          Some records have not been automatically added because they match an existing record in your catalog: Display them

          +

          Some records have not been automatically added because they match an existing record in your catalog: Display them

          [% END %] @@ -573,12 +573,12 @@ [% END %]

          [% IF ( books_loo.order_internalnote ) %] -

          Internal note: [% books_loo.order_internalnote | html %] Edit internal note

          +

          Internal note: [% books_loo.order_internalnote | html %] Edit internal note

          [% ELSE %] Add internal note [% END %] [% IF ( books_loo.order_vendornote ) %] -

          Vendor note: [% books_loo.order_vendornote | html %] Edit vendor note

          +

          Vendor note: [% books_loo.order_vendornote | html %] Edit vendor note

          [% ELSE %] Add vendor note [% END %] @@ -647,7 +647,7 @@ [% books_loo.estimated_delivery_date | $KohaDates %] [% IF CAN_user_acquisition_order_manage %] - Edit + Edit [% END %] [% IF Koha.Preference('EDIFACT') && ediaccount %] @@ -834,7 +834,7 @@
          - +
          [% END # /IF ( confirm_close ) %] @@ -859,7 +859,7 @@
          - +
          [% END # /IF edi_confirm %] @@ -1145,7 +1145,7 @@ ids.push(borrowernumber); $("#users_ids").val(ids.join(':')); var li = '
        • '+borrowername - + ' ' + + ' ' + _("Delete user") + '
          • '; $("#users_names").prepend(li); $("#add_user_submit").show(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index ec285960f9..83d998fe58 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -73,7 +73,7 @@ $("#basketgroupcolumns").on("click", ".addtogroup", function(){ const row = $("#" + $(this).data("basketid") ); if( row ){ - $(this).removeClass("addtogroup").addClass("removefromgroup").html(" " + _("Remove") ); + $(this).removeClass("addtogroup").addClass("removefromgroup").html(" " + _("Remove") ); row.removeClass("ungrouped").addClass("grouped"); ungrouped.row( row ).remove().draw(); grouped.row.add( row ).draw(); @@ -290,7 +290,7 @@ [% IF ( closedbg ) %] [% ELSE %] - Remove + Remove [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 1297f7b423..0cc8b5a69c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -188,7 +188,7 @@ Add to basket @@ -169,7 +169,7 @@ [% ELSE %] [% IF ( subscription.routingedit ) %]
        • - Edit routing list ([% subscription.routingedit | html %]) + Edit routing list ([% subscription.routingedit | html %])
          • [% ELSE %]
        • @@ -180,7 +180,7 @@ [% END # IF ( routing && CAN_user_serials_routing ) %]
        • - Issue history + Issue history
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt index 6a79892621..3ba4e5cd91 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt @@ -84,7 +84,7 @@ fieldset.rows table { clear: none; margin: 0; }
        Search for record [% IF ( CAN_user_editcatalogue ) %] [% IF ( modify ) %] - | Edit record + | Edit record [% ELSE %] | Create record [% END %] @@ -266,7 +266,7 @@ fieldset.rows table { clear: none; margin: 0; }
        - +
        @@ -514,7 +514,7 @@ fieldset.rows table { clear: none; margin: 0; }
      •   - Modify pattern + Modify pattern
        • @@ -538,7 +538,7 @@ fieldset.rows table { clear: none; margin: 0; }
        - +
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index 73e97e992a..3d3d5a5052 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -69,7 +69,7 @@
        - +
        [% END # /IF NEEDSCONFIRMATION %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt index 03eabba09f..0280c9e5ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt @@ -126,7 +126,7 @@
        - +
        [% END %] @@ -153,8 +153,8 @@ [% frequency.unitsperissue | html %] [% frequency.displayorder | html %] - Edit - Delete + Edit + Delete [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt index 1d0a60ce75..4d4c6ea664 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt @@ -267,7 +267,7 @@
        - +
        [% END %] @@ -295,8 +295,8 @@ [% numberpattern.numberingmethod | html %] [% numberpattern.displayorder | html %] - Edit - Delete + Edit + 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 3d0372d537..86363cc05f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -96,8 +96,8 @@
        @@ -557,7 +557,7 @@
        Select manager [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %] - Keep existing manager + Keep existing manager [% END %] @@ -841,9 +841,9 @@
        - Edit + Edit [% ELSE %]This record has no items.[% END %] -
        +
        [% 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 3a7679caff..d3ab56fef4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt @@ -130,10 +130,10 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } @@ -142,7 +142,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } [% ELSE %] [% UNLESS ( filter_approved_pending ) %] [% END %] @@ -158,7 +158,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } [% END %] [% IF ( tagloop ) %]
        - +
        [% END %]
        @@ -187,7 +187,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 ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt index 6fbe8edc95..94cf527b3c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt @@ -192,11 +192,11 @@
      [% IF category == 'news' %] - Cancel + Cancel [% ELSIF category == 'pages' %] - Cancel + Cancel [% ELSE %] - Cancel + Cancel [% END %] @@ -409,7 +409,7 @@ [% END %]
      - Preview content + Preview content
      [% ELSE %]

      Automatic item modifications by age

      [% IF ( rules ) %] [% ELSE %]
      @@ -80,7 +80,7 @@ [% FOR rule IN rules %] [% SET id = loop.count %]
      - Rule [% loop.count | html %] Remove this rule + Rule [% loop.count | html %] Remove this rule
      Age in days
      @@ -117,7 +117,7 @@ = Add a condition - Remove condition + Remove condition
      [% END %]
      @@ -138,7 +138,7 @@ = Add a substitution - Remove substitution + Remove substitution A field name is required [% END %] @@ -155,7 +155,7 @@
      - Rule Remove this rule + Rule Remove this rule
      Age in days
      @@ -183,7 +183,7 @@ = Add a condition - Remove condition + Remove condition
      @@ -198,7 +198,7 @@ = Add a substitution - Remove substitution + Remove substitution A field name is required
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt index c27dec510b..6e30e93dd2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt @@ -125,7 +125,7 @@ [% IF recordtype == 'biblio' %]
      Select all - | Clear all + | Clear all | Select without items | Select without holds | Select without subscriptions @@ -161,7 +161,7 @@ [% ELSE %]
      Select all - | Clear all + | Clear all | Clear used authorities
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt index 7ca54add95..36d14f5eeb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt @@ -43,7 +43,7 @@ [% IF message.type == 'success' %]
      [% ELSIF message.type == 'warning' %] -
      +
      [% ELSIF message.type == 'error' %]
      [% END %] @@ -125,7 +125,7 @@
      Select all - | Clear all + | Clear all
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt index de54b30568..2c83052eb1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt @@ -47,7 +47,7 @@ [% IF message.type == 'success' %]
      [% ELSIF message.type == 'warning' %] -
      +
      [% ELSIF message.type == 'error' %]
      [% END %] @@ -183,7 +183,7 @@ [% IF recordtype == 'biblio' %]
      Select all - | Clear all + | Clear all
      @@ -202,7 +202,7 @@ [% END %] @@ -213,7 +213,7 @@ [% ELSE %]
      Select all - | Clear all + | Clear all
      [% biblio.biblionumber | html %] [% biblio.title | html %] - Show MARC + Show MARC
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt index 601d663c10..49d1d0ef00 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt @@ -310,8 +310,8 @@ [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt index 673029cd9e..a430a3fc24 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt @@ -197,7 +197,7 @@
    • -

      Select all | Clear all

      +

      Select all | Clear all

      [% FOREACH itemtype IN itemtypes %]
      @@ -243,7 +243,7 @@ [% UNLESS uploadedbarcodesflag %] - + [% END %]
      @@ -331,7 +331,7 @@
      [% UNLESS uploadedbarcodesflag %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt index 5133669e9b..7ffbee6dd5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -233,16 +233,16 @@ [% ELSE %] [% select_for_copy | $raw %] [% END %] - + [% END # /IF !independent_branch %]
      • @@ -280,7 +280,7 @@
    • Save and continue editing
      • - Cancel + Cancel @@ -603,7 +603,7 @@ @@ -567,10 +567,10 @@ if (aData['matched']) { $('td:eq(6)', nRow).html( ' ' + _("View") + ' ' + + aData['matched'] + '"> ' + _("View") + ' ' [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] + ' ' + _("Edit") + '' + + aData['matched'] + '"> ' + _("Edit") + '' [% END %] ); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt index d9d10d26e9..3ea2c24d7a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt @@ -62,7 +62,7 @@ New template [% IF ( template_id != '' ) %] New action - Delete template + Delete template [% END %] @@ -93,9 +93,9 @@ [% END %] @@ -188,10 +188,10 @@ [% END # /FOREACH ActionsLoo %] 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 7289c48a22..b130e8789f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -196,7 +196,7 @@ [% IF ( borrowers ) %] -
      Select all | Clear all
      +
      Select all | Clear all
      [% END %] [% END %] [% IF borrowers %] @@ -349,7 +349,7 @@ [% END %] [% IF ( field.type == 'date' ) %] - Clear + Clear [% END %] [% IF field.mandatory %] @@ -540,7 +540,7 @@ var li_clone = $(li_node).clone(); if ( $(li_clone).find("a.del_attributes").length == 0 ) { var add_attributes = $(li_clone).find("a.add_attributes") - $(add_attributes).after(' ' + _("Delete") + ''); + $(add_attributes).after(' ' + _("Delete") + ''); } $(li_clone).find('select[name="patron_attributes"]').change(function() { updateAttrValues(this); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt index 10947347ac..5d6da9b627 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt @@ -51,14 +51,14 @@ [% IF ( problem_reports.count ) %]
      - +
      Select all - | Clear all + | Clear all | Hide viewed | Hide closed | Hide new @@ -107,11 +107,11 @@
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt index 6beffac461..4be8129ce6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt @@ -33,7 +33,7 @@

      Quote uploader

      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt index 160ed40ef7..29ffcc4f61 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt @@ -91,7 +91,7 @@
      - + [% END %] @@ -199,11 +199,11 @@ { "data": function( row, type, val, meta ) { - var result = ' '+_("Edit")+''; + var result = ' '+_("Edit")+''; result += '
      '; result += ''+"\n"; - result += ' '+_("Delete")+''; + result += ' '+_("Delete")+''; return result; }, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt index 1b92c3b0f2..c65fb3799b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt @@ -227,7 +227,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt index 8b74ed6630..e15378537e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt @@ -101,7 +101,7 @@
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt index c66a23a910..52de83edc5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt @@ -281,7 +281,7 @@ Thumbnail [% END %] - Delete image + Delete image [% END # /IF img %] [% END # /FOREACH img %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt index b0a2902bdb..c6c13cb9b5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt @@ -214,7 +214,7 @@ [% END %] [% IF record.owner == owner || CAN_user_tools_upload_manage %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt index 53a20517f9..234c2d9502 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -66,38 +66,38 @@ [% BLOCK translate_log_module %] [% SWITCH module %] -[% CASE 'AUTH' %]Authentication[% UNLESS Koha.Preference('AuthFailureLog') || Koha.Preference('AuthScuccessLog') %] [% END %] -[% CASE 'CATALOGUING' %]Catalog[% UNLESS Koha.Preference('CataloguingLog') %] [% END %] +[% CASE 'AUTH' %]Authentication[% UNLESS Koha.Preference('AuthFailureLog') || Koha.Preference('AuthScuccessLog') %] [% END %] +[% CASE 'CATALOGUING' %]Catalog[% UNLESS Koha.Preference('CataloguingLog') %] [% END %] -[% CASE 'AUTHORITIES' %]Authorities[% UNLESS Koha.Preference('AuthoritiesLog') %] [% END %] +[% CASE 'AUTHORITIES' %]Authorities[% UNLESS Koha.Preference('AuthoritiesLog') %] [% END %] -[% CASE 'MEMBERS' %]Patrons[% UNLESS Koha.Preference('BorrowersLog') %] [% END %] +[% CASE 'MEMBERS' %]Patrons[% UNLESS Koha.Preference('BorrowersLog') %] [% END %] -[% CASE 'ACQUISITIONS' %]Acquisitions[% UNLESS Koha.Preference('AcquisitionLog') %][% END %] +[% CASE 'ACQUISITIONS' %]Acquisitions[% UNLESS Koha.Preference('AcquisitionLog') %][% END %] -[% CASE 'SERIAL' %]Serials[% UNLESS Koha.Preference('SubscriptionLog') %] [% END %] +[% CASE 'SERIAL' %]Serials[% UNLESS Koha.Preference('SubscriptionLog') %] [% END %] -[% CASE 'HOLDS' %]Holds[% UNLESS Koha.Preference('HoldsLog') %] [% END %] +[% CASE 'HOLDS' %]Holds[% UNLESS Koha.Preference('HoldsLog') %] [% END %] -[% CASE 'ILL' %]Interlibrary loans[% UNLESS Koha.Preference('IllLog') %] [% END %] +[% CASE 'ILL' %]Interlibrary loans[% UNLESS Koha.Preference('IllLog') %] [% END %] -[% CASE 'CIRCULATION' %]Circulation[% UNLESS Koha.Preference('IssueLog') %] [% END %] +[% CASE 'CIRCULATION' %]Circulation[% UNLESS Koha.Preference('IssueLog') %] [% END %] -[% CASE 'CLAIMS' %]Claims[% UNLESS Koha.Preference('ClaimsLog') %] [% END %] +[% CASE 'CLAIMS' %]Claims[% UNLESS Koha.Preference('ClaimsLog') %] [% END %] -[% CASE 'FINES' %]Fines[% UNLESS Koha.Preference('FinesLog') %] [% END %] +[% CASE 'FINES' %]Fines[% UNLESS Koha.Preference('FinesLog') %] [% END %] [% CASE 'SYSTEMPREFERENCE' %]System preferences -[% CASE 'CRONJOBS' %]Cron jobs[% UNLESS Koha.Preference('CronjobLog') %] [% END %] +[% CASE 'CRONJOBS' %]Cron jobs[% UNLESS Koha.Preference('CronjobLog') %] [% END %] -[% CASE 'REPORTS' %]Reports[% UNLESS Koha.Preference('ReportsLog') %] [% END %] +[% CASE 'REPORTS' %]Reports[% UNLESS Koha.Preference('ReportsLog') %] [% END %] [% CASE 'SEARCHENGINE' %]Search engine -[% CASE 'NOTICES' %]Notices[% UNLESS Koha.Preference('NoticesLog') %] [% END %] -[% CASE 'NEWS' %]News[% UNLESS Koha.Preference('NewsLog') %] [% END %] -[% CASE 'RECALLS' %]Recalls[% UNLESS Koha.Preference('RecallsLog') %] [% END %] +[% CASE 'NOTICES' %]Notices[% UNLESS Koha.Preference('NoticesLog') %] [% END %] +[% CASE 'NEWS' %]News[% UNLESS Koha.Preference('NewsLog') %] [% END %] +[% CASE 'RECALLS' %]Recalls[% UNLESS Koha.Preference('RecallsLog') %] [% END %] [% CASE %][% module | html %] [% END %] @@ -312,7 +312,7 @@ [% IF ( total ) %]

      Log entries

      - Check none + Check none
      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 99eb6127c8..a28727f18d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -258,10 +258,10 @@ |   [% IF CAN_user_reserveforothers && Koha.Preference('DisplayMultiPlaceHold') %] -
      +
      [% END %] [% IF can_remove_biblios %] -
      +
      [% END %] [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
      @@ -716,7 +716,7 @@ stickTo: "#listform", stickyClass: "floating" }); - $("span.clearall").html(""+_(" Clear all")+"<\/a>"); + $("span.clearall").html(""+_(" Clear all")+"<\/a>"); $("span.checkall").html(""+_(" Select all")+"<\/a>"); $("#CheckAll").click(function(e){ e.preventDefault(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt index 8e5a4c24d6..26675409ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt @@ -43,7 +43,7 @@ [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ ' ' ~%] [%~ END ~%] [%~ IF can_delete_shelf ~%] @@ -53,7 +53,7 @@ [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] [%~ END ~%] [%~ IF public AND allow_transfer ~%] diff --git a/koha-tmpl/intranet-tmpl/prog/js/additem.js b/koha-tmpl/intranet-tmpl/prog/js/additem.js index fac6b2648c..35ee4e2995 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/additem.js +++ b/koha-tmpl/intranet-tmpl/prog/js/additem.js @@ -90,7 +90,7 @@ function constructTrNode(index, unique_item_fields) { var edit_link = " " + ( __("Edit") ) + ""; var del_link = " " + + "onclick='deleteItemBlock(this, \"" + index + "\", \"" + unique_item_fields + "\");' class='btn btn-default btn-xs'> " + ( __("Delete") ) + ""; result += "
      "; for(var i in fields) { diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js index a591afbc71..b54b4be768 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js @@ -979,7 +979,7 @@ $(document).ready(function() { notes += oObj.notes; } notes += ''; - notes += ''; + notes += ''; return notes; } }, @@ -1012,7 +1012,7 @@ $(document).ready(function() { { "mDataProp": function ( oObj ) { let delete_html = oObj.resolved_on - ? '
    • ' + __("Delete") + '
      • ' + ? '
    • ' + __("Delete") + '
      • ' : ""; let resolve_html = ! oObj.resolution ? '
    • ' + __("Resolve") + '
      • ' diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js index e468f4275b..8d79a44253 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js +++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js @@ -36,7 +36,7 @@ var dataTablesDefaults = { className: "dt_button_clear_filter", titleAttr: __('Clear filter'), enabled: false, - text: '' + __('Clear filter') + '', + text: '' + __('Clear filter') + '', available: function ( dt ) { // The "clear filter" button is made available if this test returns true if( dt.settings()[0].aanFeatures.f ){ // aanFeatures.f is null if there is no search form diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/results.js b/koha-tmpl/intranet-tmpl/prog/js/pages/results.js index 8ce456e3fd..e46daf26c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/pages/results.js +++ b/koha-tmpl/intranet-tmpl/prog/js/pages/results.js @@ -359,7 +359,7 @@ function forgetPatronAndClub(){ Cookies.remove("holdfor", { path: '/', SameSite: 'Lax' }); Cookies.remove("holdforclub", { path: '/', SameSite: 'Lax' }); $(".holdforlink").remove(); - $("#placeholdc").html(" " + __("Place hold") + ""); + $("#placeholdc").html(" " + __("Place hold") + ""); } function browse_selection () { diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/tags-review.js b/koha-tmpl/intranet-tmpl/prog/js/pages/tags-review.js index d1588f6a86..b0c3635c7a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/pages/tags-review.js +++ b/koha-tmpl/intranet-tmpl/prog/js/pages/tags-review.js @@ -55,7 +55,7 @@ var indeterminate_test = function(tag){ var success_test_call = function() { $('#test_button').prop('disabled', false); - $('#test_button').html("" +__(" Test")); + $('#test_button').html("" +__(" Test")); }; $(document).ready(function() { @@ -68,7 +68,7 @@ $(document).ready(function() { "sPaginationType": "full" })); $('.ajax_buttons' ).css({visibility:"visible"}); - $("p.check").html("
      <\/i> " + __("Select all") + "<\/a> | <\/i> " + __("Clear all") + "<\/a> | " + __("Select all pending") + "<\/a><\/div>"); + $("p.check").html("
      <\/i> " + __("Select all") + "<\/a> | <\/i> " + __("Clear all") + "<\/a> | " + __("Select all pending") + "<\/a><\/div>"); $("#CheckAll").on("click", function (e) { e.preventDefault(); @@ -109,7 +109,7 @@ $(document).ready(function() { success: count_approve // success_approve })); $(event.target).next(".rej").prop('disabled', false).css("color","#000"); - $(event.target).next(".rej").html(" " + __("Reject")); + $(event.target).next(".rej").html(" " + __("Reject")); $(event.target).prop('disabled', true).css("color","#666"); $(event.target).html(" " + __("Approved") ); getelement = $(event.target).data("num"); @@ -132,7 +132,7 @@ $(document).ready(function() { $(event.target).prev(".ok").prop('disabled', false).css("color","#000"); $(event.target).prev(".ok").html(" " + __("Approve")); $(event.target).prop('disabled', true).css("color","#666"); - $(event.target).html(" " + __("Rejected")); + $(event.target).html(" " + __("Rejected")); getelement = $(event.target).data("num"); gettitle = ".status" + getelement; $(gettitle).text(__("Rejected")); diff --git a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js b/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js index 0b82974962..ebf0977d47 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js +++ b/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js @@ -443,7 +443,7 @@ function mana_search() { ] })); if( $("#mana_results_datatable").length && $("td.dataTables_empty").length == 0){ - $("#mana_search").html("

      " + __("Subscription found on Mana Knowledge Base:") + "

      " + __("Show Mana results") + "

      "); + $("#mana_search").html("

      " + __("Subscription found on Mana Knowledge Base:") + "

      " + __("Show Mana results") + "

      "); } else if ( $("#mana_results_datatable").length ){ $("#mana_search").html("

      " + __("No subscription found on Mana Knowledge Base") + "

      " + __("Please feel free to share your pattern with all others librarians once you are done") + "

      "); @@ -709,7 +709,7 @@ $(document).ready(function() { $("body").on("click", ".mana-use", function(e) { e.preventDefault(); - $(this).find("i").attr("class","fa fa-refresh fa-spin"); + $(this).find("i").attr("class","fa-solid fa-rotate fa-spin"); var subscription_id = $(this).data("subscription_id"); mana_use( subscription_id ); }); diff --git a/koha-tmpl/intranet-tmpl/prog/js/upload-images.js b/koha-tmpl/intranet-tmpl/prog/js/upload-images.js index 1d7b0a4d21..76e8918673 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/upload-images.js +++ b/koha-tmpl/intranet-tmpl/prog/js/upload-images.js @@ -162,7 +162,7 @@ function ParseFile(file) { reader.readAsDataURL(file); } else if( file.type.indexOf("zip") > 0) { Output( - '

      ' + '

      ' ); $("#biblionumber_entry").hide(); $("#image").prop("checked", false ); diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue index d6d6156aa1..ca63b6db86 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue @@ -57,7 +57,7 @@ class="disabled" > {{ $__("Local") @@ -93,7 +93,7 @@ :to="`/cgi-bin/koha/erm/eholdings/${provider}/titles`" > {{ $__("Titles") diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss index 7a8091493a..e48225df2e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -2682,7 +2682,7 @@ $star-selected: #EDB867; white-space: nowrap; a { - font: normal normal normal 20px/1 FontAwesome; + font: normal normal normal 20px/1 "Font Awesome 6 Free"; -webkit-font-smoothing: antialiased; margin-right: 2px; text-decoration: none; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc index 867498fae0..54776d74aa 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc @@ -81,7 +81,7 @@ e.preventDefault(); instance.clear(); }) - .addClass("fa fa-fw fa-remove") + .addClass("fa fa-fw fa-times") .attr("aria-hidden", true) .attr("aria-label", _("Clear date") ) ).keydown(function(e) { diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/columns_settings.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/columns_settings.inc index 78935a9d5c..6fe51008c3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/columns_settings.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/columns_settings.inc @@ -47,7 +47,7 @@ function KohaTable(selector, dt_parameters, columns_settings) { className: "dt_button_clear_filter", titleAttr: _("Clear filter"), enabled: false, - text: ' ' + _("Clear filter") + '', + text: ' ' + _("Clear filter") + '', action: function ( e, dt, node, config ) { dt.search( "" ).draw("page"); node.addClass("disabled"); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc index 4fc0dd2617..7787c62f94 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc @@ -68,6 +68,8 @@ [% Asset.js('js/Gettext.js') | $raw %] [% Asset.js('js/i18n.js') | $raw %] -[% Asset.css("lib/font-awesome/css/font-awesome.min.css") | $raw %] +[% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %] +[% Asset.css("lib/fontawesome/css/brands.min.css") | $raw %] +[% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %] [% PROCESS 'html_helpers.inc' %] [% KohaPlugins.get_plugins_opac_head | $raw %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc index 909a9e34fa..5e26852ec7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc @@ -89,7 +89,7 @@ [% HOLD.branch.branchname | html %] [% IF ( HOLD.can_update_pickup_location_opac ) %]
      - +
      @@ -191,14 +191,14 @@
      - + [% ELSIF HOLD.is_waiting && HOLD.cancellation_requestable_from_opac %]
      - + [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc index eb7cc480bc..687e2a822c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc @@ -34,7 +34,7 @@
    • - Log out + Log out
      • diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index 9fbbd720f5..7abe61f0d6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -118,7 +118,7 @@

      - Clear + Clear

      [% END %] Log out @@ -133,7 +133,7 @@
    • - Clear + Clear
      • [% END %] [% END %] @@ -367,7 +367,7 @@
      [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %] - Log in with Google + Log in with Google

      If you do not have a Google account, but do have a local account, you can still log in:

      [% END # /IF GoogleOpenIDConnect %] [% IF ( shibbolethAuthentication ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc index a0b0cd1ac2..3b65253d82 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc @@ -12,7 +12,7 @@ [% END %] [% IF Koha.Preference('UseRecalls') %] -
    • +
    • Place recall
      • [% END %] @@ -48,8 +48,8 @@ [% IF ( OpacHighlightedWords && query_desc ) %]
    • - Unhighlight - Highlight + Unhighlight + Highlight
      • [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc index 9f1fb2015e..ecb91cf1b2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc @@ -18,12 +18,12 @@ [% END # / OPACHoldRequests %] [% IF Koha.Preference('UseRecalls') %] - Place recall + Place recall [% END %] [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) %] [% IF items.artreqpossible %] - Request article + Request article [% END %] [% END %] @@ -52,7 +52,7 @@ [% IF ( shelf AND op == 'view' ) %] Save to another list [% IF can_remove_biblios %] - Remove from this list + Remove from this list [% END %] [% ELSE %] Save to lists diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/user-star-ratings.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/user-star-ratings.inc index c0ebd2c0c7..cac8d22a89 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/user-star-ratings.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/user-star-ratings.inc @@ -42,11 +42,11 @@ [% IF item.my_rating %]
      Your rating: [% item.my_rating.rating_value | html %]. - Cancel rating. + Cancel rating.
      [% ELSE %] - + [% END %]
      Average rating: [% rating_avg | html %] ([% item.ratings.count | html %] votes)
      diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt index 162189c8da..c084ae304f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt @@ -25,7 +25,7 @@
      @@ -1012,7 +1012,7 @@ @@ -1060,7 +1060,7 @@
      - +
      diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index 1f40f5ce39..003c792402 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -141,7 +141,7 @@ - + [% ELSE %]
      @@ -151,7 +151,7 @@ - + [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js b/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js index 566ee9869b..776b3bbdc7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js +++ b/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js @@ -57,7 +57,7 @@ $.fn.dataTable.ext.buttons.clearFilter = { className: "dt_button_clear_filter", titleAttr: window.MSG_CLEAR_FILTER, enabled: false, - text: ' ' + window.MSG_CLEAR_FILTER + '', + text: ' ' + window.MSG_CLEAR_FILTER + '', available: function ( dt ) { // The "clear filter" button is made available if this test returns true if( dt.settings()[0].aanFeatures.f ){ // aanFeatures.f is null if there is no search form @@ -278,7 +278,7 @@ $.fn.dataTable.ext.buttons.clearFilter = { className: "dt_button_clear_filter", titleAttr: __("Clear filter"), enabled: false, - text: ' ' + __("Clear filter") + '', + text: ' ' + __("Clear filter") + '', action: function ( e, dt, node ) { dt.search( "" ).draw("page"); node.addClass("disabled"); diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/global.js b/koha-tmpl/opac-tmpl/bootstrap/js/global.js index b9ea0b6edf..99b204dd4d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/js/global.js +++ b/koha-tmpl/opac-tmpl/bootstrap/js/global.js @@ -91,7 +91,7 @@ function confirmModal(message, title, yes_label, no_label, callback) {

      \
      \ \ - \ + \
      \ \ \ -- 2.39.5
      [% PROCESS type_description type_code = csv_profile.type %] [% PROCESS used_for_description used_for_code = csv_profile.used_for %] - Edit - Delete + Edit + Delete
      [% IF can_edit %] - Edit + Edit [% END %] [% IF !lette.protected && can_edit %] - Delete + Delete [% END %]
      - + @@ -613,7 +613,7 @@ [% IF preview_is_available %]
    • - Preview + Preview
      • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt index 6b9e93082d..c4ff6fe2e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt @@ -366,7 +366,7 @@ - + [% END %]       		[% TemplatesLoo.template_id | html %] [% TemplatesLoo.name | html %] - Edit actions + Edit actions Duplicate - Delete + Delete
      [% ActionsLoo.description | html %] - Edit + Edit - Delete + Delete
      [% IF ( report.status == 'New' ) %] - + [% ELSIF ( report.status == 'Viewed' ) %] - + [% ELSE %] - + [% END %]
      [% rota.stockrotationitems.count | html %] - + Edit
      @@ -275,10 +275,10 @@ [% stage.duration | html %] - Edit + Edit - Delete + Delete @@ -347,7 +347,7 @@

      Are you sure you wish to remove this item from it's rota

      Yes - No + No

      [% ELSIF (op == 'confirm_delete_rota') %] @@ -363,7 +363,7 @@ [% END %]

      Yes - No + No

      [% ELSIF (op == 'confirm_delete_stage') %] @@ -380,7 +380,7 @@ [% END %]

      Yes - No + No

      [% ELSIF (op == 'manage_items') %] @@ -503,7 +503,7 @@ [% ELSE %] [% END %] - + Remove from rota
      " + edit_link + " " + del_link + " [% IF e.club.club_template.is_enrollable_from_opac %] [% ELSE %] Contact your library to be disenrolled from this club. diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt index 936960f6bd..3cb72f853a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt @@ -27,8 +27,8 @@

      [% INCLUDE 'biblio-title.inc' %]

      [% ISBD | $raw %]
      diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt index 392ca0b3ac..5090bc6b4a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt @@ -27,8 +27,8 @@
      - Normal view - MARC view + Normal view + MARC view [% IF ( ISBD ) %] ISBD view[% END %]

      [% bibliotitle | html %] (Record no. [% biblio.biblionumber | html %])

      diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt index ecec5b0de6..bb37926648 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt @@ -87,7 +87,7 @@ $('#hierarchies').jstree({ "types" : { "default" : { - "icon" : "fa fa-file-o" + "icon" : "fa-solid fa-file" } }, "plugins" : [ "types" ] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt index c88c70a139..82c219fede 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt @@ -212,7 +212,7 @@ $('#hierarchies').jstree({ "types" : { "default" : { - "icon" : "fa fa-file-o" + "icon" : "fa-solid fa-file" } }, "plugins" : [ "types" ] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt index 3e95981a36..4e583500c3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt @@ -188,7 +188,7 @@

      Please note that the Google login will only work if you are using the e-mail address registered with this library.

      If you want to, you can try to log in using a different account [% END %] - Log in with Google + Log in with Google

      If you do not have a Google account, but do have a local account, you can still log in:

      [% END # /IF GoogleOpenIDConnect %] [% END # /UNLESS OPACShibOnly %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt index 87ceda18c7..7b20dad9c3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt @@ -43,7 +43,7 @@
      - Empty and close + Empty and close Hide window [% IF ( verbose ) %] Print @@ -57,7 +57,7 @@
      Select titles to: - Remove + Remove [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) %] [% IF ( ( Koha.Preference( 'virtualshelves' ) == 1 ) && loggedinusername ) %] Add to a list diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index e477f7e359..0fe610c225 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -156,9 +156,9 @@ [% END %]
      - Normal view + Normal view - MARC view + MARC view [% IF ( ISBD ) %] ISBD view @@ -333,10 +333,10 @@ [% IF my_rating %] Your rating: [% my_rating.rating_value | html %]. - Cancel rating. + Cancel rating. [% ELSE %] - + [% END %] Average rating: [% rating_avg | html %] ([% ratings.count | html %] votes) @@ -1004,7 +1004,7 @@ [% ELSE %] Browse results [% END %] - Close + Close
      @@ -1067,7 +1067,7 @@
      [% END # /IF ( listResults ) %]
      - Close + Close
      [% END # / IF OpacBrowseResults && busc %] @@ -1095,7 +1095,7 @@ [% FOREACH network IN SocialNetworks.split(",") %] [% SWITCH network -%] [% CASE "facebook" -%] -
      +
      [% CASE "linkedin" -%]
      [% CASE "email" -%] @@ -1138,7 +1138,7 @@
      Select all | - Select none + Select none
      @@ -1474,7 +1474,7 @@ window.emojiPicker = new EmojiPicker({ emojiable_selector: '[data-emojiable=true]', assetsPath: '[% interface | html %]/lib/emoji-picker/img/', - popupButtonClasses: 'fa fa-smile-o' + popupButtonClasses: 'fa-solid fa-face-smile' }); window.emojiPicker.discover(); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt index cca221a4e0..57a0e90c11 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -189,7 +189,7 @@
      Log in to your account: [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %] - Log in with Google + Log in with Google

      If you do not have a Google account, but do have a local account, you can still log in:

      [% END # /IF GoogleOpenIDConnect %] [% SET identity_providers = AuthClient.get_providers('opac') %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt index 0b04429b5b..2109a26fd6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -407,7 +407,7 @@
      		- + [% END %] [% IF ( itemLoo.copynumber ) %] [% itemLoo.copynumber | html %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 06057cd28b..861d2a7db6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -205,8 +205,8 @@
      [% IF ( OpacHighlightedWords ) %]
      - Unhighlight - Highlight + Unhighlight + Highlight
      [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt index 135d9c2ebf..4a9fab692a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt @@ -271,7 +271,7 @@
      Select searches to: - Delete + Delete
      [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index 5c8a8fe695..ddcf38ec95 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -14,7 +14,7 @@ [% END # /IF can_manage_shelf %] @@ -999,7 +999,7 @@ $(function() { return false; } }); - $("#removeitems").html(" "+_("Remove from list")+"") + $("#removeitems").html(" "+_("Remove from list")+"") .click(function(){ $("#myform").submit(); return false; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt index 71fd3b1b93..9c21008640 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt @@ -389,7 +389,7 @@
      Select suggestions to: - Delete + Delete
      diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index b3bd0a4d75..b6028314e8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -903,7 +903,7 @@ - + [% END %]       		- +