From a8942c28847e145f74e8373c3447313672cafe1d Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 11 Feb 2016 01:26:46 +0000 Subject: [PATCH] Revert bug 13618 - "Prevent XSS in the Staff Client and the OPAC" due to performance issues Revert "DBRev to make notes of the XSS patches and the new important dependency." This reverts commit e140603a594576180b846cf9299bee4629442c84. Revert "Bug 13618: Specific for branches.opac_info" This reverts commit 06e4a50f00efc62bbeb54260350f6f402d2e5e98. Revert "Bug 13618: (follow-up) Specific for other prefs" This reverts commit d6475a111fb701df68862afc6b23a7bfc774787b. Revert "Bug 13618: Fix for debarredcomment and patron messages" This reverts commit dd98c9df92503885f4f88e4cb6ca4c555fb28ee8. Revert "Bug 13618: Do not display html tags in patron's notices" This reverts commit a065b243feaef07586779d7943e00bbda6023db3. Revert "Bug 13618: Do not display   and html tags in item fields content" This reverts commit baeeaffbf894d6eb7d12666071d2d9b9ab66e874. Revert "Bug 13618: Fix for system preference description" This reverts commit a967a09261fb2eebf27cc4a2c523122432a37203. Revert "Bug 13618: Remove html filters for newly pushed code" This reverts commit 0e98662b10197b1d92f2fb8ad50206e598a571e6. Revert "Bug 13618: (follow-up) add missing lines for opac-shelves" This reverts commit fc2fb605e53d8c5774a952bcf620335fbf77c004. Revert "Bug 13618: (follow-up) Specific for ColumnsSettings" This reverts commit bc308fdd9c95b13810bac57a2da9514ff37f570d. Revert "Bug 13618: Fix for edit biblios and items" This reverts commit 811c4e8402593127074ad47a81098f3aad389c94. Revert "Bug 13618: followup to remove tabs" This reverts commit ca8e8c397c8c2392b85d4c3232309ded66f3b8f1. Revert "Bug 13618: Fix last occurrences recently introduced to master" This reverts commit bb417b256b319d8a99ea611b76bad80c4d47004c. Revert "Bug 13618: Fix for news" This reverts commit ae5b98020aeec7d56faa7170cbad3319a8245379. Revert "Bug 13618: Fix escape on sending baskets or shelves by email" This reverts commit a7731ffe25e89d900d57e07f8e3de7b398090980. Revert "Bug 13618: Specific for XSLTBloc" This reverts commit 11fa38dc29e16d94a5ed81eb9e29b84f7e166d6c. Revert "Bug 13618: Specific for Salutation on editing a patron" This reverts commit 36c07ad6d3cf57c31bad4b11370b53aafd4d4806. Revert "Bug 13618: Specific for other prefs" This reverts commit e6ea281a3bcd2c3550578e8f2dd188a7701c77fb. Revert "Bug 13618 - memberentrygen.tt errors Not a GLOB reference" This reverts commit 782487455770a59ab7b30b5e92a1a66c28d30b88. Revert "Bug 13618: Specific for ColumnsSettings" This reverts commit 1834da3da367321771530331e7420ffa94d52979. Revert "Bug 13618: Specific for IntranetUser* and OPACUser* prefs" This reverts commit 21ae62b25310ea0876b087b729cf0b3a2ad7b1e6. Revert "Bug 13618: Fix error 'Not a GLOB reference'" This reverts commit 602bdbab4c6f86aa136158e1459d800d9530e243. Revert "Bug 13618: Specific for the ISBD view" This reverts commit d254362435a9ada5dffa8b5ef1c2a19f5d525f5e. Revert "Bug 13618: Specific for pagination_bar" This reverts commit 8837a8ae68f8089777b824203f3878735ff96591. Revert "Bug 13618: Specific places where we don't need to escape variables - intra" This reverts commit 00eff140b3402a043e31915d1a7b29aec3605433. Revert "Bug 13618: Remove html filters at the intranet" This reverts commit 7db851ff03a168fa46d56bb0e472be249dbd5410. Revert "Bug 13618: Specific places where we don't need to escape variables" This reverts commit 49a3738b8d54580e80e92e74fdba0483008b5cfd. Revert "Bug 13618: Remove html filters at the OPAC" This reverts commit cedaa0e23e0927884f1c5ef2cafde4bcdd6d55ff. Revert "Bug 13618: Use Template::Stash::AutoEscaping to use the html filter" This reverts commit 01b38d3b13f09b927201cba5eb146b6597d4bfeb. Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com --- C4/Installer/PerlDependencies.pm | 5 -- C4/Templates.pm | 2 - Koha.pm | 2 +- installer/data/mysql/updatedatabase.pl | 8 -- .../prog/en/includes/acquisitions-search.inc | 2 +- .../prog/en/includes/auth-finder-search.inc | 8 +- .../includes/authorities-search-results.inc | 22 ++--- .../prog/en/includes/authorities-search.inc | 8 +- .../prog/en/includes/authorities.inc | 4 +- .../prog/en/includes/borrower_debarments.inc | 2 +- .../catalogue/itemsearch_item.csv.inc | 2 +- .../en/includes/catalogue/itemsearch_item.inc | 2 +- .../catalogue/itemsearch_item.json.inc | 24 +++--- .../prog/en/includes/circ-menu.inc | 9 +-- .../prog/en/includes/doc-head-close.inc | 4 +- .../intranet-tmpl/prog/en/includes/facets.inc | 6 +- .../intranet-tmpl/prog/en/includes/header.inc | 2 +- .../prog/en/includes/merge-record.inc | 2 +- .../prog/en/includes/page-numbers.inc | 6 +- .../prog/en/includes/prefs-admin-search.inc | 2 +- .../prog/en/includes/slip-print.inc | 4 +- .../intranet-tmpl/prog/en/modules/about.tt | 20 ++--- .../prog/en/modules/acqui/addorder.tt | 2 +- .../prog/en/modules/acqui/addorderiso2709.tt | 4 +- .../prog/en/modules/acqui/basket.tt | 18 ++--- .../prog/en/modules/acqui/basketgroup.tt | 14 ++-- .../prog/en/modules/acqui/histsearch.tt | 4 +- .../prog/en/modules/acqui/invoice-files.tt | 8 +- .../prog/en/modules/acqui/invoice.tt | 6 +- .../prog/en/modules/acqui/lateorders.tt | 10 +-- .../prog/en/modules/acqui/modordernotes.tt | 2 +- .../prog/en/modules/acqui/neworderbiblio.tt | 4 +- .../prog/en/modules/acqui/neworderempty.tt | 4 +- .../en/modules/acqui/newordersubscription.tt | 2 +- .../en/modules/acqui/newordersuggestion.tt | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../prog/en/modules/acqui/parcel.tt | 8 +- .../modules/acqui/tables/members_results.tt | 6 +- .../prog/en/modules/acqui/transferorder.tt | 2 +- .../prog/en/modules/acqui/z3950_search.tt | 6 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 6 +- .../modules/admin/auth_subfields_structure.tt | 24 +++--- .../en/modules/admin/auth_tag_structure.tt | 4 +- .../prog/en/modules/admin/authtypes.tt | 6 +- .../prog/en/modules/admin/biblio_framework.tt | 6 +- .../prog/en/modules/admin/branches.tt | 81 ++++++++++--------- .../prog/en/modules/admin/categories.tt | 30 +++---- .../prog/en/modules/admin/cities.tt | 6 +- .../prog/en/modules/admin/classsources.tt | 16 ++-- .../prog/en/modules/admin/currency.tt | 6 +- .../prog/en/modules/admin/itemtypes.tt | 8 +- .../modules/admin/marc_subfields_structure.tt | 22 ++--- .../prog/en/modules/admin/marctagstructure.tt | 4 +- .../prog/en/modules/admin/matching-rules.tt | 46 +++++------ .../en/modules/admin/patron-attr-types.tt | 22 ++--- .../prog/en/modules/admin/preferences.tt | 4 +- .../en/modules/admin/systempreferences.tt | 22 ++--- .../prog/en/modules/admin/z3950servers.tt | 2 +- .../intranet-tmpl/prog/en/modules/auth.tt | 2 +- .../en/modules/authorities/authorities.tt | 8 +- .../authorities/searchresultlist-auth.tt | 2 +- .../modules/authorities/searchresultlist.tt | 4 +- .../prog/en/modules/basket/basket.tt | 6 +- .../prog/en/modules/basket/sendbasket.tt | 46 +++++------ .../prog/en/modules/catalogue/ISBDdetail.tt | 2 +- .../prog/en/modules/catalogue/MARCdetail.tt | 10 +-- .../prog/en/modules/catalogue/detail.tt | 24 +++--- .../prog/en/modules/catalogue/imageviewer.tt | 6 +- .../prog/en/modules/catalogue/issuehistory.tt | 8 +- .../prog/en/modules/catalogue/itemsearch.tt | 2 +- .../prog/en/modules/catalogue/moredetail.tt | 8 +- .../prog/en/modules/catalogue/results.tt | 28 +++---- .../en/modules/catalogue/search-history.tt | 8 +- .../prog/en/modules/catalogue/subject.tt | 2 +- .../prog/en/modules/cataloguing/addbiblio.tt | 16 ++-- .../prog/en/modules/cataloguing/addbooks.tt | 6 +- .../prog/en/modules/cataloguing/additem.tt | 16 ++-- .../prog/en/modules/cataloguing/linkitem.tt | 6 +- .../prog/en/modules/cataloguing/moveitem.tt | 8 +- .../cataloguing/value_builder/macles.tt | 14 ++-- .../value_builder/marc21_linking_section.tt | 5 +- .../value_builder/unimarc_field_210c.tt | 4 +- .../value_builder/unimarc_field_4XX.tt | 24 +++--- .../value_builder/unimarc_field_686a.tt | 6 +- .../modules/cataloguing/z3950_auth_search.tt | 10 +-- .../en/modules/cataloguing/z3950_search.tt | 4 +- .../prog/en/modules/circ/bookcount.tt | 6 +- .../prog/en/modules/circ/branchoverdues.tt | 8 +- .../prog/en/modules/circ/branchtransfers.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 18 ++--- .../circ/circulation_batch_checkouts.tt | 4 +- .../prog/en/modules/circ/on-site_checkouts.tt | 2 +- .../prog/en/modules/circ/overdue.tt | 38 ++++----- .../prog/en/modules/circ/pendingreserves.tt | 2 +- .../prog/en/modules/circ/printslip.tt | 4 +- .../prog/en/modules/circ/renew.tt | 2 +- .../prog/en/modules/circ/reserveratios.tt | 2 +- .../prog/en/modules/circ/returns.tt | 22 ++--- .../en/modules/circ/selectbranchprinter.tt | 8 +- .../prog/en/modules/circ/transfer-slip.tt | 2 +- .../en/modules/circ/transferstoreceive.tt | 4 +- .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 4 +- .../prog/en/modules/installer/auth.tt | 2 +- .../prog/en/modules/installer/step3.tt | 4 +- .../prog/en/modules/intranet-main.tt | 4 +- .../en/modules/labels/label-edit-layout.tt | 4 +- .../prog/en/modules/labels/result.tt | 2 +- .../en/modules/labels/spinelabel-print.tt | 4 +- .../prog/en/modules/members/boraccount.tt | 2 +- .../prog/en/modules/members/member.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 36 ++++----- .../en/modules/members/moremember-print.tt | 4 +- .../en/modules/members/moremember-receipt.tt | 8 +- .../prog/en/modules/members/moremember.tt | 13 ++- .../prog/en/modules/members/notices.tt | 2 +- .../modules/members/purchase-suggestions.tt | 4 +- .../prog/en/modules/members/readingrec.tt | 2 +- .../members/tables/guarantor_search.tt | 4 +- .../modules/members/tables/members_results.tt | 8 +- .../en/modules/offline_circ/process_koc.tt | 6 +- .../prog/en/modules/patron_lists/lists.tt | 2 +- .../en/modules/patroncards/edit-layout.tt | 44 +++++----- .../patroncards/tables/members_results.tt | 4 +- .../modules/reports/guided_reports_start.tt | 12 +-- .../prog/en/modules/reports/issues_stats.tt | 4 +- .../prog/en/modules/reports/itemslost.tt | 4 +- .../prog/en/modules/reports/reserves_stats.tt | 4 +- .../prog/en/modules/reports/serials_stats.tt | 2 +- .../prog/en/modules/reserve/request.tt | 14 ++-- .../prog/en/modules/reviews/reviewswaiting.tt | 4 +- .../modules/rotating_collections/addItems.tt | 2 +- .../prog/en/modules/serials/add_fields.tt | 4 +- .../en/modules/serials/checkexpiration.tt | 2 +- .../prog/en/modules/serials/claims.tt | 2 +- .../prog/en/modules/serials/result.tt | 10 +-- .../modules/serials/routing-preview-slip.tt | 2 +- .../en/modules/serials/routing-preview.tt | 4 +- .../prog/en/modules/serials/routing.tt | 8 +- .../en/modules/serials/serials-collection.tt | 2 +- .../prog/en/modules/serials/serials-edit.tt | 12 +-- .../prog/en/modules/serials/serials-search.tt | 28 +++---- .../en/modules/serials/subscription-add.tt | 6 +- .../serials/subscription-bib-search.tt | 4 +- .../modules/serials/tables/members_results.tt | 2 +- .../en/modules/services/itemrecorddisplay.tt | 6 +- .../prog/en/modules/suggestion/suggestion.tt | 50 ++++++------ .../prog/en/modules/tags/list.tt | 8 +- .../prog/en/modules/tags/review.tt | 2 +- .../prog/en/modules/tools/batchMod-del.tt | 2 +- .../prog/en/modules/tools/batchMod-edit.tt | 6 +- .../en/modules/tools/batch_delete_records.tt | 2 +- .../prog/en/modules/tools/inventory.tt | 16 ++-- .../prog/en/modules/tools/koha-news.tt | 4 +- .../prog/en/modules/tools/viewlog.tt | 4 +- .../virtualshelves/addbybiblionumber.tt | 12 +-- .../en/modules/virtualshelves/sendshelf.tt | 50 ++++++------ .../prog/en/modules/virtualshelves/shelves.tt | 20 ++--- .../virtualshelves/tables/shelves_results.tt | 2 +- .../includes/authorities-search-results.inc | 22 ++--- .../bootstrap/en/includes/bodytag.inc | 10 +-- .../bootstrap/en/includes/doc-head-close.inc | 2 +- .../bootstrap/en/includes/masthead-sco.inc | 2 +- .../bootstrap/en/includes/masthead.inc | 12 +-- .../bootstrap/en/includes/navigation.inc | 4 +- .../en/includes/opac-authorities.inc | 4 +- .../bootstrap/en/includes/opac-bottom.inc | 6 +- .../en/includes/opac-detail-sidebar.inc | 2 +- .../bootstrap/en/includes/opac-facets.inc | 6 +- .../bootstrap/en/includes/page-numbers.inc | 6 +- .../bootstrap/en/includes/shelfbrowser.inc | 4 +- .../bootstrap/en/modules/maintenance.tt | 2 +- .../bootstrap/en/modules/opac-ISBDdetail.tt | 2 +- .../bootstrap/en/modules/opac-MARCdetail.tt | 20 ++--- .../en/modules/opac-addbybiblionumber.tt | 14 ++-- .../en/modules/opac-auth-MARCdetail.tt | 2 +- .../bootstrap/en/modules/opac-auth.tt | 4 +- .../opac-authoritiessearchresultlist.tt | 12 +-- .../bootstrap/en/modules/opac-basket.tt | 14 ++-- .../bootstrap/en/modules/opac-blocked.tt | 2 +- .../bootstrap/en/modules/opac-browser.tt | 6 +- .../bootstrap/en/modules/opac-detail.tt | 46 +++++------ .../bootstrap/en/modules/opac-downloadcart.tt | 2 +- .../en/modules/opac-downloadshelf.tt | 6 +- .../bootstrap/en/modules/opac-imageviewer.tt | 2 +- .../bootstrap/en/modules/opac-main.tt | 8 +- .../bootstrap/en/modules/opac-mymessages.tt | 10 +-- .../bootstrap/en/modules/opac-news-rss.tt | 6 +- .../bootstrap/en/modules/opac-opensearch.tt | 52 ++++++------ .../en/modules/opac-overdrive-search.tt | 8 +- .../en/modules/opac-readingrecord.tt | 10 +-- .../modules/opac-registration-confirmation.tt | 4 +- .../bootstrap/en/modules/opac-reserve.tt | 2 +- .../en/modules/opac-restrictedpage.tt | 2 +- .../en/modules/opac-results-grouped.tt | 14 ++-- .../bootstrap/en/modules/opac-results.tt | 40 ++++----- .../bootstrap/en/modules/opac-review.tt | 10 +-- .../en/modules/opac-search-history.tt | 8 +- .../bootstrap/en/modules/opac-sendbasket.tt | 52 ++++++------ .../bootstrap/en/modules/opac-sendshelf.tt | 52 ++++++------ .../en/modules/opac-serial-issues.tt | 4 +- .../bootstrap/en/modules/opac-shelves-rss.tt | 6 +- .../bootstrap/en/modules/opac-shelves.tt | 71 ++++++++-------- .../en/modules/opac-showreviews-rss.tt | 20 ++--- .../bootstrap/en/modules/opac-showreviews.tt | 6 +- .../bootstrap/en/modules/opac-suggestions.tt | 18 ++--- .../bootstrap/en/modules/opac-tags.tt | 13 +-- .../bootstrap/en/modules/opac-tags_subject.tt | 2 +- .../bootstrap/en/modules/opac-topissues.tt | 4 +- .../bootstrap/en/modules/opac-user.tt | 17 ++-- .../bootstrap/en/modules/sco/help.tt | 8 +- .../bootstrap/en/modules/sco/sco-main.tt | 14 ++-- .../bootstrap/en/modules/svc/suggestion.tt | 2 +- 213 files changed, 1058 insertions(+), 1076 deletions(-) diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm index be840776b3..d621f3377d 100644 --- a/C4/Installer/PerlDependencies.pm +++ b/C4/Installer/PerlDependencies.pm @@ -822,11 +822,6 @@ our $PERL_DEPS = { 'required' => '0', 'min_ver' => '0.03', }, - 'Template::Stash::AutoEscaping' => { - 'usage' => 'Code', - 'required' => '1', - 'min_ver' => '0.0303', - }, }; 1; diff --git a/C4/Templates.pm b/C4/Templates.pm index 052821749b..4f23dc700c 100644 --- a/C4/Templates.pm +++ b/C4/Templates.pm @@ -5,7 +5,6 @@ use warnings; use Carp; use CGI qw ( -utf8 ); use List::MoreUtils qw/ any uniq /; -use Template::Stash::AutoEscaping; # Copyright 2009 Chris Cormack and The Koha Dev Team # @@ -70,7 +69,6 @@ sub new { COMPILE_DIR => $use_template_cache ? C4::Context->config('template_cache_dir') : '', INCLUDE_PATH => \@includes, FILTERS => {}, - STASH => Template::Stash::AutoEscaping->new, ENCODING => 'UTF-8', } ) or die Template->error(); diff --git a/Koha.pm b/Koha.pm index 23ab78e051..a71409da31 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "3.23.00.018"; +$VERSION = "3.23.00.017"; sub version { return $VERSION; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index a67727faef..99046acf8d 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -11713,14 +11713,6 @@ remove_tree( $tmp ) if -d $tmp; } -$DBversion = "3.23.00.018"; -if ( CheckVersion($DBversion) ) { - - print "Upgrade to $DBversion done (Bug 13618 - Prevent XSS in the Staff Client and the OPAC -- Please note the new dependency Template::Stash::AutoEscaping - pretty important to have)\n"; - SetVersion($DBversion); - -} - # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc index 74d9d9544a..5aebf54b73 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -12,7 +12,7 @@
- + [+] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc index 54c7c83b5b..bb2d3a8d15 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc @@ -142,7 +142,7 @@ function finderjumpfull(page) [% END %] - +
@@ -168,7 +168,7 @@ function finderjumpfull(page) [% END %] - +
  • @@ -193,7 +193,7 @@ function finderjumpfull(page) [% END %] - +
  • @@ -217,7 +217,7 @@ function finderjumpfull(page) [% END %] - +
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc index 8cedd318fa..a009c7d5be 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc @@ -12,24 +12,24 @@ [% IF marcflavour == 'UNIMARC' %] [% SWITCH type %] [% CASE 'broader' %] - BT: [% heading %] + BT: [% heading | html %] [% CASE 'narrower' %] - NT: [% heading %] + NT: [% heading | html %] [% CASE 'seefrom' %] - UF: [% heading %] + UF: [% heading | html %] [% CASE 'seealso' %] - RT: [% heading %] + RT: [% heading | html %] [% END %] [% ELSE %] [% IF ( linkType=='seealso' ) %] [% IF ( authid ) %] - [% heading %] + [% heading | html %] [% ELSE %] - [% heading %] + [% heading | html %] [% END %] [% ELSE %] - [% heading %] + [% heading | html %] [% END %] [% UNLESS ( type=='seefrom' || type=='seealso' ) %] @@ -42,7 +42,7 @@ [% CASE 'broader' %](Broader heading) [% CASE 'narrower' %](Narrower heading) [% CASE 'parent' %](Immediate parent body) - [% CASE %][% IF type %]([% type %]) + [% CASE %][% IF type %]([% type | html %]) [% END %] [% END %] @@ -50,7 +50,7 @@ [% END %] [% END %] [% BLOCK authresult %] - [% IF ( summary.label ) %][% summary.label %]:[% END %] + [% IF ( summary.label ) %][% summary.label | html %]:[% END %] [% IF summary.summary %]
    [% summary.summary %] @@ -59,7 +59,7 @@ [% UNLESS ( summary.summaryonly ) %]
    [% FOREACH authorize IN summary.authorized %] - [% authorize.heading %] + [% authorize.heading | html %] [% UNLESS loop.last %] | [% END %] [% END %]
    @@ -67,7 +67,7 @@ [% IF summary.notes %]
    [% FOREACH note IN summary.notes %] - [% note.note %] + [% note.note | html %] [% END %]
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc index 55165565de..d410dcc588 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc @@ -53,7 +53,7 @@ [% END %] - + - + - + - + - +
    • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc index 2ef952fafc..2992164929 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc @@ -1,7 +1,7 @@ [% IF ( PAGE_NUMBERS ) %]
    - [% IF ( previous_page_offset.defined ) %]<< Previous[% END %] - [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %][% IF ( PAGE_NUMBER.highlight ) %][% PAGE_NUMBER.pg %][% ELSE %] [% PAGE_NUMBER.pg %][% END %] + [% IF ( previous_page_offset.defined ) %]<< Previous[% END %] + [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %][% IF ( PAGE_NUMBER.highlight ) %][% PAGE_NUMBER.pg %][% ELSE %] [% PAGE_NUMBER.pg %][% END %] [% END %] - [% IF ( next_page_offset ) %]Next >>[% END %] + [% IF ( next_page_offset ) %]Next >>[% END %]
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc index d11d3955ab..34de2d4b1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc @@ -6,7 +6,7 @@ - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc index e17afd6462..413f4bbbcf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc @@ -1,10 +1,10 @@ + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index 2c0d0eb994..7ca5b4ad6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -37,21 +37,21 @@ - - - - + + + + - - + + [% IF (is_psgi) %] - + [% END %] - + [% IF (errZebraConnection == 10000) %] [% ELSIF (errZebraConnection) %] @@ -826,7 +826,7 @@ [% FOREACH ro IN tabl.row2 %] - + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt index 909d78a954..322e5356a9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt @@ -15,7 +15,7 @@ [% FOREACH var IN vars_loop %] [% FOREACH val IN var.values %] - + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index 7a3e291306..31822d98a3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -308,9 +308,9 @@ [% FOREACH iteminformatio IN item.iteminformation %]
  • [% IF (iteminformatio.mandatory) %] - + [% ELSE %] - + [% END %] [% IF ( iteminformatio.marc_value.type == 'select' ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 00f001baac..3b3e1b1d71 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -3,7 +3,7 @@ [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname %] ([% basketno %]) for [% name %] +Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] @@ -145,7 +145,7 @@ [% INCLUDE 'acquisitions-search.inc' %] - +
    @@ -228,7 +228,7 @@

    The following records could not be deleted:

      [% FOREACH cannotdelbiblio IN cannotdelbiblios %] -
    • [% cannotdelbiblio.title %] by [% cannotdelbiblio.author %]: +
    • [% cannotdelbiblio.title |html %] by [% cannotdelbiblio.author %]:
        [% IF (cannotdelbiblio.itemcount) %]
      • [% cannotdelbiblio.itemcount %] item(s) attached.
        • [% END %] [% IF (cannotdelbiblio.subscriptions) %]
      • [% cannotdelbiblio.subscriptions %] subscription(s) attached.
        • [% END %] @@ -244,7 +244,7 @@ [% END %] [% ELSE %] -

        [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname %] ([% basketno %]) for [% name %]

        +

        [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]

        [% IF ( basketno ) %]
        @@ -454,7 +454,7 @@

        [% IF ( books_loo.order_received ) %] (rcvd)[% END %] [% IF books_loo.title %] - [% books_loo.title %][% IF books_loo.author %] by [% books_loo.author %][% END %] + [% books_loo.title |html %][% IF books_loo.author %] by [% books_loo.author %][% END %] [% ELSE %] Deleted bibliographic record, can't find title
        [% END %] @@ -471,12 +471,12 @@ [% END %]

        [% IF ( books_loo.order_internalnote ) %] -

        Internal note: [% books_loo.order_internalnote %] [Change internal note]

        +

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

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

        Vendor note: [% books_loo.order_vendornote %] [Change vendor note]

        +

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

        [% ELSE %] [Add vendor note] [% END %] @@ -578,7 +578,7 @@

        [% IF ( order.order_received ) %] (rcvd)[% END %] [% IF (order.title) %] - [% order.title %][% IF order.author %] by [% order.author %][% END %] + [% order.title |html %][% IF order.author %] by [% order.author %][% END %] [% ELSE %] Deleted bibliographic record, can't find title [% END %] @@ -646,7 +646,7 @@

        -

        Are you sure you want to close basket [% basketname %]?

        +

        Are you sure you want to close basket [% basketname|html %]?

        [% IF ( CAN_user_acquisition_group_manage ) %]

        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index 261edd3b1f..0bdd830291 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -1,6 +1,6 @@ [% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Basket grouping for [% booksellername %] +Koha › Basket grouping for [% booksellername |html %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] @@ -129,9 +129,9 @@ function submitForm(form) {

        + [% booksellername |html %] › Basket grouping › Add basket group for [% booksellername |html %]
        [% ELSE %] - [% booksellername %] › Basket grouping
        + [% booksellername |html %] › Basket grouping
        [% END %]
        @@ -149,11 +149,11 @@ function submitForm(form) {
        Delete basket group
        [% END %] [% IF (name && closedbg) %] -

        Basket group [% name %] ([% basketgroupid %]) for [% booksellername %]

        +

        Basket group [% name %] ([% basketgroupid %]) for [% booksellername |html %]

        [% ELSIF (name) %] -

        Edit basket group [% name %] ([% basketgroupid %]) for [% booksellername %]

        +

        Edit basket group [% name %] ([% basketgroupid %]) for [% booksellername |html %]

        [% ELSE %] -

        Add basket group for [% booksellername %]

        +

        Add basket group for [% booksellername |html %]

        [% END %]
        [% UNLESS (closedbg) %] @@ -303,7 +303,7 @@ function submitForm(form) { -

        Basket grouping for [% booksellername %]

        +

        Basket grouping for [% booksellername |html %]

          [% UNLESS ( listclosed) %]
        • Open
          • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt index e6f87526c6..988fd27938 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -13,7 +13,7 @@ //
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt index 9703efa8f5..b2e26aa9e0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt @@ -36,7 +36,7 @@
    -

    Files for invoice: [% invoicenumber %]

    +

    Files for invoice: [% invoicenumber | html %]

    Vendor: [% suppliername %]


    [% IF errors %] @@ -62,9 +62,9 @@
    [% FOREACH f IN files %] - - - + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 7cb26cc222..3c0991eddf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -230,9 +230,9 @@ [% FOREACH f IN files %] - - - + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index 5df669b41a..f6804019ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -25,7 +25,7 @@ function check_uncheck() { $(document).ready(function() { - var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'lateorders', 'late_orders', 'json' ).raw %]; + var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'lateorders', 'late_orders', 'json' ) %]; late_orderst = KohaTable("#late_orders", { "aoColumnDefs": [ { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false }, @@ -98,7 +98,7 @@ $(document).ready(function() { [% IF ( lateorders ) %] - + [% IF ( letters ) %]

    - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt index a85e52f72e..11ab14419e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -53,7 +53,7 @@ - - + @@ -216,7 +216,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index cd0888cbce..f9ab2091c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -8,7 +8,7 @@
    Server information
    Koha version: [% kohaVersion %]
    OS version ('uname -a'): [% osVersion %]
    Perl interpreter: [% perlPath %]
    Perl version: [% perlVersion %]
    Koha version: [% kohaVersion |html %]
    OS version ('uname -a'): [% osVersion |html %]
    Perl interpreter: [% perlPath |html %]
    Perl version: [% perlVersion |html %]
    Perl @INC: [% FOREACH perlIncPat IN perlIncPath %] - [% perlIncPat.perlinc %]
    + [% perlIncPat.perlinc |html %]
    [% END %]
    MySQL version: [% mysqlVersion %]
    Apache version: [% apacheVersion %]
    MySQL version: [% mysqlVersion |html %]
    Apache version: [% apacheVersion |html %]
    PSGI: [% psgi_server %]
    PSGI: [% psgi_server |html %]
    Zebra version: [% zebraVersion %]
    Zebra version: [% zebraVersion |html %]
    Error Zebra server seems not to be available. Is it started?
    [% ro.date %][% ro.desc %][% ro.desc|html %]
    - [% order.title %] + [% order.title |html %]
    [% order.author %]
    [% order.isbn %]     		[% order.name %]
    [% f.file_name %][% f.file_type %][% f.file_description %][% f.file_name | html %][% f.file_type | html %][% f.file_description | html %] [% f.date_uploaded | $KohaDates %]
    [% f.file_name %][% f.file_type %][% f.file_description %][% f.file_name | html %][% f.file_type | html %][% f.file_description | html %] [% f.date_uploaded | $KohaDates %] - [% lateorder.title %] + [% lateorder.title |html %] [% IF ( lateorder.author ) %]
    Author: [% lateorder.author %][% END %] [% IF ( lateorder.publisher ) %]
    Published by: [% lateorder.publisher %] @@ -222,10 +222,10 @@ $(document).ready(function() {

    Filter results:

    [% FOREACH ERROR_LOO IN ERROR_LOOP %] -[% IF ( ERROR_LOO.delay_digits ) %]

    The number of days ([% ERROR_LOO.bad_delay %]) must be a number between 0 and 999.

    [% END %] +[% IF ( ERROR_LOO.delay_digits ) %]

    The number of days ([% ERROR_LOO.bad_delay | html %]) must be a number between 0 and 999.

    [% END %] [% END %]
      -
    1. days ago
      2. +
    2. days ago
    3. [% INCLUDE 'date-format.inc' %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt index 081e013252..f17d5c2bff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt @@ -12,7 +12,7 @@ [% INCLUDE 'header.inc' %] - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt index 712f289e39..037dc10617 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt @@ -46,7 +46,7 @@ [% IF ( total ) %] [% total %] results found -
      [% pagination_bar.raw %]
      +
      [% pagination_bar %]
      [% ELSE %]

      No results found

      @@ -74,7 +74,7 @@ [% FOREACH biblio IN resultsloop %]

    -

    [% biblio.title %] +

    [% biblio.title |html %] [% IF ( biblio.author ) %] by [% biblio.author %],[% END %]

    [% IF ( biblio.isbn ) %] [% biblio.isbn %][% END %] [% IF ( biblio.pages ) %] - [% biblio.pages %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 45855ea9e9..7638f0289e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -309,10 +309,10 @@ $(document).ready(function()

    1. [% IF ( biblionumber ) %] Title - [% title %] + [% title |html %] [% ELSE %] - + Required [% END %]
      2. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt index 1ae94c6b49..d6e65a0fb9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -70,7 +70,7 @@ [% FOREACH sub IN subs_loop %]
    [% sub.issn %][% IF (sub.title) %][% sub.title %][% ELSE %] + [% IF (sub.title) %][% sub.title |html %][% ELSE %] --- [% END %][% IF (sub.unititle) %], [% sub.unititle %][% END %]
    [% suggestions_loo.managedby %] -

    [% suggestions_loo.title %] - [% suggestions_loo.author %]

    +

    [% suggestions_loo.title |html %] - [% suggestions_loo.author %]

    [% IF ( suggestions_loo.copyrightdate ) %]© [% suggestions_loo.copyrightdate %] [% END %] [% IF ( suggestions_loo.volumedesc ) %]volume: [% suggestions_loo.volumedesc %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index 26da5fce7b..31b08c513a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -141,7 +141,7 @@

    Catalog details -
    1. Title: [% title %]
      2. +
      1. Title: [% title |html %]
      2. Author: [% author %]
      3. Copyright: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 1d942d5944..05de2889e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -254,7 +254,7 @@
    		[% loop_order.ordernumber %] - [% loop_order.title %] + [% loop_order.title |html %] [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %] [% IF ( loop_order.isbn ) %] – [% loop_order.isbn %][% END %] [% IF ( loop_order.publishercode ) %]
    Publisher:[% loop_order.publishercode %][% END %] @@ -265,12 +265,12 @@ [% END %]
    [% IF ( loop_order.order_internalnote ) %] -

    Internal note: [% loop_order.order_internalnote %] [Change internal note]

    +

    Internal note: [% loop_order.order_internalnote|html %] [Change internal note]

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

    Vendor note: [% loop_order.order_vendornote %]

    +

    Vendor note: [% loop_order.order_vendornote|html %]

    [% ELSE %] [Add vendor note] [% END %] @@ -401,7 +401,7 @@ 0 [% END %]     		[% order.title %] + [% order.title |html %] [% IF ( order.author ) %] / [% order.author %][% END %] [% IF ( order.isbn ) %] - [% order.isbn %][% END %] [% IF ( order.publishercode ) %]
    Publisher :[% order.publishercode %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt index ea2660c4b8..681f1cd583 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt @@ -11,12 +11,12 @@ "dt_name": "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames cardnumber = data.cardnumber invert_name = 1%]", "dt_branch": - "[% data.branchname %]", + "[% data.branchname |html %]", "dt_category": - "[% data.category_description %] ([% data.category_type %])", + "[% data.category_description |html %] ([% data.category_type |html %])", "dt_action": [%- IF selection_type == 'select' -%] - "Select" + "Select" [%- ELSE -%] "Select" [%- END -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt index 00b106f367..68e76e42dc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt @@ -95,7 +95,7 @@
    [% ordersloo.ordernumber %] - [% ordersloo.title %] + [% ordersloo.title |html %] [% IF ( ordersloo.author ) %] by [% ordersloo.author %][% END %] [% IF ( ordersloo.isbn ) %] – [% ordersloo.isbn %][% END %] [% IF ( ordersloo.publishercode ) %]
    Publisher :[% ordersloo.publishercode %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index a585972b21..6e1ad43475 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -108,7 +108,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
      -
      2. +
      6. @@ -187,7 +187,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
    [% breeding_loo.server %]
    Preview MARC Preview card Order X
    		[% breeding_loo.title %][% breeding_loo.title |html %] [% breeding_loo.author %] [% breeding_loo.isbn %] [% breeding_loo.lccn %]
    Subfield: [% tagsubfield %]
    Description: [% liblibrarian %]
    - + - +
    - + - +
    @@ -241,14 +241,14 @@ function displayMoreConstraint(numlayer){

    Data deleted

    - +
    [% END %] [% IF ( else ) %] -

    Authority MARC subfield structure admin for [% tagfield %] (authority: [% authtypecode %])

    +

    Authority MARC subfield structure admin for [% tagfield | html %] (authority: [% authtypecode | html%])

    This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.

    The column 'Koha field' shows that the subfield is linked with a Koha field.

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt index 932511b9f0..2d9da9af55 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -96,8 +96,8 @@ [% END %] -
    • -
    • +
    • +
  • [% IF ( repeatable ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt index d28b871100..5a82fbf4f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -91,7 +91,7 @@
  • - + Required
  • @@ -163,8 +163,8 @@ [% authority_type.summary %] [% authority_type.auth_tag_to_report %] MARC structure - Edit - Delete + Edit + Delete [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index da7c4e7fdb..52ce915a72 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -162,7 +162,7 @@ [% END %]
  • - + Required
    • @@ -272,8 +272,8 @@ [% loo.frameworkcode %] [% loo.frameworktext %] MARC structure - Edit - Delete + Edit + Delete diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index 36c4f2b9e1..305741ab79 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -142,17 +142,17 @@ tinyMCE.init({
  • [% IF library %] Library code: - + [% library.branchcode %] [% ELSE %] - + Required [% END %]
  • - + Required
    • @@ -176,22 +176,22 @@ tinyMCE.init({ [% END %]
      -
      2. -
      3. -
      4. -
      5. -
      6. -
      7. -
      8. -
      9. -
      10. -
      11. -
      12. -
      13. -
      14. -
      15. -
    15. Can be entered as a single IP, or a subnet such as 192.168.1.*
      16. -
      17. +
      18. +
      19. +
      20. +
      21. +
      22. +
      23. +
      24. +
      25. +
      26. +
      27. +
      28. +
      29. +
      30. +
      31. +
    31. Can be entered as a single IP, or a subnet such as 192.168.1.*
      32. +
    @@ -206,8 +206,8 @@ tinyMCE.init({
    Confirm deletion of [% library.branchname %] ([% library.branchcode %])? - - + +
    Cancel @@ -234,34 +234,34 @@ tinyMCE.init({ [% FOREACH library IN libraries %] - [% library.branchname %] - [% library.branchcode %] + [% library.branchname |html %] + [% library.branchcode |html %] [% IF library.branchaddress1 %] - [% library.branchaddress1 %][% END %] + [% library.branchaddress1 |html %][% END %] [% IF library.branchaddress2 %] -
    [% library.branchaddress2 %][% END %] +
    [% library.branchaddress2 |html %][% END %] [% IF library.branchaddress3 %] -
    [% library.branchaddress3 %][% END %] +
    [% library.branchaddress3 |html %][% END %] [% IF library.branchcity %] -
    [% library.branchcity %][% END %][% IF ( library.branchstate ) %], - [% library.branchstate %][% END %] +
    [% library.branchcity |html %][% END %][% IF ( library.branchstate ) %], + [% library.branchstate |html %][% END %] [% IF library.branchzip %] - [% library.branchzip %][% END %] + [% library.branchzip |html %][% END %] [% IF library.branchcountry %] -
    [% library.branchcountry %][% END %] +
    [% library.branchcountry |html %][% END %] [% IF library.branchphone %] -
    Ph: [% library.branchphone %][% END %] +
    Ph: [% library.branchphone |html %][% END %] [% IF library.branchfax %] -
    Fax: [% library.branchfax %][% END %] +
    Fax: [% library.branchfax |html %][% END %] [% IF library.branchemail %] -
    [% library.branchemail %][% END %] +
    [% library.branchemail |html %][% END %] [% IF library.branchurl %] -
    [% library.branchurl %][% END %] +
    [% library.branchurl |html %][% END %] [% IF library.opac_info %] -
    OPAC Info:
    [% library.opac_info.raw %]
    [% END %] +
    OPAC Info:
    [% library.opac_info %]
    [% END %] [% IF library.branchnotes %] -
    Notes: [% library.branchnotes %][% END %] +
    Notes: [% library.branchnotes |html %][% END %] [% FOREACH category IN library.get_categories %] @@ -339,7 +339,7 @@ tinyMCE.init({
  • [% IF category.categorycode %] Category code: - + [% category.categorycode %] [% ELSE %] @@ -348,11 +348,11 @@ tinyMCE.init({
  • - +
  • - +
  • @@ -363,6 +363,7 @@ tinyMCE.init({ [% ELSE %] + [% END %]
    • @@ -385,7 +386,7 @@ tinyMCE.init({ Are you sure you want to delete the group '[% category.codedescription %]' ([% category.categorycode %])?
    - + Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index 79a54e07c2..d4d01309d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -2,8 +2,8 @@ [% USE KohaDates %] [% USE Price %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Administration › Patron categories › [% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode %]'[% ELSE %]New category[% END %][% END %] -[% IF op == 'delete_confirm' %][% IF ( patrons_in_category > 0 ) %]Cannot delete: category [% categorycode %] in use[% ELSE %]Confirm deletion of category '[% categorycode %]'[% END %][% END %] +<title>Koha › Administration › Patron categories › [% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %] +[% IF op == 'delete_confirm' %][% IF ( patrons_in_category > 0 ) %]Cannot delete: category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] @@ -107,8 +107,8 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patrons-admin-search.inc' %] - [% END %] - - + + [% FOREACH category IN categories %] - + [% END %]
    Category code: [% category.categorycode %]
    Description: [% category.description %]
    Category code: [% category.categorycode |html %]
    Description: [% category.description |html %]
    Enrollment period: [% IF category.enrolmentperiod %] @@ -364,7 +364,7 @@ [% ELSE %] - + Cancel [% END %] @@ -409,9 +409,9 @@
    [% category.categorycode %][% category.categorycode |html %] - [% category.description %] + [% category.description |html %] [% SWITCH category.category_type %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index 01e27df1f6..7143661618 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -80,11 +80,11 @@ [% END %]
  • - Required + Required
  • - +
  • @@ -92,7 +92,7 @@
  • - +
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt index dbcdfeff58..3bea496f35 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -117,7 +117,7 @@ function CheckRuleForm(f) {
  • + value="[% description |html %]" />
  • [% IF ( used ) %][% ELSE %] @@ -165,7 +165,7 @@ function CheckRuleForm(f) {
  • + value="[% description |html %]" />
    		• [% IF ( class_source.used ) %]Yes[% ELSE %]No[% END %] [% class_source.sortrule %] - Edit - Delete + Edit + Delete
    -
    [% pagination_bar.raw %]
    +
    [% pagination_bar %]

    Classification filing rules

    [% IF ( added_rule ) %] @@ -292,13 +292,13 @@ function CheckRuleForm(f) { [% class_sort_rule.description %] [% class_sort_rule.sort_routine %] - Edit - Delete + Edit + Delete [% END %] -
    [% pagination_bar.raw %]
    +
    [% pagination_bar %]
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt index 74339fce55..6c94bb242e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -25,7 +25,7 @@ } $(document).ready(function() { - columns_settings = [% ColumnsSettings.GetColumns( 'admin', 'currency', 'currencies-table', 'json' ).raw %] + columns_settings = [% ColumnsSettings.GetColumns( 'admin', 'currency', 'currencies-table', 'json' ) %] var issuest = KohaTable("#currencies-table", { "sDom": 'C<"clearfix">t', "aaSorting": [], @@ -191,8 +191,8 @@ [% loo.currency %] [% loo.rate %] - [% loo.symbol %] - [% loo.isocode %] + [% loo.symbol |html %] + [% loo.isocode |html %] [% loo.timestamp | $KohaDates %] [% IF ( loo.active ) %]✓[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index 432ec8ab6f..bcd8c4d16e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -139,7 +139,7 @@ Item types administration [% END %]
  • - Required + Required Translate into other languages
  • @@ -347,7 +347,7 @@ Item types administration [% UNLESS Koha.Preference('noItemTypeImages') %] [% IF itemtype.image_location %][% ELSE %] [% END %][% END %] - + [% itemtype.itemtype %] @@ -376,8 +376,8 @@ Item types administration [% itemtype.checkinmsg | html_line_break %] - Edit - Delete + Edit + Delete [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt index ea573d45cc..bd76f43130 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -170,16 +170,16 @@ function populateHiddenCheckboxes(tab) { Home › Administration › MARC frameworks › [% IF ( frameworkcode ) %][% frameworkcode %][% ELSE %]Default[% END %] framework structure › [% IF ( add_form ) %] [% IF ( use_heading_flags_p ) %] - [% IF ( heading_edit_subfields_p ) %] Tag [% tagfield %] subfield structure › Edit subfields constraints + [% IF ( heading_edit_subfields_p ) %] Tag [% tagfield | html %] subfield structure › Edit subfields constraints [% END %] - [% ELSE %] Tag [% tagfield %] Subfield structure › [% action %] + [% ELSE %] Tag [% tagfield | html %] Subfield structure › [% action %] [% END %] [% END %] -[% IF ( delete_confirm ) %] Tag [% tagfield %] Subfield structure › Confirm deletion of subfield [% tagsubfield %] +[% IF ( delete_confirm ) %] Tag [% tagfield | html %] Subfield structure › Confirm deletion of subfield [% tagsubfield %] [% END %] -[% IF ( delete_confirmed ) %] Tag [% tagfield %] subfield structure › Subfield deleted +[% IF ( delete_confirmed ) %] Tag [% tagfield | html %] subfield structure › Subfield deleted [% END %] -[% IF ( else ) %]Tag [% tagfield %] Subfield structure[% END %] +[% IF ( else ) %]Tag [% tagfield | html %] Subfield structure[% END %]
    @@ -191,14 +191,14 @@ function populateHiddenCheckboxes(tab) { [% IF ( add_form ) %]

    [% IF ( use_heading_flags_p ) %] - [% IF ( heading_edit_subfields_p ) %]Tag [% tagfield %] Subfield constraints[% END %] + [% IF ( heading_edit_subfields_p ) %]Tag [% tagfield | html %] Subfield constraints[% END %] [% ELSE %] [% action %] [% END %]

    - +
      @@ -352,7 +352,7 @@ function populateHiddenCheckboxes(tab) { - + @@ -360,7 +360,7 @@ function populateHiddenCheckboxes(tab) { - + @@ -371,14 +371,14 @@ function populateHiddenCheckboxes(tab) {

      Data deleted

      - + [% END %] [% IF ( else ) %] -

      MARC subfield structure admin for [% tagfield %] [% IF ( frameworkcode ) %](framework [% frameworkcode %])[% ELSE %](default framework)[% END %]

      +

      MARC subfield structure admin for [% tagfield | html %] [% IF ( frameworkcode ) %](framework [% frameworkcode %])[% ELSE %](default framework)[% END %]

      This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.

      The column 'Koha field' shows that the subfield is linked with a Koha field.

      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index 2398312307..bd42b65c45 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -77,8 +77,8 @@ $(document).ready(function() { Required [% END %] -
      • -
      • +
      • +
    • [% IF ( repeatable ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt index 1be78a3826..64462fb86f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -214,11 +214,11 @@ function CheckRuleForm(f) {
    • Required + value="[% description |html %]" /> Required
    • Required + value="[% threshold |html %]" /> Required
    • -
      • @@ -268,28 +268,28 @@ function CheckRuleForm(f) {
      • [% FOREACH norm IN component.norms %] @@ -297,7 +297,7 @@ function CheckRuleForm(f) { [% END %] @@ -375,28 +375,28 @@ function CheckRuleForm(f) {
      • [% FOREACH norm IN src_component.norms %] @@ -404,7 +404,7 @@ function CheckRuleForm(f) { [% END %] @@ -419,28 +419,28 @@ function CheckRuleForm(f) {
      • [% FOREACH norm IN tgt_component.norms %] @@ -448,7 +448,7 @@ function CheckRuleForm(f) { [% END %] @@ -571,14 +571,14 @@ function CheckRuleForm(f) { [% available_matching_rule.code %] [% available_matching_rule.description %] - Edit - Delete + Edit + Delete [% END %] [% ELSE %]

      There are no saved matching rules.

      [% END %] -
      [% pagination_bar.raw %]
      +
      [% pagination_bar %]
      [% END %] [% IF ( matching_rule_form ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt index f362b70d45..5827f304f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -8,7 +8,7 @@ [% END %] [% END %] [% IF ( delete_attribute_type_form ) %] - › Confirm deletion of patron attribute type "[% code %]" + › Confirm deletion of patron attribute type "[% code |html %]" [% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -62,7 +62,7 @@ function CheckAttributeTypeForm(f) { [% END %] [% END %] [% IF ( delete_attribute_type_form ) %] - › Confirm deletion of patron attribute type "[% code %]" + › Confirm deletion of patron attribute type "[% code |html %]" [% END %]
    @@ -94,8 +94,8 @@ function CheckAttributeTypeForm(f) {
  • [% IF ( edit_attribute_type ) %] Patron attribute type code: - - [% code %] + + [% code |html %] [% ELSE %] @@ -103,7 +103,7 @@ function CheckAttributeTypeForm(f) {
  • + value="[% description |html %]" />
  • [% IF ( repeatable_checked ) %] @@ -249,10 +249,10 @@ function CheckAttributeTypeForm(f) { [% END %] [% IF ( delete_attribute_type_form ) %] -

    Confirm deletion of patron attribute type '[% code %]' ([% description %])?

    +

    Confirm deletion of patron attribute type '[% code |html %]' ([% description %])?

    - +
    @@ -300,7 +300,7 @@ function CheckAttributeTypeForm(f) { [% FOREACH item IN attribute.items %] - [% item.code %] + [% item.code |html %] [% item.description %] [% IF item.branches.size > 0 %] @@ -320,8 +320,8 @@ function CheckAttributeTypeForm(f) { [% END %] - Edit - Delete + Edit + Delete [% END %] @@ -332,7 +332,7 @@ function CheckAttributeTypeForm(f) {

    There are no saved patron attribute types.

    [% END %] -
    [% pagination_bar.raw %]
    +
    [% pagination_bar %]
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt index fbde1cd202..e42aca27f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -70,7 +70,7 @@ [% END %] [% IF ( search_not_found ) %]
    - No system preferences matched your search for [% searchfield %]. You can try a different search or return to where you were before. + No system preferences matched your search for [% searchfield |html %]. You can try a different search or return to where you were before.
    [% END %] [% FOREACH TAB IN TABS %] @@ -116,7 +116,7 @@
    [% FOREACH CHUNK IN LINE.CHUNKS %] [% IF ( CHUNK.type_text ) %] - [% CHUNK.contents.raw %] + [% CHUNK.contents %] [% ELSIF ( CHUNK.type_input ) %] [% IF ( CHUNK.dateinput ) %][% INCLUDE 'date-format.inc' %][% END %] [% ELSIF ( CHUNK.type_select ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt index c203be64bb..eca3be5b8c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -103,19 +103,19 @@ [% IF ( modify ) %]Modify [% ELSE %]Add [% END %] a system preference
      -
      2. +
    3. [% IF ( searchfield ) %]Variable: [% searchfield %] [% ELSE %][% END %]
    4. [% IF ( type_free ) %] - + [% ELSIF ( type_upload ) %] [% ELSIF ( type_textarea || type_htmlarea ) %] [% IF ( type_htmlarea ) && ( Koha.Preference('UseWYSIWYGinSystemPreferences') ) %] - + [% ELSE %] - + [% END %] [% ELSIF ( type_choice ) %] + [% END %] [% IF ( loo.type_upload ) %] - + [% END %] [% IF ( loo.type_textarea ) || ( loo.type_htmlarea ) %] [% IF ( loo.type_htmlarea ) && ( Koha.Preference('UseWYSIWYGinSystemPreferences') ) %] - + [% ELSE %] - + [% END %] [% END %] [% IF ( loo.type_choice ) %] @@ -430,9 +430,9 @@ [% END %] - + - +
      5. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt index ccdcb9c93e..81310834dc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -119,7 +119,7 @@ [% END %]
        -
        2. +
      3. Required [% IF (server.servertype||type) == 'sru' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt index 31d7cbeaf6..28968861c9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt @@ -43,7 +43,7 @@
        [% FOREACH INPUT IN INPUTS %] - + [% END %]

        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt index 92cceed133..7faf688d88 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt @@ -63,7 +63,7 @@ function AreMandatoriesNotOk(){ [% FOREACH subfield_loo IN innerloo.subfield_loop %] [% IF ( subfield_loo.mandatory ) %]mandatories.push("[% subfield_loo.id %]"); tab.push("[% BIG_LOO.number %]"); - label.push("[% subfield_loo.marc_lib.raw |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"); + label.push("[% subfield_loo.marc_lib |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"); [% END %] [% END %] [% END %] @@ -319,7 +319,7 @@ function confirmnotdup(redirect){ Move Up [% END %] [% ELSE %][% END %] - [% subfield_loo.marc_lib.raw %] + [% subfield_loo.marc_lib %] [% IF ( subfield_loo.mandatory ) %]*[% END %] @@ -363,7 +363,7 @@ function confirmnotdup(redirect){ [% ELSE %] ... [% END %] - [% mv.javascript.raw %] + [% mv.javascript %] [% ELSIF ( mv.type == 'text' ) %] [% ELSIF ( mv.type == 'textarea' ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt index cdb25c5cfd..fd2e92b2e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt @@ -75,7 +75,7 @@ function doauth(authid, index, repet) [% IF resul.summary && resul.summary.authorized && resul.summary.authorized.size > 1 %] [% FOREACH authorized IN resul.summary.authorized %] - [% loop.count %] + [% loop.count %] [% END %] [% ELSE %] choose diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt index 367d21b463..be2e156f68 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt @@ -56,7 +56,7 @@ function searchauthority() {

        [% IF ( total ) %] -
        [% pagination_bar.raw %]
        +
        [% pagination_bar %]

        Results [% from %] to [% to %] of [% total %] @@ -100,7 +100,7 @@ function searchauthority() {

    -
    [% pagination_bar.raw %]
    +
    [% pagination_bar %]
    [% ELSE %] No results found diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt index a5a5409690..ff9095c620 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -160,12 +160,12 @@ function batchDelete(){ [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]

    [% IF ( print_basket ) %] - [% BIBLIO_RESULT.title %] + [% BIBLIO_RESULT.title |html %] [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %] [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %] [% ELSE %] - [% BIBLIO_RESULT.title %] + [% BIBLIO_RESULT.title |html %] [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %] [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %] [% END %] @@ -348,7 +348,7 @@ function batchDelete(){ [% END %] - [% BIBLIO_RESULT.title %] + [% BIBLIO_RESULT.title |html %] [% BIBLIO_RESULT.author %]

    [% IF ( BIBLIO_RESULT.publishercode ) %]- [% BIBLIO_RESULT.publishercode %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt index c36238913b..c99b54ebfa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt @@ -22,26 +22,26 @@ Your cart [% FILTER html2text %] [% IF comment %] -

    [% comment.raw %]

    +

    [% comment %]

    [% END %]
      [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
    1. - [% BIBLIO_RESULT.title.raw %] - [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle.raw %][% END %] + [% BIBLIO_RESULT.title %] + [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %]

      [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] - Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author.raw %][% END %] + Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %] [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %] [% IF ( BIBLIO_RESULT.author ) %]; [% END %] [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %] [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %] - [% MARCAUTHOR_SUBFIELDS_LOO.separator.raw %][% MARCAUTHOR_SUBFIELDS_LOO.value.raw %] + [% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %] [% END %] [% UNLESS ( loop.last ) %];[% END %] [% END %] @@ -51,18 +51,18 @@ Your cart [% IF ( BIBLIO_RESULT.ISBN ) %] - ISBN: [% BIBLIO_RESULT.ISBN.raw %] + ISBN: [% BIBLIO_RESULT.ISBN %]
      [% END %] [% IF BIBLIO_RESULT.publishercode %] - Published by: [% BIBLIO_RESULT.publishercode.raw %] + Published by: [% BIBLIO_RESULT.publishercode %] [% IF ( BIBLIO_RESULT.publicationyear ) %] - in [% BIBLIO_RESULT.publicationyear.raw %] + in [% BIBLIO_RESULT.publicationyear %] [% END %] [% IF ( BIBLIO_RESULT.pages ) %] - , [% BIBLIO_RESULT.pages.raw %] + , [% BIBLIO_RESULT.pages %] [% END %] [% IF BIBLIO_RESULT.item('size') %] , [% BIBLIO_RESULT.item('size') %] @@ -72,55 +72,55 @@ Your cart [% IF BIBLIO_RESULT.collection %] - Collection: [% BIBLIO_RESULT.seriestitle.raw %] + Collection: [% BIBLIO_RESULT.seriestitle %]
      [% END %] [% IF ( BIBLIO_RESULT.subject ) %] - Subject: [% BIBLIO_RESULT.subject.raw %] + Subject: [% BIBLIO_RESULT.subject %]
      [% END %] [% IF ( BIBLIO_RESULT.copyrightdate ) %] - Copyright year: [% BIBLIO_RESULT.copyrightdate.raw %] + Copyright year: [% BIBLIO_RESULT.copyrightdate %]
      [% END %] [% IF ( BIBLIO_RESULT.notes ) %] - Notes : [% BIBLIO_RESULT.notes.raw %] + Notes : [% BIBLIO_RESULT.notes %]
      [% END %] [% IF ( BIBLIO_RESULT.unititle ) %] - Unified title: [% BIBLIO_RESULT.unititle.raw %] + Unified title: [% BIBLIO_RESULT.unititle %]
      [% END %] [% IF ( BIBLIO_RESULT.serial ) %] - Serial: [% BIBLIO_RESULT.serial.raw %] + Serial: [% BIBLIO_RESULT.serial %]
      [% END %] [% IF ( BIBLIO_RESULT.dewey ) %] - Dewey: [% BIBLIO_RESULT.dewey.raw %] + Dewey: [% BIBLIO_RESULT.dewey %]
      [% END %] [% IF ( BIBLIO_RESULT.classification ) %] - Classification: [% BIBLIO_RESULT.classification.raw %] + Classification: [% BIBLIO_RESULT.classification %]
      [% END %] [% IF ( BIBLIO_RESULT.lccn ) %] - LCCN: [% BIBLIO_RESULT.lccn.raw %] + LCCN: [% BIBLIO_RESULT.lccn %]
      [% END %] [% IF ( BIBLIO_RESULT.url ) %] @@ -132,17 +132,17 @@ Your cart [% IF ( OPACBaseURL ) %]

      - In online catalog: [% OPACBaseURL.raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %] + In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]

      [% END %] [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %]

      Items:

        [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
      • - [% ITEM_RESULT.branchname.raw %] - [% ITEM_RESULT.location.raw %] - [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber.raw %])[% END %] - [% ITEM_RESULT.barcode.raw %] + [% ITEM_RESULT.branchname %] + [% ITEM_RESULT.location %] + [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %] + [% ITEM_RESULT.barcode %]
        • [% END %]

      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt index 4b0c470cdb..1c61305cf2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt @@ -46,7 +46,7 @@ [% END %]
      - [% ISBD.raw %] + [% ISBD %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt index 139e75af01..4c0c115232 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt @@ -38,7 +38,7 @@ function Changefwk(FwkList) { [% IF ( unknownbiblionumber ) %] Unknown record [% ELSE %] - MARC Details for [% bibliotitle %] + MARC Details for [% bibliotitle |html %] [% END %] @@ -53,7 +53,7 @@ function Changefwk(FwkList) { [% INCLUDE 'cat-toolbar.inc' %] [% UNLESS ( popup ) %] -

    MARC biblio : [% biblionumber %] ( [% bibliotitle %] )

    +

    MARC biblio : [% biblionumber %] ( [% bibliotitle |html %] )

    [% END %] @@ -90,10 +90,10 @@ function Changefwk(FwkList) {   [% UNLESS ( subfiel.hide_marc ) %][% subfiel.marc_subfield %][% END %] [% subfiel.short_desc %] - [% IF ( subfiel.is_url ) %][% subfiel.marc_value %][% ELSE %][% subfiel.marc_value %][% END %] + [% IF ( subfiel.is_url ) %][% subfiel.marc_value |html %][% ELSE %][% subfiel.marc_value |html %][% END %] [% IF ( subfiel.link ) %] - Search on [% subfiel.marc_value %] + Search on [% subfiel.marc_value |html %] [% END %] [% IF ( subfiel.authority ) %] @@ -174,7 +174,7 @@ function Changefwk(FwkList) { [% FOREACH item IN item_loop %] [% FOREACH sf_code IN item_subfield_codes %] - [% item.$sf_code.raw %] + [% item.$sf_code %] [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 5cb1cc3218..e46428a34c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -22,7 +22,7 @@ [% IF ( unknownbiblionumber ) %] Unknown record [% ELSE %] - Details for [% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %] + Details for [% title |html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %] [% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -253,7 +253,7 @@ function AreMandatoriesNotOk(){ [% FOREACH subfield_loo IN innerloo.subfield_loop %] [% IF ( subfield_loo.mandatory ) %]mandatories.push("[% subfield_loo.id %]"); tab.push("[% BIG_LOO.number %]"); - label.push("[% subfield_loo.marc_lib.raw %]"); + label.push("[% subfield_loo.marc_lib %]"); [% END %] [% END %] [% END %] @@ -401,7 +401,7 @@ function Changefwk(FwkList) { [% INCLUDE 'header.inc' %] - +
    @@ -410,7 +410,7 @@ function Changefwk(FwkList) {

    -[% IF ( biblionumber ) %]Editing [% title %] (Record number [% biblionumber %]) +[% IF ( biblionumber ) %]Editing [% title |html %] (Record number [% biblionumber %]) [% ELSE %]Add MARC record [% IF (circborrowernumber) %](fast cataloging)[% END %] [% END %]

    @@ -445,7 +445,7 @@ function Changefwk(FwkList) { [% IF ( done ) %] [% ELSE %] @@ -619,7 +619,7 @@ function Changefwk(FwkList) { Move Up [% END %] [% ELSE %][% END %] - [% subfield_loo.marc_lib.raw %] + [% subfield_loo.marc_lib %] [% IF ( subfield_loo.mandatory ) %]*[% END %] @@ -656,7 +656,7 @@ function Changefwk(FwkList) { Tag editor [% END %] - [% mv.javascript.raw %] + [% mv.javascript %] [% ELSIF ( mv.type == 'hidden' ) %] [% ELSIF ( mv.type == 'textarea' ) %] 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 c16796bc9e..1a60e7e41d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -130,7 +130,7 @@ [% total %] result(s) found in catalog, [% breeding_count %] result(s) found in reservoir
    -
    [% pagination_bar.raw %]
    +
    [% pagination_bar %]
    @@ -150,7 +150,7 @@ [% END %] - 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 1ae550ca44..fd0054ba62 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -1,7 +1,7 @@ [% USE ColumnsSettings %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Cataloging › [% title %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %]) › Items +Koha › Cataloging › [% title |html %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %]) › Items [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] @@ -48,7 +48,7 @@ $(document).ready(function(){ }); }); - var columns_settings = [% ColumnsSettings.GetColumns( 'cataloguing', 'additem', 'itemst', 'json' ).raw %] + var columns_settings = [% ColumnsSettings.GetColumns( 'cataloguing', 'additem', 'itemst', 'json' ) %] // Skip the first column columns_settings.unshift( { cannot_be_toggled: "1" } ); @@ -117,7 +117,7 @@ function confirm_deletion() { @@ -126,7 +126,7 @@ function confirm_deletion() {
    -

    Items for [% title %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %])

    +

    Items for [% title |html %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %])

    [% IF ( barcode_not_unique ) %]
    Error saving item: Barcode must be unique.
    [% END %] [% IF ( no_next_barcode ) %]
    Error saving items: Unable to automatically determine values for barcodes. No item has been inserted.
    [% END %] @@ -194,7 +194,7 @@ function confirm_deletion() { [% END %] [% FOREACH item_valu IN item_loo.item_value %] -
    + [% END %] [% END %] @@ -225,9 +225,9 @@ function confirm_deletion() { [% FOREACH ite IN item %]
  • [% IF ( ite.mandatory ) %] - + [% ELSE %] - + [% END %] [% SET mv = ite.marc_value %] @@ -258,7 +258,7 @@ function confirm_deletion() { [% ELSE %] ... [% END %] - [%- mv.javascript.raw -%] + [%- mv.javascript -%] [% ELSIF ( mv.type == 'text' ) %] [% ELSIF ( mv.type == 'textarea' ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt index 1836a783ae..4261554a7a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt @@ -5,7 +5,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
    [% IF ( error ) %] @@ -20,7 +20,7 @@ [% ELSE %] [% IF ( success ) %] -
    The item has successfully been linked to [% bibliotitle %].
    +
    The item has successfully been linked to [% bibliotitle |html %].
    @@ -40,7 +40,7 @@ [% IF ( missingbarcode ) %]
    - +
    Enter item barcode:
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt index 04e4870fed..e998929b80 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt @@ -1,11 +1,11 @@ [% INCLUDE 'doc-head-open.inc' %] -Attach an item to [% bibliotitle %] +Attach an item to [% bibliotitle |html %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
    [% BLOCK actions %] @@ -52,7 +52,7 @@ [% ELSE %] [% IF ( success ) %] -
    The item has successfully been attached to [% INCLUDE 'biblio-default-view.inc' %][% bibliotitle %]. +
    The item has successfully been attached to [% INCLUDE 'biblio-default-view.inc' %][% bibliotitle |html %].

    [% INCLUDE actions %] @@ -79,7 +79,7 @@ [% END %] [% IF ( missingbarcode ) %] -

    Attach an item[% IF ( bibliotitle ) %] to [% bibliotitle %][% END %]

    +

    Attach an item[% IF ( bibliotitle ) %] to [% bibliotitle |html %][% END %]

    The item you select will be moved to the target record.

    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 e7755d537f..9b7de75a70 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 @@ -43,17 +43,17 @@
    • [% FOREACH col_hd IN BIGLOO.col_hdr %] - [% END %] [% FOREACH line IN BIGLOO.lines %] - [% FOREACH cell IN line.cells %] @@ -67,17 +67,17 @@ [% FOREACH List IN BIGLOO.Lists %]

    [% List.lib %]

    [% FOREACH liblis IN List.liblist %] - [% liblis.listlib %]
    + [% liblis.listlib |html %]
    [% END %] [% END %] [% END %] [% UNLESS ( BIGLOO.Table ) %] [% FOREACH line IN BIGLOO.lines %] -

    [% line.rowvalue %] - [% line.rowlib %] 

    +

    [% line.rowvalue |html %] - [% line.rowlib |html %] 

    [% FOREACH cell IN line.cells %] -

    [% cell.celvalue %] - [% FOREACH lib IN cell.libs %] - [% lib.lib %]   +

    [% cell.celvalue |html %] - [% FOREACH lib IN cell.libs %] + [% lib.lib |html %]   [% 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 159d39602b..ba214da88b 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 @@ -171,10 +171,9 @@ [% IF ( resul.even ) %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt index dd3ae2ffd9..9bf6707ea6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt @@ -14,7 +14,7 @@ [% IF ( Koha.Preference('SlipCSS') ) %] - + [% END %] [% INCLUDE 'slip-print.inc' #printThenClose %] @@ -27,7 +27,7 @@ [% IF ( slip ) %][% slip %][% ELSE %]No slip template found[% END %] [% ELSE %] -[% IF ( slip ) %][% slip.raw %][% ELSE %]No slip template found[% END %] +[% IF ( slip ) %][% slip %][% ELSE %]No slip template found[% END %] [% END %] [% INCLUDE 'intranet-bottom.inc' %] 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 72aa02286e..5a33706ace 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -3,7 +3,7 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Renew [% title %] +Koha › Circulation › Renew [% title |html %] [% INCLUDE 'doc-head-close.inc' %] 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 b377769682..67f4226e34 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt @@ -70,7 +70,7 @@ - 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 aace2fb053..a56b8e6016 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -6,7 +6,7 @@ [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Check in [% title %] +Koha › Circulation › Check in [% title |html %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] @@ -135,7 +135,7 @@ $(document).ready(function () { [% IF ( collectionItemNeedsTransferred ) %]

    Please transfer item to: [% collectionBranch %]

    -

    [% itembarcode %]: [% title %]

    +

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

    This item is part of a rotating collection.

    [% END %] @@ -170,7 +170,7 @@ $(document).ready(function () { [% IF ( wrongbranch ) %]

    Cannot check in

    -

    [% itembarcode %]: [% title %]

    +

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

    NOT CHECKED IN

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

    @@ -180,7 +180,7 @@ $(document).ready(function () {

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

    -

    [% itembarcode %]: [% title %]

    +

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

    [% IF ( wborcnum ) %]
    Hold for:

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

    [% IF ( resultsloo.summary ) %]

    [% resultsloo.summary %]

    @@ -236,7 +236,7 @@ [% ELSE %]
    [% breeding_loo.title %] + [% breeding_loo.title |html %] [% breeding_loo.author %] [% breeding_loo.isbn %] [% breeding_loo.copyrightdate %] [% item_valu.field %][% item_valu.field |html %]
    Espace\Temps [% col_hd.collib %]
    +     		[% col_hd.collib |html %]
    [% line.rowlib %]
    +     		[% line.rowlib |html %]
    		- + [% cell.celvalue %]
    		[% ELSE %][% END %] [% IF ( resul.MARC_ON ) %] - [% resul.title %] + [% resul.title |html %] [% ELSE %] - [% resul.title %] - [% END %] + [% resul.title |html %] [% END %]

    [% resul.author %] [% IF ( resul.publishercode ) %]- [% resul.publishercode %][% END %] [% IF ( resul.place ) %] ; [% resul.place %][% END %] 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 2aa0f3d3a6..043e700ac2 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 @@ -41,7 +41,7 @@ [% IF ( total ) %]

    Authority search results

    - [% pagination_bar.raw %] + [% pagination_bar %]
    [% END %]

    [% IF ( total ) %] @@ -74,7 +74,7 @@ [% END %] [% IF ( total ) %]

    - [% pagination_bar.raw %] + [% pagination_bar %]
    [% END %] +
    - +
    [% ELSE %] - + [% END %] [% IF ( patron_attr_filter_loo.repeatable ) %] Add @@ -193,8 +193,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] [% FOREACH itemtypeloo IN itemtypeloop %][% IF ( itemtypeloo.selected ) %] - [% ELSE %] - [% END %] + [% ELSE %] + [% END %] [% END %] @@ -204,8 +204,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] [% FOREACH homebranchloo IN homebranchloop %][% IF ( homebranchloo.selected ) %] - [% ELSE %] - [% END %] + [% ELSE %] + [% END %] [% END %] @@ -215,8 +215,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] [% FOREACH holdingbranchloo IN holdingbranchloop %][% IF ( holdingbranchloo.selected ) %] - [% ELSE %] - [% END %] + [% ELSE %] + [% END %] [% END %] @@ -226,8 +226,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] Any [% FOREACH branchloo IN branchloop %] [% IF ( branchloo.selected ) %] - [% ELSE %] - [% END %] + [% ELSE %] + [% END %] [% END %] @@ -253,8 +253,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] [% patron_attr_order_loo.label %] - [% ELSE %][% END %] + [% IF ( patron_attr_order_loo.selected ) %] + [% ELSE %][% END %] [% 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 0ef55155ed..919f0c33f6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -117,7 +117,7 @@ $(document).ready(function() {

    [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] - [% reserveloo.title %]

    + [% reserveloo.title |html %]

    [% IF ( reserveloo.author ) %]

    by [% reserveloo.author %]

    [% END %]

    [% reserveloo.reservecount %]

    [% reserveloo.itemcount %]

    [% reserveloo.thisratio %]

    		 [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% reserveloo.title %] [% IF ( reserveloo.subtitle ) %][% FOREACH subtitl IN reserveloo.subtitle %][% subtitl.subfield %][% END %][% END %][% IF ( reserveloo.author ) %] by [% reserveloo.author %][% END %] + [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% reserveloo.title |html %] [% IF ( reserveloo.subtitle ) %][% FOREACH subtitl IN reserveloo.subtitle %][% subtitl.subfield %][% END %][% END %][% IF ( reserveloo.author ) %] by [% reserveloo.author %][% END %]

    [% reserveloo.homebranch_list %]

    [% reserveloo.holdingbranch_list %]

    - + @@ -373,7 +373,7 @@ $(document).ready(function () {

    Hold found

    -

    [% itembarcode %]: [% title %]

    +

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

    [% IF ( reservenotes ) %]

    Notes: [% reservenotes %]

    [% END %]
    Hold for:
    + [% riloo.itemtitle |html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt index 0c0ce5ced0..faaa96355c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt @@ -34,10 +34,10 @@ Updated:
      [% END %] [% END %]
    - +
    [% FOREACH recycle_loo IN recycle_loop %] - + [% END %]
    @@ -84,9 +84,9 @@ Updated:
      [% FOREACH recycle_loo IN recycle_loop %] - + [% END %] - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt index 99e170316e..5854fdbbd9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt @@ -16,7 +16,7 @@ window.close();

      Transfer to [% branchname %]

      ITEM

      -

      [% biblio.title %]

      +

      [% biblio.title |html %]

      [% biblio.author %]
        [% IF ( item.barcode ) %]
      • [% item.barcode %]
        • [% 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 d64395f727..877be7ce2d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt @@ -60,7 +60,7 @@ $(document).ready(function() { [% END %]
    @@ -72,7 +72,7 @@ $(document).ready(function() { [% IF ( reser.borrowermail ) %]
    [% BLOCK subject %]Hold:[% END %] - + [% reser.borrowermail %] [% END %] 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 5aacc66376..e419bcd99f 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 @@ -68,7 +68,7 @@ $(document).ready(function() { [% FOREACH itemsloo IN itemsloop %] [% FOREACH overloo IN overloop %] - +  [% IF ( account.itemnumber ) %]View item [% END %][% account.title |html %] [% IF ( account.amountcredit ) %] [% IF ( account.amountoutstandingcredit ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt index 6d74cceeda..ad360ecf10 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -148,7 +148,7 @@ $(document).ready(function() { }); // Apply DataTables on the results table - var columns_settings = [% ColumnsSettings.GetColumns( 'members', 'member', 'memberresultst', 'json' ).raw %]; + var columns_settings = [% ColumnsSettings.GetColumns( 'members', 'member', 'memberresultst', 'json' ) %]; dtMemberResults = KohaTable("#memberresultst", { 'bServerSide': true, 'sAjaxSource': "/cgi-bin/koha/svc/members/search", diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index d66357f195..8a8d3d48d5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -299,7 +299,7 @@ - [% borrotitlepopup.raw %] + [% borrotitlepopup %] [% IF ( mandatorytitle ) %]Required[% END %] [% END %] @@ -510,12 +510,11 @@ [% END %] [% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %] - [% SWITCH Koha.Preference( 'AddressFormat' ) %] - [% CASE 'de' %] - [% INCLUDE 'member-main-address-style-de.inc' %] - [% CASE # us %] - [% INCLUDE 'member-main-address-style-us.inc' %] - [% END %] + [% IF Koha.Preference( 'AddressFormat' ) %] + [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] + [% ELSE %] + [% INCLUDE 'member-main-address-style-us.inc' %] + [% END %] [% END # nostreet && nocity etc group%] [% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %] @@ -604,23 +603,20 @@ [% IF ( step_6 ) %] [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %] - [% SWITCH Koha.Preference( 'AddressFormat' ) %] - [% CASE 'de' %] - [% INCLUDE 'member-alt-address-style-de.inc' %] - [% CASE # us %] + [% IF Koha.Preference( 'AddressFormat' ) %] + [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] + [% ELSE %] [% INCLUDE 'member-alt-address-style-us.inc' %] - [% END %] - + [% END %] [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %] [% END %] [% IF ( step_2 ) %] [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %] - [% SWITCH Koha.Preference( 'AddressFormat' ) %] - [% CASE 'de' %] - [% INCLUDE 'member-alt-contact-style-de.inc' %] - [% CASE # us %] + [% IF Koha.Preference( 'AddressFormat' ) %] + [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] + [% ELSE %] [% INCLUDE 'member-alt-contact-style-us.inc' %] - [% END %] + [% END %] [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %] [% END %] @@ -980,7 +976,7 @@ [% FOREACH d IN debarments %] - + [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %] [% ELSE %][% END %] @@ -105,7 +105,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt index 81ae05b60f..c7d67a11aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt @@ -23,7 +23,7 @@ Checked out to [% firstname %] [% surname %]
    [% FOREACH issueloo IN issueloop %] [% IF ( issueloo.red ) %][% ELSE %] [% IF ( issueloo.today ) %] -

    [% issueloo.title %]
    +

    [% issueloo.title |html %]
    Barcode: [% issueloo.barcode %]
    Date due: [% issueloo.date_due %]

    [% END %] @@ -34,7 +34,7 @@ Date due: [% issueloo.date_due %]

    Checked out

    [% FOREACH issueloo IN issueloop %] [% IF ( issueloo.red ) %][% ELSE %] -

    [% issueloo.title %]
    +

    [% issueloo.title |html %]
    Barcode: [% issueloo.barcode %]
    Date due: [% issueloo.date_due %]

    [% END %] @@ -48,7 +48,7 @@ Date due: [% issueloo.date_due %]

    Overdues

    [% FOREACH issueloo IN issueloop %] [% IF ( issueloo.red ) %] -

    [% issueloo.title %]
    +

    [% issueloo.title |html %]
    Barcode: [% issueloo.barcode %]
    Date due: [% issueloo.date_due %]

    [% END %] @@ -61,7 +61,7 @@ Date due: [% issueloo.date_due %]

    [% FOREACH koha_new IN koha_news %]
    [% koha_new.title %]
    -

    [% koha_new.new.raw %]

    +

    [% koha_new.new %]

    Posted on [% koha_new.newdate %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index b1a7bee5ff..30cda467e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -45,7 +45,7 @@ var relatives_borrowernumbers = new Array(); var MSG_ADD_MESSAGE = _("Add a new message"); var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); -columns_settings = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ).raw %] +columns_settings = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) %] $(document).ready(function() { $('#finesholdsissues').tabs({ @@ -180,7 +180,7 @@ function validate1(date) { [% END %] [% IF ( debarredcomment ) %] - with the explanation: [% debarredcomment.raw | html_line_break %] + with the explanation: [% debarredcomment | html_line_break %] [% END %] View restrictions @@ -199,11 +199,10 @@ function validate1(date) { [% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %]
    - [% SWITCH Koha.Preference( 'AddressFormat' ) %] - [% CASE 'de' %] - [% INCLUDE 'member-display-address-style-de.inc' %] - [% CASE # us %] - [% INCLUDE 'member-display-address-style-us.inc' %] + [% IF Koha.Preference( 'AddressFormat' ) %] + [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] + [% ELSE %] + [% INCLUDE 'member-display-address-style-us.inc' %] [% END %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt index 2c59cce96e..f3f9c37cdd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -58,7 +58,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt index 0cbc79573b..33cb95faad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt @@ -9,7 +9,7 @@ [% FOREACH data IN aaData %] { "dt_cardnumber": - "[% data.cardnumber %]", + "[% data.cardnumber |html %]", "dt_name": "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames cardnumber = data.cardnumber invert_name = 1%]", "dt_dateofbirth": @@ -17,7 +17,7 @@ "dt_address": "[% INCLUDE escape_address data=data %]", "dt_action": - "Select" + "Select" }[% UNLESS loop.last %],[% END %] [% END %] ] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt index 4c0583b58a..930fdc70df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt @@ -13,21 +13,21 @@ "", [% END %] "dt_cardnumber": - "[% data.cardnumber %]", + "[% data.cardnumber | html %]", "dt_name": "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 %]
    [% INCLUDE escape_address data = data %]    ", "dt_dateofbirth": "[% data.dateofbirth | $KohaDates %]", "dt_category": - "[% data.category_description %] ([% data.category_type %])", + "[% data.category_description |html %] ([% data.category_type |html %])", "dt_branch": - "[% data.branchname %]", + "[% data.branchname |html %]", "dt_dateexpiry": "[% data.dateexpiry %]", "dt_od_checkouts": "[% IF data.overdues %][% data.overdues %][% ELSE %][% data.overdues %][% END %] / [% data.issues %]", "dt_fines": - "[% IF data.fines < 0 %][% data.fines %] [% ELSIF data.fines > 0 %] [% data.fines %] [% ELSE %] [% data.fines %] [% END %]", + "[% IF data.fines < 0 %][% data.fines |html %] [% ELSIF data.fines > 0 %] [% data.fines |html %] [% ELSE %] [% data.fines |html%] [% END %]", "dt_borrowernotes": "[% data.borrowernotes.replace('\\\\' , '\\\\') |html |html_line_break |collapse %]", "dt_action": diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt index 8bc2d07169..714596fdc4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt @@ -80,9 +80,9 @@ function CheckForm(f) { [% END %] [% IF ( message.ERROR_no_borrower_from_item ) %]

    Warning: Unable to determine patron from item barcode ([% message.badbarcode %]). Cannot check in.

    [% END %] - [% IF ( message.issue ) %]

    Checked out [% message.title %] ([% message.barcode %]) to [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

    [% END %] - [% IF ( message.renew ) %]

    Renewed [% message.title %] ([% message.barcode %]) for [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

    [% END %] - [% IF ( message.return ) %]

    Checked in [% message.title %] ([% message.barcode %]) from [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

    [% END %] + [% IF ( message.issue ) %]

    Checked out [% message.title |html %] ([% message.barcode %]) to [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

    [% END %] + [% IF ( message.renew ) %]

    Renewed [% message.title |html %] ([% message.barcode %]) for [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

    [% END %] + [% IF ( message.return ) %]

    Checked in [% message.title |html %] ([% message.barcode %]) from [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

    [% END %] [% IF ( message.payment ) %]

    Accepted payment ([% message.amount %]) from [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

    [% END %] [% END %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt index c16d6d15aa..50c72138a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt @@ -66,7 +66,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt index 689c8f40de..4916d9eba3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt @@ -194,7 +194,7 @@
    1. - +
    2. @@ -210,7 +210,7 @@
    3. - + pt
    4. @@ -227,11 +227,11 @@
    5. - +
    6. - +
    @@ -248,7 +248,7 @@
    1. - +
    2. @@ -264,7 +264,7 @@
    3. - + pt
    4. @@ -281,11 +281,11 @@
    5. - +
    6. - +
    @@ -302,7 +302,7 @@
    1. - +
    2. @@ -318,7 +318,7 @@
    3. - + pt
    4. @@ -335,11 +335,11 @@
    5. - +
    6. - +
    @@ -384,19 +384,19 @@
    1. - +
    2. - +
    3. - +
    4. - +
    5. @@ -463,15 +463,15 @@
      1. - +
      2. - +
      3. - +
      @@ -519,15 +519,15 @@
      1. - +
      2. - +
      3. - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt index ae87f6967e..cbe741ba47 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt @@ -11,9 +11,9 @@ "dt_name": "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames cardnumber = data.cardnumber invert_name = 1%]", "dt_category": - "[% data.category_description %] ([% data.category_type %])", + "[% data.category_description |html %] ([% data.category_type |html %])", "dt_branch": - "[% data.branchname %]", + "[% data.branchname |html %]", "dt_dateexpiry": "[% data.dateexpiry %]", "dt_borrowernotes": diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index a797a171e2..1655d92685 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -571,7 +571,7 @@ canned reports and writing custom SQL reports.

    @@ -668,7 +668,7 @@ canned reports and writing custom SQL reports.

    Confirm custom report

    Your report will be generated with the following SQL statement.

    -[% sql %] +[% sql |html %]

    @@ -684,7 +684,7 @@ canned reports and writing custom SQL reports.

    [% IF ( save ) %] - + @@ -801,7 +801,7 @@ canned reports and writing custom SQL reports.

    [% name %]

    [% IF ( notes ) %]

    [% notes %]

    [% END %] [% IF ( unlimited_total ) %]

    Total number of rows matching the (unlimited) query is [% unlimited_total %].

    [% END %] -
    [% sql %]
    +
    [% sql |html %]
    @@ -826,7 +826,7 @@ canned reports and writing custom SQL reports.

    -
    [% pagination_bar.raw %]
    +
    [% pagination_bar %]
    [% UNLESS ( errors ) %]
    [% title %][% title |html %]
    Hold for: [% name %] - [% riloo.itemtitle %] [% riloo.itemauthor %] [% riloo.barcode %] [% Branches.GetName( riloo.homebranch ) %]

    [% reser.datetransfer | $KohaDates %]

    [% IF ( reser.messcompa ) %]Transfer is [% reser.diff %] days late[% END %]    		 - [% INCLUDE 'biblio-default-view.inc' biblionumber = reser.biblionumber %][% reser.title %] [% IF ( reser.subtitle ) %] [% FOREACH subtitl IN reser.subtitle %][% subtitl.subfield %][% END %][% END %] [% IF ( reser.author ) %]by [% reser.author %][% END %] + [% INCLUDE 'biblio-default-view.inc' biblionumber = reser.biblionumber %][% reser.title |html %] [% IF ( reser.subtitle ) %] [% FOREACH subtitl IN reser.subtitle %][% subtitl.subfield %][% END %][% END %] [% IF ( reser.author ) %]by [% reser.author %][% END %] [% IF ( reser.itemtype ) %] ([% reser.itemtype %])[% END %]
    Barcode: [% reser.barcode %]
    -

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

    +

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

    [% itemsloo.biblionumber %]
    [% itemsloo.author %]
    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 3ec4f1b1d8..1028033514 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -90,7 +90,7 @@
    [% reserveloo.waitingdate | $KohaDates %] [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] - [% reserveloo.title %] [% FOREACH subtitl IN reserveloo.subtitle %] [% subtitl.subfield %][% END %] + [% reserveloo.title |html %] [% FOREACH subtitl IN reserveloo.subtitle %] [% subtitl.subfield %][% END %] [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %]  ([% reserveloo.itemtype %])[% END %][% END %]
    Barcode: [% reserveloo.barcode %] @@ -151,7 +151,7 @@

    [% overloo.waitingdate | $KohaDates %]

    		[% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title %] + [% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %] [% FOREACH subtitl IN overloo.subtitle %] [% subtitl.subfield %][% END %] [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]  ([% overloo.itemtype %])[% END %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt index dc2a2545dd..c3509cd903 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt @@ -31,7 +31,7 @@
    [% FOREACH INPUT IN INPUTS %] - + [% END %]

    Welcome to the Koha web installer

    Before we begin, please verify you have the correct credentials to continue. Please log in diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt index 6bcd69ea29..3ae276f9a3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -232,7 +232,7 @@

    Update report :

      [% FOREACH update_repor IN update_report %] -
    • [% update_repor.line %]
      • +
    • [% update_repor.line |html %]
      • [% END %]
    [% END %] @@ -240,7 +240,7 @@

    Update errors :

      [% FOREACH update_error IN update_errors %] -
    • [% update_error.line %]
      • +
    • [% update_error.line |html %]
      • [% END %]
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt index 90c0b6a165..be0e5aa35d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -161,7 +161,7 @@ [% IF ( IntranetmainUserblock ) %]
    [% END %] @@ -174,7 +174,7 @@ [% SET newsdisp = Koha.Preference('NewsAuthorDisplay') %] [% FOREACH koha_new IN koha_news %]

    [% koha_new.title %]

    -

    [% koha_new.new.raw %]

    +

    [% koha_new.new %]

    Posted on [% koha_new.newdate %][% IF( ( newsdisp == 'staff' || newsdisp == 'both' ) && koha_new.borrowernumber ) %] by [% koha_new.author_title %] [% koha_new.author_firstname %] [% koha_new.author_surname %]
    [% END %] [% IF ( CAN_user_tools ) %] Edit diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt index e3c70c6654..017af77e34 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt @@ -132,7 +132,7 @@ [% END %]

  • - +

    Enter a comma separated list of fields to print. You may include any Koha field or MARC subfield.

    See online help for advanced options

    @@ -185,7 +185,7 @@
  • - +
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt index f15dbfbe0e..65dc131c10 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt @@ -69,7 +69,7 @@ [% FOREACH result_se IN result_set %]
    -

    [% result_se.title %]

    +

    [% result_se.title |html %]

    [% IF ( result_se.author ) %]by [% result_se.author %][% END %] [[% result_se.itemtype %]], [% IF ( result_se.publishercode ) %][% result_se.publishercode %] [% END %][% IF ( result_se.place ) %][% result_se.place %] [% END %][% IF ( result_se.copyrightdate ) %][% result_se.copyrightdate %], [% END %][% IF ( result_se.pages ) %][% result_se.pages %][% END %][% IF ( result_se.isbn ) %], ISBN: [% result_se.isbn %][% END %][% IF ( result_se.notes ) %],
    [% result_se.notes %][% END %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt index 3fdc66ecb6..fabc07b669 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt @@ -10,12 +10,12 @@ .noprint { display: none; } } -[% IF ( IntranetUserCSS ) %][% END %] +[% IF ( IntranetUserCSS ) %][% END %] [% IF ( IntranetUserJS ) %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index 8228f61189..824c41c3e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -100,7 +100,7 @@ $(document).ready(function() { [% CASE %][% account.accounttype %] [%- END -%] [%- IF account.description %], [% account.description %][% END %] -  [% IF ( account.itemnumber ) %]View item [% END %][% account.title %]
    		•  [% account.note | html_line_break %][% ELSE %][% END %][% account.amount %][% ELSE %][% END %][% account.amountoutstanding %]
    [% d.type %][% d.comment.raw %][% d.comment %] [% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] Indefinite [% END %] @@ -1029,7 +1025,7 @@ [% FOREACH patron_attribute IN pa_loo.items %]
  • - + [% IF ( patron_attribute.use_dropdown ) %]
    • - [% issue.title %] + [% issue.title |html %] [% issue.author %]
    [% IF ( account.itemnumber ) %][% END %] - [% account.description %] [% IF ( account.printtitle ) %] [% account.title %][% END %] + [% account.description %] [% IF ( account.printtitle ) %] [% account.title |html %][% END %] [% IF ( account.itemnumber ) %][% END %] [% account.date | $KohaDates %] [% QUEUED_MESSAGE.subject %]
    - [% QUEUED_MESSAGE.content.raw FILTER html_line_break %] + [% QUEUED_MESSAGE.content FILTER html_line_break %]
    		diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt index 6c12d98866..aebe66508e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt @@ -57,9 +57,9 @@

    [% IF ( CAN_user_catalogue ) %] - [% s.title %] + [% s.title |html %] [% ELSE %] - [% s.title %] + [% s.title |html %] [% END %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt index 5f31f3006a..0f3bbe9c31 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -97,7 +97,7 @@     		[% issue.issuestimestamp | $KohaDates with_hours => 1 %] [% issue.title %][% issue.title |html %] [% issue.author %] - + Delete
    [% FOREACH header_ro IN header_row %][% END %] @@ -844,7 +844,7 @@ canned reports and writing custom SQL reports.

    - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt index e508e85f1a..52f1cfa21d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt @@ -39,7 +39,7 @@ [% FOREACH loopco IN mainloo.loopcol %] - + [% END %] @@ -49,7 +49,7 @@ [% ELSE %] [% END %] - + [% FOREACH loopcel IN loopro.loopcell %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt index f3c5a65a01..e72f446c41 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt @@ -9,7 +9,7 @@ [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc index 8e7d45265c..d02b4c2bed 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc @@ -71,7 +71,7 @@ More searches 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 995adfd795..769145f764 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc @@ -39,10 +39,10 @@ [% IF facet.active %] [% SET local_url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %] [% facet.facet_label_value %] - [x] + [x] [% ELSE %] [% SET local_url = url _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %] - [% facet.facet_label_value %] + [% facet.facet_label_value %] [% IF ( displayFacetCount ) %] ([% facet.facet_count %]) [% END %] @@ -63,7 +63,7 @@ [% IF ( OPACResultsSidebar ) %]
    - [% OPACResultsSidebar.raw %] + [% OPACResultsSidebar %]
    [% END %] [% END # / IF opacfacets && facets_loop %] 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 175c37887d..f18c9ce3fe 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc @@ -2,17 +2,17 @@ diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc index fad11cbd29..f806b4fb6e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc @@ -60,7 +60,7 @@ [% IF ( BakerTaylorEnabled ) %] [% bt_id = ( item.browser_normalized_upc || item.browser_normalized_isbn ) %] [% IF ( bt_id ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] No cover image available [% END %] @@ -81,7 +81,7 @@ [% FOREACH item IN shelfbrowser_items %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt index 9ae1298e92..62fc15fd0d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt @@ -20,7 +20,7 @@ [% IF ( opacheader ) %] - [% opacheader.raw %] + [% opacheader %] [% END %]
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt index f1c3cf9389..3c47566308 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt @@ -21,7 +21,7 @@ -
    [% ISBD.raw %]
    +
    [% ISBD %]
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt index a34310df72..f4ca0951f2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt @@ -37,7 +37,7 @@ [% FOREACH subfiel IN tab0X.subfield %] - + [% END %] @@ -46,7 +46,7 @@ [% FOREACH subfiel IN tab1X.subfield %] - + [% END %] @@ -56,7 +56,7 @@ [% FOREACH subfiel IN tab2X.subfield %] - + [% END %] @@ -66,7 +66,7 @@ [% FOREACH subfiel IN tab3X.subfield %] - + [% END %] @@ -76,7 +76,7 @@ [% FOREACH subfiel IN tab4X.subfield %] - + [% END %] @@ -86,7 +86,7 @@ [% FOREACH subfiel IN tab5X.subfield %] - + [% END %] @@ -96,7 +96,7 @@ [% FOREACH subfiel IN tab6X.subfield %] - + [% END %] @@ -106,7 +106,7 @@ [% FOREACH subfiel IN tab7X.subfield %] - + [% END %] @@ -116,7 +116,7 @@ [% FOREACH subfiel IN tab8X.subfield %] - + [% END %] @@ -126,7 +126,7 @@ [% FOREACH subfiel IN tab9X.subfield %] - + [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt index b39e7d5166..164c750fd0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt @@ -12,13 +12,13 @@ [% IF ( authorized ) %] [% UNLESS ( newshelf ) %] [% IF ( multiple ) %] -

    Add [% total %] items to [% IF ( singleshelf ) %][% shelfname %]: [% ELSE %]a list:[% END %]

    +

    Add [% total %] items to [% IF ( singleshelf ) %][% shelfname | html %]: [% ELSE %]a list:[% END %]

    [% ELSE %] -

    Add to [% IF ( singleshelf ) %][% shelfname %][% ELSE %]a list:[% END %]

    +

    Add to [% IF ( singleshelf ) %][% shelfname | html %][% ELSE %]a list:[% END %]

    [% END %]
      [% FOREACH biblio IN biblios %] -
    • [% biblio.title %] +
    • [% biblio.title |html %] [% IF ( biblio.author ) %] [% biblio.author %] [% END %]
      • [% END %] @@ -30,17 +30,17 @@ @@ -87,7 +87,7 @@ [% FOREACH biblio IN biblios %] - + [% 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 6de7978cd2..7aded0b992 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 @@ -49,7 +49,7 @@

      [% Tag0X.tag %]

        [% FOREACH subfiel IN Tag0X.subfield %] -
      • [% subfiel.marc_lib.raw %]: +
      • [% subfiel.marc_lib %]: [% IF subfiel.isurl %][% subfiel.marc_value %] [% ELSE %][% subfiel.marc_value %][% END %]
        • [% 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 687582281a..c5cd351aa1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt @@ -142,7 +142,7 @@
        [% FOREACH INPUT IN INPUTS %] - + [% END %] @@ -157,7 +157,7 @@ [% END %]
        [% IF Koha.Preference('NoLoginInstructions') %] - [% Koha.Preference('NoLoginInstructions').raw %] + [% Koha.Preference('NoLoginInstructions') %] [% ELSE %]
        Don't have a password yet?

        If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.

        Don't have a library card?

        If you don't have a library card, stop by your local library to sign up.

        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 214da84401..4ebaac6521 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt @@ -1,12 +1,12 @@ [% USE Koha %] [% PROCESS 'opac-authorities.inc' %] [% PROCESS 'authorities-search-results.inc' %] -[% BLOCK pagination %] +[% pagination = BLOCK %]
    [% header_ro.cell %]
    [% mainloo.line %] / [% mainloo.column %][% loopco.coltitle_display %][% loopco.coltitle_display |html %]TOTAL
    [% loopro.rowtitle_display or "UNKNOWN VALUE" %][% loopro.rowtitle_display or "UNKNOWN VALUE" |html %][% loopcel.value %] [% item.itemcallnumber %] - [% item.title %] + [% item.title |html %]
    [% tab0X.tag %]
    [% subfiel.marc_lib.raw %][% subfiel.marc_lib %] [% subfiel.marc_value %]
    [% tab1X.tag %]
    [% subfiel.marc_lib.raw %][% subfiel.marc_lib %] [% subfiel.marc_value %]
    [% tab2X.tag %]
    [% subfiel.marc_lib.raw %][% subfiel.marc_lib %] [% subfiel.marc_value %]
    [% tab3X.tag %]
    [% subfiel.marc_lib.raw %][% subfiel.marc_lib %] [% subfiel.marc_value %]
    [% tab4X.tag %]
    [% subfiel.marc_lib.raw %][% subfiel.marc_lib %] [% subfiel.marc_value %]
    [% tab5X.tag %]
    [% subfiel.marc_lib.raw %][% subfiel.marc_lib %] [% subfiel.marc_value %]
    [% tab6X.tag %]
    [% subfiel.marc_lib.raw %][% subfiel.marc_lib %] [% subfiel.marc_value %]
    [% tab7X.tag %]
    [% subfiel.marc_lib.raw %][% subfiel.marc_lib %] [% subfiel.marc_value %]
    [% tab8X.tag %]
    [% subfiel.marc_lib.raw %][% subfiel.marc_lib %] [% subfiel.marc_value %]
    [% tab9X.tag %]
    [% subfiel.marc_lib.raw %][% subfiel.marc_lib %] [% subfiel.marc_value %]
    - [% PROCESS pagination %] + [% pagination %] [% END # / IF total %]
    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 f346965e04..94d5e0b60e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt @@ -66,14 +66,14 @@ [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]

    [% IF ( print_basket ) %] - [% BIBLIO_RESULT.title %] - [% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield %] [% END %][% END %] - [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %] + [% BIBLIO_RESULT.title |html %] + [% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield |html %] [% END %][% END %] + [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author |html %][% END %] [% ELSE %] - [% BIBLIO_RESULT.title %] - [% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield %] [% END %][% END %] - [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %] + [% BIBLIO_RESULT.title |html %] + [% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield |html %] [% END %][% END %] + [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author |html %][% END %] [% END # / IF print_basket %]

    @@ -256,7 +256,7 @@ [% END %] - [% BIBLIO_RESULT.title %][% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %][% subtitl.subfield %][% 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-blocked.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt index 89d05d319a..be4776c58b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt @@ -19,7 +19,7 @@

    You are not authorized to view this record.

    [% IF ( OpacSuppressionMessage ) %]
    - [% OpacSuppressionMessage.raw %] + [% OpacSuppressionMessage %]
    [% END %] 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 ec6f92e292..635f8d800e 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 %] + [% HIERARCHY_LOO.description |html %]
    • [% END %] @@ -43,9 +43,9 @@

      [% IF ( LEVEL_LOO.endnode ) %] - [% LEVEL_LOO.description %] + [% LEVEL_LOO.description |html %] [% ELSE %] - [% LEVEL_LOO.description %] + [% LEVEL_LOO.description |html %] [% END %]

      ([% LEVEL_LOO.number %] biblios)

      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 b9ab8cbb54..4b3db89353 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -24,7 +24,7 @@ [% SET protocol = "http://" %] [% END %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Details for: [% title %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield %][% END %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Details for: [% title |html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield |html %][% END %] [% INCLUDE 'doc-head-close.inc' %] [% IF ( bidi ) %] [% BLOCK cssinclude %][% END %] @@ -40,7 +40,7 @@
      @@ -88,12 +88,12 @@ [% 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 + See Baker & Taylor [% END %] [% END %]
      @@ -109,10 +109,10 @@ [% IF ( ISBD ) %]ISBD view[% END %]
      [% IF ( OPACXSLTDetailsDisplay ) %] - [% XSLTBloc.raw %] + [% XSLTBloc %] [% ELSE %] -

      [% title %][% IF ( subtitle ) %] [% FOREACH subtitl IN subtitle %][% subtitl.subfield %] [% END %][% END %]

      - [% IF ( author ) %]
      by [% author %]
      [% END %] +

      [% title |html %][% IF ( subtitle ) %] [% FOREACH subtitl IN subtitle %][% subtitl.subfield |html %] [% END %][% END %]

      + [% IF ( author ) %]
      by [% author |html %]
      [% END %] [% UNLESS ( item_level_itypes ) %] [ @@ -213,7 +213,7 @@ [% IF ( publishercode ) %] Published by : - [% publishercode %] + [% publishercode |html %] [% IF ( place ) %]([% place %])[% END %] [% IF ( publicationyear ) %], [% publicationyear %][% END %] [% END %] @@ -401,7 +401,7 @@ Tags from this library:
        [% FOREACH TagLoo IN TagLoop %] -
      • [% TagLoo.term %] ([% TagLoo.weight_total %]) +
      • [% TagLoo.term |html %] ([% TagLoo.weight_total %]) [% IF ( loop.last ) %][% ELSE %], [% END %]
        • [% END %] @@ -515,7 +515,7 @@ [% IF ( BakerTaylorContentURL ) %] Enhanced content: - [% IF ( OPACURLOpenInNewWindow ) %]Content Cafe[% ELSE %]Content Cafe[% END %] + [% IF ( OPACURLOpenInNewWindow ) %]Content Cafe[% ELSE %]Content Cafe[% END %] [% END # / IF BakerTaylorContentURL %] @@ -901,7 +901,7 @@ [% review.datereviewed | $KohaDates %]

        [% FILTER html_break %] - [% review.review %] + [% review.review |html %] [% END %] Edit

        @@ -930,7 +930,7 @@ [% END # / IF ShowReviewer != "none"%]

        [% FILTER html_break %] - [% review.review %] + [% review.review |html %] [% END %]

        @@ -979,11 +979,11 @@ [% UNLESS ( item_level_itypes ) %] [% XISBN.description %] [% END %] - [% XISBN.title %] - [% IF ( XISBN.author ) %] by [% XISBN.author %][% END %] + [% XISBN.title |html %] + [% IF ( XISBN.author ) %] by [% XISBN.author |html %][% END %] [% IF ( XISBN.copyrightdate ) %] ©[% XISBN.copyrightdate %][% END %] [% IF ( XISBN.publishercode ) %] -

        [% XISBN.publishercode %] +

        [% XISBN.publishercode |html %] [% IF ( XISBN.place ) %]([% XISBN.place %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear %][% END %] [% IF ( XISBN.pages ) %][% XISBN.pages %] [% XISBN.illus %] [% XISBN.size %][% END %] @@ -1066,7 +1066,7 @@

        • [% IF ( previousBiblionumber ) %] - « Previous + « Previous [% ELSE %] Previous [% END %] @@ -1075,7 +1075,7 @@
        • Back to results
        • [% IF ( nextBiblionumber ) %] - Next » + Next » [% ELSE %] Next [% END %] @@ -1213,7 +1213,7 @@ [% ITEM_RESULT.branchname %] [% END %] -
          [% ITEM_RESULT.holding_branch_opac_info.raw %]
          +
          [% ITEM_RESULT.holding_branch_opac_info %]
          [% IF ( OpacLocationBranchToDisplayShelving == 'holding' || OpacLocationBranchToDisplayShelving == 'both' ) %] [% ITEM_RESULT.location_description %] @@ -1238,7 +1238,7 @@ [% Branches.GetName( ITEM_RESULT.homebranch ) %] [% END %] -
          [% ITEM_RESULT.home_branch_opac_info.raw %]
          +
          [% ITEM_RESULT.home_branch_opac_info %]
          [% IF ( OpacLocationBranchToDisplayShelving == 'home' || OpacLocationBranchToDisplayShelving == 'both' ) %] [% ITEM_RESULT.location_description %] @@ -1353,8 +1353,8 @@ [% FOREACH listResult IN listResults %] arrPagination[[% listResult.index %]] = { url:"[% listResult.url %][% IF ( listResult.url && query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]", - title:"[% listResult.title|remove('\n') %]", - author:"[% listResult.author %]", + title:"[% listResult.title|remove('\n')|html %]", + author:"[% listResult.author|html %]", biblionumber:[% listResult.biblionumber %] }; [% END %] @@ -1451,7 +1451,7 @@ ] })); - [% IF ( query_desc ) %][% IF ( OpacHighlightedWords ) %]var query_desc = "[% query_desc |replace("'", "\'") |replace('\n', '\\n') |replace('\r', '\\r') %]"; + [% IF ( query_desc ) %][% IF ( OpacHighlightedWords ) %]var query_desc = "[% query_desc |replace("'", "\'") |replace('\n', '\\n') |replace('\r', '\\r') |html %]"; q_array = query_desc.split(" "); q_array = q_array.filter(function(n){ return n }); // Remove empty strings highlightOn(); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt index 8e00cf39ac..f7eebd8c41 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt @@ -22,7 +22,7 @@ [% END %]
          - + Cancel
          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 6a30d33657..4e4f832493 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt @@ -57,16 +57,16 @@ [% FOREACH csv_profile IN csv_profiles %] - + [% END %] Required
    • - + - Cancel + Cancel
    [% IF ( modal ) %] 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 a14e48c88e..9598f4d47c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt @@ -1,6 +1,6 @@ [% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Images for: [% biblio.title %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Images for: [% biblio.title |html %] [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %] @@ -36,11 +36,11 @@ [% END # / ERRORs %] -

    Comments on [% title %] [% subtitle %]

    - [% IF ( author ) %]

    [% author %]

    [% END %] +

    Comments on [% title |html %] [% subtitle %]

    + [% IF ( author ) %]

    [% author |html %]

    [% END %]
    - - [% IF ( reviewid ) %][% END %] + + [% IF ( reviewid ) %][% END %]
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt index fa04930b22..d8d6c579b3 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 @@ -68,7 +68,7 @@ [% s.time |$KohaDates with_hours => 1 %] - Subscribe to this search [% s.query_desc %] + Subscribe to this search [% s.query_desc |html %] [% s.total %] [% END %] @@ -108,7 +108,7 @@ [% s.time |$KohaDates with_hours => 1 %] - Subscribe to this search [% s.query_desc %] + Subscribe to this search [% s.query_desc |html %] [% s.total %] [% END %] @@ -153,7 +153,7 @@ [% s.time |$KohaDates with_hours => 1 %] - [% s.query_desc %] + [% s.query_desc |html %] [% s.total %] [% END %] @@ -190,7 +190,7 @@ [% s.time |$KohaDates with_hours => 1 %] - [% s.query_desc %] + [% s.query_desc |html %] [% s.total %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt index ec6219201d..e3c88abdd7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt @@ -9,7 +9,7 @@ Your cart [% FILTER html2text %]

    Hi,

    -

    [% firstname.raw %] [% surname.raw %] sent you a cart from our online catalog.

    +

    [% firstname %] [% surname %] sent you a cart from our online catalog.

    Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, @@ -22,26 +22,26 @@ Your cart [% FILTER html2text %] [% IF comment %] -

    [% comment.raw %]

    +

    [% comment %]

    [% END %]
      [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
    1. - [% BIBLIO_RESULT.title.raw %] - [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle.raw %][% END %] + [% BIBLIO_RESULT.title %] + [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %]

      [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] - Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author.raw %][% END %] + Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %] [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %] - [% IF ( BIBLIO_RESULT.author.raw ) %]; [% END %] + [% IF ( BIBLIO_RESULT.author ) %]; [% END %] [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %] [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %] - [% MARCAUTHOR_SUBFIELDS_LOO.separator.raw %][% MARCAUTHOR_SUBFIELDS_LOO.value.raw %] + [% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %] [% END %] [% UNLESS ( loop.last ) %];[% END %] [% END %] @@ -51,76 +51,76 @@ Your cart [% IF ( BIBLIO_RESULT.ISBN ) %] - ISBN: [% BIBLIO_RESULT.ISBN.raw %] + ISBN: [% BIBLIO_RESULT.ISBN %]
      [% END %] [% IF BIBLIO_RESULT.publishercode %] - Published by: [% BIBLIO_RESULT.publishercode.raw %] + Published by: [% BIBLIO_RESULT.publishercode %] [% IF ( BIBLIO_RESULT.publicationyear ) %] - in [% BIBLIO_RESULT.publicationyear.raw %] + in [% BIBLIO_RESULT.publicationyear %] [% END %] [% IF ( BIBLIO_RESULT.pages ) %] - , [% BIBLIO_RESULT.pages.raw %] + , [% BIBLIO_RESULT.pages %] [% END %] [% IF BIBLIO_RESULT.item('size') %] - , [% BIBLIO_RESULT.item('size').raw %] + , [% BIBLIO_RESULT.item('size') %] [% END %]
      [% END %] [% IF BIBLIO_RESULT.collection %] - Collection: [% BIBLIO_RESULT.seriestitle.raw %] + Collection: [% BIBLIO_RESULT.seriestitle %]
      [% END %] [% IF ( BIBLIO_RESULT.subject ) %] - Subject: [% BIBLIO_RESULT.subject.raw %] + Subject: [% BIBLIO_RESULT.subject %]
      [% END %] [% IF ( BIBLIO_RESULT.copyrightdate ) %] - Copyright year: [% BIBLIO_RESULT.copyrightdate.raw %] + Copyright year: [% BIBLIO_RESULT.copyrightdate %]
      [% END %] [% IF ( BIBLIO_RESULT.notes ) %] - Notes : [% BIBLIO_RESULT.notes.raw %] + Notes : [% BIBLIO_RESULT.notes %]
      [% END %] [% IF ( BIBLIO_RESULT.unititle ) %] - Unified title: [% BIBLIO_RESULT.unititle.raw %] + Unified title: [% BIBLIO_RESULT.unititle %]
      [% END %] [% IF ( BIBLIO_RESULT.serial ) %] - Serial: [% BIBLIO_RESULT.serial.raw %] + Serial: [% BIBLIO_RESULT.serial %]
      [% END %] [% IF ( BIBLIO_RESULT.dewey ) %] - Dewey: [% BIBLIO_RESULT.dewey.raw %] + Dewey: [% BIBLIO_RESULT.dewey %]
      [% END %] [% IF ( BIBLIO_RESULT.classification ) %] - Classification: [% BIBLIO_RESULT.classification.raw %] + Classification: [% BIBLIO_RESULT.classification %]
      [% END %] [% IF ( BIBLIO_RESULT.lccn ) %] - LCCN: [% BIBLIO_RESULT.lccn.raw %] + LCCN: [% BIBLIO_RESULT.lccn %]
      [% END %] [% IF ( BIBLIO_RESULT.url ) %] @@ -132,17 +132,17 @@ Your cart [% IF ( OPACBaseURL ) %]

      - In online catalog: [% OPACBaseURL.raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %] + In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]

      [% END %] [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %]

      Items:

        [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
      • - [% ITEM_RESULT.branchname.raw %] - [% ITEM_RESULT.location.raw %] - [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber.raw %])[% END %] - [% ITEM_RESULT.barcode.raw %] + [% ITEM_RESULT.branchname %] + [% ITEM_RESULT.location %] + [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %] + [% ITEM_RESULT.barcode %]
        • [% END %]

      diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt index 62a4306def..4c7f5d43c4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt @@ -1,5 +1,5 @@ -Your list : [% shelfname.raw %] +Your list : [% shelfname %] [% USE HtmlToText %] @@ -8,8 +8,8 @@ Your list : [% shelfname.raw %] [% FILTER html2text %]

      Hi,

      -

      [% firstname.raw %] [% surname.raw %] sent you from our online catalog, the - virtual shelf called : [% shelfname.raw %].

      +

      [% firstname %] [% surname %] sent you from our online catalog, the + virtual shelf called : [% shelfname %].

      Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, @@ -23,30 +23,30 @@ Your list : [% shelfname.raw %] [% FILTER html2text %] [% IF comment %] -

      [% comment.raw %]

      +

      [% comment %]

      [% END %]
        [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
      1. - [% BIBLIO_RESULT.title.raw %] + [% BIBLIO_RESULT.title %] [% IF ( BIBLIO_RESULT.subtitle.size ) %] [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %] - [% subtitle.subfield.raw %] + [% subtitle.subfield %] [% END %] [% END %]

        [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] - Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author.raw %][% END %] + Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %] [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %] [% IF ( BIBLIO_RESULT.author ) %]; [% END %] [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %] [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %] - [% MARCAUTHOR_SUBFIELDS_LOO.separator.raw %][% MARCAUTHOR_SUBFIELDS_LOO.value.raw %] + [% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %] [% END %] [% UNLESS ( loop.last ) %];[% END %] [% END %] @@ -57,7 +57,7 @@ Your list : [% shelfname.raw %] [% IF ( BIBLIO_RESULT.ISBN ) %] ISBN: [% FOREACH isbn IN BIBLIO_RESULT.ISBN %] - [% isbn.raw %] + [% isbn %] [% UNLESS ( loop.last ) %]; [% END %] [% END %]
        @@ -65,12 +65,12 @@ Your list : [% shelfname.raw %] [% IF BIBLIO_RESULT.publishercode %] - Published by: [% BIBLIO_RESULT.publishercode.raw %] + Published by: [% BIBLIO_RESULT.publishercode %] [% IF ( BIBLIO_RESULT.publicationyear ) %] - in [% BIBLIO_RESULT.publicationyear.raw %] + in [% BIBLIO_RESULT.publicationyear %] [% END %] [% IF ( BIBLIO_RESULT.pages ) %] - , [% BIBLIO_RESULT.pages.raw %] + , [% BIBLIO_RESULT.pages %] [% END %] [% IF BIBLIO_RESULT.item('size') %] , [% BIBLIO_RESULT.item('size') %] @@ -80,55 +80,55 @@ Your list : [% shelfname.raw %] [% IF BIBLIO_RESULT.collection %] - Collection: [% BIBLIO_RESULT.seriestitle.raw %] + Collection: [% BIBLIO_RESULT.seriestitle %]
        [% END %] [% IF ( BIBLIO_RESULT.subject ) %] - Subject: [% BIBLIO_RESULT.subject.raw %] + Subject: [% BIBLIO_RESULT.subject %]
        [% END %] [% IF ( BIBLIO_RESULT.copyrightdate ) %] - Copyright year: [% BIBLIO_RESULT.copyrightdate.raw %] + Copyright year: [% BIBLIO_RESULT.copyrightdate %]
        [% END %] [% IF ( BIBLIO_RESULT.notes ) %] - Notes : [% BIBLIO_RESULT.notes.raw %] + Notes : [% BIBLIO_RESULT.notes %]
        [% END %] [% IF ( BIBLIO_RESULT.unititle ) %] - Unified title: [% BIBLIO_RESULT.unititle.raw %] + Unified title: [% BIBLIO_RESULT.unititle %]
        [% END %] [% IF ( BIBLIO_RESULT.serial ) %] - Serial: [% BIBLIO_RESULT.serial.raw %] + Serial: [% BIBLIO_RESULT.serial %]
        [% END %] [% IF ( BIBLIO_RESULT.dewey ) %] - Dewey: [% BIBLIO_RESULT.dewey.raw %] + Dewey: [% BIBLIO_RESULT.dewey %]
        [% END %] [% IF ( BIBLIO_RESULT.classification ) %] - Classification: [% BIBLIO_RESULT.classification.raw %] + Classification: [% BIBLIO_RESULT.classification %]
        [% END %] [% IF ( BIBLIO_RESULT.lccn ) %] - LCCN: [% BIBLIO_RESULT.lccn.raw %] + LCCN: [% BIBLIO_RESULT.lccn %]
        [% END %] [% IF ( BIBLIO_RESULT.url ) %] @@ -140,17 +140,17 @@ Your list : [% shelfname.raw %] [% IF ( OPACBaseURL ) %]

        - In online catalog: [% OPACBaseURL.raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %] + In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]

        [% END %] [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %]

        Items:

          [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
        • - [% ITEM_RESULT.branchname.raw %] - [% ITEM_RESULT.location.raw %] - [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber.raw %])[% END %] - [% ITEM_RESULT.barcode.raw %] + [% ITEM_RESULT.branchname %] + [% ITEM_RESULT.location %] + [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %] + [% ITEM_RESULT.barcode %]
          • [% 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 a702b741ad..4517ffc44f 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 @@ -30,10 +30,10 @@

        Issues for a subscription

        [% FOREACH subscription_LOO IN subscription_LOOP %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves-rss.tt index 6a46354e1b..2525d80c0e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves-rss.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves-rss.tt @@ -5,14 +5,14 @@ [% shelf.shelfname %] [% OPACBaseURL %]/cgi-bin/koha/opac-shelves.pl?rss=1&viewshelf=[% shelf.shelfnumber %] - RSS feed for public list [% shelf.shelfname %] + RSS feed for public list [% shelf.shelfname | html %] [% FOREACH i IN itemsloop %] - [% i.title %] + [% i.title | html %] [% IF i.author %] - by [% i.author %] + by [% i.author | html %] [% END %] [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber %] 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 63d848ee3a..d13c721a4a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -5,7 +5,7 @@ [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsInputOnList') ) %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › [% IF op == 'view' %]Contents of [% shelf.shelfname %][% ELSE %]Your lists[% END %][% INCLUDE 'doc-head-close.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › [% IF op == 'view' %]Contents of [% shelf.shelfname |html %][% ELSE %]Your lists[% END %][% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] [% IF ( loggedinusername ) %][% INCLUDE 'bodytag.inc' bodyid='opac-userlists' bodyclass='scrollto' %][% ELSE %][% INCLUDE 'bodytag.inc' bodyid='opac-lists' bodyclass='scrollto' %][% END %] @@ -66,7 +66,7 @@ [% END %] [% IF op == 'view' %] -
      2. › Contents of [% shelf.shelfname %]
        3. +
      3. › Contents of [% shelf.shelfname | html %]
        4. [% END %] [% IF op == 'add_form' %] @@ -74,7 +74,7 @@ [% END %] [% IF op == 'edit_form' %] -
      4. › Edit list [% shelf.shelfname %]
        5. +
      5. › Edit list [% shelf.shelfname | html %]
        6. [% END %] @@ -155,20 +155,20 @@ [% IF op == 'view' %]

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

        - [% IF ( itemsloop ) %] -
        -
        + [% IF ( itemsloop ) %] +
        +
        New list | - Download list + Download list [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] - Send list + Send list [% END %] Print list @@ -179,7 +179,7 @@ - + @@ -187,18 +187,18 @@ - + [% IF category == PRIVATE && Koha.Preference('OpacAllowSharingPrivateLists') %] - Share list + Share list [% END %] [% ELSIF category == PRIVATE # not manageshelf and private means shared %]
        - +
        [% END %] @@ -206,7 +206,7 @@
        - + - + [% END %]
        @@ -342,14 +342,14 @@ [% IF ( BakerTaylorEnabled ) %] [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) %] [% IF ( bt_id ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] No cover image available [% END %] [% END %] [% IF ( itemsloo.XSLTBloc ) %] - [% itemsloo.XSLTBloc.raw %] + [% itemsloo.XSLTBloc %] [% ELSE %] [% IF ( itemsloo.BiblioDefaultViewmarc ) %] @@ -363,13 +363,13 @@ [% END %] [% IF ( itemsloo.title ) %] - [% itemsloo.title %] + [% itemsloo.title |html %] [% ELSE %] No title [% END %] [% FOREACH subtitl IN itemsloo.subtitle %] - [% subtitl.subfield %] + [% subtitl.subfield|html %] [% END %] @@ -385,7 +385,7 @@ [% itemsloo.place %] [% END %] [% IF ( itemsloo.publishercode ) %] - [% itemsloo.publishercode %] + [% itemsloo.publishercode|html %] [% END %] [% IF ( itemsloo.publicationyear ) %] [% itemsloo.publicationyear %] @@ -395,7 +395,7 @@ [% END %] [% END %] [% IF ( itemsloo.pages ) %]. [% itemsloo.pages %][% END %] - [% IF ( itemsloo.notes ) %], [% itemsloo.notes %][% END %] + [% IF ( itemsloo.notes ) %], [% itemsloo.notes|html %][% END %] [% IF ( itemsloo.item('size') ) %] [% itemsloo.item('size') %][% END %] @@ -488,7 +488,7 @@ [% IF ( pagination_bar ) %] -
        [% pagination_bar.raw %]
        +
        [% pagination_bar %]
        [% END %] [% ELSE %] @@ -500,13 +500,13 @@ - +
        - + @@ -521,10 +521,11 @@ [% END %] [% END # / IF itemsloop %] - [% END %] + [% END %] + [% IF itemsloop && can_remove_biblios %] - + @@ -532,7 +533,7 @@
        - + [% END %] @@ -545,16 +546,16 @@ Create a new list [% ELSE %] - Editing [% shelf.shelfname %] + Editing [% shelf.shelfname |html %] - + [% END %]
        1. -
          2. +
        - + [% END %] [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) == 1 %] @@ -220,7 +220,7 @@ [% ELSIF ( suggestions_loo.REJECTED ) %]Suggestion declined [% ELSIF ( suggestions_loo.AVAILABLE ) %]Available in the library [% ELSE %] [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS, 1 ) %] [% END %] - [% IF ( suggestions_loo.reason ) %]([% suggestions_loo.reason %])[% END %] + [% IF ( suggestions_loo.reason ) %]([% suggestions_loo.reason |html %])[% END %] [% END # / FOREACH suggestions_loo %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt index da39882e3d..295c32dfce 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt @@ -97,7 +97,7 @@
        [% FOREACH TAGLOO IN TAGLOOP %] - [% TAGLOO.term %] + [% TAGLOO.term |html %] [% TAGLOO.weight_total %] [% END %] @@ -123,21 +123,22 @@
        + @@ -58,7 +58,7 @@ [% FOREACH result IN results %] - [% END # / IF JacketImages %] [% IF ( ISSUE.overdue ) %] @@ -260,7 +261,7 @@ [% END %] [% IF ( OPACMySummaryHTML ) %] - + [% END %] [% END # /FOREACH ISSUES %] @@ -423,7 +424,7 @@ [% IF ( BakerTaylorEnabled ) %] [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) %] [% IF ( bt_id ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] No cover image available [% END %] @@ -440,7 +441,7 @@ [% END # /IF jacketcell %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt index c41e6dcc31..3bf2f15138 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt @@ -7,8 +7,8 @@ -[% IF ( OPACUserCSS ) %][% END %] -[% IF ( SCOUserCSS ) %][% END %] +[% IF ( OPACUserCSS ) %][% END %] +[% IF ( SCOUserCSS ) %][% END %] @@ -28,7 +28,7 @@ [% IF ( SelfCheckHelpMessage ) %]
        -[% SelfCheckHelpMessage.raw %] +[% SelfCheckHelpMessage %]
        [% END %] @@ -61,5 +61,5 @@ The Submit button only needs to be clicked if you enter the barcode manually.

        [% SCOUserJS.raw %][% END %] +[% IF ( SCOUserJS ) %][% END %] [% END %] 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 65e133669f..3f0b1f3a71 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 @@ -8,8 +8,8 @@ -[% IF ( OPACUserCSS ) %][% END %] -[% IF ( SCOUserCSS ) %][% END %] +[% IF ( OPACUserCSS ) %][% END %] +[% IF ( SCOUserCSS ) %][% END %] @@ -37,7 +37,7 @@

        Item cannot be checked out.

        Sorry, this item cannot be checked out at this station.

        [% IF ( title ) %] -

        Title: [% title %]

        +

        Title: [% title |html %]

        [% END %]

        @@ -231,9 +231,9 @@

        [% s.shelfname %][% s.shelfname |html %] [% IF contents.count %][% contents.count %] [% IF contents.count == 1 %]item[% ELSE %]items[% END %][% ELSE %]Empty[% END %] [% IF s.category == PRIVATE %] @@ -676,7 +677,7 @@ [% IF s.can_be_managed( loggedinusernumber ) %]
        - + @@ -688,19 +689,19 @@ - +
        [% END %] [% IF s.category == PRIVATE AND s.can_be_managed( loggedinusernumber ) AND Koha.Preference('OpacAllowSharingPrivateLists') %] - Share + Share [% END %] [% IF s.is_shared_with( loggedinusernumber ) %]
        - +
        [% END %]  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 528bf5a1ec..fddf531e7c 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 @@ -8,7 +8,7 @@ [% timestamp %] [% FOREACH review IN reviews %] - New comment on [% review.title %] [% FOREACH subtitl IN review.subtitle %], [% subtitl.subfield %][% END %] + New comment on [% review.title |html %] [% FOREACH subtitl IN review.subtitle %], [% subtitl.subfield |html %][% END %] [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber %]#comments [% END %][% END %] @@ -19,15 +19,15 @@ [% END %][% END %][% END %][% END %] [% bt_id = ( review.normalized_upc || review.normalized_isbn ) %] -[% IF ( BakerTaylorEnabled && bt_id ) %]See Baker & Taylor[% END %] - [% IF ( review.author ) %]

        By [% review.author %].

        [% END %] -

        [% IF ( review.place ) %][% review.place %] [% END %][% IF ( review.publishercode ) %][% review.publishercode %][% END %][% IF ( review.publicationyear ) %] [% review.publicationyear %] - [% ELSE %][% IF ( review.copyrightdate ) %] [% review.copyrightdate %][% END %][% END %] - [% IF ( review.pages ) %]. [% review.pages %][% END %] - [% IF ( review.notes ) %], [% review.notes %][% END %] - [% IF ( review.size ) %] [% review.size %]. [% END %] - [% IF ( review.isbn ) %] [% review.isbn %][% END %]

        -

        [% IF ( review.borrowernumber && ShowReviewer ) %][% review.firstname %] [% review.surname %] commented[% ELSE %]Comment[% END %] on [% review.datereviewed | $KohaDates %]: [% review.review %]

        +[% 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 %] + [% IF ( review.pages ) %]. [% review.pages |html %][% END %] + [% IF ( review.notes ) %], [% review.notes |html %][% END %] + [% IF ( review.size ) %] [% review.size |html %]. [% END %] + [% IF ( review.isbn ) %] [% review.isbn |html %][% END %]

        +

        [% IF ( review.borrowernumber && ShowReviewer ) %][% review.firstname %] [% review.surname %] commented[% ELSE %]Comment[% END %] on [% review.datereviewed | $KohaDates %]: [% review.review |html %]

        ]]>         [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber %]&reviewid=[% review.reviewid %] [% review.timestamp %] 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 87b9ae5abb..464aa21574 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt @@ -45,7 +45,7 @@ [% END %] [% END %] [% IF ( review.title ) %][% review.title %][% ELSE %]No title[% END %] - [% FOREACH subtitl IN review.subtitle %] [% subtitl.subfield %][% END %] + [% FOREACH subtitl IN review.subtitle %] [% subtitl.subfield |html %][% END %] [% IF ( review.author ) %] by [% review.author %] @@ -84,7 +84,7 @@ [% END %] [% FILTER html_break %] - [% review.review %] + [% review.review |html %] [% END %] Added [% review.datereviewed | $KohaDates %] [% IF ( review.your_comment ) %] by you[% ELSE %] [% IF ( review.borrowernumber && ShowReviewer != "none" ) %] by @@ -140,7 +140,7 @@ [% bt_id = ( review.normalized_upc || review.normalized_isbn ) %] [% 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-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt index 45b99cf080..c176a12e4e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt @@ -120,7 +120,7 @@
        - + [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) == 1 %] [% IF loggedinusername %] @@ -178,19 +178,19 @@
        		-

        [% suggestions_loo.title %]

        -

        [% IF ( suggestions_loo.author ) %][% suggestions_loo.author %],[% END %] - [% IF ( suggestions_loo.copyrightdate ) %] - [% suggestions_loo.copyrightdate %],[% END %] - [% IF ( suggestions_loo.publishercode ) %] - [% suggestions_loo.publishercode %][% END %] - [% IF ( suggestions_loo.place ) %]([% suggestions_loo.place %])[% END %] - [% IF ( suggestions_loo.collectiontitle ) %] , [% suggestions_loo.collectiontitle %][% END %] +

        [% suggestions_loo.title |html %]

        +

        [% IF ( suggestions_loo.author ) %][% suggestions_loo.author |html %],[% END %] + [% IF ( suggestions_loo.copyrightdate ) %] - [% suggestions_loo.copyrightdate |html %],[% END %] + [% IF ( suggestions_loo.publishercode ) %] - [% suggestions_loo.publishercode |html %][% END %] + [% IF ( suggestions_loo.place ) %]([% suggestions_loo.place |html %])[% END %] + [% IF ( suggestions_loo.collectiontitle ) %] , [% suggestions_loo.collectiontitle |html %][% END %] [% IF ( suggestions_loo.itemtype ) %] - [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 1 ) %][% END %]

        		[% IF ( suggestions_loo.note ) %] Note: - [% suggestions_loo.note %] + [% suggestions_loo.note |html %] [% END %]
        Tag: [% IF MY_TAG.approved == 1 %] - [% MY_TAG.term %] + [% MY_TAG.term |html %] [% ELSE %] - [% MY_TAG.term %] (not approved) + [% MY_TAG.term |html %] (not approved) [% END %] [% IF ( MY_TAG.XSLTBloc ) %] - [% MY_TAG.XSLTBloc.raw %] + [% MY_TAG.XSLTBloc %] [% ELSE %] Title: - [% MY_TAG.title %] + [% MY_TAG.title |html %] [% IF ( MY_TAG.subtitle ) %] [% FOREACH subtitle IN MY_TAG.subtitle %] - [% subtitle.subfield %] + [% subtitle.subfield |html %] [% END %] [% 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 92975dbecc..f3194b2067 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 %] + [% LOO.entry %] [% 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 d881264d59..672e241c17 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt @@ -44,7 +44,7 @@ [% branch %] [% END %] [% IF ( timeLimit != 999 ) %] - in the past [% timeLimitFinite %] months + in the past [% timeLimit |html %] months [% ELSE %] of all time[% END %]
        [% result.title %]

        [% result.author %] +

        		[% result.title |html %]

        [% result.author %] [% IF ( result.publishercode ) %]- [% result.publishercode %][% END %] [% IF ( result.place ) %][% result.place %][% END %] [% IF ( result.publicationyear ) %] 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 28b237efd5..3a8b01651f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -31,7 +31,7 @@

          [% FOREACH bor_messages_loo IN bor_messages_loop %]
        • - [% bor_messages_loo.message.raw %]
          + [% bor_messages_loo.message %]
             Written on [% bor_messages_loo.message_date | $KohaDates %] by [% bor_messages_loo.branchname %]
          • [% END %] @@ -89,7 +89,7 @@
            [% IF ( userdebarred ) %] -
          • Please note: Your account has been frozen[% IF ( BORROWER_INFO.userdebarreddate ) %] until [% BORROWER_INFO.userdebarreddate | $KohaDates %][% END %][% IF ( BORROWER_INFO.debarredcomment ) %] with the comment "[% BORROWER_INFO.debarredcomment.raw %]"[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If your account page shows your account to be clear, please contact the library.
            • +
          • Please note: Your account has been frozen[% IF ( BORROWER_INFO.userdebarreddate ) %] until [% BORROWER_INFO.userdebarreddate | $KohaDates %][% END %][% IF ( BORROWER_INFO.debarredcomment ) %] with the comment "[% BORROWER_INFO.debarredcomment %]"[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If your account page shows your account to be clear, please contact the library.
            • [% END %] [% IF ( BORROWER_INFO.gonenoaddress ) %]
          • Please note: According to our records, we don't have up-to-date [% UNLESS OPACPatronDetails %]contact information[% ELSE %]contact information[% END %] on file. Please contact the library[% IF OPACPatronDetails %] or use the online update form to submit current information (Please note: there may be a delay in restoring your account if you submit online)[% END %].
            • @@ -104,7 +104,8 @@
          [% END # / IF patron_flagged %] - [% IF OPACMySummaryNote %][% Koha.Preference('OPACMySummaryNote').raw %][% END %] + [% SET OPACMySummaryNote = Koha.Preference('OPACMySummaryNote') %] + [% IF OPACMySummaryNote %][% OPACMySummaryNote %][% END %]
            @@ -173,7 +174,7 @@ [% IF ( BakerTaylorEnabled ) %] [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) %] [% IF ( bt_id ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] No cover image available [% END %] @@ -190,7 +191,7 @@
        		- [% ISSUE.title %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %] + [% ISSUE.title |html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %] [% ISSUE.author %] [% ISSUE.MySummaryHTML.raw %][% ISSUE.MySummaryHTML %]
        - [% OVERDUE.title %] [% FOREACH subtitl IN OVERDUE.subtitle %] [% subtitl.subfield %][% END %] + [% OVERDUE.title |html %] [% FOREACH subtitl IN OVERDUE.subtitle %] [% subtitl.subfield %][% END %] [% OVERDUE.author %] [% ISSUE.issuedate %] [% UNLESS ( noitemlinks ) %] - [% ISSUE.title %] + [% ISSUE.title |html %] [% ELSE %] - [% ISSUE.title %] + [% ISSUE.title |html %] [% END %] [% ISSUE.author %] ([% ISSUE.barcode %]) @@ -302,7 +302,7 @@ [% END # / IF authbylogin %] [% FOREACH INPUT IN INPUTS %] - + [% END %] @@ -381,5 +381,5 @@ //]]> - [% IF ( SCOUserJS ) %][% END %] + [% IF ( SCOUserJS ) %][% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt index 212f3e4b3f..3e62d0e6c0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt @@ -34,7 +34,7 @@
        Did you mean: [% FOREACH suggestion IN suggestions %] - [% suggestion.label %] + [% suggestion.label |html %] [% END %]
        [% ELSE %] -- 2.39.5