From cedaa0e23e0927884f1c5ef2cafde4bcdd6d55ff 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch removes the html filters at the OPAC, if necessary. Generated with: perl -p -i -e 's/\ ?\|\ ?html(\ ?)%/\1%/g' **/*.tt **/*.inc Signed-off-by: Signed-off-by: Joonas Kylmälä Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com --- .../includes/authorities-search-results.inc | 22 +++---- .../bootstrap/en/includes/masthead.inc | 6 +- .../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 +- .../en/modules/opac-addbybiblionumber.tt | 14 ++-- .../bootstrap/en/modules/opac-auth.tt | 2 +- .../opac-authoritiessearchresultlist.tt | 6 +- .../bootstrap/en/modules/opac-basket.tt | 14 ++-- .../bootstrap/en/modules/opac-browser.tt | 6 +- .../bootstrap/en/modules/opac-detail.tt | 40 ++++++------ .../bootstrap/en/modules/opac-downloadcart.tt | 2 +- .../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 | 6 +- .../bootstrap/en/modules/opac-opensearch.tt | 52 +++++++-------- .../en/modules/opac-overdrive-search.tt | 8 +-- .../en/modules/opac-readingrecord.tt | 8 +-- .../bootstrap/en/modules/opac-reserve.tt | 2 +- .../en/modules/opac-results-grouped.tt | 14 ++-- .../bootstrap/en/modules/opac-results.tt | 32 ++++----- .../bootstrap/en/modules/opac-review.tt | 10 +-- .../en/modules/opac-search-history.tt | 8 +-- .../en/modules/opac-serial-issues.tt | 4 +- .../bootstrap/en/modules/opac-shelves-rss.tt | 6 +- .../bootstrap/en/modules/opac-shelves.tt | 65 +++++++++---------- .../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 | 11 ++-- .../bootstrap/en/modules/opac-tags_subject.tt | 2 +- .../bootstrap/en/modules/opac-topissues.tt | 4 +- .../bootstrap/en/modules/opac-user.tt | 8 +-- .../bootstrap/en/modules/sco/sco-main.tt | 8 +-- .../bootstrap/en/modules/svc/suggestion.tt | 2 +- 38 files changed, 218 insertions(+), 226 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 043556dbef..b9290fd883 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 21504c215f..a80a291379 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -41,7 +41,7 @@
  • Public lists
    • [% SET number_of_public_shelves = 0 %] [% FOREACH s IN some_public_shelves %] -
  • [% s.shelfname |html %]
    • +
  • [% s.shelfname %]
    • [% SET number_of_public_shelves = number_of_public_shelves + 1 %] [% IF number_of_public_shelves >= 10 %][% LAST %][% END %] [% END %] @@ -58,7 +58,7 @@ [% IF some_private_shelves.count %] [% SET number_of_private_shelves = 0 %] [% FOREACH s IN some_private_shelves %] -
  • [% s.shelfname |html %]
    • +
  • [% s.shelfname %]
    • [% SET number_of_private_shelves = number_of_private_shelves + 1 %] [% IF number_of_private_shelves >= 10 %][% LAST %][% END %] [% END %] @@ -211,7 +211,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 aed68e500a..fc17f53879 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 03ede078ea..e9a625d6d5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -241,7 +241,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 769145f764..93da8b22db 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 %] 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 f18c9ce3fe..175c37887d 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 f806b4fb6e..fad11cbd29 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 %] [% 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 164c750fd0..b39e7d5166 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,17 +30,17 @@ @@ -87,7 +87,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 c5cd351aa1..a267ef17fd 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 6ded40c7c5..214da84401 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 94d5e0b60e..f346965e04 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 635f8d800e..ec6f92e292 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 4b3db89353..1a9a4a5d51 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 @@
        @@ -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 %]
        @@ -111,8 +111,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 ) %] [ @@ -213,7 +213,7 @@ [% IF ( publishercode ) %] Published by : - [% publishercode |html %] + [% publishercode %] [% IF ( place ) %]([% place %])[% END %] [% IF ( publicationyear ) %], [% publicationyear %][% END %] [% END %] @@ -401,7 +401,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 %] @@ -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 |html %] + [% review.review %] [% END %] Edit

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

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

        @@ -979,11 +979,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 %] @@ -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 %] @@ -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')|html %]", - author:"[% listResult.author|html %]", + title:"[% listResult.title|remove('\n') %]", + author:"[% listResult.author %]", 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') |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 f7eebd8c41..8e00cf39ac 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 4e4f832493..6a30d33657 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 9598f4d47c..a14e48c88e 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 d8d6c579b3..fa04930b22 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 4517ffc44f..a702b741ad 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 2525d80c0e..6a46354e1b 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 | html %] + RSS feed for public list [% shelf.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 d13c721a4a..79b0fb66b9 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 |html %][% ELSE %]Your lists[% END %][% INCLUDE 'doc-head-close.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' %] [% 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' %] -
  • › Contents of [% shelf.shelfname | html %]
    • +
  • › Contents of [% shelf.shelfname %]
    • [% END %] [% IF op == 'add_form' %] @@ -74,7 +74,7 @@ [% END %] [% IF op == 'edit_form' %] -
  • › Edit list [% shelf.shelfname | html %]
    • +
  • › Edit list [% shelf.shelfname %]
    • [% END %] @@ -155,20 +155,13 @@ [% IF op == 'view' %]

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

    - - [% IF ( itemsloop ) %] -
    -
    New list | - Download list + Download list [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] - Send list + Send list [% END %] Print list @@ -179,7 +172,7 @@ - + @@ -187,18 +180,18 @@ - + [% IF category == PRIVATE && Koha.Preference('OpacAllowSharingPrivateLists') %] - Share list + Share list [% END %] [% ELSIF category == PRIVATE # not manageshelf and private means shared %]
    - +
    [% END %] @@ -206,7 +199,7 @@
    - + - + [% END %]
    @@ -342,7 +335,7 @@ [% 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 %] @@ -363,13 +356,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 %] @@ -385,7 +378,7 @@ [% itemsloo.place %] [% END %] [% IF ( itemsloo.publishercode ) %] - [% itemsloo.publishercode|html %] + [% itemsloo.publishercode %] [% END %] [% IF ( itemsloo.publicationyear ) %] [% itemsloo.publicationyear %] @@ -395,7 +388,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 %] @@ -500,13 +493,13 @@ - +
    - + @@ -525,7 +518,7 @@ [% IF itemsloop && can_remove_biblios %] - + @@ -533,7 +526,7 @@
    - + [% END %] @@ -546,16 +539,16 @@ Create a new list [% ELSE %] - Editing [% shelf.shelfname |html %] + Editing [% shelf.shelfname %] - + [% 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 |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 295c32dfce..43f3754d5f 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,22 +123,21 @@
    - @@ -58,7 +58,7 @@ [% FOREACH result IN results %] - [% END # / IF JacketImages %] [% IF ( ISSUE.overdue ) %] @@ -424,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 %] @@ -441,7 +441,7 @@ [% END # /IF jacketcell %] 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 3f0b1f3a71..925d471bc6 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 @@

    [% s.shelfname |html %][% s.shelfname %] [% IF contents.count %][% contents.count %] [% IF contents.count == 1 %]item[% ELSE %]items[% END %][% ELSE %]Empty[% END %] [% IF s.category == PRIVATE %] @@ -677,7 +670,7 @@ [% IF s.can_be_managed( loggedinusernumber ) %]
    - + @@ -689,19 +682,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 fddf531e7c..e704236782 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 %] @@ -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 |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 && 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 %]

    ]]>     [% 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 464aa21574..87b9ae5abb 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 @@ -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 c176a12e4e..45b99cf080 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 |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 ) %] - [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 1 ) %][% END %]

    		[% IF ( suggestions_loo.note ) %] Note: - [% suggestions_loo.note |html %] + [% suggestions_loo.note %] [% END %]
    Tag: [% IF MY_TAG.approved == 1 %] - [% MY_TAG.term |html %] + [% MY_TAG.term %] [% ELSE %] - [% MY_TAG.term |html %] (not approved) + [% MY_TAG.term %] (not approved) [% END %] [% 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 f3194b2067..92975dbecc 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 672e241c17..d881264d59 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 [% timeLimit |html %] months + in the past [% timeLimitFinite %] months [% ELSE %] of all time[% END %]
    [% result.title |html %]

    [% result.author %] +

    		[% result.title %]

    [% 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 3a8b01651f..351a2653d1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -174,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 %] @@ -191,7 +191,7 @@

    		- [% ISSUE.title |html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %] + [% ISSUE.title %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %] [% ISSUE.author %] - [% OVERDUE.title |html %] [% FOREACH subtitl IN OVERDUE.subtitle %] [% subtitl.subfield %][% END %] + [% OVERDUE.title %] [% FOREACH subtitl IN OVERDUE.subtitle %] [% subtitl.subfield %][% END %] [% OVERDUE.author %] [% 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 3e62d0e6c0..212f3e4b3f 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.39.5