From a9a3ebd829c8352fb7abe369f8dc1cf11b0934f4 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 22 Jun 2015 16:44:05 +0200 Subject: [PATCH] Bug 13618: Remove html filters at the OPAC This patch removes the html filters at the OPAC, if necessary. Generated with: perl -p -i -e 's/\ ?\|\ ?html(\ ?)%/\1%/g' **/*.tt **/*.inc --- .../en/includes/authorities-search-results.inc | 22 +++--- .../opac-tmpl/bootstrap/en/includes/masthead.inc | 6 +- .../bootstrap/en/includes/opac-authorities.inc | 4 +- .../bootstrap/en/includes/opac-bottom.inc | 2 +- .../bootstrap/en/includes/opac-facets.inc | 4 +- .../bootstrap/en/includes/page-numbers.inc | 6 +- .../bootstrap/en/includes/shelfbrowser.inc | 4 +- .../bootstrap/en/modules/opac-addbybiblionumber.tt | 12 ++-- .../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 2 +- .../en/modules/opac-authoritiessearchresultlist.tt | 6 +- .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 14 ++-- .../opac-tmpl/bootstrap/en/modules/opac-browser.tt | 6 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 40 +++++------ .../bootstrap/en/modules/opac-downloadcart.tt | 2 +- .../bootstrap/en/modules/opac-downloadshelf.tt | 6 +- .../bootstrap/en/modules/opac-imageviewer.tt | 2 +- .../bootstrap/en/modules/opac-mymessages.tt | 10 +-- .../bootstrap/en/modules/opac-news-rss.tt | 4 +- .../bootstrap/en/modules/opac-opensearch.tt | 52 +++++++-------- .../bootstrap/en/modules/opac-overdrive-search.tt | 8 +-- .../bootstrap/en/modules/opac-readingrecord.tt | 8 +-- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +- .../bootstrap/en/modules/opac-results-grouped.tt | 14 ++-- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 40 +++++------ .../opac-tmpl/bootstrap/en/modules/opac-review.tt | 10 +-- .../bootstrap/en/modules/opac-search-history.tt | 8 +-- .../bootstrap/en/modules/opac-serial-issues.tt | 4 +- .../bootstrap/en/modules/opac-shelves-rss.tt | 6 +- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 78 +++++++++++----------- .../bootstrap/en/modules/opac-showreviews-rss.tt | 20 +++--- .../bootstrap/en/modules/opac-showreviews.tt | 6 +- .../bootstrap/en/modules/opac-suggestions.tt | 18 ++--- .../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 8 +-- .../bootstrap/en/modules/opac-tags_subject.tt | 2 +- .../bootstrap/en/modules/opac-topissues.tt | 4 +- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 8 +-- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 8 +-- .../bootstrap/en/modules/svc/suggestion.tt | 2 +- 38 files changed, 229 insertions(+), 229 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc index 043556d..b9290fd 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc @@ -11,24 +11,24 @@ [% IF marcflavour == 'UNIMARC' %] [% SWITCH type %] [% CASE 'broader' %] - BT: [% heading | html %] + BT: [% heading %] [% CASE 'narrower' %] - NT: [% heading | html %] + NT: [% heading %] [% CASE 'seefrom' %] - UF: [% heading | html %] + UF: [% heading %] [% CASE 'seealso' %] - RT: [% heading | html %] + RT: [% heading %] [% END %] [% ELSE %] [% IF ( linkType=='seealso' ) %] [% IF ( authid ) %] - [% heading | html %] + [% heading %] [% ELSE %] - [% heading | html %] + [% heading %] [% END %] [% ELSE %] - [% heading | html %] + [% heading %] [% END %] [% UNLESS ( type=='seefrom' || type=='seealso' ) %] @@ -42,7 +42,7 @@ [% CASE 'narrower' %](Narrower heading) [% CASE 'parent' %](Immediate parent body) [% CASE %] - [% IF type %]([% type | html %])[% END %] + [% IF type %]([% type %])[% END %] [% END %] [% END # / UNLESS seefrom %] @@ -50,7 +50,7 @@ [% END # / BLOCK showreference %] [% BLOCK authresult %] - [% IF ( summary.label ) %][% summary.label | html %]:[% END %] + [% IF ( summary.label ) %][% summary.label %]:[% END %] [% IF summary.summary %]
[% summary.summary %] @@ -59,7 +59,7 @@ [% UNLESS ( summary.summaryonly ) %]
[% FOREACH authorize IN summary.authorized %] - [% authorize.heading | html %] + [% authorize.heading %] [% UNLESS loop.last %] | [% END %] [% END %]
@@ -67,7 +67,7 @@ [% IF summary.notes %]
[% FOREACH note IN summary.notes %] - [% note.note | html %] + [% note.note %] [% END %]
[% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index 1ccd2be..e827ea1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -40,7 +40,7 @@ [% IF ( pubshelves ) %]
  • Public lists
  • [% FOREACH pubshelvesloo IN pubshelvesloop %] -
  • [% pubshelvesloo.shelfname |html %]
  • +
  • [% pubshelvesloo.shelfname %]
  • [% END %]
  • View All
  • [% ELSE %] @@ -52,7 +52,7 @@ [% IF ( loggedinusername ) %] [% IF ( barshelves ) %] [% FOREACH barshelvesloo IN barshelvesloop %] -
  • [% barshelvesloo.shelfname |html %]
  • +
  • [% barshelvesloo.shelfname %]
  • [% END %]
  • View all
  • [% ELSE %] @@ -234,7 +234,7 @@
    [% END %] [% IF ( ms_value ) %] - + [% ELSE %] [% END # /ms_value %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc index aed68e5..fc17f53 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc @@ -9,9 +9,9 @@ [% FOREACH node IN tree %]
  • [% IF ( node.current_value ) %] - [% node.value | html %] + [% node.value %] [% ELSE %] - [% node.value | html %] + [% node.value %] [% END %] [% IF ( node.children && node.children.size > 0 ) %] [% PROCESS showtree tree = node.children %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index 1d350ea..eb974dd 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -238,7 +238,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); signinLink.onclick = function(evt) { // Requests a signed identity assertion from the user. navigator.id.request({ - siteName: "[% LibraryName | html %]", + siteName: "[% LibraryName %]", returnTo: '/cgi-bin/koha/opac-user.pl', oncancel: function() { alert('user refuses to share identity.'); } }); 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 958d571..65f3e9c 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 url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %] [% facet.facet_label_value %] - [x] + [x] [% ELSE %] [% SET 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 %] 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 f18c9ce..175c378 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 255fac1..5fd2215 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc @@ -59,7 +59,7 @@ [% END %] [% IF ( BakerTaylorEnabled ) %] [% IF ( item.browser_normalized_isbn ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] No cover image available [% END %] @@ -80,7 +80,7 @@ [% FOREACH item IN shelfbrowser_items %] [% item.itemcallnumber %] - [% item.title |html %] + [% item.title %] [% 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 859a091..3a7f628 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 | html %]: [% ELSE %]a list:[% END %]

    +

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

    [% ELSE %] -

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

    +

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

    [% END %]
      [% FOREACH biblio IN biblios %] -
    • [% biblio.title |html %] +
    • [% biblio.title %] [% IF ( biblio.author ) %] [% biblio.author %] [% END %]
    • [% END %] @@ -30,12 +30,12 @@ @@ -82,7 +82,7 @@ [% FOREACH biblio IN biblios %] - + [% 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 c474791..e294fd4 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 %] 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 6ded40c..214da84 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt @@ -6,7 +6,7 @@ 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 fb9234b..4e25a8e 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 |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 %] + [% 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 %] [% ELSE %] - [% 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 %] + [% 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 %] [% END # / IF print_basket %]

      @@ -256,7 +256,7 @@ [% END %] - [% BIBLIO_RESULT.title |html %][% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %][% subtitl.subfield |html %][% END %][% END %] + [% BIBLIO_RESULT.title %][% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %][% subtitl.subfield %][% END %][% END %] [% IF ( TagsInputEnabled && loggedinusername ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt index 635f8d8..ec6f92e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt @@ -32,7 +32,7 @@
        [% FOREACH HIERARCHY_LOO IN HIERARCHY_LOOP %]
      • - [% HIERARCHY_LOO.description |html %] + [% HIERARCHY_LOO.description %]
      • [% END %] @@ -43,9 +43,9 @@

        [% IF ( LEVEL_LOO.endnode ) %] - [% LEVEL_LOO.description |html %] + [% LEVEL_LOO.description %] [% ELSE %] - [% LEVEL_LOO.description |html %] + [% LEVEL_LOO.description %] [% 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 6799e23..d732ef6 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 |html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield |html %][% END %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Details for: [% title %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield %][% END %] [% INCLUDE 'doc-head-close.inc' %] [% IF ( bidi ) %] [% BLOCK cssinclude %][% END %] @@ -40,7 +40,7 @@
        @@ -91,12 +91,12 @@ [% IF ( BakerTaylorEnabled && normalized_isbn ) %] [% 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 %]
        @@ -114,8 +114,8 @@ [% IF ( OPACXSLTDetailsDisplay ) %] [% XSLTBloc %] [% ELSE %] -

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

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

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

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

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

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

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

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

        [% XISBN.publishercode |html %] +

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

        • [% IF ( previousBiblionumber ) %] - « Previous + « Previous [% ELSE %] Previous [% END %] @@ -1078,7 +1078,7 @@
        • Back to results
        • [% IF ( nextBiblionumber ) %] - Next » + Next » [% ELSE %] Next [% END %] @@ -1346,8 +1346,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')|html %]", - author:"[% listResult.author|html %]", + title:"[% listResult.title|remove('\n') %]", + author:"[% listResult.author %]", biblionumber:[% listResult.biblionumber %] }; [% END %] @@ -1444,7 +1444,7 @@ ] })); - [% IF ( query_desc ) %][% IF ( OpacHighlightedWords ) %]var query_desc = "[% query_desc |replace("'", "\'") |replace('\n', '\\n') |replace('\r', '\\r') |html %]"; + [% IF ( query_desc ) %][% IF ( OpacHighlightedWords ) %]var query_desc = "[% query_desc |replace("'", "\'") |replace('\n', '\\n') |replace('\r', '\\r') %]"; 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 f7eebd8..8e00cf3 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 1aa3a4b..322c7ad 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 9598f4d..a14e48c 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 |html %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Images for: [% biblio.title %] [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %] @@ -36,11 +36,11 @@
  • [% END # / ERRORs %] -

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

    - [% IF ( author ) %]

    [% author |html %]

    [% END %] +

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

    + [% IF ( author ) %]

    [% author %]

    [% 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 d8d6c57..fa04930 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 |html %] + Subscribe to this search [% s.query_desc %] [% s.total %] [% END %] @@ -108,7 +108,7 @@ [% s.time |$KohaDates with_hours => 1 %] - Subscribe to this search [% s.query_desc |html %] + Subscribe to this search [% s.query_desc %] [% s.total %] [% END %] @@ -153,7 +153,7 @@ [% s.time |$KohaDates with_hours => 1 %] - [% s.query_desc |html %] + [% s.query_desc %] [% s.total %] [% END %] @@ -190,7 +190,7 @@ [% s.time |$KohaDates with_hours => 1 %] - [% s.query_desc |html %] + [% s.query_desc %] [% s.total %] [% 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 4517ffc..a702b74 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 f25f3ed..96dcedd 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 @@ [% shelfname %] [% OPACBaseURL %]/cgi-bin/koha/opac-shelves.pl?rss=1&viewshelf=[% shelfnumber %] - RSS feed for public list [% shelfname | html %] + RSS feed for public list [% shelfname %] [% FOREACH i IN itemsloop %] - [% i.title | html %] + [% i.title %] [% IF i.author %] - by [% i.author | html %] + by [% i.author %] [% 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 3478866..32c144c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -3,7 +3,7 @@ [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsInputOnList ) %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › [% IF ( viewshelf ) %]Contents of [% shelfname |html %][% ELSE %]Your lists[% END %][% INCLUDE 'doc-head-close.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › [% IF ( viewshelf ) %]Contents of [% shelfname %][% 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 %] @@ -77,7 +77,7 @@ [% END %] [% IF ( viewshelf ) %] -
  • Contents of [% shelfname | html %]
  • +
  • Contents of [% shelfname %]
  • [% END %] [% IF ( shelves ) %] @@ -85,7 +85,7 @@ [% END %] [% IF ( edit ) %] -
  • Edit list [% shelfname | html %]
  • +
  • Edit list [% shelfname %]
  • [% END %] @@ -122,7 +122,7 @@
    [% END %] [% IF ( paramsloo.nopermission ) %] -
    ERROR: You do not have adequate permission for that action on list [% paramsloo.nopermission |html%].
    +
    ERROR: You do not have adequate permission for that action on list [% paramsloo.nopermission%].
    [% END %] [% IF ( paramsloo.failgetitem ) %]
    ERROR: No item found with barcode [% paramsloo.failgetitem %].
    @@ -131,10 +131,10 @@
    A record matching barcode [% paramsloo.duplicatebiblio %] has already been added.
    [% END %] [% IF ( paramsloo.delete_ok ) %] -
    List [% paramsloo.delete_ok |html %] Deleted.
    +
    List [% paramsloo.delete_ok %] Deleted.
    [% END %] [% IF ( paramsloo.delete_fail ) %] -
    ERROR: Database error. Delete (list number [% paramsloo.delete_fail |html %]) failed.
    +
    ERROR: Database error. Delete (list number [% paramsloo.delete_fail %]) failed.
    [% END %] [% IF ( paramsloo.unrecognized ) %]
    ERROR: List number [% paramsloo.unrecognized %] unrecognized.
    @@ -153,7 +153,7 @@ [% IF ( viewshelf ) %]

    - [% shelfname |html %] + [% shelfname %] Subscribe to this list @@ -163,10 +163,10 @@
    New list | - Download list + Download list [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] - Send list + Send list [% END %] Print list @@ -176,30 +176,30 @@ - +
    - + [% IF ( showprivateshelves ) %] [% END %]
    [% IF showprivateshelves && Koha.Preference('OpacAllowSharingPrivateLists') %] - Share list + Share list [% END %] [% ELSIF showprivateshelves # not manageshelf and private means shared %] [% INCLUDE remove_share %] - + [% END # / IF manageshelf %]
    - + + [% END %]
    @@ -334,7 +334,7 @@ [% IF ( BakerTaylorEnabled ) %] [% IF ( itemsloo.normalized_isbn ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] No cover image available [% END %] @@ -355,13 +355,13 @@ [% END %] [% IF ( itemsloo.title ) %] - [% itemsloo.title |html %] + [% itemsloo.title %] [% ELSE %] No title [% END %] [% FOREACH subtitl IN itemsloo.subtitle %] - [% subtitl.subfield|html %] + [% subtitl.subfield %] [% END %] @@ -377,7 +377,7 @@ [% itemsloo.place %] [% END %] [% IF ( itemsloo.publishercode ) %] - [% itemsloo.publishercode|html %] + [% itemsloo.publishercode %] [% END %] [% IF ( itemsloo.publicationyear ) %] [% itemsloo.publicationyear %] @@ -387,7 +387,7 @@ [% END %] [% END %] [% IF ( itemsloo.pages ) %]. [% itemsloo.pages %][% END %] - [% IF ( itemsloo.notes ) %], [% itemsloo.notes|html %][% END %] + [% IF ( itemsloo.notes ) %], [% itemsloo.notes %][% END %] [% IF ( itemsloo.item('size') ) %] [% itemsloo.item('size') %][% END %] @@ -492,7 +492,7 @@ - + @@ -518,13 +518,13 @@ [% END # / IF viewshelf %] [% IF ( itemsloop && allowremovingitems ) %] - + - + [% ELSIF ( !itemsloop && manageshelf ) %]
    - + @@ -534,12 +534,12 @@ [% IF ( edit ) %] - - + +
    - Editing [% shelfname |html %] + Editing [% shelfname %]
      -
    1. +
    2. [% IF ( showprivateshelves ) %] - Cancel + Cancel [% ELSE %] - Cancel + Cancel [% END %]
    @@ -643,7 +643,7 @@ [% FOREACH shelveslooppri IN shelveslooppriv %] - [% shelveslooppri.shelfname |html %] + [% shelveslooppri.shelfname %] [% IF ( shelveslooppri.count ) %][% shelveslooppri.count %] [% IF ( shelveslooppri.single ) %]item[% ELSE %]items[% END %][% ELSE %]Empty[% END %] [% IF ( shelveslooppri.viewcategory1 ) %][% IF !shelveslooppri.shares %]Private[% ELSE %]Shared[% END %][% END %] @@ -651,7 +651,7 @@ [% IF ( shelveslooppri.mine ) %]
    - + @@ -659,22 +659,22 @@ - - + + [% IF ( shelveslooppri.confirm ) %] - + [% ELSE %] [% END %]
    [% IF Koha.Preference('OpacAllowSharingPrivateLists') %] - Share + Share [% END %] [% ELSE # not shelveslooppri.mine, so shared %] [% INCLUDE remove_share # if pref is off, you should still be able to remove shares %] - - + + [% END %]  @@ -717,7 +717,7 @@ [% FOREACH shelvesloo IN shelvesloop %] - [% shelvesloo.shelfname |html %] + [% shelvesloo.shelfname %] [% shelvesloo.count %] [% IF ( shelvesloo.single ) %]item[% ELSE %]item(s)[% END %] [% IF ( shelvesloo.viewcategory2 ) %]Public[% 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 b354419..ba96fe4 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 |html %] [% FOREACH subtitl IN review.subtitle %], [% subtitl.subfield |html %][% END %] + New comment on [% review.title %] [% FOREACH subtitl IN review.subtitle %], [% subtitl.subfield %][% END %] [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber %]#comments [% END %][% END %] @@ -18,15 +18,15 @@ [% END %][% END %][% END %][% END %] -[% IF ( BakerTaylorEnabled ) %][% IF ( review.normalized_isbn ) %]See Baker & Taylor[% END %][% 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 %]

    +[% IF ( BakerTaylorEnabled ) %][% IF ( review.normalized_isbn ) %]See Baker & Taylor[% END %][% 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 %]

    ]]>
    [% 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 6fca7ec..9020eb6 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 |html %][% END %] + [% FOREACH subtitl IN review.subtitle %] [% subtitl.subfield %][% END %] [% IF ( review.author ) %] by [% review.author %] @@ -84,7 +84,7 @@ [% END %] [% FILTER html_break %] - [% review.review |html %] + [% review.review %] [% END %] Added [% review.datereviewed | $KohaDates %] [% IF ( review.your_comment ) %] by you[% ELSE %] [% IF ( review.borrowernumber && ShowReviewer != "none" ) %] by @@ -139,7 +139,7 @@ [% IF ( BakerTaylorEnabled ) %] [% IF ( review.normalized_isbn ) %] - 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 09032e4..0e01d72 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt @@ -131,7 +131,7 @@
    - + [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) == 1 %] [% IF loggedinusername %] @@ -189,19 +189,19 @@ [% 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 %] +

    [% 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 %] [% IF ( suggestions_loo.itemtype ) %] - [% suggestions_loo.itemtype %][% END %]

    [% IF ( suggestions_loo.note ) %] Note: - [% suggestions_loo.note |html %] + [% suggestions_loo.note %] [% END %] [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) == 1 %] @@ -231,7 +231,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 |html %])[% END %] + [% IF ( suggestions_loo.reason ) %]([% suggestions_loo.reason %])[% 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 1065c09..a1faf03 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 |html %] + [% TAGLOO.term %] [% TAGLOO.weight_total %] [% END %] @@ -123,17 +123,17 @@ Tag: - [% MY_TAG.term |html %] + [% MY_TAG.term %] [% IF ( MY_TAG.XSLTBloc ) %] [% MY_TAG.XSLTBloc %] [% ELSE %] Title: - [% MY_TAG.title |html %] + [% MY_TAG.title %] [% IF ( MY_TAG.subtitle ) %] [% FOREACH subtitle IN MY_TAG.subtitle %] - [% subtitle.subfield |html %] + [% subtitle.subfield %] [% 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 f3194b2..92975db 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 3ec33af..ef2b9c0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt @@ -50,7 +50,7 @@ [% branch %] [% END %] [% IF ( timeLimitFinite ) %] - in the past [% timeLimitFinite |html %] months + in the past [% timeLimitFinite %] months [% ELSE %] of all time[% END %] @@ -64,7 +64,7 @@ [% FOREACH results_loo IN results_loop %] - [% results_loo.title |html %]

    [% results_loo.author %] + [% results_loo.title %]

    [% results_loo.author %] [% IF ( results_loo.publishercode ) %]- [% results_loo.publishercode %][% END %] [% IF ( results_loo.seriestitle ) %]([% results_loo.seriestitle %])[% END %] [% IF ( results_loo.place ) %][% results_loo.place %][% END %] [% IF ( results_loo.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 b5bc8d2..0c94f8d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -167,7 +167,7 @@ [% IF ( BakerTaylorEnabled ) %] [% IF ( ISSUE.normalized_isbn ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] No cover image available [% END %] @@ -184,7 +184,7 @@ [% END # / IF JacketImages %] - [% ISSUE.title |html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %] + [% ISSUE.title %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %] [% ISSUE.author %] [% IF ( ISSUE.overdue ) %] @@ -410,7 +410,7 @@ [% IF ( BakerTaylorEnabled ) %] [% IF ( OVERDUE.normalized_isbn ) %] - See Baker & Taylor + See Baker & Taylor [% ELSE %] No cover image available [% END %] @@ -427,7 +427,7 @@ [% END # /IF jacketcell %] - [% OVERDUE.title |html %] [% FOREACH subtitl IN OVERDUE.subtitle %] [% subtitl.subfield %][% END %] + [% OVERDUE.title %] [% FOREACH subtitl IN OVERDUE.subtitle %] [% subtitl.subfield %][% END %] [% OVERDUE.author %] 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 3f0b1f3..925d471 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 @@ -37,7 +37,7 @@

    Item cannot be checked out.

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

    [% IF ( title ) %] -

    Title: [% title |html %]

    +

    Title: [% title %]

    [% END %]

    @@ -231,9 +231,9 @@ [% ISSUE.issuedate %] [% UNLESS ( noitemlinks ) %] - [% ISSUE.title |html %] + [% ISSUE.title %] [% ELSE %] - [% ISSUE.title |html %] + [% ISSUE.title %] [% END %] [% ISSUE.author %] ([% ISSUE.barcode %]) @@ -302,7 +302,7 @@ [% END # / IF authbylogin %] [% FOREACH INPUT IN INPUTS %] - + [% 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 3e62d0e..212f3e4 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 |html %] + [% suggestion.label %] [% END %]
    [% ELSE %] -- 2.1.0