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' %]
-
Clear field
+
Clear field
Create new authority
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 @@