From 582502644801b44595497caf6bbee449f0347238 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 15 Oct 2018 19:44:51 -0300 Subject: [PATCH] Bug 21526: uri escape TT variables when used in 'a href' This patch has been generated with the script provided on bug 21576. It only affects variable used in the href attribute of a link *when* href it the first attribute of the node (grep "a href") Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens --- .../includes/acquisitions-add-to-basket.inc | 14 ++--- .../prog/en/includes/acquisitions-toolbar.inc | 4 +- .../includes/authorities-search-results.inc | 2 +- .../prog/en/includes/authorities-toolbar.inc | 10 ++-- .../prog/en/includes/authorities.inc | 2 +- .../prog/en/includes/biblio-view-menu.inc | 2 +- .../prog/en/includes/blocked-fines.inc | 4 +- .../en/includes/budgets-admin-toolbar.inc | 14 ++--- .../prog/en/includes/cat-toolbar.inc | 28 ++++----- .../catalogue/itemsearch_item.json.inc | 6 +- .../prog/en/includes/circ-menu.inc | 30 +++++----- .../includes/circ-patron-search-results.inc | 4 +- .../intranet-tmpl/prog/en/includes/facets.inc | 8 +-- .../prog/en/includes/holds_table.inc | 4 +- .../prog/en/includes/ill-toolbar.inc | 2 +- .../prog/en/includes/intranet-bottom.inc | 4 +- .../prog/en/includes/langmenu-staff-top.inc | 4 +- .../prog/en/includes/members-toolbar.inc | 2 +- .../prog/en/includes/merge-record.inc | 2 +- .../prog/en/includes/patron-title.inc | 5 +- .../prog/en/includes/patron-toolbar.inc | 4 +- .../prog/en/includes/serials-menu.inc | 6 +- .../prog/en/includes/serials-toolbar.inc | 4 +- .../prog/en/includes/vendor-menu.inc | 12 ++-- .../en/includes/virtualshelves-toolbar.inc | 10 ++-- .../prog/en/modules/acqui/acqui-home.tt | 8 +-- .../prog/en/modules/acqui/addorderiso2709.tt | 6 +- .../prog/en/modules/acqui/basket.tt | 42 ++++++++------ .../prog/en/modules/acqui/basketgroup.tt | 18 +++--- .../prog/en/modules/acqui/basketheader.tt | 2 +- .../prog/en/modules/acqui/booksellers.tt | 6 +- .../prog/en/modules/acqui/cancelorder.tt | 6 +- .../prog/en/modules/acqui/edifactmsgs.tt | 6 +- .../prog/en/modules/acqui/histsearch.tt | 10 ++-- .../prog/en/modules/acqui/invoice-files.tt | 6 +- .../prog/en/modules/acqui/invoice.tt | 12 ++-- .../prog/en/modules/acqui/invoices.tt | 12 ++-- .../prog/en/modules/acqui/lateorders.tt | 4 +- .../prog/en/modules/acqui/neworderbiblio.tt | 8 +-- .../prog/en/modules/acqui/neworderempty.tt | 6 +- .../en/modules/acqui/newordersubscription.tt | 2 +- .../en/modules/acqui/newordersuggestion.tt | 4 +- .../prog/en/modules/acqui/ordered.tt | 6 +- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../prog/en/modules/acqui/parcel.tt | 58 +++++++++---------- .../prog/en/modules/acqui/parcels.tt | 14 ++--- .../prog/en/modules/acqui/spent.tt | 6 +- .../prog/en/modules/acqui/supplier.tt | 6 +- .../prog/en/modules/acqui/transferorder.tt | 4 +- .../prog/en/modules/acqui/uncertainprice.tt | 8 +-- .../prog/en/modules/acqui/z3950_search.tt | 6 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 22 +++---- .../prog/en/modules/admin/aqbudgets.tt | 12 ++-- .../prog/en/modules/admin/aqcontract.tt | 18 +++--- .../prog/en/modules/admin/aqplan.tt | 6 +- .../modules/admin/auth_subfields_structure.tt | 8 +-- .../en/modules/admin/auth_tag_structure.tt | 18 +++--- .../en/modules/admin/authorised_values.tt | 4 +- .../prog/en/modules/admin/authtypes.tt | 6 +- .../prog/en/modules/admin/biblio_framework.tt | 6 +- .../modules/admin/branch_transfer_limits.tt | 2 +- .../prog/en/modules/admin/branches.tt | 4 +- .../prog/en/modules/admin/edi_accounts.tt | 2 +- .../prog/en/modules/admin/itemtypes.tt | 10 ++-- .../modules/admin/marc_subfields_structure.tt | 26 ++++----- .../prog/en/modules/admin/marctagstructure.tt | 20 +++---- .../prog/en/modules/admin/oai_sets.tt | 4 +- .../en/modules/admin/systempreferences.tt | 2 +- .../prog/en/modules/admin/usage_statistics.tt | 2 +- .../prog/en/modules/admin/z3950servers.tt | 8 +-- .../intranet-tmpl/prog/en/modules/auth.tt | 6 +- .../en/modules/authorities/authorities.tt | 4 +- .../prog/en/modules/authorities/detail.tt | 8 +-- .../prog/en/modules/authorities/merge.tt | 6 +- .../authorities/searchresultlist-auth.tt | 14 ++--- .../modules/authorities/searchresultlist.tt | 6 +- .../prog/en/modules/basket/basket.tt | 14 ++--- .../prog/en/modules/catalogue/MARCdetail.tt | 6 +- .../prog/en/modules/catalogue/advsearch.tt | 4 +- .../prog/en/modules/catalogue/detail.tt | 48 +++++++-------- .../prog/en/modules/catalogue/issuehistory.tt | 2 +- .../prog/en/modules/catalogue/moredetail.tt | 20 +++---- .../prog/en/modules/catalogue/results.tt | 14 ++--- .../en/modules/catalogue/search-history.tt | 8 +-- .../prog/en/modules/cataloguing/addbiblio.tt | 2 +- .../prog/en/modules/cataloguing/addbooks.tt | 18 +++--- .../prog/en/modules/cataloguing/additem.tt | 20 +++---- .../prog/en/modules/cataloguing/merge.tt | 4 +- .../cataloguing/value_builder/cn_browser.tt | 2 +- .../cataloguing/value_builder/macles.tt | 4 +- .../value_builder/marc21_linking_section.tt | 4 +- .../modules/cataloguing/z3950_auth_search.tt | 2 +- .../en/modules/cataloguing/z3950_search.tt | 4 +- .../prog/en/modules/circ/article-requests.tt | 8 +-- .../prog/en/modules/circ/branchoverdues.tt | 12 ++-- .../prog/en/modules/circ/branchtransfers.tt | 10 ++-- .../prog/en/modules/circ/checkout-notes.tt | 2 +- .../prog/en/modules/circ/circulation-home.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 16 ++--- .../circ/circulation_batch_checkouts.tt | 2 +- .../prog/en/modules/circ/on-site_checkouts.tt | 6 +- .../prog/en/modules/circ/overdue.tt | 6 +- .../prog/en/modules/circ/pendingreserves.tt | 2 +- .../prog/en/modules/circ/renew.tt | 12 ++-- .../prog/en/modules/circ/request-article.tt | 8 +-- .../prog/en/modules/circ/reserveratios.tt | 2 +- .../prog/en/modules/circ/returns.tt | 42 +++++++------- .../en/modules/circ/transferstoreceive.tt | 6 +- .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 10 ++-- .../prog/en/modules/clubs/club-enrollments.tt | 2 +- .../prog/en/modules/clubs/clubs.tt | 8 +-- .../course_reserves/add_items-step1.tt | 2 +- .../course_reserves/add_items-step2.tt | 2 +- .../course_reserves/batch_add_items.tt | 2 +- .../modules/course_reserves/course-details.tt | 12 ++-- .../course_reserves/course-reserves.tt | 4 +- .../prog/en/modules/course_reserves/course.tt | 2 +- .../prog/en/modules/errors/errorpage.tt | 2 +- .../prog/en/modules/ill/ill-requests.tt | 8 +-- .../prog/en/modules/intranet-main.tt | 2 +- .../en/modules/members/accountline-details.tt | 6 +- .../prog/en/modules/members/boraccount.tt | 16 ++--- .../prog/en/modules/members/discharges.tt | 2 +- .../prog/en/modules/members/files.tt | 2 +- .../prog/en/modules/members/holdshistory.tt | 2 +- .../prog/en/modules/members/housebound.tt | 6 +- .../prog/en/modules/members/mancredit.tt | 8 +-- .../prog/en/modules/members/maninvoice.tt | 8 +-- .../prog/en/modules/members/memberentrygen.tt | 6 +- .../prog/en/modules/members/members-update.tt | 2 +- .../prog/en/modules/members/merge-patrons.tt | 2 +- .../en/modules/members/moremember-brief.tt | 8 +-- .../en/modules/members/moremember-print.tt | 6 +- .../en/modules/members/moremember-receipt.tt | 8 +-- .../prog/en/modules/members/moremember.tt | 18 +++--- .../prog/en/modules/members/pay.tt | 8 +-- .../prog/en/modules/members/paycollect.tt | 10 ++-- .../modules/members/purchase-suggestions.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 2 +- .../prog/en/modules/members/routing-lists.tt | 4 +- .../prog/en/modules/offline_circ/list.tt | 4 +- .../en/modules/offline_circ/process_koc.tt | 8 +-- .../prog/en/modules/patron_lists/list.tt | 2 +- .../prog/en/modules/patron_lists/lists.tt | 10 ++-- .../prog/en/modules/plugins/plugins-home.tt | 6 +- .../prog/en/modules/reports/bor_issues_top.tt | 2 +- .../en/modules/reports/cash_register_stats.tt | 4 +- .../prog/en/modules/reports/catalogue_out.tt | 4 +- .../modules/reports/guided_reports_start.tt | 12 ++-- .../prog/en/modules/reports/itemslost.tt | 4 +- .../en/modules/reports/orders_by_budget.tt | 4 +- .../prog/en/modules/reports/reserves_stats.tt | 2 +- .../prog/en/modules/reports/serials_stats.tt | 4 +- .../prog/en/modules/reserve/request.tt | 34 +++++------ .../prog/en/modules/reviews/reviewswaiting.tt | 8 +-- .../modules/rotating_collections/addItems.tt | 2 +- .../rotating_collections/editCollections.tt | 2 +- .../rotatingCollections.tt | 8 +-- .../en/modules/serials/checkexpiration.tt | 4 +- .../prog/en/modules/serials/claims.tt | 2 +- .../prog/en/modules/serials/routing.tt | 2 +- .../en/modules/serials/serials-collection.tt | 8 +-- .../prog/en/modules/serials/serials-search.tt | 12 ++-- .../modules/serials/subscription-batchedit.tt | 4 +- .../en/modules/serials/subscription-detail.tt | 10 ++-- .../serials/subscription-frequencies.tt | 2 +- .../serials/subscription-numberpatterns.tt | 2 +- .../prog/en/modules/serials/viewalerts.tt | 4 +- .../prog/en/modules/suggestion/suggestion.tt | 22 +++---- .../prog/en/modules/tags/list.tt | 2 +- .../prog/en/modules/tags/review.tt | 2 +- .../prog/en/modules/tools/batchMod-del.tt | 10 ++-- .../prog/en/modules/tools/batchMod-edit.tt | 8 +-- .../en/modules/tools/batch_delete_records.tt | 10 ++-- .../tools/batch_record_modification.tt | 16 ++--- .../prog/en/modules/tools/csv-profiles.tt | 4 +- .../prog/en/modules/tools/holidays.tt | 4 +- .../prog/en/modules/tools/inventory.tt | 2 +- .../prog/en/modules/tools/koha-news.tt | 4 +- .../prog/en/modules/tools/letter.tt | 4 +- .../en/modules/tools/manage-marc-import.tt | 10 ++-- .../prog/en/modules/tools/modborrowers.tt | 2 +- .../prog/en/modules/tools/overduerules.tt | 2 +- .../prog/en/modules/tools/showdiffmarc.tt | 2 +- .../prog/en/modules/tools/upload-images.tt | 2 +- .../prog/en/modules/tools/viewlog.tt | 14 ++--- .../prog/en/modules/virtualshelves/shelves.tt | 24 ++++---- .../includes/authorities-search-results.inc | 2 +- .../en/includes/masthead-langmenu.inc | 4 +- .../bootstrap/en/includes/masthead.inc | 6 +- .../en/includes/opac-authorities.inc | 6 +- .../bootstrap/en/includes/opac-bottom.inc | 4 +- .../bootstrap/en/includes/opac-facets.inc | 10 ++-- .../bootstrap/en/includes/page-numbers.inc | 10 ++-- .../bootstrap/en/includes/shelfbrowser.inc | 8 +-- .../bootstrap/en/modules/errors/errorpage.tt | 2 +- .../bootstrap/en/modules/maintenance.tt | 2 +- .../bootstrap/en/modules/opac-advsearch.tt | 2 +- .../en/modules/opac-alert-subscribe.tt | 4 +- .../en/modules/opac-auth-MARCdetail.tt | 4 +- .../bootstrap/en/modules/opac-auth-detail.tt | 2 +- .../bootstrap/en/modules/opac-auth.tt | 12 ++-- .../opac-authoritiessearchresultlist.tt | 10 ++-- .../bootstrap/en/modules/opac-basket.tt | 6 +- .../bootstrap/en/modules/opac-browser.tt | 4 +- .../en/modules/opac-course-details.tt | 6 +- .../en/modules/opac-course-reserves.tt | 2 +- .../bootstrap/en/modules/opac-detail.tt | 58 +++++++++---------- .../en/modules/opac-downloadshelf.tt | 2 +- .../en/modules/opac-full-serial-issues.tt | 2 +- .../bootstrap/en/modules/opac-idref.tt | 4 +- .../bootstrap/en/modules/opac-illrequests.tt | 8 +-- .../bootstrap/en/modules/opac-imageviewer.tt | 2 +- .../bootstrap/en/modules/opac-main.tt | 2 +- .../bootstrap/en/modules/opac-memberentry.tt | 2 +- .../bootstrap/en/modules/opac-opensearch.tt | 4 +- .../en/modules/opac-password-recovery.tt | 2 +- .../en/modules/opac-readingrecord.tt | 4 +- .../bootstrap/en/modules/opac-results.tt | 18 +++--- .../en/modules/opac-routing-lists.tt | 2 +- .../en/modules/opac-search-history.tt | 8 +-- .../en/modules/opac-serial-issues.tt | 6 +- .../bootstrap/en/modules/opac-shelves.tt | 22 +++---- .../en/modules/opac-showreviews-rss.tt | 2 +- .../bootstrap/en/modules/opac-showreviews.tt | 4 +- .../bootstrap/en/modules/opac-tags_subject.tt | 2 +- .../bootstrap/en/modules/opac-topissues.tt | 2 +- .../bootstrap/en/modules/opac-user.tt | 14 ++--- .../bootstrap/en/modules/sco/sco-main.tt | 2 +- misc/cronjobs/rss/lastAcquired-1.0.tt | 2 +- misc/cronjobs/rss/lastAcquired-2.0.tt | 2 +- 232 files changed, 889 insertions(+), 882 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc index 0bf441824c..1e2943324f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc @@ -12,13 +12,13 @@ -
  • From a suggestion
    • -
  • From a subscription
    • -
  • From a new (empty) record
    • -
  • From an external source
    • -
  • From a new file
    • -
  • From a staged file
    • - [% IF ( CAN_user_circulate ) %]
  • From titles with highest hold ratios
    • [% END %] +
  • From a suggestion
    • +
  • From a subscription
    • +
  • From a new (empty) record
    • +
  • From an external source
    • +
  • From a new file
    • +
  • From a staged file
    • + [% IF ( CAN_user_circulate ) %]
  • From titles with highest hold ratios
    • [% END %] [% ELSE %]
    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 5ad1a08124..79824b3f3b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -16,10 +16,10 @@ function confirm_deletion() {
      [% IF CAN_user_acquisition_order_manage && active %] -
    • Basket
      • +
    • Basket
      • [% END %] [% IF CAN_user_acquisition_contracts_manage && active %] -
    • Contract
      • +
    • Contract
      • [% END %] [% IF ( CAN_user_acquisition_vendors_manage ) %]
    • Vendor
      • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc index fe219ef199..06d66219df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc @@ -30,7 +30,7 @@ [% IF ( authid ) %] [% heading | html %] [% ELSE %] - [% heading | html %] + [% heading | html %] [% END %] [% ELSE %] [% heading | html %] 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 893df07b87..395026331c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc @@ -14,7 +14,7 @@ [% END %] [% FOREACH authority_type IN authority_types %] -
    • [% authority_type.authtypetext | html %]
      • +
    • [% authority_type.authtypetext | html %]
      • [% END %]
    @@ -44,10 +44,10 @@ [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc index 45225f8917..1e37b65c7f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc @@ -10,7 +10,7 @@ [% IF ( node.current_value ) %] [% node.value | html %] [% ELSE %] - [% node.value | html %] + [% node.value | html %] [% END %] [% IF ( node.children && node.children.size > 0 ) %] [% PROCESS showtree tree = node.children %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc index 84536e011d..d13312a0df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc @@ -31,7 +31,7 @@ [% IF Koha.Preference('ArticleRequests') %] [% IF ( article_requests_view ) %]
  • [% ELSE %]
  • [% END %] - Article requests ([% Biblio.ArticleRequestsActiveCount( biblio_object_id ) | html %])
    • + Article requests ([% Biblio.ArticleRequestsActiveCount( biblio_object_id ) | html %]) [% END %] [% IF ( subscriptionsnumber ) %]
  • Subscriptions ([% subscriptionsnumber | html %])
    • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc index 832706f98b..80b0514720 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc @@ -7,7 +7,7 @@ [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %] Checkouts are BLOCKED because fine balance is OVER THE LIMIT. [% END %] - Make payment - Pay all fines + Make payment + Pay all fines [% END %] 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 f76b7876dc..980cca9e2c 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 @@ -10,15 +10,15 @@ [% ELSE %]
  • [% END %] - New fund for [% budget_period_description | html %]
    • + New fund for [% budget_period_description | html %]
    @@ -30,26 +30,26 @@ [% ELSE %]
  • [% END %] - Plan by months
    • + Plan by months [% IF ( CAN_user_acquisition_planning_manage ) %]
  • [% ELSE %]
  • [% END %] - Plan by libraries
    • + Plan by libraries [% IF ( CAN_user_acquisition_planning_manage ) %]
  • [% ELSE %]
  • [% END %] - Plan by item types
    • + Plan by item types [% FOREACH auth_cats_loo IN auth_cats_loop %] [% IF ( CAN_user_acquisition_planning_manage ) %]
  • [% ELSE %]
  • [% END %] - Plan by [% auth_cats_loo | html %] + Plan by [% auth_cats_loo | html %]
    • [% END %] 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 d5191e30fd..d17964187d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -18,10 +18,10 @@ CAN_user_serials_create_subscription ) %] [% END %] [% IF ( EasyAnalyticalRecords && CAN_user_editcatalogue_edit_catalogue ) %] -
  • Analyze items
    • +
  • Analyze items
    • [% END %] [% IF CAN_user_editcatalogue_edit_catalogue && ! EasyAnalyticalRecords %] -
  • New child record
    • +
  • New child record
    • [% END %] @@ -55,10 +55,10 @@ CAN_user_serials_create_subscription ) %] [% END %] [% END %] - [% IF ( CAN_user_editcatalogue_edit_items ) %]
  • Attach item
    • [% END %] + [% IF ( CAN_user_editcatalogue_edit_items ) %]
  • Attach item
    • [% END %] - [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]
  • Link to host item[% END %][% END %] - [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( CAN_user_tools_upload_local_cover_images ) %]
  • Upload image[% END %][% END %] + [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]
  • Link to host item[% END %][% END %] + [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( CAN_user_tools_upload_local_cover_images ) %]
  • Upload image[% END %][% END %] [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
  • Edit as new (duplicate)
    • @@ -88,14 +88,14 @@ CAN_user_serials_create_subscription ) %]
    @@ -125,8 +125,8 @@ CAN_user_serials_create_subscription ) %] [% ELSE %] 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 f683757080..45b43f647b 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 @@ -5,13 +5,13 @@ [%- biblioitem = item.biblioitem -%] [ "[% FILTER escape_quotes = replace('"', '\"') ~%] - [% biblio.title | html %][% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %] by[% END %] [% biblio.author | html %] + [% biblio.title | html %][% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %] by[% END %] [% biblio.author | html %] [%~ END %]", "[% (biblioitem.publicationyear || biblio.copyrightdate) | html %]", "[% biblioitem.publishercode | html %]", "[% AuthorisedValues.GetByCode( 'CCODE', item.ccode ) | html %]", "[% FILTER escape_quotes ~%] - [% item.barcode | html %] + [% item.barcode | html %] [%~ END %]", "[% item.itemcallnumber | html %]", "[% Branches.GetName(item.homebranch) | html %]", @@ -21,6 +21,6 @@ "[% item.status | html %]", "[% (item.issues || 0) | html %]", "[% 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 a69d099e92..25592900a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -73,56 +73,56 @@ [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc index 08e4a2a38f..dbad05777e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc @@ -15,7 +15,7 @@ [% FOREACH borrower IN borrowers %] [% IF destination == "circ" %] - [% borrower.surname | html %], [% borrower.firstname | html %] + [% borrower.surname | html %], [% borrower.firstname | html %] [% ELSIF destination == "holds" %] [% IF multi_hold %] [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&multi_hold=1&biblionumbers=" _ biblionumbers %] @@ -23,7 +23,7 @@ [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&biblionumber=" _ biblionumber %] [% END %] - [% borrower.surname | html %], [% borrower.firstname | html %] + [% borrower.surname | html %], [% borrower.firstname | html %] [% END %] [% borrower.cardnumber | html %] [% borrower.dateofbirth | $KohaDates %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc index 3943c0ab6f..b05084898a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ -4,7 +4,7 @@

    Refine your search

    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 a04d1e0095..804c868c3b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -123,7 +123,7 @@ [% IF ( hold.found ) %] - + [% IF ( hold.barcodenumber ) %] [% hold.barcodenumber | html %] @@ -135,7 +135,7 @@ [% IF ( hold.item_level_hold ) %] Only item - + [% IF ( hold.barcodenumber ) %] [% hold.barcodenumber | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc index 45a3c6839e..f3ef56c74b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc @@ -9,7 +9,7 @@
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc index 37ebda8444..432bde7a5a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc @@ -31,7 +31,7 @@ [% IF ( sublanguages_loo.sublanguage_current ) %]
  • [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])
    • [% ELSE %] -
  • [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])
    • +
  • [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])
    • [% END %] [% END %] @@ -49,7 +49,7 @@ [% END %] [% ELSE %] -
  • +
  • [% IF ( languages_loo.native_description ) %] [% languages_loo.native_description | html %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc index 21725d09f6..d7fab933d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc @@ -11,7 +11,7 @@ [% IF ( sublanguages_loo.sublanguage_current ) %]
  • [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] 
    • [% ELSE %] -
  • [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]
    • +
  • [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]
    • [% END %] [% END # / IF sublanguages_loo.enabled %] [% END # / FOREACH sublanguages_loo %] @@ -20,7 +20,7 @@ [% IF ( languages_loo.current ) %]
  • [% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %] 
    • [% ELSE %] -
  • [% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]
    • +
  • [% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]
    • [% END %] [% END # / IF languages_loo.current %] [% END # / IF ( languages_loo.plural ) %] 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 e68a0369db..e29e9e197f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -59,7 +59,7 @@ [% END %] [% IF CAN_user_borrowers_edit_borrowers && useDischarge %] -
  • Discharge
    • +
  • Discharge
    • [% END %] [% IF Koha.Preference('RESTOAuth2ClientCredentials') %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc index 0a366564fb..6d14015916 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc @@ -50,7 +50,7 @@