From b8b9fac6a23dcecb3a8cbf772eb0fc32d7451af9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 10 Oct 2018 09:46:25 -0300 Subject: [PATCH] Bug 21526: uri escape TT variables used to build a link --- .../en/includes/acquisitions-add-to-basket.inc | 14 ++--- .../prog/en/includes/acquisitions-toolbar.inc | 4 +- .../en/includes/authorities-search-results.inc | 2 +- .../prog/en/includes/authorities-toolbar.inc | 10 ++-- .../intranet-tmpl/prog/en/includes/authorities.inc | 2 +- .../prog/en/includes/biblio-view-menu.inc | 2 +- .../prog/en/includes/blocked-fines.inc | 4 +- .../prog/en/includes/budgets-admin-toolbar.inc | 14 ++--- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 28 +++++----- .../en/includes/catalogue/itemsearch_item.json.inc | 6 +-- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 34 ++++++------ .../en/includes/circ-patron-search-results.inc | 4 +- .../intranet-tmpl/prog/en/includes/facets.inc | 8 +-- .../intranet-tmpl/prog/en/includes/holds_table.inc | 6 +-- .../intranet-tmpl/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 | 4 +- .../prog/en/includes/patron-toolbar.inc | 4 +- .../prog/en/includes/serials-menu.inc | 6 +-- .../prog/en/includes/serials-toolbar.inc | 4 +- .../intranet-tmpl/prog/en/includes/vendor-menu.inc | 12 ++--- .../prog/en/includes/virtualshelves-toolbar.inc | 10 ++-- .../prog/en/modules/acqui/acqui-home.tt | 8 +-- .../prog/en/modules/acqui/addorderiso2709.tt | 6 +-- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 46 ++++++++-------- .../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 +-- .../intranet-tmpl/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 | 6 +-- .../prog/en/modules/acqui/neworderempty.tt | 6 +-- .../prog/en/modules/acqui/newordersubscription.tt | 2 +- .../prog/en/modules/acqui/newordersuggestion.tt | 4 +- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 6 +-- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 60 ++++++++++----------- .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 14 ++--- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 6 +-- .../prog/en/modules/acqui/supplier.tt | 6 +-- .../en/modules/acqui/tables/members_results.tt | 4 +- .../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 | 14 ++--- .../prog/en/modules/admin/aqcontract.tt | 18 +++---- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 6 +-- .../en/modules/admin/auth_subfields_structure.tt | 8 +-- .../prog/en/modules/admin/auth_tag_structure.tt | 18 +++---- .../prog/en/modules/admin/authorised_values.tt | 4 +- .../prog/en/modules/admin/authtypes.tt | 6 +-- .../prog/en/modules/admin/biblio_framework.tt | 12 ++--- .../en/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 ++-- .../en/modules/admin/marc_subfields_structure.tt | 26 ++++----- .../prog/en/modules/admin/marctagstructure.tt | 20 +++---- .../prog/en/modules/admin/matching-rules.tt | 4 +- .../prog/en/modules/admin/oai_sets.tt | 4 +- .../prog/en/modules/admin/systempreferences.tt | 2 +- .../prog/en/modules/admin/usage_statistics.tt | 4 +- .../prog/en/modules/admin/z3950servers.tt | 8 +-- koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 6 +-- .../prog/en/modules/authorities/authorities.tt | 20 +++---- .../prog/en/modules/authorities/detail.tt | 8 +-- .../prog/en/modules/authorities/merge.tt | 6 +-- .../modules/authorities/searchresultlist-auth.tt | 14 ++--- .../en/modules/authorities/searchresultlist.tt | 6 +-- .../intranet-tmpl/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 | 52 +++++++++--------- .../prog/en/modules/catalogue/issuehistory.tt | 2 +- .../prog/en/modules/catalogue/moredetail.tt | 20 +++---- .../prog/en/modules/catalogue/results.tt | 18 +++---- .../prog/en/modules/catalogue/search-history.tt | 8 +-- .../prog/en/modules/cataloguing/addbiblio.tt | 22 ++++---- .../prog/en/modules/cataloguing/addbooks.tt | 18 +++---- .../prog/en/modules/cataloguing/additem.tt | 26 ++++----- .../prog/en/modules/cataloguing/merge.tt | 4 +- .../cataloguing/value_builder/cn_browser.tt | 2 +- .../en/modules/cataloguing/value_builder/macles.tt | 4 +- .../value_builder/marc21_linking_section.tt | 4 +- .../value_builder/unimarc_field_210c.tt | 2 +- .../cataloguing/value_builder/unimarc_field_4XX.tt | 4 +- .../en/modules/cataloguing/z3950_auth_search.tt | 4 +- .../prog/en/modules/cataloguing/z3950_search.tt | 6 +-- .../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 +++--- .../en/modules/circ/circulation_batch_checkouts.tt | 2 +- .../prog/en/modules/circ/on-site_checkouts.tt | 6 +-- .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 6 +-- .../prog/en/modules/circ/pendingreserves.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/renew.tt | 12 ++--- .../prog/en/modules/circ/request-article.tt | 8 +-- .../prog/en/modules/circ/reserveratios.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 42 +++++++-------- .../prog/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 +- .../intranet-tmpl/prog/en/modules/clubs/clubs.tt | 10 ++-- .../en/modules/course_reserves/add_items-step1.tt | 2 +- .../en/modules/course_reserves/add_items-step2.tt | 2 +- .../en/modules/course_reserves/batch_add_items.tt | 2 +- .../en/modules/course_reserves/course-details.tt | 12 ++--- .../en/modules/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 | 6 +-- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +- .../prog/en/modules/members/accountline-details.tt | 6 +-- .../prog/en/modules/members/boraccount.tt | 16 +++--- .../prog/en/modules/members/discharges.tt | 2 +- .../intranet-tmpl/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 +- .../prog/en/modules/members/moremember-brief.tt | 8 +-- .../prog/en/modules/members/moremember-print.tt | 6 +-- .../prog/en/modules/members/moremember-receipt.tt | 8 +-- .../prog/en/modules/members/moremember.tt | 18 +++---- .../intranet-tmpl/prog/en/modules/members/pay.tt | 8 +-- .../prog/en/modules/members/paycollect.tt | 10 ++-- .../en/modules/members/purchase-suggestions.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 2 +- .../prog/en/modules/members/routing-lists.tt | 4 +- .../en/modules/members/tables/guarantor_search.tt | 2 +- .../en/modules/members/tables/members_results.tt | 4 +- .../prog/en/modules/offline_circ/list.tt | 4 +- .../prog/en/modules/offline_circ/process_koc.tt | 8 +-- .../prog/en/modules/patron_lists/list.tt | 2 +- .../prog/en/modules/patron_lists/lists.tt | 12 ++--- .../modules/patroncards/tables/members_results.tt | 4 +- .../prog/en/modules/plugins/plugins-home.tt | 6 +-- .../prog/en/modules/reports/bor_issues_top.tt | 2 +- .../prog/en/modules/reports/cash_register_stats.tt | 4 +- .../prog/en/modules/reports/catalogue_out.tt | 4 +- .../en/modules/reports/guided_reports_start.tt | 12 ++--- .../prog/en/modules/reports/itemslost.tt | 4 +- .../prog/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 +-- .../en/modules/rotating_collections/addItems.tt | 2 +- .../rotating_collections/editCollections.tt | 2 +- .../rotating_collections/rotatingCollections.tt | 8 +-- .../prog/en/modules/serials/checkexpiration.tt | 4 +- .../prog/en/modules/serials/claims.tt | 2 +- .../prog/en/modules/serials/routing.tt | 2 +- .../prog/en/modules/serials/serials-collection.tt | 10 ++-- .../prog/en/modules/serials/serials-edit.tt | 8 +-- .../prog/en/modules/serials/serials-search.tt | 12 ++--- .../prog/en/modules/serials/subscription-add.tt | 2 +- .../en/modules/serials/subscription-batchedit.tt | 4 +- .../prog/en/modules/serials/subscription-detail.tt | 10 ++-- .../en/modules/serials/subscription-frequencies.tt | 2 +- .../modules/serials/subscription-numberpatterns.tt | 2 +- .../en/modules/serials/tables/members_results.tt | 4 +- .../prog/en/modules/serials/viewalerts.tt | 4 +- .../prog/en/modules/suggestion/suggestion.tt | 24 ++++----- .../intranet-tmpl/prog/en/modules/tags/list.tt | 2 +- .../intranet-tmpl/prog/en/modules/tags/review.tt | 2 +- .../prog/en/modules/tools/batchMod-del.tt | 10 ++-- .../prog/en/modules/tools/batchMod-edit.tt | 12 ++--- .../prog/en/modules/tools/batch_delete_records.tt | 10 ++-- .../en/modules/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 +- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 6 +-- .../prog/en/modules/tools/manage-marc-import.tt | 10 ++-- .../prog/en/modules/tools/modborrowers.tt | 4 +- .../prog/en/modules/tools/overduerules.tt | 2 +- .../prog/en/modules/tools/showdiffmarc.tt | 2 +- .../prog/en/modules/tools/upload-images.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 14 ++--- .../prog/en/modules/virtualshelves/shelves.tt | 24 ++++----- .../virtualshelves/tables/shelves_results.tt | 4 +- .../en/includes/authorities-search-results.inc | 2 +- .../bootstrap/en/includes/masthead-langmenu.inc | 4 +- .../opac-tmpl/bootstrap/en/includes/masthead.inc | 6 +-- .../bootstrap/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 +- .../opac-tmpl/bootstrap/en/modules/maintenance.tt | 2 +- .../bootstrap/en/modules/opac-advsearch.tt | 2 +- .../bootstrap/en/modules/opac-alert-subscribe.tt | 4 +- .../bootstrap/en/modules/opac-auth-MARCdetail.tt | 4 +- .../bootstrap/en/modules/opac-auth-detail.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 12 ++--- .../en/modules/opac-authoritiessearchresultlist.tt | 10 ++-- .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 8 +-- .../opac-tmpl/bootstrap/en/modules/opac-browser.tt | 4 +- .../bootstrap/en/modules/opac-course-details.tt | 6 +-- .../bootstrap/en/modules/opac-course-reserves.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 62 +++++++++++----------- .../bootstrap/en/modules/opac-downloadshelf.tt | 2 +- .../en/modules/opac-full-serial-issues.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-idref.tt | 4 +- .../bootstrap/en/modules/opac-illrequests.tt | 8 +-- .../bootstrap/en/modules/opac-imageviewer.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +- .../bootstrap/en/modules/opac-memberentry.tt | 2 +- .../bootstrap/en/modules/opac-opensearch.tt | 4 +- .../bootstrap/en/modules/opac-password-recovery.tt | 2 +- .../bootstrap/en/modules/opac-readingrecord.tt | 4 +- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 18 +++---- .../bootstrap/en/modules/opac-routing-lists.tt | 2 +- .../bootstrap/en/modules/opac-search-history.tt | 8 +-- .../bootstrap/en/modules/opac-serial-issues.tt | 6 +-- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 22 ++++---- .../bootstrap/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 +- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 16 +++--- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 2 +- misc/cronjobs/rss/lastAcquired-1.0.tt | 2 +- misc/cronjobs/rss/lastAcquired-2.0.tt | 2 +- 243 files changed, 954 insertions(+), 954 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() {
    @@ -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 430ad211cd..7da052b09f 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 ) %]
  • Subscription(s)
    • [% 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..bb45f85875 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -38,10 +38,10 @@ [% END %] [% END %][% END %] [% IF ( patron.email ) %] -
  • [% patron.email | html %]
    • +
  • [% patron.email | html %]
    • [% ELSE %] [% IF ( patron.emailpro ) %] -
  • [% patron.emailpro | html %]
    • +
  • [% patron.emailpro | html %]
    • [% END %] [% END %] @@ -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..bbbb0f7b35 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..c917c962d8 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 %] @@ -182,7 +182,7 @@ [% IF AutoResumeSuspendedHolds %] - Clear date + Clear date [% ELSE %] [% END %] 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 3f9a0ea744..c289b2546a 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 @@ [% END %] @@ -331,8 +331,8 @@ [% items_table_block_iter = items_table_block_iter + 1 %]
    [% IF (StaffDetailItemSelection) %] - | Select all | - Clear all + | Select all | + Clear all | Actions: [% IF CAN_user_tools_items_batchdel %] @@ -478,7 +478,7 @@ [% item.datelastseen | $KohaDates %] [% item.dateaccessioned | $KohaDates %] - [% item.barcode | html %] + [% item.barcode | html %] [% IF ( volinfo ) %] [% IF ( itemdata_enumchron ) %] @@ -500,7 +500,7 @@ [% END %] [% IF ( itemdata_uri ) %] - [% item.uri | html %] + [% item.uri | html %] [% END %] [% IF ( itemdata_copynumber ) %] [% item.copynumber | html %] @@ -518,20 +518,20 @@ [% item.itemnotes_nonpublic | html %] [% END %] [% IF ( SpineLabelShowPrintOnBibDetails ) %] - Print label + Print label [% END %] [% IF ( hostrecords ) %] - [% IF ( item.hostbiblionumber) %][% item.hosttitle | html %][% END %] + [% IF ( item.hostbiblionumber) %][% item.hosttitle | html %][% END %] [% END %] [% IF ( analyze ) %] [% IF ( item.countanalytics ) %] - [% item.countanalytics | html %] analytics + [% item.countanalytics | html %] analytics [% END %] [% END %] [% IF ( analyze ) %] - Create analytics + Create analytics [% END %] [% IF ShowCourseReserves %] @@ -540,7 +540,7 @@ [% FOREACH r IN item.course_reserves %] [% IF r.course.enabled == 'yes' %]

    - + [% r.course.course_name | html %] [% IF r.course.section %] [% r.course.section | html %] [% END %] @@ -579,7 +579,7 @@ [% PROCESS items_table tab="holdings" items=itemloop %] [% END %] [% IF ( hiddencount ) %] -

    Show all items ([% hiddencount | html %] hidden) +

    Show all items ([% hiddencount | html %] hidden) [% END %] [% IF ( debug_display ) %]

    @@ -626,7 +626,7 @@ [% FOREACH MARCNOTE IN MARCNOTES %]

    [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] - [% MARCNOTE.marcnote | html %] + [% MARCNOTE.marcnote | html %] [% ELSE %] [% MARCNOTE.marcnote FILTER html_line_break | html %] [% END %] @@ -691,7 +691,7 @@ [% END %] [% END %] - Subscription details + Subscription details [% END %]

    @@ -787,9 +787,9 @@ [% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]

    Editions

    -[% FOREACH XISBN IN XISBNS %][% IF ( AmazonCoverImages ) %][% END %] +[% FOREACH XISBN IN XISBNS %][% IF ( AmazonCoverImages ) %][% END %] [% UNLESS ( item_level_itypes ) %][% END %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 119bd110e8..4474432d93 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -39,19 +39,19 @@
  • Physical details: [% pages | html %] [% illus | html %] [% size | html %] 
    • [% IF ( bnotes ) %]
  • Notes: [% bnotes | html %]
    • [% END %]
  • No. of items: [% count | html %] [% IF ( hiddencount ) %]total ([% showncount | html %] shown / [% hiddencount | html %] hidden) -Show all items[% END %]
    • +Show all items[% END %]
    [% IF ( ONLY_ONE ) %] -
    You are only viewing one item. View All
    +
    You are only viewing one item. View All
    [% END %] [% FOREACH ITEM_DAT IN ITEM_DATA %]

    Barcode [% ITEM_DAT.barcode | html %] [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]

    Item information [% IF ( CAN_user_editcatalogue_edit_catalogue ) %][% UNLESS ( ITEM_DAT.nomod ) %] [% IF ( CAN_user_editcatalogue_edit_items ) %] - [Edit Item] + [Edit Item] [% END %] [% END %][% END %]

      @@ -196,7 +196,7 @@ [% IF ITEM_DAT.basketno %]
    1. Order date: [% IF ( CAN_user_acquisition_order_manage ) %] - [% ITEM_DAT.orderdate | $KohaDates %] + [% ITEM_DAT.orderdate | $KohaDates %] [% ELSE %] [% ITEM_DAT.orderdate | $KohaDates %] [% END %] @@ -209,7 +209,7 @@ [% IF ITEM_DAT.dateaccessioned %]
    2. Accession date: [% IF ( CAN_user_acquisition_order_receive && ITEM_DAT.invoiceid ) %] - [% ITEM_DAT.dateaccessioned | $KohaDates %] + [% ITEM_DAT.dateaccessioned | $KohaDates %] [% ELSE %] [% ITEM_DAT.dateaccessioned | $KohaDates %] [% END %] @@ -221,16 +221,16 @@
      3. [% END %] -
    3. Total checkouts:[% IF ( ITEM_DAT.issues ) %][% ITEM_DAT.issues | html %][% ELSE %]0[% END %] (View item's checkout history)
      4. +
    4. Total checkouts:[% IF ( ITEM_DAT.issues ) %][% ITEM_DAT.issues | html %][% ELSE %]0[% END %] (View item's checkout history)
    5. Last seen:[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen | $KohaDates %] [%END %] 
    6. Last borrowed:[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %] 
      7. [% IF Koha.Preference('StoreLastBorrower') && ITEM_DAT.object.last_returned_by %] -
    7. Last returned by: [% ITEM_DAT.object.last_returned_by.cardnumber | html %] 
      8. +
    8. Last returned by: [% ITEM_DAT.object.last_returned_by.cardnumber | html %] 
      9. [% END %] - [% IF ( ITEM_DAT.card0 ) %]
    9. Last borrower: [% ITEM_DAT.card0 | html %] 
      10. [% END %] - [% IF ( ITEM_DAT.card1 ) %]
    10. Previous borrower: [% ITEM_DAT.card1 | html %] 
      11. [% END %] - [% IF ( ITEM_DAT.card2 ) %]
    11. Previous borrower: [% ITEM_DAT.card2 | html %] 
      12. [% END %] + [% IF ( ITEM_DAT.card0 ) %]
    12. Last borrower: [% ITEM_DAT.card0 | html %] 
      13. [% END %] + [% IF ( ITEM_DAT.card1 ) %]
    13. Previous borrower: [% ITEM_DAT.card1 | html %] 
      14. [% END %] + [% IF ( ITEM_DAT.card2 ) %]
    14. Previous borrower: [% ITEM_DAT.card2 | html %] 
      15. [% END %] [% IF ( ITEM_DAT.paidfor ) %]
    15. Paid for?: [% ITEM_DAT.paidfor | html %] 
      16. [% END %] [% IF ( ITEM_DAT.enumchron ) %]
    16. Serial enumeration: [% ITEM_DAT.enumchron | html %] 
      17. [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 7024546f9e..c4800203ad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -44,7 +44,7 @@ @@ -86,7 +86,7 @@ [% FOREACH s IN add_to_some_private_shelves %] [% IF shelfnumber != s.shelfnumber %]
    17. - [% s.shelfname | html %] + [% s.shelfname | html %]
      18. [% SET number_of_private_shelves = number_of_private_shelves + 1 %] [% IF number_of_private_shelves == 10 %][% LAST | html %][% END %] @@ -99,7 +99,7 @@ [% FOREACH s IN add_to_some_public_shelves %] [% IF shelfnumber != s.shelfnumber %]
    18. - [% s.shelfname | html %] + [% s.shelfname | html %]
      19. [% SET number_of_public_shelves = number_of_public_shelves + 1 %] [% IF number_of_public_shelves == 10 %][% LAST | html %][% END %] @@ -326,7 +326,7 @@ [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
    - + [% END %] @@ -94,7 +94,7 @@ - + [% END %] @@ -137,7 +137,7 @@ - + [% END %] @@ -174,7 +174,7 @@ - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 7eb4402477..4efc9e3ee1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -514,7 +514,7 @@ function Changefwk() { [% FOREACH framework IN frameworks%]
  • - + [% IF framework.frameworkcode == frameworkcode %] [% ELSE %] @@ -570,7 +570,7 @@ function Changefwk() {
    @@ -582,10 +582,10 @@ function Changefwk() {
    [% IF advancedMARCEditor %] - [% innerloo.tag | html %] + [% innerloo.tag | html %] [% ELSE %] [% innerloo.tag | html %] - [% IF marcflavour != 'NORMARC' %] ?[% END %] + [% IF marcflavour != 'NORMARC' %] ?[% END %] [% END %] [% IF ( innerloo.fixedfield ) %] [% innerloo.tag_lib | html %] + [% innerloo.tag_lib | html %] [% END %] [% IF ( innerloo.repeatable ) %] - + Repeat this Tag [% END %] - + Delete this Tag @@ -680,7 +680,7 @@ function Changefwk() { [% END %] [% IF ( mv.authtype ) %] - Tag editor + Tag editor [% END %] [% ELSIF ( mv.type == 'text_complex' ) %] @@ -688,7 +688,7 @@ function Changefwk() { [% IF mv.noclick %] [% ELSE %] - Tag editor + Tag editor [% END %] [% mv.javascript | $raw %] @@ -710,10 +710,10 @@ function Changefwk() { [% IF ( subfield_loo.repeatable ) %] - + Clone - + Delete [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt index ce3bf76f5b..f9f9d00cdd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -27,7 +27,7 @@
    @@ -76,7 +76,7 @@
    • @@ -178,10 +178,10 @@ Actions diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index 8f14152e89..714ac9fcb1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -36,9 +36,9 @@ $(document).ready(function(){ var rowid = $(this).parent().attr("id"); num_rowid = rowid.replace("row",""); $(".linktools").remove(); - var edit_link = $(''); + var edit_link = $(''); $(edit_link).text(_("Edit item")); - var delete_link = $(''); + var delete_link = $(''); $(delete_link).text(_("Delete item")); $(delete_link).on('click', function(e) { return confirm_deletion(); @@ -151,8 +151,8 @@ function confirm_deletion() {
    @@ -167,7 +167,7 @@ function confirm_deletion() { [% IF ( book_on_loan ) %]
    Cannot delete: item is checked out.
    [% END %] [% IF ( book_reserved ) %]
    Cannot delete: item has a waiting hold.
    [% END %] [% IF ( not_same_branch ) %]
    Cannot delete: The items do not belong to your library.
    [% END %] -[% IF ( linked_analytics ) %]
    Cannot delete: item has linked analytics..
    [% END %] +[% IF ( linked_analytics ) %]
    Cannot delete: item has linked analytics..
    [% END %]
    [% IF ( item_loop ) %] @@ -213,11 +213,11 @@ function confirm_deletion() {
    [% IF ( noItemTypeImages ) %][% XISBN.description | html %][% ELSE %][% XISBN.description | html %][% END %][% XISBN.title | html %] by [% XISBN.author | html %] ©[% XISBN.copyrightdate | html %] +[% XISBN.title | html %] by [% XISBN.author | html %] ©[% XISBN.copyrightdate | html %] [% IF ( XISBN.publishercode ) %] [% XISBN.publishercode | html %] [% IF ( XISBN.place ) %]([% XISBN.place | html %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear | html %][% END %] [% IF ( XISBN.editionstatement ) %][% XISBN.editionstatement | html %][% END %] [% IF ( XISBN.editionresponsibility ) %][% XISBN.editionresponsibility | html %][% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt index 215b40d23c..0b0ce8019a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt @@ -56,7 +56,7 @@ [% END %] [% IF checkout.item.barcode %] [%# FIXME This test is not mandatory I think %] - [% checkout.item.barcode | html %] + [% checkout.item.barcode | html %] [% ELSE %]   [% END %]
    - [% SEARCH_RESULT.title | html %] + [% SEARCH_RESULT.title | html %] [% SEARCH_RESULT.author | html %] @@ -443,7 +443,7 @@ [% ELSE %] [% IF CAN_user_reserveforothers_place_holds %] Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %]) - [% IF ( holdfor ) %] | Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])[% END %] + [% IF ( holdfor ) %] | Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])[% END %] [% ELSE %] Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %]) [% END %] @@ -462,15 +462,15 @@ [% END %] [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] - | Edit record + | Edit record [% END %] [% IF ( CAN_user_editcatalogue_edit_items ) %] - | Edit items + | Edit items [% END %] [% IF ( OPACBaseURL ) %] - | OPAC view + | OPAC view [% END %] @@ -594,7 +594,7 @@ [% IF ( outer_sup_results_loo.inner_sup_results_loop ) %] [% outer_sup_results_loo.servername | html %] [% FOREACH inner_sup_results_loo IN outer_sup_results_loo.inner_sup_results_loop %] - + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt index f82f1a3b47..34111a2042 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt @@ -57,7 +57,7 @@
    [% s.time |$KohaDates with_hours => 1 | html %][% s.query_desc | html %][% s.query_desc | html %] [% s.total | html %]
    [% s.time |$KohaDates with_hours => 1 | html %][% s.query_desc | html %][% s.query_desc | html %] [% s.total | html %]
    [% s.time |$KohaDates with_hours => 1 | html %][% s.query_desc | html %][% s.query_desc | html %] [% s.total | html %]
    [% s.time |$KohaDates with_hours => 1 | html %][% s.query_desc | html %][% s.query_desc | html %] [% s.total | html %]

    - [% resultsloo.title | html %] + [% resultsloo.title | html %] [% FOREACH subtitl IN resultsloo.subtitle %][% subtitl.subfield | html %][% END %]

    [% IF ( resultsloo.summary ) %]

    [% resultsloo.summary | html %]

    @@ -131,10 +131,10 @@ Actions
    @@ -105,7 +105,7 @@ div#result { margin-top: 1em; } [% FOREACH subtitle IN record.subtitles %] [% subtitle.subfield | html %] [% END %] - ([% record.biblionumber | html %]) View MARC + ([% record.biblionumber | uri %]) View MARC [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt index 89c5a9ccf5..974bee254d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt @@ -34,7 +34,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt index c4970e5976..2d09128ed2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt @@ -67,7 +67,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt index 8f613adf6d..e986bce866 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt @@ -88,9 +88,9 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt index a72dc19fe3..b43daa593a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt @@ -94,8 +94,8 @@ Actions diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt index 4792b1d4d3..63d0923361 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt @@ -137,9 +137,9 @@ Actions diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt index 4401043a5a..5ccfea70f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt @@ -128,7 +128,7 @@ [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt index 01e25b2943..fcef398891 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -21,10 +21,10 @@
    [% cn_loo.itemcallnumber | html %] - + [% cn_loo.title | html %] [% cn_loo.subtitle | html %] [% cn_loo.subtitle2 | html %] [% IF ( cn_loo.author ) %] by [% cn_loo.author | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt index e5a7e09ae9..f989b6942c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt @@ -22,7 +22,7 @@
    [% IF ( BIGLOOP ) %][% END %] @@ -68,7 +68,7 @@ [% FOREACH List IN BIGLOO.Lists %]

    [% List.lib | html %]

    [% FOREACH liblis IN List.liblist %] - [% liblis.listlib | html %]
    + [% liblis.listlib | html %]
    [% END %] [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt index 4b71b80d92..4b7f2788f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt @@ -84,9 +84,9 @@
    		[% IF ( resul.biblionumber ) %] - Choose + Choose [% ELSE %] - Clear field + Clear field [% END %]
    [% resul.used | html %] times [% IF ( resul.to_report ) %] - choose + choose [% END %]
    [% IF ( resul.biblionumber ) %] - Choose + Choose [% ELSE %] - Clear field + Clear field [% END %]

    - + [% ar.biblio.title | html %] [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %] @@ -182,7 +182,7 @@

    		[% ar.item.barcode | html %]

    - + [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %])

    @@ -236,7 +236,7 @@

    - + [% ar.biblio.title | html %] [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %] @@ -290,7 +290,7 @@

    		[% ar.item.barcode | html %]

    - + [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %])

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt index 8994f47367..e8490d4a47 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt @@ -49,10 +49,10 @@
    Barcode : [% overduesloo.barcode | html %]     		- [% overduesloo.borrowersurname | html %], [% overduesloo.borrowerfirstname | html %] + [% overduesloo.borrowersurname | html %], [% overduesloo.borrowerfirstname | html %]
    [% overduesloo.cardnumber | html %]
    [% overduesloo.borrowerphone | html %]
    - [% IF ( overduesloo.borroweremail ) %] + [% IF ( overduesloo.borroweremail ) %] [% overduesloo.borroweremail | html %][% END %]     		[% Branches.GetName( overduesloo.homebranch ) | html %] [% overduesloo.itemcallnumber | html %] @@ -83,23 +83,23 @@

    - [% todayoverduesloo.title | html %] + [% todayoverduesloo.title | html %]   ([% todayoverduesloo.description | html %])
    Barcode : [% todayoverduesloo.barcode | html %]

    		-

    [% todayoverduesloo.borrowersurname | html %]   [% todayoverduesloo.borrowerfirstname | html %] +

    [% todayoverduesloo.borrowersurname | html %]   [% todayoverduesloo.borrowerfirstname | html %]
    [% todayoverduesloo.cardnumber | html %]

    [% todayoverduesloo.borrowerphone | html %]
    - [% IF ( todayoverduesloo.borroweremail ) %] + [% IF ( todayoverduesloo.borroweremail ) %] [% todayoverduesloo.borroweremail | html %][% END %]

    [% Branches.GetName( todayoverduesloo.homebranch ) | html %] [% todayoverduesloo.itemcallnumber | html %]

    		 - Cancel notification + Cancel notification
    @@ -130,7 +130,7 @@
  • Item is already at destination library.
    • [% END %] [% IF ( errmsgloo.errwasreturned ) %] -
  • Item was on loan to +
  • Item was on loan to [% errmsgloo.patron.firstname | html %] [% errmsgloo.patron.surname | html %] ([% errmsgloo.patron.cardnumber | html %]) and has been returned.
    • [% END %] @@ -181,9 +181,9 @@ [% FOREACH trsfitemloo IN trsfitemloop %] - + - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt index b598e188f8..dbad745f75 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt @@ -72,7 +72,7 @@ [% FOREACH note IN notes %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt index c05fd3c600..f59fcaa6fa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt @@ -135,7 +135,7 @@

    Get desktop application

    -

    Get Firefox add-on

    +

    Get Firefox add-on

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 2b273e047a..87681ef3eb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -115,15 +115,15 @@ [% END %] [% IF ( RESERVE_WAITING ) %] -
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) has been waiting for [% resfirstname | html %] [% ressurname | html %] ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% reswaitingdate | $KohaDates %]
    • +
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) has been waiting for [% resfirstname | html %] [% ressurname | html %] ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% reswaitingdate | $KohaDates %]
    • [% END %] [% IF ( RESERVED ) %] -
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) has been on hold for [% resfirstname | html %] [% ressurname | html %] ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% resreservedate | $KohaDates %]
    • +
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) has been on hold for [% resfirstname | html %] [% ressurname | html %] ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% resreservedate | $KohaDates %]
    • [% END %] [% IF ( ISSUED_TO_ANOTHER ) %] -
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) is checked out to [% issued_firstname | html %] [% issued_surname | html %] ([% issued_cardnumber | html %]). +
  • Item [% getTitleMessageIteminfo | html %] ([% getBarcodeMessageIteminfo | html %]) is checked out to [% issued_firstname | html %] [% issued_surname | html %] ([% issued_cardnumber | html %]). [% IF CAN_user_circulate_force_checkout %] Check in and check out? [% END %] @@ -656,7 +656,7 @@ No patron matched [% message | html %] [% IF ( warndeparture ) %]
  • Expiration: Patron's card will expire soon. - Patron's card expires on [% expiry | $KohaDates %] Renew or Edit Details + Patron's card expires on [% expiry | $KohaDates %] Renew or Edit Details
    • [% END %] @@ -669,7 +669,7 @@ No patron matched [% message | html %] [% IF ( expired ) %]
  • Expiration: Patron's card has expired. - [% IF ( expiry ) %]Patron's card expired on [% expiry | $KohaDates %][% END %] Renew or Edit Details + [% IF ( expiry ) %]Patron's card expired on [% expiry | $KohaDates %][% END %] Renew or Edit Details
    • [% END %] @@ -703,7 +703,7 @@ No patron matched [% message | html %] View restrictions [% IF (noissues && patron && CAN_user_circulate_force_checkout) %] - Override restriction temporarily + Override restriction temporarily [% END %] @@ -741,7 +741,7 @@ No patron matched [% message | html %] [% FOREACH w IN WaitingHolds %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt index 496d1f8cfb..3f16a648b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -35,7 +35,7 @@

    [% IF ( isfiltered ) %] - Download file of displayed overdues + Download file of displayed overdues [% ELSE %] Download file of all overdues [% END %] @@ -63,12 +63,12 @@

    [% END %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt index c6c71197cd..f9551ddd0a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -74,7 +74,7 @@ - + - + @@ -254,7 +254,7 @@ - [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 5763e97bdc..35be233fcb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -118,7 +118,7 @@ [% IF ( collectionItemNeedsTransferred ) %]

    Please transfer item to: [% Branches.GetName( collectionBranch ) | html %]

    -

    [% itembarcode | html %]: [% title | html %]

    +

    [% itembarcode | html %]: [% title | html %]

    This item is part of a rotating collection.

    @@ -129,7 +129,7 @@

    Patron note

    [% issue.notedate | $KohaDates %]

    -

    [% title | html %] [% author | html %]

    +

    [% title | html %] [% author | html %]

    [% issue.note | html %]

    [% END %] @@ -138,7 +138,7 @@ [% IF ( fines ) %]

    Patron has outstanding fines of [% fines | html %].

    -

    Make payment.

    +

    Make payment.

    [% END %] @@ -146,7 +146,7 @@ [% IF ( waiting_holds ) %]

    [% holdsfirstname | html %] [% holdssurname | html %] has [% waiting_holds | html %] hold(s) waiting for pickup.

    -

    Check out to this patron.

    +

    Check out to this patron.

    [% END %] @@ -154,7 +154,7 @@ [% IF return_date_was_overriden && Borrowers.IsDebarred( borrower ) %]

    - + [% patron.firstname | html %] [% patron.surname | html %] is restricted. Please verify this patron should still be restricted. @@ -164,7 +164,7 @@ [% IF ( wrongbranch ) %]

    Cannot check in

    -

    [% itembarcode | html %]: [% title | html %]

    +

    [% itembarcode | html %]: [% title | html %]

    NOT CHECKED IN

    This item must be checked in at following library: [% Branches.GetName( rightbranch ) | html %]

    @@ -175,12 +175,12 @@

    Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %]

    -

    [% itembarcode | html %]: [% title | html %]

    +

    [% itembarcode | html %]: [% title | html %]

    [% IF ( patron.cardnumber ) %]
    Hold for:

    [% IF ( reserved ) %] - Reserve found for [% name | html %] ([% borrowernumber | html %]). + Reserve found for [% name | html %] ([% borrowernumber | html %]). [% END %] [% IF ( waiting ) %] - Item is marked waiting at [% branchname | html %] for [% name | html %] ([% borrowernumber | html %]). + Item is marked waiting at [% branchname | html %] for [% name | html %] ([% borrowernumber | html %]). [% END %]
    [% trsfitemloo.title | html %][% trsfitemloo.title | html %] [% trsfitemloo.author | html %][% trsfitemloo.barcode | html %][% trsfitemloo.barcode | html %] [% trsfitemloo.location | html %] [% trsfitemloo.itemcallnumber | html %] [% ItemTypes.GetDescription( trsfitemloo.itemtype ) | html %]
    [% note.item.biblio.title | html %] - [% note.item.biblio.author | html %] ([% note.item.barcode | html %])[% note.item.biblio.title | html %] - [% note.item.biblio.author | html %] ([% note.item.barcode | html %]) [% note.note | html %] [% note.notedate | $KohaDates %] [% INCLUDE 'patron-title.inc' patron => note.patron hide_patron_infos_if_needed=1 %] [% checkout_info.barcode | html %] - [% checkout_info.biblio.title | html %][% FOREACH subtitle IN checkout_info.biblio.subtitles %] [% subtitle.subfield | html %][% END %][% IF checkout_info.biblio.author %], by [% checkout_info.biblio.author | html %][% END %][% IF ( checkout_info.item.itemnotes ) %]- [% checkout_info.item.itemnotes | html %][% END %] [% checkout_info.item.barcode | html %] + [% checkout_info.biblio.title | html %][% FOREACH subtitle IN checkout_info.biblio.subtitles %] [% subtitle.subfield | html %][% END %][% IF checkout_info.biblio.author %], by [% checkout_info.biblio.author | html %][% END %][% IF ( checkout_info.item.itemnotes ) %]- [% checkout_info.item.itemnotes | html %][% END %] [% checkout_info.item.barcode | html %] [% IF checkout_info.NEEDSCONFIRMATION %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt index 5d3f618656..221ae8f49f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt @@ -38,14 +38,14 @@ [% IF item.is_overdue %][% END %] - [% item.firstname | html %] [% item.surname | html %] + [% item.firstname | html %] [% item.surname | html %] - [% item.title | html %][% IF ( item.author ) %], by [% item.author | html %][% END %][% IF ( item.itemnotes ) %]- [% item.itemnotes | html %][% END %] + [% item.title | html %][% IF ( item.author ) %], by [% item.author | html %][% END %][% IF ( item.itemnotes ) %]- [% item.itemnotes | html %][% END %] [% item.itemcallnumber | html %] - [% item.barcode | html %] + [% item.barcode | html %] [% Branches.GetName(item.branchcode) | html %] [% AuthorisedValues.GetByCode( 'LOC', item.location ) | html %] [% INCLUDE 'patron-title.inc' patron=overdueloo.patron hide_patron_infos_if_needed=1 link_to="circulation_reserves" %] [% IF logged_in_user.can_see_patron_infos( overdueloo.patron ) %] - [% IF ( overdueloo.email ) %][email][% END %] + [% IF ( overdueloo.email ) %][email][% END %] [% IF ( overdueloo.phone ) %]([% overdueloo.phone | html %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile | html %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro | html %])[% END %][% Branches.GetName( overdueloo.patron.branchcode ) | html %] [% INCLUDE 'biblio-default-view.inc' biblionumber = overdueloo.biblionumber %][% overdueloo.title | html %] [% overdueloo.subtitle | html %] [% IF ( overdueloo.author ) %], by [% overdueloo.author | html %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron | html %][% END %][% overdueloo.barcode | html %][% overdueloo.barcode | html %] [% overdueloo.itemcallnumber | html %] [% overdueloo.replacementprice | html %]

    [% reserveloo.pullcount | html %]

    		 [% reserveloo.count | html %] [% reserveloo.rcount | html %][% reserveloo.firstname | html %] [% reserveloo.surname | html %][% reserveloo.firstname | html %] [% reserveloo.surname | html %]

    [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt index 39c6b70234..3e38f8fdca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -28,11 +28,11 @@ [% ELSIF error == "no_checkout" %] -

    [% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] ( [% item.barcode | html %] ) is not checked out to a patron.

    +

    [% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] ( [% item.barcode | html %] ) is not checked out to a patron.

    [% ELSIF error == "too_many" %] -

    [% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] ( [% item.barcode | html %] ) has been renewed the maximum number of times by [% borrower.firstname | html %] [% borrower.surname | html %] ( [% borrower.cardnumber | html %] )

    +

    [% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] ( [% item.barcode | html %] ) has been renewed the maximum number of times by [% borrower.firstname | html %] [% borrower.surname | html %] ( [% borrower.cardnumber | html %] )

    [% IF Koha.Preference('AllowRenewalLimitOverride') %] @@ -115,7 +115,7 @@ [% ELSIF error == "patron_restricted" %] -

    [% borrower.firstname | html %] [% borrower.surname | html %] ( [% borrower.cardnumber | html %] ) is currently restricted.

    +

    [% borrower.firstname | html %] [% borrower.surname | html %] ( [% borrower.cardnumber | html %] ) is currently restricted.

    [% ELSE %] @@ -133,10 +133,10 @@

    Item renewed:

    - [% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] - ( [% item.barcode | html %] ) + [% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] + ( [% item.barcode | html %] ) renewed for - [% borrower.firstname | html %] [% borrower.surname | html %] ( [% borrower.cardnumber | html %] ) + [% borrower.firstname | html %] [% borrower.surname | html %] ( [% borrower.cardnumber | html %] ) now due on [% date_due | $KohaDates %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt index a8c0a1c549..18c5d73820 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt @@ -22,7 +22,7 @@ Catalog [% UNLESS blocking_error %] › - [% biblio.title | html %] + [% biblio.title | html %] › Request article [% END %] @@ -34,7 +34,7 @@
    -

    Request article from [% biblio.title | html %]

    +

    Request article from [% biblio.title | html %]

    [% IF no_patrons_found %]

    Patron not found

    @@ -243,7 +243,7 @@ [% FOREACH ar IN biblio.article_requests_current %]
    [% ar.created_on | $KohaDates %][% ar.borrower.firstname | html %] [% ar.borrower.surname | html %][% ar.borrower.firstname | html %] [% ar.borrower.surname | html %] [% ar.title | html %] [% ar.author | html %] [% ar.volume | html %][% ar.patron_notes | html %] [% IF ar.item %] - [% ar.item.barcode | html %] + [% ar.item.barcode | html %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt index ecd444c73e..538453314c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt @@ -92,7 +92,7 @@ [% END %] [% IF ( reserveloo.thisratio_atleast1 ) %]

    [% IF ( CAN_user_acquisition && basketno && booksellerid ) %][% END %][% reserveloo.ratiocalc | html %] to order[% IF ( CAN_user_acquisition && basketno && booksellerid ) %][% END %] +

    		[% IF ( reserveloo.thisratio_atleast1 ) %]

    [% IF ( CAN_user_acquisition && basketno && booksellerid ) %][% END %][% reserveloo.ratiocalc | html %] to order[% IF ( CAN_user_acquisition && basketno && booksellerid ) %][% END %] [% IF ( reserveloo.pendingorders ) %]
    [% reserveloo.pendingorders | html %] pending[% END %]

    [% END %]
    - + @@ -410,7 +410,7 @@

    Hold found:
    - + [% itembarcode | html %]: [% title | html %] @@ -512,7 +512,7 @@

    Check in message

    [% IF itembiblionumber %] -

    [% itembarcode | html %]: [% title | html %]

    +

    [% itembarcode | html %]: [% title | html %]

    [% END %] [% FOREACH errmsgloo IN errmsgloop %] [% IF ( errmsgloo.NotForLoanStatusUpdated ) %] @@ -568,7 +568,7 @@

    Item is withdrawn.

    [% END %] [% IF ( errmsgloo.debarred ) %] -

    [% errmsgloo.debarname | html %]([% errmsgloo.debarcardnumber | html %]) is now debarred until [% errmsgloo.debarred | $KohaDates %].

    +

    [% errmsgloo.debarname | html %]([% errmsgloo.debarcardnumber | html %]) is now debarred until [% errmsgloo.debarred | $KohaDates %].

    [% END %] [% IF ( errmsgloo.prevdebarred ) %]

    Reminder: Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].

    @@ -695,7 +695,7 @@ [% ELSE %]Not checked out [% END %] -

    - + @@ -712,14 +712,14 @@ - + [% END %]
    [% title | html %][% title | html %]
    Hold for: [% INCLUDE 'patron-title.inc' patron=patron %] + [% riloo.itemtitle | html %] [% IF ( riloo.enumchron ) %] @@ -704,7 +704,7 @@ [% END %] [% riloo.itemauthor | html %][% riloo.barcode | html %][% riloo.barcode | html %] [% Branches.GetName( riloo.homebranch ) | html %] [% Branches.GetName( riloo.holdingbranch ) | html %] [% riloo.location | html %][% riloo.dateaccessioned | $KohaDates %] [% ItemTypes.GetDescription( riloo.itemtype ) | html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %] [% IF ( riloo.duedate ) %] - + [% riloo.patron.surname | html %], [% riloo.patron.firstname | html %] ([% riloo.patron.category.description | html %]) [% IF riloo.borissuescount %] Checkouts: - [% riloo.borissuescount | html %] + [% riloo.borissuescount | html %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt index 8e819c23d7..66e0683564 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt @@ -53,14 +53,14 @@
    Barcode: [% reser.barcode | html %]     		[% IF ( reser.patron ) %] - + [% reser.patron.surname | html %][%IF ( reser.patron.firstname ) %], [% reser.patron.firstname | html %][% END %] [% IF ( reser.patron.phone ) %]
    [% reser.patron.phone | html %][% END %] [% IF ( reser.patron.first_valid_email_address ) %]
    [% BLOCK subject %]Hold:[% END %] - + [% reser.patron.first_valid_email_address | html %] [% END %] @@ -70,7 +70,7 @@     		[% IF reser.homebranch %][% Branches.GetName( reser.homebranch ) | html %][% END %] [% reser.itemcallnumber | html %] Cancel transfer Cancel transfer
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt index e2bb802897..07b9657969 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -119,7 +119,7 @@ [% FOREACH itemsloo IN itemsloop %] -

    [% itemsloo.title | html %] [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %]

    +

    [% itemsloo.title | html %] [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %]

    [% itemsloo.biblionumber | html %]
    [% itemsloo.author | html %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index 8c442941da..c7850d4913 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -28,7 +28,7 @@

    Holds awaiting pickup for your library on: [% show_date | $KohaDates %] [% IF ( all_branches_link ) %] - + View all libraries [% END %]

    @@ -92,9 +92,9 @@ [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %]  ([% reserveloo.itemtype | html %])[% END %][% END %]
    Barcode: [% reserveloo.barcode | html %] - [% reserveloo.patron.surname | html %], [% reserveloo.patron.firstname | html %] + [% reserveloo.patron.surname | html %], [% reserveloo.patron.firstname | html %] [% IF ( reserveloo.patron.phone ) %]
    [% reserveloo.patron.phone | html %][% END %] - [% IF ( reserveloo.patron.first_valid_email_address ) %]
    + [% IF ( reserveloo.patron.first_valid_email_address ) %]
     [% reserveloo.patron.first_valid_email_address | html %][% END %] [% Branches.GetName( reserveloo.homebranch ) | html %] @@ -163,8 +163,8 @@ [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]  ([% overloo.itemtype | html %])[% END %][% END %]
    Barcode: [% overloo.barcode | html %] - [% overloo.patron.surname | html %], [% overloo.patron.firstname | html %]
    [% overloo.patron.phone | html %]
    - [% IF ( overloo.patron.first_valid_email_address ) %] + [% overloo.patron.surname | html %], [% overloo.patron.firstname | html %]
    [% overloo.patron.phone | html %]
    + [% IF ( overloo.patron.first_valid_email_address ) %] [% overloo.patron.first_valid_email_address | html %][% END %] [% Branches.GetName( overloo.homebranch ) | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt index 7cf9165d0f..bdcccd0164 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt @@ -35,7 +35,7 @@ [% SET p = e.patron %] - [% p.surname | html %], [% p.firstname | html %] + [% p.surname | html %], [% p.firstname | html %] [% p.cardnumber | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt index 0e3ba3e635..7e1d348ad3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt @@ -113,7 +113,7 @@ [% END %]
    @@ -178,25 +178,25 @@ [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt index 99ca86165f..492c40f03d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt @@ -98,7 +98,7 @@ [% IF ( subscription.issn ) %][% subscription.issn | html %] [% END %] - [% subscription.title | html %] + [% subscription.title | html %] [% IF ( subscription.publicnotes ) %][% subscription.publicnotes | html %][% END %] [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes | html %])[% END %] @@ -141,13 +141,13 @@ [% IF ( routing && CAN_user_serials_routing ) %] [% UNLESS ( subscription.cannotedit ) %]
  • - Reopen + Reopen
    • [% END %] [% END # IF ( routing && CAN_user_serials_routing ) %]
  • - Issue history + Issue history
    • @@ -170,18 +170,18 @@ [% ELSE %] [% IF ( subscription.routingedit ) %]
  • - Edit routing list ([% subscription.routingedit | html %]) + Edit routing list ([% subscription.routingedit | html %])
    • [% ELSE %]
  • - New routing list + New routing list
    • [% END %] [% END %] [% 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 7f1586c71c..b41b0d3ce6 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 @@ -53,7 +53,7 @@ fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
    Search for record [% IF ( CAN_user_editcatalogue ) %] [% IF ( modify ) %] - | Edit record + | Edit record [% ELSE %] | Create record [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt index 2880d77f6b..aa81f216f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt @@ -47,8 +47,8 @@ [% FOREACH subscription IN subscriptions %] [% subscription.biblio.biblioitem.issn | html %] - [% subscription.biblio.title | html %] (#[% subscription.subscriptionid | html %]) - [% subscription.vendor.name | html %] + [% subscription.biblio.title | html %] (#[% subscription.subscriptionid | html %]) + [% subscription.vendor.name | html %] [% AuthorisedValues.GetByCode('LOC', subscription.location) | html %] [% Branches.GetName(subscription.branchcode) | html %] [% ItemTypes.GetDescription( subscription.itemtype ) | html %] 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 5818cf1740..5c67aa56d8 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 @@ -70,8 +70,8 @@
    1. Subscription ID: [% subscriptionid | html %]
    2. Librarian identity: [% librarian | html %]
      3. -
    3. Vendor: [% aqbooksellername | html %]
      4. -
    4. Biblio: [% bibliotitle | html %] ([% bibnum | html %])
      5. +
    5. Vendor: [% aqbooksellername | html %]
      6. +
    6. Biblio: [% bibliotitle | html %] ([% bibnum | html %])
      7. [% IF ( OPACBaseURL ) %]
    7. OPAC view: @@ -106,7 +106,7 @@ [% IF ( letter ) %]
    8. Patron notification: [% letter | html %] - (subscribers) + (subscribers)
      9. [% END %] [% IF ( hasRouting ) %]
    9. Routing: yes
      10. [% END %] @@ -150,7 +150,7 @@
    10. Manual history: [% IF ( manualhistory ) %] - Enabled Edit history + Enabled Edit history [% ELSE %] Disabled [% END %] @@ -363,7 +363,7 @@ [% IF order.invoice %] [% IF CAN_user_acquisition %] - + [% order.invoice.invoicenumber | html %] [% ELSE %] [% order.invoice.invoicenumber | html %] 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 cecb67ee4b..db71ce5912 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 @@ -107,7 +107,7 @@ 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 53de19d4e5..d2f86aa9ae 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 @@ -243,7 +243,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt index 976b178922..4b6f272d69 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt @@ -9,11 +9,11 @@ "dt_cardnumber": "[% data.cardnumber | html %]", "dt_name": - "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) cardnumber = data.cardnumber invert_name = 1%]", + "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) cardnumber = data.cardnumber invert_name = 1%]", "dt_branch": "[% data.branchname | html %]", "dt_action": - "Add" + "Add" }[% UNLESS loop.last %],[% END %] [% END %] ] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt index 2ffc6888aa..1296a2bd6b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt @@ -16,7 +16,7 @@

      Alert subscribers for [% bibliotitle | html %]

      - Subscription: [% bibliotitle | html %] #[% subscriptionid | html %] + Subscription: [% bibliotitle | html %] #[% subscriptionid | html %]

      [% IF subscribers.count %] @@ -27,7 +27,7 @@ [% FOREACH subscriber IN subscribers %] - [% INCLUDE 'patron-title.inc' patron=subscriber %] + [% INCLUDE 'patron-title.inc' patron=subscriber %] [% 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 03cde0a100..dd361c56a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -162,7 +162,7 @@ [% suggesteddate | $KohaDates %] [% IF ( suggestedby_borrowernumber ) %] - [% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %]) + [% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %]) [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %]) [% END %] @@ -172,7 +172,7 @@ [% manageddate | $KohaDates %] [% IF ( managedby_borrowernumber ) %] - [% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %]) + [% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %]) [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %]) [% END %] @@ -182,7 +182,7 @@ [% accepteddate | $KohaDates %] [% IF ( acceptedby_borrowernumber ) %] - [% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %]) + [% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %]) [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %]) [% END %] @@ -347,18 +347,18 @@ [% INCLUDE 'date-format.inc' %] - [% IF ( suggestedby_borrowernumber ) %][% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %]) [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])[% END %] + [% IF ( suggestedby_borrowernumber ) %][% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %]) [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])[% END %] [% INCLUDE 'date-format.inc' %] - [% IF ( managedby_borrowernumber ) %][% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %]) [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %])[% END %] + [% IF ( managedby_borrowernumber ) %][% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %]) [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %])[% END %] [% INCLUDE 'date-format.inc' %] - [% IF ( acceptedby_borrowernumber ) %][% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %]) [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %])[% END %] + [% IF ( acceptedby_borrowernumber ) %][% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %]) [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %])[% END %]
    @@ -422,7 +422,7 @@
    [% SWITCH m.code %] [% CASE 'already_exists' %] - The suggestion has not been added. A suggestion with this title already exists (suggestion #[% m.id | html %]) + The suggestion has not been added. A suggestion with this title already exists (suggestion #[% m.id | html %]) [% CASE %] [% m.code | html %] [% END %] @@ -434,7 +434,7 @@
    [% opac_new.content | $raw %] - Edit - Delete + Edit + Delete [% END %] 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 36df8f681f..9a930465b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -305,9 +305,9 @@ [% FOR language IN languages %] [% FOR sublanguage IN language.sublanguages_loop %] [% IF language.plural %] -
  • [% sublanguage.native_description | html %] [% sublanguage.region_description | html %] ([% sublanguage.rfc4646_subtag | html %])
    • +
  • [% sublanguage.native_description | html %] [% sublanguage.region_description | html %] ([% sublanguage.rfc4646_subtag | html %])
    • [% ELSE %] -
  • [% sublanguage.native_description | html %] ([% sublanguage.rfc4646_subtag | html %])
    • +
  • [% sublanguage.native_description | html %] ([% sublanguage.rfc4646_subtag | html %])
    • [% END %] [% END %] [% END %] @@ -381,7 +381,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 7786e46718..f98a35ec4d 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 @@ -21,7 +21,7 @@ @@ -287,7 +287,7 @@ [% FOREACH batch_lis IN batch_list %] [% batch_lis.import_batch_id | html %] - [% batch_lis.file_name | html %] + [% batch_lis.file_name | html %] [% batch_lis.comments | html %] [% IF ( batch_lis.record_type == 'auth' ) %]Authority[% ELSE %]Bibliographic[% END %] @@ -309,7 +309,7 @@ [% batch_lis.upload_timestamp | html %] [% batch_lis.num_records | html %] - [% batch_lis.num_items | html %][% IF ( batch_lis.num_items ) %] (Create label batch)[% END %] + [% batch_lis.num_items | html %][% IF ( batch_lis.num_items ) %] (Create label batch)[% END %] [% IF ( batch_lis.can_clean ) %]
    @@ -334,7 +334,7 @@ [% IF ( page.current_page ) %] [% page.page_number | html %] [% ELSE %] - [% page.page_number | html %] + [% page.page_number | html %] [% END %] [% END %]
    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 94e80506e7..b5ac8e1ac8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -159,7 +159,7 @@ [% IF ( op == 'show' ) %] [% END %] - [% borrower.cardnumber | html %] + [% borrower.cardnumber | html %] [% borrower.surname | html %] [% borrower.firstname | html %] [% Branches.GetName( borrower.branchcode ) | html %] @@ -246,7 +246,7 @@ [% END %] [% IF ( field.type == 'date' ) %] - Clear + Clear [% END %] [% IF field.mandatory %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt index 2afb535b2f..25a83108ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt @@ -61,7 +61,7 @@
      [% FOR tab IN tabs %] -
      • +
      • [% END %]
    [% FOR tab IN tabs %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt index 678a9d6994..5ee390b813 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt @@ -46,7 +46,7 @@
    -

    Return to staged MARC batch [% batchid | html %]

    +

    Return to staged MARC batch [% batchid | html %]

    [% MACRO jsinclude BLOCK %] [% Asset.js("js/tools-menu.js") | $raw %] 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 817fee9217..e90113a149 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 @@ -37,7 +37,7 @@ [% END %] -
  • View final record
    • +
  • View final record
  • Back
    • 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 65569ffbc5..d56cd0afb0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -210,7 +210,7 @@ [% loopro.timestamp | html %] [% IF loopro.librarian %] - [% IF ( loopro.librarian.firstname ) || ( loopro.librarian.surname ) %][% loopro.librarian.firstname | html %] [% loopro.librarian.surname | html %] ([% loopro.librarian.borrowernumber | html %]) [% ELSE %][% loopro.librarian.borrowernumber | html %][% END %] + [% IF ( loopro.librarian.firstname ) || ( loopro.librarian.surname ) %][% loopro.librarian.firstname | html %] [% loopro.librarian.surname | html %] ([% loopro.librarian.borrowernumber | html %]) [% ELSE %][% loopro.librarian.borrowernumber | html %][% END %] [% ELSE %] [% loopro.user | html %] [% END %] @@ -220,25 +220,25 @@ [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %] [% IF loopro.patron %] - [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %][% loopro.patron.firstname | html %] [% loopro.patron.surname | html %] ([% loopro.object | html %]) [% ELSE %]Member [% loopro.object | html %][% END %][% END %] + [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %][% loopro.patron.firstname | html %] [% loopro.patron.surname | html %] ([% loopro.object | html %]) [% ELSE %]Member [% loopro.object | html %][% END %][% END %] [% ELSE %] [% loopro.object | html %] [% END %] [% ELSE %] [% IF ( loopro.module == 'CATALOGUING' ) %] [% IF ( loopro.info.substr(0, 4) == 'item' ) %] - Item [% loopro.object | html %] + Item [% loopro.object | html %] [% ELSIF ( loopro.info.substr(0, 6) == 'biblio' ) %] - Biblio [% loopro.object | html %] + Biblio [% loopro.object | html %] [% ELSE %] [% loopro.object | html %] [% END %] [% ELSE %] [% IF ( loopro.module == 'SERIAL' ) %] - Subscription [% loopro.object | html %] + Subscription [% loopro.object | html %] [% ELSE %] [% IF ( loopro.module == 'AUTHORITIES' ) %] - Authority [% loopro.object | html %] + Authority [% loopro.object | html %] [% ELSE %] [% loopro.object | html %] [% END %] @@ -248,7 +248,7 @@ [% IF ( loopro.module == 'CIRCULATION' ) %] - Item [% loopro.barcode | html %] + Item [% loopro.barcode | html %] [% ELSE %] [% loopro.info | html %] [% END %] 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 b89db7687e..2370e0754f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -45,13 +45,13 @@ [% END %] [% IF shelf AND shelf.is_private %] › [% IF op == 'view' OR op == 'edit_form' %] - Your lists + Your lists [% ELSE %] Your lists [% END %] [% ELSIF shelf AND shelf.is_public %] › [% IF op == 'view' %] - Public lists + Public lists [% ELSE %] Public lists [% END %] @@ -168,7 +168,7 @@ [% UNLESS ( item_level_itypes ) %]Item type[% END %] - Title + Title [% IF sortfield == 'title' %] [% direction | html %] sort [% ELSE %] @@ -176,7 +176,7 @@ [% END %] - Author + Author [% IF sortfield == 'author' %] [% direction | html %] sort [% ELSE %] @@ -184,7 +184,7 @@ [% END %] - Date added + Date added [% IF sortfield == 'dateadded' %] [% direction | html %] sort [% ELSE %] @@ -192,7 +192,7 @@ [% END %] - Call number + Call number [% IF sortfield == 'itemcallnumber' %] [% direction | html %] sort [% ELSE %] @@ -223,16 +223,16 @@ [% ELSE %] [% IF ( itemsloo.ITEM_RESULTS.size ) %] Holds - [% IF ( holdfor ) %] | Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])[% END %] + [% IF ( holdfor ) %] | Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])[% END %] [% ELSE %] No holds allowed [% END %] [% END %] [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] - | Edit record + | Edit record [% END %] [% IF ( CAN_user_editcatalogue_edit_items ) %] - | Edit items + | Edit items [% END %]

    @@ -321,12 +321,12 @@
    [% IF referer == 'view' %] - Cancel + Cancel [% ELSE %] [% IF category == PUBLIC %] - Cancel + Cancel [% ELSE %] - Cancel + Cancel [% END %] [% END %]
    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 66452ff796..e5f5a0cf7f 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 @@ -11,13 +11,13 @@ "dt_type": "[% data.type | html %]", "dt_shelfname": - "[% data.shelfname | html %]", + "[% data.shelfname | html %]", "dt_count": "[% data.count | html %] item(s)", "dt_is_shared": "[% IF data.type == 2 %]Public[% ELSIF data.is_shared %]Shared[% ELSE %]Private[% END %]", "dt_owner": - "[% data.firstname | html %] [% data.surname | html %]", + "[% data.firstname | html %] [% data.surname | html %]", "dt_sortby": [% IF data.sortby == "author" %]"Author"[% ELSIF data.sortby == "copyrightdate" %]"Year"[% ELSIF data.sortby == "itemcallnumber" %]"Call number"[% ELSIF data.sortby == "dateadded" %]"Date added"[% ELSE %]"Title"[% END %], "dt_created_on": diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc index 074b87ce70..a309e01856 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc @@ -24,7 +24,7 @@ [% IF ( authid ) %] [% heading | html %] [% ELSE %] - [% heading | html %] + [% heading | html %] [% END %] [% ELSE %] [% heading | html %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc index 1d31707d48..7671e6dd81 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.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/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index 6de2d19e5c..1c4ac76e9e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -43,7 +43,7 @@
  • Public lists
    • [% SET number_of_public_shelves = 0 %] [% FOREACH s IN some_public_shelves %] -
  • [% s.shelfname | html %]
    • +
  • [% s.shelfname | html %]
    • [% SET number_of_public_shelves = number_of_public_shelves + 1 %] [% IF number_of_public_shelves >= 10 %][% LAST | html %][% END %] [% END %] @@ -60,7 +60,7 @@ [% IF some_private_shelves.count %] [% SET number_of_private_shelves = 0 %] [% FOREACH s IN some_private_shelves %] -
  • [% s.shelfname | html %]
    • +
  • [% s.shelfname | html %]
    • [% SET number_of_private_shelves = number_of_private_shelves + 1 %] [% IF number_of_private_shelves >= 10 %][% LAST | html %][% END %] [% END %] @@ -312,7 +312,7 @@ [% ELSE %]

    Shibboleth login

    -

    If you have a Shibboleth account, please click here to login.

    +

    If you have a Shibboleth account, please click here to login.

    Local Login

    [% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc index 28518b9b84..27c5296210 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc @@ -11,7 +11,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 %] @@ -52,8 +52,8 @@ [% END %] [% BLOCK authheadingdisplay %] - [% IF authid %][% heading | html %] - [% ELSIF search %][% heading | html %] + [% IF authid %][% heading | html %] + [% ELSIF search %][% heading | html %] [% ELSE %][% heading | html %] [% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index ab7eb2c306..0f70926605 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -52,7 +52,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 # / IF sublanguages_loo.enabled %] [% END # / FOREACH sublanguages_loo %] @@ -63,7 +63,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/opac-tmpl/bootstrap/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc index dcf075e487..1f583234f2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc @@ -8,9 +8,9 @@ @@ -43,10 +43,10 @@ [% IF facet.active %] [% SET local_url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %] [% facet.facet_label_value | html %] - [x] + [x] [% ELSE %] [% SET local_url = url _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %] - [% facet.facet_label_value | html %] + [% facet.facet_label_value | html %] [% IF ( displayFacetCount ) %] ([% facet.facet_count | html %]) [% END %] @@ -55,7 +55,7 @@ [% END %] [% IF ( facets_loo.expandable ) %]
  • - Show more + Show more
    • [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc index 01f8a026af..71cf3cff1e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc @@ -3,19 +3,19 @@ [% IF hits_to_paginate < total %]
    [% hits_to_paginate | html %] of [% total | html %] results loaded, refine your search to view other records
    [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc index e36ce82a68..7c3cc47f41 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc @@ -13,14 +13,14 @@ [% IF shelfbrowser_prev_item %] [% END %] [% FOREACH item IN shelfbrowser_items %] - + [% IF ( OPACLocalCoverImages ) %]
    [% END %] @@ -67,7 +67,7 @@ [% IF shelfbrowser_next_item %]     [% END %] @@ -77,7 +77,7 @@ [% FOREACH item IN shelfbrowser_items %] [% item.itemcallnumber | html %] - + [% item.title | html %] [% FOREACH subtitl IN item.subtitle %] [% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt index e1e242d431..92b4eb50e8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt @@ -67,7 +67,7 @@

    Report issues and broken links

     diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt index 3445bbfac8..50cd287b18 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt @@ -32,7 +32,7 @@ [% Koha.Preference( 'OpacMaintenanceNotice' ) | html %] [% ELSE %]

    System Maintenance

    -

    The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon! If you have any questions, please contact the site administrator

    +

    The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon! If you have any questions, please contact the site administrator

    [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt index 8cbc5a9f49..11e389ace1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt @@ -120,7 +120,7 @@
      [% FOREACH advsearchloo IN advancedsearchesloop %]
    • - + [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt index 806acbf063..bf83086bfe 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt @@ -10,7 +10,7 @@
      @@ -43,7 +43,7 @@ - No + No [% END %]
      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 696b09d17f..38674558d4 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 @@ -46,13 +46,13 @@ [% END %]

      Entry [% authtypetext | html %]

      -

      Number of records used in: [% count | html %]

      +

      Number of records used in: [% count | html %]

      [% FOREACH Tag0X IN Tab0XX %]

      [% Tag0X.tag | html %]

      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 7270021a30..7d19e6b686 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 @@ -48,7 +48,7 @@

      [% summary.mainentry | html %][% IF authtypetext %] ([% authtypetext | html %])[% END %]

      - [% IF count %]Number of records used in: [% count | html %][% ELSE %]This authority is not used in any records.[% END %] + [% IF count %]Number of records used in: [% count | html %][% ELSE %]This authority is not used in any records.[% END %]
      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 ccaddde454..765a6d56ba 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt @@ -91,7 +91,7 @@
      [% ELSE %]

      Shibboleth Login

      -

      If you have a Shibboleth account, please click here to log in.

      +

      If you have a Shibboleth account, please click here to log in.

      [% END %] [% IF ( casAuthentication ) %]

      CAS login

      @@ -106,14 +106,14 @@ [% IF ( casAuthentication ) %] [% IF ( shibbolethAuthentication ) %] [% IF ( casServerUrl ) %] -

      Please click here to log in.

      +

      Please click here to log in.

      [% END %] [% IF ( casServersLoop ) %]

      Please choose against which one you would like to authenticate:

      [% END %] @@ -126,14 +126,14 @@ [% END %] [% IF ( casServerUrl ) %] -

      If you have a CAS account, please click here to log in.

      +

      If you have a CAS account, please click here to log in.

      [% END %] [% IF ( casServersLoop ) %]

      If you have a CAS account, please choose against which one you would like to authenticate:

      [% END %] @@ -201,7 +201,7 @@ [% ELSE %]

      Logging on to the catalog has not been enabled by the library.

        -
      • To report this error, you can email the Koha Administrator.Email
        • +
      • To report this error, you can email the Koha Administrator.Email
      • Use top menu bar to navigate to another part of Koha.
      [% END # / IF opacuserlogin %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt index 18c95f97f4..f664058015 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt @@ -7,7 +7,7 @@ @@ -88,11 +88,11 @@ [% FOREACH resul IN result %] [% PROCESS authresult summary=resul.summary %] - Details + Details [% resul.authtype | html %] [% UNLESS ( resul.isEDITORS ) %] - [% IF resul.used > 0 %][% resul.used | html %] biblios[% ELSE %]0 biblios[% END %] + [% IF resul.used > 0 %][% resul.used | html %] biblios[% ELSE %]0 biblios[% END %] [% END %] 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 edb6ef4f3c..628cdb28f2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt @@ -148,7 +148,7 @@ [% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %]

      [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] - - [% MARCNOTE.marcnote | html %] + - [% MARCNOTE.marcnote | html %] [% ELSE %] - [% MARCNOTE.marcnote | html %] [% END %] @@ -201,9 +201,9 @@ [% IF MARCurl.part %]

      [% MARCurl.part | html %]

      [% END %] [% IF OPACURLOpenInNewWindow %] - [% MARCurl.linktext | html %] + [% MARCurl.linktext | html %] [% ELSE %] - [% MARCurl.linktext | html %] + [% MARCurl.linktext | html %] [% END %] [% IF MARCurl.notes %][% FOREACH note IN MARCurl.notes %]

      [% note.note | html %]

      [% END %][% END %] @@ -256,7 +256,7 @@ - [% BIBLIO_RESULT.title | html %][% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %][% subtitl.subfield | html %][% END %][% END %] + [% BIBLIO_RESULT.title | html %][% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %][% subtitl.subfield | html %][% END %][% END %] [% IF ( TagsInputEnabled && loggedinusername ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt index aa04c76d96..71bac82e51 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt @@ -32,7 +32,7 @@
        [% FOREACH HIERARCHY_LOO IN HIERARCHY_LOOP %]
      • - [% HIERARCHY_LOO.description | html %] + [% HIERARCHY_LOO.description | html %]
      • [% END %] @@ -45,7 +45,7 @@ [% IF ( LEVEL_LOO.endnode ) %] [% LEVEL_LOO.description | html %] [% ELSE %] - [% LEVEL_LOO.description | html %] + [% LEVEL_LOO.description | html %] [% END %]

        ([% LEVEL_LOO.number | html %] biblios)

        diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt index e77a9a2020..e2d8a8703e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt @@ -68,7 +68,7 @@ [% FOREACH cr IN course_reserves %] - [% cr.biblio.title | html %] + [% cr.biblio.title | html %] [% cr.biblio.author | html %] [% ItemTypes.GetDescription( cr.item.itype ) | html %] [% Branches.GetName( cr.item.holdingbranch ) | html %]
        [% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) | html %] @@ -84,9 +84,9 @@ [% END %] [% IF (cr.item.uri) %] - Item URI + Item URI [% ELSIF (cr.biblioitem.url) %] - Record URL + Record URL [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt index c53e991b55..1f055ae337 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt @@ -42,7 +42,7 @@ [% FOREACH c IN courses %] - [% c.course_name | html %] + [% c.course_name | html %] [% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department, 1 ) | html %] [% c.course_number | html %] [% c.section | html %] 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 c451d8d60d..e7b5236455 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -59,9 +59,9 @@ [% END %] [% IF ( OPACAmazonCoverImages ) %] [% IF ( OPACURLOpenInNewWindow ) %] - + [% ELSE %] - + [% END %] Cover image [% END %] @@ -88,9 +88,9 @@ [% IF ( BakerTaylorEnabled && bt_id ) %] [% IF BakerTaylorBookstoreURL %] [% IF ( OPACURLOpenInNewWindow ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] - See Baker & Taylor + See Baker & Taylor [% END %] [% ELSE %] See Baker & Taylor @@ -184,7 +184,7 @@ [% END %] [% IF IDREF and MARCAUTHOR.unimarc3 %] - IdRef + IdRef [% END %] [% UNLESS ( loop.last ) %]|[% END %] [% END # /FOREACH MARCAUTHORS %] @@ -337,15 +337,15 @@ [% IF ( OPACURLOpenInNewWindow ) %] [% IF trackclicks == 'track' || trackclicks == 'anonymous' %] - + [% ELSE %] - + [% END %] [% ELSE %] [% IF trackclicks == 'track' || trackclicks == 'anonymous' %] - + [% ELSE %] - + [% END %] [% END %] [% MARCurl.linktext | html %] @@ -380,7 +380,7 @@ [% IF shelves.count %] List(s) this item appears in: [% FOREACH s IN shelves %] - [% s.shelfname | html %] + [% s.shelfname | html %] [% IF ( loop.last ) %][% ELSE %]|[% END %] [% END %] @@ -503,7 +503,7 @@ [% IF ( BakerTaylorContentURL ) %] Enhanced content: - [% IF ( OPACURLOpenInNewWindow ) %]Content Cafe[% ELSE %]Content Cafe[% END %] + [% IF ( OPACURLOpenInNewWindow ) %]Content Cafe[% ELSE %]Content Cafe[% END %] [% END # / IF BakerTaylorContentURL %] @@ -555,7 +555,7 @@ [% IF ( LibraryThingForLibrariesID ) %]
      • - +
        • [% END %] [% END %] @@ -634,7 +634,7 @@
        [% IF too_many_items %] -

        This record has many physical items ([% items_count | html %]). Click here to view them all.

        +

        This record has many physical items ([% items_count | html %]). Click here to view them all.

        [% ELSIF ( itemloop.size ) %] [% INCLUDE items_table items=itemloop tab="holdings" table_id="holdingst" %] [% IF Koha.Preference('OPACAcquisitionDetails') and acquisition_details.total_quantity > 0 %] @@ -705,7 +705,7 @@ [% FOREACH MARCNOTE IN MARCNOTES %]

        [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] - [% MARCNOTE.marcnote | html %] + [% MARCNOTE.marcnote | html %] [% ELSE %] [% MARCNOTE.marcnote FILTER html_line_break | html %] [% END %] @@ -863,7 +863,7 @@ [% END # / IF subscription.latestserials %] [% END # / FOREACH subscriptions %] -

        More details

        +

        More details

        [% END # IF subscriptionsnumber %] @@ -908,7 +908,7 @@ [% FILTER html_break %] [% review.review | html %] [% END %] - Edit + Edit

        [% ELSE %] @@ -949,7 +949,7 @@ [% IF ( loggedinusername ) %] [% UNLESS ( loggedincommenter ) %] -
        + [% END %] @@ -982,7 +982,7 @@ [% UNLESS ( item_level_itypes ) %] [% XISBN.description | html %] [% END %] - [% XISBN.title | html %] + [% XISBN.title | html %] [% IF ( XISBN.author ) %] by [% XISBN.author | html %][% END %] [% IF ( XISBN.copyrightdate ) %] ©[% XISBN.copyrightdate | html %][% END %] [% IF ( XISBN.publishercode ) %] @@ -1075,16 +1075,16 @@
        @@ -1108,9 +1108,9 @@
          [% FOREACH listitem IN listResults %] [% IF ( listitem.biblionumber == biblionumber ) %] -
        • [% loop.count + offset | html %][% title | html %]
          [% IF ( author ) %]by [% author | html %][% END %]
          • +
        • [% loop.count + offset | html %][% title | html %]
          [% IF ( author ) %]by [% author | html %][% END %]
          • [% ELSE %] -
        • [% loop.count + offset | html %][% listitem.title | html %]
          [% IF ( listitem.author ) %]by [% listitem.author | html %][% END %]
          • +
        • [% loop.count + offset | html %][% listitem.title | html %]
          [% IF ( listitem.author ) %]by [% listitem.author | html %][% END %]
          • [% END %] [% END %]
        @@ -1156,7 +1156,7 @@ [% IF ( LibraryThingForLibrariesID ) %] + here. [% END %] [% IF ( NovelistSelectProfile && ( normalized_isbn || normalized_upc ) ) %] @@ -1232,7 +1232,7 @@ [% IF ( ITEM_RESULT.branchurl ) %] - [% ITEM_RESULT.branchname | html %] + [% ITEM_RESULT.branchname | html %] [% ELSE %] [% ITEM_RESULT.branchname | html %] [% END %] @@ -1254,7 +1254,7 @@ [% IF Branches.GetURL( ITEM_RESULT.homebranch ) %] [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) | html %] [% IF ( home_branch_url ) %] - [% Branches.GetName( ITEM_RESULT.homebranch ) | html %] + [% Branches.GetName( ITEM_RESULT.homebranch ) | html %] [% ELSE %] [% Branches.GetName( ITEM_RESULT.homebranch ) | html %] [% END %] @@ -1286,7 +1286,7 @@ [% IF ( ITEM_RESULT.itemnumber == starting_itemnumber ) %] (Browse shelf) [% ELSE %] - (Browse shelf) + (Browse shelf) [% END %] [% END %] [% END %] @@ -1316,14 +1316,14 @@ [% IF Koha.Preference("OPACURLOpenInNewWindow") %] Link to resource [% ELSE %] - Link to resource + Link to resource [% END %] [% ELSE %] [% IF Koha.Preference("OPACURLOpenInNewWindow") %] [% ITEM_RESULT.uri | html %] [% ELSE %] - [% ITEM_RESULT.uri | html %] + [% ITEM_RESULT.uri | html %] [% END %] [% END %] [% END %] @@ -1352,7 +1352,7 @@ [% FOREACH r IN ITEM_RESULT.course_reserves %] [% IF r.course.enabled == 'yes' %]

        - + [% r.course.course_name | html %] [% IF r.course.section %] [% r.course.section | html %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt index cfeae2591a..02b2ae3be4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt @@ -66,7 +66,7 @@

        - Cancel + Cancel
        [% IF ( modal ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt index b034c8fa4d..b20196c8cd 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt @@ -16,7 +16,7 @@
        diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt index cf38cb7611..bd4ff8257b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt @@ -37,8 +37,8 @@ [% FOREACH doc IN role.docs %] [% doc.citation | html %] - Koha - Sudoc + Koha + Sudoc [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt index 838f827951..3f273bc34e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt @@ -61,7 +61,7 @@

        [% Koha.Preference('ILLModuleCopyrightClearance') | $raw %]

        - Yes No @@ -98,7 +98,7 @@ [% ELSE %] @@ -133,7 +133,7 @@ [% request.placed | html %] [% request.updated | html %] - View + View [% END %] @@ -154,7 +154,7 @@ [% IF request.biblio_id %]
      • - Click here to view + Click here to view
        • [% END %]
      • diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt index bc4fe2e4d1..55bccec1c8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt @@ -94,7 +94,7 @@
        - + [% IF Branches.all.size == 1 %] [% IF branchcode %] RSS feed for [% Branches.GetName( branchcode ) | html %] library news. diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt index abf4fba394..3628f10eeb 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -126,7 +126,7 @@ [% END %] [% IF ( extended_unique_id_failed_code ) %] -
        [% extended_unique_id_failed_description _ ': ' | html %] Value is already in use ([% extended_unique_id_failed_value | html %])
        +
        [% extended_unique_id_failed_description _ ': ' | html %] Value is already in use ([% extended_unique_id_failed_value | html %])
        [% END %]
        diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt index c577c50aa4..f67fc29db1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt @@ -44,7 +44,7 @@ [% END %][% END %][% END %] [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %] -[% IF ( BakerTaylorEnabled ) %][% IF bt_id %]See Baker & Taylor[% END %][% END %] +[% IF ( BakerTaylorEnabled ) %][% IF bt_id %]See Baker & Taylor[% END %][% END %]

        [% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author | html %]. [% END %] [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place | html %] [% END %][% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode | html %][% END %][% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear | html %] [% ELSE %][% IF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate | html %][% END %][% END %] @@ -54,7 +54,7 @@ [% IF ( SEARCH_RESULT.isbn ) %] [% SEARCH_RESULT.isbn | html %][% END %]

        [% IF Koha.Preference( 'RequestOnOpac' ) == 1 %] -

        Place Hold on [% SEARCH_RESULT.title | html %]

        +

        Place Hold on [% SEARCH_RESULT.title | html %]

        [% END %] ]]> [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt index 521616099d..73eb975eca 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt @@ -65,7 +65,7 @@ ("[% email | html %]") [% END %]
        You should have received an email with a link to reset your password. -
        If you did not receive this email, you can request a new one: Get new password recovery link +
        If you did not receive this email, you can request a new one: Get new password recovery link [% ELSIF (errPassNotMatch) %] The passwords do not match. [% ELSIF password_too_short %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt index f571ebf633..9f4c0aa177 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -96,7 +96,7 @@ [% IF OPACAmazonCoverImages %] [% IF issue.normalized_isbn %] - + [% ELSE %] No cover image available [% END %] @@ -113,7 +113,7 @@ [% IF BakerTaylorEnabled %] [% bt_id = ( issue.normalized_upc || issue.normalized_isbn ) | html %] [% IF ( bt_id ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] No cover image available [% END %] 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 4d4fe4fa11..cc24f3032b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -43,14 +43,14 @@ No results found!

        [% IF ( searchdesc ) %] - No results found for that in [% LibraryName | html %] catalog. Subscribe to this search + No results found for that in [% LibraryName | html %] catalog. Subscribe to this search [% ELSE %] You did not specify any search criteria. [% END %]

        [% IF ( ReturnPath ) %]
        -

        Return to the last advanced search

        +

        Return to the last advanced search

        [% END %] [% IF ( OPACNoResultsFound ) %] @@ -87,7 +87,7 @@ [% END %] ). [% END %] - Subscribe to this search + Subscribe to this search [% END # / IF total %]

        [% END # / IF searchdesc %] @@ -104,7 +104,7 @@ @@ -112,7 +112,7 @@ [% IF ( total ) %] [% IF ( ReturnPath ) %]
        -

        Return to the last advanced search

        +

        Return to the last advanced search

        [% END %] [% END %] @@ -283,7 +283,7 @@ [% IF ( BakerTaylorEnabled && BakerTaylorBookstoreURL ) %] [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %] [% IF ( bt_id ) %] - + See Baker & Taylor [% ELSE %] @@ -294,9 +294,9 @@ [% IF ( IDreamBooksResults && SEARCH_RESULT.normalized_isbn ) %] @@ -462,7 +462,7 @@ Lists: diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt index a51642c255..abdabdccff 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt @@ -48,7 +48,7 @@ [% FOREACH routinglist IN routinglists %] [% IF ( titles_loop.odd ) %][% ELSE %][% END %] - + [% routinglist.subscription.biblio.title | html %] 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 284955359d..063da8d974 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 @@ -71,7 +71,7 @@ [% s.time |$KohaDates with_hours => 1 | html %] - Subscribe to this search [% s.query_desc | html %] + Subscribe to this search [% s.query_desc | html %] [% s.total | html %] [% END %] @@ -111,7 +111,7 @@ [% s.time |$KohaDates with_hours => 1 | html %] - Subscribe to this search [% s.query_desc | html %] + Subscribe to this search [% s.query_desc | html %] [% s.total | html %] [% END %] @@ -156,7 +156,7 @@ [% s.time |$KohaDates with_hours => 1 | html %] - [% s.query_desc | html %] + [% s.query_desc | html %] [% s.total | html %] [% END %] @@ -193,7 +193,7 @@ [% s.time |$KohaDates with_hours => 1 | html %] - [% s.query_desc | html %] + [% s.query_desc | html %] [% s.total | html %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt index da453bc430..9733a327b8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt @@ -10,7 +10,7 @@
        @@ -137,11 +137,11 @@ [% IF ( subscription_LOO.letter ) %] [% IF ( loggedinusername ) %] [% IF ( subscription_LOO.hasalert ) %] - You have subscribed to email notification on new issues + You have subscribed to email notification on new issues Cancel email notification [% ELSE %] - + Subscribe to email notification on new issues [% 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 dae56ede38..83c3909d1d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -48,13 +48,13 @@ [% IF shelf and shelf.is_private %] [% IF op == 'view' OR op == 'edit_form' %] -
      • › Your lists
        • +
      • › Your lists
        • [% ELSE %]
      • › Your lists
        • [% END %] [% ELSIF shelf AND shelf.is_public %] [% IF op == 'view' %] -
      • › Public lists
        • +
      • › Public lists
        • [% ELSE %]
      • › Public lists
        • [% END %] @@ -151,7 +151,7 @@ [% IF shelf AND op == 'view' %]

        [% shelf.shelfname | html %] - + Subscribe to this list

        @@ -160,10 +160,10 @@
        New list | - Download list + Download list [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] - Send list + Send list [% END %] Print list @@ -186,7 +186,7 @@ [% IF category == PRIVATE && Koha.Preference('OpacAllowSharingPrivateLists') %] - Share list + Share list [% END %] [% ELSIF category == PRIVATE # not manageshelf and private means shared %]
        @@ -349,7 +349,7 @@ [% IF ( BakerTaylorEnabled ) %] [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) | html %] [% IF ( bt_id ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] No cover image available [% END %] @@ -623,9 +623,9 @@
        [% IF referer == 'view' %] - Cancel + Cancel [% ELSE %] - Cancel + Cancel [% END %]
        @@ -677,7 +677,7 @@ [% FOREACH s IN shelves %] [% SET contents = s.get_contents %] - [% s.shelfname | html %] + [% s.shelfname | html %] [% IF contents.count %][% contents.count | html %] [% IF contents.count == 1 %]item[% ELSE %]items[% END %][% ELSE %]Empty[% END %] [% IF s.is_private %] @@ -706,7 +706,7 @@
        [% END %] [% IF s.is_private AND s.can_be_managed( loggedinusernumber ) AND Koha.Preference('OpacAllowSharingPrivateLists') %] - Share + Share [% END %] [% IF s.is_shared_with( loggedinusernumber ) %]
        diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt index 19900ab7e5..96ebb10fb9 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt @@ -17,7 +17,7 @@ [% END %][% END %][% END %] [% bt_id = ( review.normalized_upc || review.normalized_isbn ) | html %] -[% IF ( BakerTaylorEnabled && bt_id ) %]See Baker & Taylor[% END %] +[% IF ( BakerTaylorEnabled && bt_id ) %]See Baker & Taylor[% END %] [% IF ( review.author ) %]

        By [% review.author | html %].

        [% END %]

        [% IF ( review.place ) %][% review.place | html %] [% END %][% IF ( review.publishercode ) %][% review.publishercode | html %][% END %][% IF ( review.publicationyear ) %] [% review.publicationyear | html %] [% ELSE %][% IF ( review.copyrightdate ) %] [% review.copyrightdate | html %][% END %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt index e33f098a22..e7d2ee244b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt @@ -29,7 +29,7 @@

        [% END %]
        -

        Recent comments Subscribe to recent comments

        +

        Recent comments Subscribe to recent comments

        [% FOREACH review IN reviews %] @@ -140,7 +140,7 @@ [% bt_id = ( review.normalized_upc || review.normalized_isbn ) | html %] [% IF ( BakerTaylorEnabled ) %] [% IF ( bt_id ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] No cover image available [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt index d1cb6f6e63..d19c5ec69c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt @@ -41,7 +41,7 @@ [% FOREACH LOO IN LOOP %] - [% LOO.entry | html %] + [% LOO.entry | html %] [% END %] [% ELSE %]

        Note: This feature only available to French catalogs where ISBD subjects have been populated, and an index built by separate script.

        diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt index 2d2bee696b..4c08a4a58b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt @@ -80,7 +80,7 @@ [% END %] - [% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% END %] + [% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% END %] [% END %] 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 5b671401a8..4d0a6b7412 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -213,7 +213,7 @@ [% IF ( OPACAmazonCoverImages ) %] [% IF ( ISSUE.normalized_isbn ) %] - View on Amazon.com + View on Amazon.com [% ELSE %] No cover image available [% END %] @@ -230,7 +230,7 @@ [% IF ( BakerTaylorEnabled ) %] [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) | html %] [% IF ( bt_id ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] No cover image available [% END %] @@ -286,7 +286,7 @@ [% IF ISSUE.renewed %]Renewed!
        [% END %] [% IF ( ISSUE.status ) %] [% IF ( canrenew ) %] - Renew + Renew [% END %] [% IF ISSUE.renewalfee > 0 %] Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) | html %]': [% ISSUE.renewalfee | $Price %] @@ -432,7 +432,7 @@ [% FOREACH i IN r.issues %] @@ -488,7 +488,7 @@
        Checkouts: [% result.count | html %][% IF Koha.Preference( 'RequestOnOpac' ) == 1 %][% UNLESS ( result.norequests ) %]Place hold[% END %][% END %][% IF Koha.Preference( 'RequestOnOpac' ) == 1 %][% UNLESS ( result.norequests ) %]Place hold[% END %][% END %]
        - + [% i.item.biblio.title | html %][% IF ( i.item.enumchron ) %] [% i.item.enumchron | html %][% END %] [% IF ( OPACAmazonCoverImages ) %] [% IF ( OVERDUE.normalized_isbn ) %] - View on Amazon.com + View on Amazon.com [% ELSE %] No cover image available [% END %] @@ -505,7 +505,7 @@ [% IF ( BakerTaylorEnabled ) %] [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) | html %] [% IF ( bt_id ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] No cover image available [% END %] @@ -551,7 +551,7 @@ Account frozen [% ELSIF ( OVERDUE.status ) %] [% IF ( canrenew ) %] - Renew + Renew [% END %] ([% OVERDUE.renewsleft | html %] of [% OVERDUE.renewsallowed | html %] renewals remaining) [% ELSIF ( OVERDUE.norenew_overdue ) %] @@ -730,7 +730,7 @@ [% INCLUDE 'date-format.inc' %] -

        Clear date to suspend indefinitely

        +

        Clear date to suspend indefinitely

        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 018374418d..70a9f0af39 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 @@ -239,7 +239,7 @@
        		[% ISSUE.issuedate | html %] [% UNLESS ( noitemlinks ) %] - [% ISSUE.title | html %] + [% ISSUE.title | html %] [% ELSE %] [% ISSUE.title | html %] [% END %] diff --git a/misc/cronjobs/rss/lastAcquired-1.0.tt b/misc/cronjobs/rss/lastAcquired-1.0.tt index 0f1a5e2d37..3059e91606 100644 --- a/misc/cronjobs/rss/lastAcquired-1.0.tt +++ b/misc/cronjobs/rss/lastAcquired-1.0.tt @@ -32,7 +32,7 @@
        [% place | html %] [% i.publishercode | html %] [% i.publicationyear | html %]
        [% pages | html %] [% i.illus | html %] [% i.size | html %] [% IF i.notes %]

        [% i.notes | html %][% END %]
        -View Details | Reserve this Item[% IF i.author %] | More by this Author[% END %] +View Details | Reserve this Item[% IF i.author %] | More by this Author[% END %] ]]> [% END %] diff --git a/misc/cronjobs/rss/lastAcquired-2.0.tt b/misc/cronjobs/rss/lastAcquired-2.0.tt index 5067fa4c99..89ca3a5ecf 100644 --- a/misc/cronjobs/rss/lastAcquired-2.0.tt +++ b/misc/cronjobs/rss/lastAcquired-2.0.tt @@ -25,7 +25,7 @@
        [% IF i.publishercode %][% i.place | html %] [% i.publishercode | html %] [% publicationyear | html %]
        [% END %] [% IF i.pages %][% i.pages | html %][% i.illus | html %][% i.size | html %][% END %] [% IF i.notes %]

        [% i.notes | html %]

        [% END %]
        -View Details | Reserve this Item[% IF i.author %] | More by this Author[% END %] +View Details | Reserve this Item[% IF i.author %] | More by this Author[% END %] ]]> [% END %] -- 2.11.0