From 9066cd152ec5a7bba896676deb6df47791c43140 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 23 Jun 2023 13:54:43 +0000 Subject: [PATCH] Bug 34112: Replace fa.fa-pencil-alt with fa-solid.fa-pencil in edit buttons The FontAwesome class "fa-pencil-alt" works in v.6 but is actually a v.5 class. We should use "fa-solid fa-pencil" instead. This patch also corrects some leftover instances of "fa-edit" To test, apply the patch and view some pages in the OPAC and staff interface which have updated icons, e.g. - Administration -> Libraries - Catalog -> Bibliographic details - OPAC -> Bibliographic details Confirm that the pencil icon looks correct. Checking all modified templates is probably too much, but inspecting the patch should show that only fa-pencil-alt and fa-edit icons are affected. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/includes/acquisitions-toolbar.inc | 2 +- .../prog/en/includes/authorities-toolbar.inc | 2 +- .../prog/en/includes/budgets-admin-toolbar.inc | 4 ++-- .../prog/en/includes/cat-toolbar.inc | 2 +- .../includes/catalogue/itemsearch_item.json.inc | 2 +- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +- .../prog/en/includes/clubs-table.inc | 2 +- .../prog/en/includes/labels-toolbar.inc | 2 +- .../prog/en/includes/members-toolbar.inc | 2 +- .../prog/en/includes/patron-search.inc | 2 +- .../prog/en/includes/patron-toolbar.inc | 2 +- .../prog/en/includes/patron_messages.inc | 4 ++-- .../prog/en/includes/patroncards-toolbar.inc | 2 +- .../prog/en/includes/reports-toolbar.inc | 2 +- .../en/includes/rotating-collections-toolbar.inc | 2 +- .../prog/en/includes/serials-toolbar.inc | 2 +- .../prog/en/includes/stockrotation-toolbar.inc | 4 ++-- .../prog/en/includes/virtualshelves-toolbar.inc | 2 +- .../prog/en/modules/acqui/basket.tt | 16 ++++++++-------- .../prog/en/modules/acqui/lateorders.tt | 6 +++--- .../prog/en/modules/acqui/supplier.tt | 2 +- .../prog/en/modules/acqui/uncertainprice.tt | 2 +- .../prog/en/modules/admin/additional-fields.tt | 2 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/admin/aqbudgets.tt | 2 +- .../prog/en/modules/admin/aqcontract.tt | 2 +- .../prog/en/modules/admin/audio_alerts.tt | 2 +- .../en/modules/admin/auth_subfields_structure.tt | 2 +- .../prog/en/modules/admin/auth_tag_structure.tt | 2 +- .../prog/en/modules/admin/authorised_values.tt | 2 +- .../prog/en/modules/admin/authtypes.tt | 2 +- .../prog/en/modules/admin/biblio_framework.tt | 2 +- .../prog/en/modules/admin/branches.tt | 4 ++-- .../prog/en/modules/admin/cash_registers.tt | 2 +- .../prog/en/modules/admin/categories.tt | 2 +- .../prog/en/modules/admin/cities.tt | 2 +- .../prog/en/modules/admin/classsources.tt | 6 +++--- .../prog/en/modules/admin/credit_types.tt | 2 +- .../prog/en/modules/admin/currency.tt | 2 +- .../prog/en/modules/admin/debit_types.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/desks.tt | 2 +- .../prog/en/modules/admin/edi_accounts.tt | 2 +- .../prog/en/modules/admin/edi_ean_accounts.tt | 2 +- .../modules/admin/identity_provider_domains.tt | 2 +- .../prog/en/modules/admin/identity_providers.tt | 2 +- .../prog/en/modules/admin/items_search_fields.tt | 2 +- .../prog/en/modules/admin/itemtypes.tt | 4 ++-- .../prog/en/modules/admin/library_groups.tt | 2 +- .../prog/en/modules/admin/marc-overlay-rules.tt | 2 +- .../en/modules/admin/marc_subfields_structure.tt | 2 +- .../prog/en/modules/admin/marctagstructure.tt | 4 ++-- .../prog/en/modules/admin/matching-rules.tt | 2 +- .../prog/en/modules/admin/oai_sets.tt | 2 +- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../prog/en/modules/admin/restrictions.tt | 2 +- .../prog/en/modules/admin/search_filters.tt | 2 +- .../prog/en/modules/admin/smart-rules.tt | 4 ++-- .../prog/en/modules/admin/sms_providers.tt | 2 +- .../prog/en/modules/admin/smtp_servers.tt | 2 +- .../prog/en/modules/admin/systempreferences.tt | 2 +- .../prog/en/modules/admin/z3950servers.tt | 2 +- .../prog/en/modules/authorities/authorities.tt | 2 +- .../modules/authorities/searchresultlist-auth.tt | 2 +- .../en/modules/authorities/searchresultlist.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 12 ++++++------ .../prog/en/modules/catalogue/moredetail.tt | 2 +- .../prog/en/modules/catalogue/results.tt | 2 +- .../prog/en/modules/cataloguing/addbiblio.tt | 2 +- .../prog/en/modules/cataloguing/addbooks.tt | 4 ++-- .../en/modules/cataloguing/cataloging-home.tt | 6 +++--- .../prog/en/modules/circ/article-requests.tt | 2 +- .../intranet-tmpl/prog/en/modules/clubs/clubs.tt | 2 +- .../en/modules/course_reserves/course-details.tt | 4 ++-- .../prog/en/modules/ill/ill-requests.tt | 2 +- .../prog/en/modules/labels/label-manage.tt | 2 +- .../prog/en/modules/members/housebound.tt | 4 ++-- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/members/moremember.tt | 16 ++++++++-------- .../prog/en/modules/patron_lists/lists.tt | 4 ++-- .../prog/en/modules/patroncards/manage.tt | 2 +- .../prog/en/modules/pos/register.tt | 2 +- .../en/modules/reports/guided_reports_start.tt | 14 +++++++------- .../rotating_collections/rotatingCollections.tt | 2 +- .../prog/en/modules/serials/checkexpiration.tt | 2 +- .../en/modules/serials/serials-collection.tt | 2 +- .../prog/en/modules/serials/serials-search.tt | 4 ++-- .../prog/en/modules/serials/subscription-add.tt | 4 ++-- .../modules/serials/subscription-frequencies.tt | 2 +- .../serials/subscription-numberpatterns.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 4 ++-- .../prog/en/modules/tools/additional-contents.tt | 6 +++--- .../tools/automatic_item_modification_by_age.tt | 2 +- .../prog/en/modules/tools/csv-profiles.tt | 2 +- .../prog/en/modules/tools/letter.tt | 2 +- .../prog/en/modules/tools/manage-marc-import.tt | 2 +- .../modules/tools/marc_modification_templates.tt | 4 ++-- .../prog/en/modules/tools/quotes.tt | 2 +- .../prog/en/modules/tools/stockrotation.tt | 4 ++-- .../virtualshelves/tables/shelves_results.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 2 +- .../bootstrap/en/includes/holds-table.inc | 2 +- .../en/includes/opac-detail-sidebar.inc | 4 ++-- .../bootstrap/en/modules/opac-results.tt | 4 ++-- .../bootstrap/en/modules/opac-shelves.tt | 6 +++--- 104 files changed, 157 insertions(+), 157 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 01be9dacfb..1dfd5955ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -20,7 +20,7 @@ [% IF ( CAN_user_acquisition_vendors_manage ) %]
- Edit vendor + Edit vendor
[% UNLESS ( basketcount OR subscriptioncount ) %]
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 5fa550bdc9..58b7ca715e 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/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc index b33fcf9ab0..5b5c3e0343 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/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index 66f355eef9..03bcb38059 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
      • 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 8d4fa89a30..dd4810592f 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/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index eeb959972f..3ed1cc5282 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -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 %] 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 0d69134839..4daa440bcc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc @@ -92,7 +92,7 @@ [% IF CAN_user_clubs_edit_clubs %]
    • - Edit + Edit
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc index 801ab9cb2e..e2d441ca5b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc @@ -11,7 +11,7 @@
    - +
    • Label batches
    • Layouts
      • 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 068198fbe7..8e277919a6 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 %] 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 bd203c62f4..1c95567cb7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -626,7 +626,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-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc index e26c5e676d..03595cb507 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc @@ -20,7 +20,7 @@
      [% END %] [% IF CAN_user_tools_manage_patron_lists %] - Patron lists + Patron lists [% END %]
    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 507c3fd0f0..e343f175c3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc @@ -314,10 +314,10 @@ [% IF patron_message.branchcode == Branches.GetLoggedInBranchcode OR Koha.Preference('AllowAllMessageDeletion') %] [% IF moremember %] - Edit + Edit Delete [% ELSE %] - Edit + Edit Delete [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc index b0163a0234..46c1f3c5ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc @@ -11,7 +11,7 @@
- +
  • Card batches
  • Images
    • 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 16c9e3fb28..d4020047d7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc @@ -25,7 +25,7 @@
      [% IF ( CAN_user_reports_create_reports ) %] 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 97ae79ceff..4cf5d8e9e2 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 @@ -9,7 +9,7 @@ Transfer
    - Edit + Edit
    Delete 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 568e4f3ff8..1fcd1a096e 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 ) %]
    • 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 e4c3ad8ff8..3753276409 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/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc index 45d2511824..1bafe9d1c6 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 %]
    - +
    • Edit list
    • Delete list
      • 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 5cd5d7b1b1..604d1a2f36 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -77,7 +77,7 @@ [% IF active %]
      Add to basket
      [% END %] -
      Edit basket
      +
      Edit basket
      [% IF CAN_user_acquisition_delete_baskets %]
      Delete basket
      [% 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 %] @@ -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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index 1d49cd3556..2de9b35463 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -109,7 +109,7 @@ [% estimated_delivery_date | $KohaDates %] [% IF CAN_user_acquisition_order_manage %] - Edit + Edit [% END %]

      @@ -169,7 +169,7 @@

      [% lateorder.order_internalnote | html %] - Edit internal note + Edit internal note

      [% ELSE %] @@ -183,7 +183,7 @@

      [% lateorder.order_vendornote | html %] - Edit vendor note + Edit vendor note

      [% ELSE %] 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 2941e9a329..9141921d55 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -435,7 +435,7 @@ div.rows { padding: 1rem; } [% contract.contractenddate | $KohaDates %] [% IF CAN_user_acquisition_contracts_manage %] - Edit + Edit Delete [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index c8cecdfec7..1f9d03b53a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -145,7 +145,7 @@ [% END %] - Edit + Edit [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt index 4713b78856..9182a16b8b 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt @@ -161,7 +161,7 @@ [% END %] - Edit + Edit Delete 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 5d5d8fe577..bfc45230b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -10,7 +10,7 @@
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index 1a5265ff3b..f45b6955fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -282,7 +282,7 @@ No limitation [% END # /IF loo.branches.size > 0 %] - Edit + Edit Delete [% END # /FOREACH loop %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt index c175f916a7..0b7e8ae57f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -187,7 +187,7 @@ Authority types › Administration › Koha Actions
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt index 4d5dbfb167..1e57883c1f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -461,7 +461,7 @@ [% available_matching_rule.code | html %] [% available_matching_rule.description | html %] - Edit + Edit Delete diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt index f0b4aa60f1..82724949bf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt @@ -130,7 +130,7 @@ Actions diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt index 81bf52d255..c7d2afb18c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -335,7 +335,7 @@ Patron attribute types › Administration › Koha [% END %] - Edit + Edit Delete diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt index c29b3726b4..c26c835034 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt @@ -174,7 +174,7 @@ [% IF restriction.is_default %]Yes[% END %] - Edit + Edit [% IF !restriction.is_system && !restriction.is_default %] Delete [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt index d75b5f40e6..f3d6ae5ec2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt @@ -139,7 +139,7 @@ filter_buttons += '" data-filter_name="'+ escape_str(filter.name); filter_buttons += '" data-filter_opac="'+ filter.opac; filter_buttons += '" data-filter_staff_client="'+ filter.staff_client; - filter_buttons += '" > '+_("Edit filter")+''; + filter_buttons += '" > '+_("Edit filter")+''; filter_buttons += ' '+ _("Edit search") + ''; filter_buttons += ' - Edit + Edit Delete @@ -391,7 +391,7 @@ [% recall_shelf_time | html %] [% END %] - Edit + Edit Delete diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt index 652ffbee7a..1c4be533c8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt @@ -53,7 +53,7 @@ [% p.patrons_using | html %] - Edit + Edit Delete diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt index 83e6c628bd..de9c86cb32 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt @@ -422,7 +422,7 @@ }, { "data": function( row, type, val, meta ) { - var result = ' '+_("Edit")+''+"\n"; + var result = ' '+_("Edit")+''+"\n"; result += ''+_("Delete")+''; return result; }, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt index 149abb718e..1941f22b5d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -433,7 +433,7 @@ - Edit Delete + Edit 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 86c2c652b9..4b9c1425ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -233,7 +233,7 @@ Actions diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt index 155fb502d0..d71fa76c1b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt @@ -302,7 +302,7 @@
    - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt index 42413b5113..10b86c5bc9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt @@ -91,7 +91,7 @@ Choose [% END %] - Edit authority + Edit authority [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt index 5cc44a6363..33a3479c72 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt @@ -97,7 +97,7 @@ Actions