@@ -, +, @@ old files --- .../bug_3150_-_add_LIST_and_CART_notices.perl | 94 ++++++------ .../data/mysql/en/mandatory/sample_notices.yml | 90 ++++++----- .../mysql/fr-CA/obligatoire/sample_notices.sql | 94 ++++++------ .../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 94 ++++++------ .../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 94 ++++++------ .../prog/en/modules/basket/sendbasket.tt | 160 -------------------- .../prog/en/modules/virtualshelves/sendshelf.tt | 165 -------------------- .../bootstrap/en/modules/opac-sendbasket.tt | 164 -------------------- .../bootstrap/en/modules/opac-sendshelf.tt | 167 --------------------- 9 files changed, 228 insertions(+), 894 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt --- a/installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.perl +++ a/installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.perl @@ -1,33 +1,32 @@ $DBversion = 'XXX'; if( CheckVersion( $DBversion ) ) { $dbh->do(q{ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES - ('catalog','LIST','','Send list',1,'Your list: [% listname | html %]',"[%- USE raw -%] -

Hi,

-

[% borrower.firstname | $raw %] [% borrower.surname | $raw %] sent you a list from our online catalog called: [% listname | $raw %].

+ ('catalog','LIST','','Send list',1,'Your list: [% listname | html %]',"

Hi,

+

[% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %].

Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.


-

[% comment | $raw %]

+

[% comment | html %]


    [% FOREACH biblio IN biblios %]
  1. - [% biblio.title | $raw %] + [% biblio.title | html %] [% IF ( biblio.subtitle ) %] [% FOREACH subtitle IN biblio.subtitle.split(' | ') %] - [% subtitle | $raw %] + [% subtitle | html %] [% END %] [% END %] - [% biblio.part_number | $raw %] [% biblio.part_name | $raw %] + [% biblio.part_number | html %] [% biblio.part_name | html %]

    [% IF ( biblio.author || biblio.get_authors_from_MARC ) %] - Author(s): [% IF ( biblio.author ) %][% biblio.author | $raw %][% END %] + Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %] [% IF ( biblio.get_authors_from_MARC ) %] [% IF ( biblio.author ) %]; [% END %] [% FOREACH author IN biblio.get_authors_from_MARC %] [% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %] - [% subfield.separator | $raw %][% subfield.value | $raw %] + [% subfield.separator | html %][% subfield.value | html %] [% END %] [% UNLESS ( loop.last ) %];[% END %] [% END %] @@ -38,50 +37,50 @@ if( CheckVersion( $DBversion ) ) { [% IF ( biblioitem.isbn ) %] ISBN: [% FOREACH isbn IN biblioitem.isbn %] - [% isbn | $raw %] + [% isbn | html %] [% UNLESS ( loop.last ) %]; [% END %] [% END %]
    [% END %] [% IF ( biblioitem.publishercode ) %] - Published by: [% biblioitem.publishercode | $raw %] + Published by: [% biblioitem.publishercode | html %] [% IF ( biblioitem.publicationyear ) %] - in [% biblioitem.publicationyear | $raw %] + in [% biblioitem.publicationyear | html %] [% END %] [% IF ( biblioitem.pages ) %] - , [% biblioitem.pages | $raw %] + , [% biblioitem.pages | html %] [% END %]
    [% END %] [% IF ( biblio.seriestitle ) %] - Collection: [% biblio.seriestitle | $raw %] + Collection: [% biblio.seriestitle | html %]
    [% END %] [% IF ( biblio.copyrightdate ) %] - Copyright year: [% biblio.copyrightdate | $raw %] + Copyright year: [% biblio.copyrightdate | html %]
    [% END %] [% IF ( biblio.notes ) %] - Notes: [% biblio.notes | $raw %] + Notes: [% biblio.notes | html %]
    [% END %] [% IF ( biblio.unititle ) %] - Unified title: [% biblio.unititle | $raw %] + Unified title: [% biblio.unititle | html %]
    [% END %] [% IF ( biblio.serial ) %] - Serial: [% biblio.serial | $raw %] + Serial: [% biblio.serial | html %]
    [% END %] [% IF ( biblioitem.lccn ) %] - LCCN: [% biblioitem.lccn | $raw %] + LCCN: [% biblioitem.lccn | html %]
    [% END %] [% IF ( biblioitem.url ) %] @@ -92,16 +91,16 @@ if( CheckVersion( $DBversion ) ) {

    [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %] [% IF ( OPACBaseURL ) %] -

    In online catalog: [% OPACBaseURL | $raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

    +

    In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

    [% END %] [% IF ( biblio.items.count > 0 ) %]

    Items:

    @@ -110,33 +109,32 @@ if( CheckVersion( $DBversion ) ) {
  2. [% END %]
", 'email','default' ), - ('catalog','CART','','Send cart',1,'Your cart',"[%- USE raw -%] -

Hi,

-

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

+ ('catalog','CART','','Send cart',1,'Your cart',"

Hi,

+

[% borrower.firstname | html %] [% borrower.surname | html %] 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, Reference Manager or ProCite.


-

[% comment | $raw %]

+

[% comment | html %]


    [% FOREACH biblio IN biblios %]
  1. - [% biblio.title | $raw %] + [% biblio.title | html %] [% IF ( biblio.subtitle ) %] [% FOREACH subtitle IN biblio.subtitle.split(' | ') %] - [% subtitle | $raw %] + [% subtitle | html %] [% END %] [% END %] - [% biblio.part_number | $raw %] [% biblio.part_name | $raw %] + [% biblio.part_number | html %] [% biblio.part_name | html %]

    [% IF ( biblio.author || biblio.get_authors_from_MARC ) %] - Author(s): [% IF ( biblio.author ) %][% biblio.author | $raw %][% END %] + Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %] [% IF ( biblio.get_authors_from_MARC ) %] [% IF ( biblio.author ) %]; [% END %] [% FOREACH author IN biblio.get_authors_from_MARC %] [% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %] - [% subfield.separator | $raw %][% subfield.value | $raw %] + [% subfield.separator | html %][% subfield.value | html %] [% END %] [% UNLESS ( loop.last ) %];[% END %] [% END %] @@ -147,50 +145,50 @@ if( CheckVersion( $DBversion ) ) { [% IF ( biblioitem.isbn ) %] ISBN: [% FOREACH isbn IN biblioitem.isbn %] - [% isbn | $raw %] + [% isbn | html %] [% UNLESS ( loop.last ) %]; [% END %] [% END %]
    [% END %] [% IF ( biblioitem.publishercode ) %] - Published by: [% biblioitem.publishercode | $raw %] + Published by: [% biblioitem.publishercode | html %] [% IF ( biblioitem.publicationyear ) %] - in [% biblioitem.publicationyear | $raw %] + in [% biblioitem.publicationyear | html %] [% END %] [% IF ( biblioitem.pages ) %] - , [% biblioitem.pages | $raw %] + , [% biblioitem.pages | html %] [% END %]
    [% END %] [% IF ( biblio.seriestitle ) %] - Collection: [% biblio.seriestitle | $raw %] + Collection: [% biblio.seriestitle | html %]
    [% END %] [% IF ( biblio.copyrightdate ) %] - Copyright year: [% biblio.copyrightdate | $raw %] + Copyright year: [% biblio.copyrightdate | html %]
    [% END %] [% IF ( biblio.notes ) %] - Notes: [% biblio.notes | $raw %] + Notes: [% biblio.notes | html %]
    [% END %] [% IF ( biblio.unititle ) %] - Unified title: [% biblio.unititle | $raw %] + Unified title: [% biblio.unititle | html %]
    [% END %] [% IF ( biblio.serial ) %] - Serial: [% biblio.serial | $raw %] + Serial: [% biblio.serial | html %]
    [% END %] [% IF ( biblioitem.lccn ) %] - LCCN: [% biblioitem.lccn | $raw %] + LCCN: [% biblioitem.lccn | html %]
    [% END %] [% IF ( biblioitem.url ) %] @@ -201,16 +199,16 @@ if( CheckVersion( $DBversion ) ) {

    [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %] [% IF ( OPACBaseURL ) %] -

    In online catalog: [% OPACBaseURL | $raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

    +

    In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

    [% END %] [% IF ( biblio.items.count > 0 ) %]

    Items:

    --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ a/installer/data/mysql/en/mandatory/sample_notices.yml @@ -1551,33 +1551,32 @@ tables: message_transport_type: email lang: default content: - - "[%- USE raw -%]" - "

    Hi,

    " - - "

    [% borrower.firstname | $raw %] [% borrower.surname | $raw %] sent you a list from our online catalog called: [% listname | $raw %].

    " + - "

    [% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %].

    " - "

    Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.

    " - "
    " - - "

    [% comment | $raw %]

    " + - "

    [% comment | html %]

    " - "
    " - "
      " - "[% FOREACH biblio IN biblios %]" - "
    1. " - "" - - "[% biblio.title | $raw %]" + - "[% biblio.title | html %]" - "[% IF ( biblio.subtitle ) %]" - "[% FOREACH subtitle IN biblio.subtitle.split(' | ') %]" - - "[% subtitle | $raw %]" + - "[% subtitle | html %]" - "[% END %]" - "[% END %]" - - "[% biblio.part_number | $raw %] [% biblio.part_name | $raw %]" + - "[% biblio.part_number | html %] [% biblio.part_name | html %]" - "" - "

      " - "[% IF ( biblio.author || biblio.get_authors_from_MARC ) %]" - - "Author(s): [% IF ( biblio.author ) %][% biblio.author | $raw %][% END %]" + - "Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %]" - "[% IF ( biblio.get_authors_from_MARC ) %]" - "[% IF ( biblio.author ) %]; [% END %]" - "[% FOREACH author IN biblio.get_authors_from_MARC %]" - "[% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %]" - - "[% subfield.separator | $raw %][% subfield.value | $raw %]" + - "[% subfield.separator | html %][% subfield.value | html %]" - "[% END %]" - "[% UNLESS ( loop.last ) %];[% END %]" - "[% END %]" @@ -1588,50 +1587,50 @@ tables: - "[% IF ( biblioitem.isbn ) %]" - "" - "ISBN: [% FOREACH isbn IN biblioitem.isbn %]" - - "[% isbn | $raw %]" + - "[% isbn | html %]" - "[% UNLESS ( loop.last ) %]; [% END %]" - "[% END %]" - "
      " - "[% END %]" - "[% IF ( biblioitem.publishercode ) %]" - "" - - "Published by: [% biblioitem.publishercode | $raw %]" + - "Published by: [% biblioitem.publishercode | html %]" - "[% IF ( biblioitem.publicationyear ) %]" - - "in [% biblioitem.publicationyear | $raw %]" + - "in [% biblioitem.publicationyear | html %]" - "[% END %]" - "[% IF ( biblioitem.pages ) %]" - - ", [% biblioitem.pages | $raw %]" + - ", [% biblioitem.pages | html %]" - "[% END %]" - "
      " - "[% END %]" - "[% IF ( biblio.seriestitle ) %]" - "" - - "Collection: [% biblio.seriestitle | $raw %]" + - "Collection: [% biblio.seriestitle | html %]" - "
      " - "[% END %]" - "[% IF ( biblio.copyrightdate ) %]" - "" - - "Copyright year: [% biblio.copyrightdate | $raw %]" + - "Copyright year: [% biblio.copyrightdate | html %]" - "
      " - "[% END %]" - "[% IF ( biblio.notes ) %]" - "" - - "Notes: [% biblio.notes | $raw %]" + - "Notes: [% biblio.notes | html %]" - "
      " - "[% END %]" - "[% IF ( biblio.unititle ) %]" - "" - - "Unified title: [% biblio.unititle | $raw %]" + - "Unified title: [% biblio.unititle | html %]" - "
      " - "[% END %]" - "[% IF ( biblio.serial ) %]" - "" - - "Serial: [% biblio.serial | $raw %]" + - "Serial: [% biblio.serial | html %]" - "
      " - "[% END %]" - "[% IF ( biblioitem.lccn ) %]" - "" - - "LCCN: [% biblioitem.lccn | $raw %]" + - "LCCN: [% biblioitem.lccn | html %]" - "
      " - "[% END %]" - "[% IF ( biblioitem.url ) %]" @@ -1642,16 +1641,16 @@ tables: - "

      " - "[% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %]" - "[% IF ( OPACBaseURL ) %]" - - "

      In online catalog: [% OPACBaseURL | $raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

      " + - "

      In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

      " - "[% END %]" - "[% IF ( biblio.items.count > 0 ) %]" - "

      Items:" - "

        " - "[% FOREACH item IN biblio.items %]
      • " - - "[% item.holding_branch.branchname | $raw %]" - - "[% item.location | $raw %]" - - "[% IF item.itemcallnumber %]([% item.itemcallnumber | $raw %])[% END %]" - - "[% item.barcode | $raw %]" + - "[% item.holding_branch.branchname | html %]" + - "[% item.location | html %]" + - "[% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %]" + - "[% item.barcode | html %]" - "
      • [% END %]" - "
      " - "

      " @@ -1670,33 +1669,32 @@ tables: message_transport_type: email lang: default content: - - "[%- USE raw -%]" - "

      Hi,

      " - - "

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

      " + - "

      [% borrower.firstname | html %] [% borrower.surname | html %] 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, Reference Manager or ProCite.

      " - "
      " - - "

      [% comment | $raw %]

      " + - "

      [% comment | html %]

      " - "
      " - "
        " - "[% FOREACH biblio IN biblios %]" - "
      1. " - "" - - "[% biblio.title | $raw %]" + - "[% biblio.title | html %]" - "[% IF ( biblio.subtitle ) %]" - "[% FOREACH subtitle IN biblio.subtitle.split(' | ') %]" - - "[% subtitle | $raw %]" + - "[% subtitle | html %]" - "[% END %]" - "[% END %]" - - "[% biblio.part_number | $raw %] [% biblio.part_name | $raw %]" + - "[% biblio.part_number | html %] [% biblio.part_name | html %]" - "" - "

        " - "[% IF ( biblio.author || biblio.get_authors_from_MARC ) %]" - - "Author(s): [% IF ( biblio.author ) %][% biblio.author | $raw %][% END %]" + - "Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %]" - "[% IF ( biblio.get_authors_from_MARC ) %]" - "[% IF ( biblio.author ) %]; [% END %]" - "[% FOREACH author IN biblio.get_authors_from_MARC %]" - "[% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %]" - - "[% subfield.separator | $raw %][% subfield.value | $raw %]" + - "[% subfield.separator | html %][% subfield.value | html %]" - "[% END %]" - "[% UNLESS ( loop.last ) %];[% END %]" - "[% END %]" @@ -1707,50 +1705,50 @@ tables: - "[% IF ( biblioitem.isbn ) %]" - "" - "ISBN: [% FOREACH isbn IN biblioitem.isbn %]" - - "[% isbn | $raw %]" + - "[% isbn | html %]" - "[% UNLESS ( loop.last ) %]; [% END %]" - "[% END %]" - "
        " - "[% END %]" - "[% IF ( biblioitem.publishercode ) %]" - "" - - "Published by: [% biblioitem.publishercode | $raw %]" + - "Published by: [% biblioitem.publishercode | html %]" - "[% IF ( biblioitem.publicationyear ) %]" - - "in [% biblioitem.publicationyear | $raw %]" + - "in [% biblioitem.publicationyear | html %]" - "[% END %]" - "[% IF ( biblioitem.pages ) %]" - - ", [% biblioitem.pages | $raw %]" + - ", [% biblioitem.pages | html %]" - "[% END %]" - "
        " - "[% END %]" - "[% IF ( biblio.seriestitle ) %]" - "" - - "Collection: [% biblio.seriestitle | $raw %]" + - "Collection: [% biblio.seriestitle | html %]" - "
        " - "[% END %]" - "[% IF ( biblio.copyrightdate ) %]" - "" - - "Copyright year: [% biblio.copyrightdate | $raw %]" + - "Copyright year: [% biblio.copyrightdate | html %]" - "
        " - "[% END %]" - "[% IF ( biblio.notes ) %]" - "" - - "Notes: [% biblio.notes | $raw %]" + - "Notes: [% biblio.notes | html %]" - "
        " - "[% END %]" - "[% IF ( biblio.unititle ) %]" - "" - - "Unified title: [% biblio.unititle | $raw %]" + - "Unified title: [% biblio.unititle | html %]" - "
        " - "[% END %]" - "[% IF ( biblio.serial ) %]" - "" - - "Serial: [% biblio.serial | $raw %]" + - "Serial: [% biblio.serial | html %]" - "
        " - "[% END %]" - "[% IF ( biblioitem.lccn ) %]" - "" - - "LCCN: [% biblioitem.lccn | $raw %]" + - "LCCN: [% biblioitem.lccn | html %]" - "
        " - "[% END %]" - "[% IF ( biblioitem.url ) %]" @@ -1761,16 +1759,16 @@ tables: - "

        " - "[% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %]" - "[% IF ( OPACBaseURL ) %]" - - "

        In online catalog: [% OPACBaseURL | $raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

        " + - "

        In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

        " - "[% END %]" - "[% IF ( biblio.items.count > 0 ) %]" - "

        Items:" - "

          " - "[% FOREACH item IN biblio.items %]
        • " - - "[% item.holding_branch.branchname | $raw %]" - - "[% item.location | $raw %]" - - "[% IF item.itemcallnumber %]([% item.itemcallnumber | $raw %])[% END %]" - - "[% item.barcode | $raw %]" + - "[% item.holding_branch.branchname | html %]" + - "[% item.location | html %]" + - "[% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %]" + - "[% item.barcode | html %]" - "
        • [% END %]" - "
        " - "

        " --- a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql +++ a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql @@ -363,33 +363,32 @@ INSERT IGNORE INTO letter (module, code, name, title, content, message_transport [% END %] ", 'email'); -INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('catalog','LIST','','Send list',1,'Your list: [% listname | html %]',"[%- USE raw -%] -

        Hi,

        -

        [% borrower.firstname | $raw %] [% borrower.surname | $raw %] sent you a list from our online catalog called: [% listname | $raw %].

        +INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('catalog','LIST','','Send list',1,'Your list: [% listname | html %]',"

        Hi,

        +

        [% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %].

        Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.


        -

        [% comment | $raw %]

        +

        [% comment | html %]


          [% FOREACH biblio IN biblios %]
        1. - [% biblio.title | $raw %] + [% biblio.title | html %] [% IF ( biblio.subtitle ) %] [% FOREACH subtitle IN biblio.subtitle.split(' | ') %] - [% subtitle | $raw %] + [% subtitle | html %] [% END %] [% END %] - [% biblio.part_number | $raw %] [% biblio.part_name | $raw %] + [% biblio.part_number | html %] [% biblio.part_name | html %]

          [% IF ( biblio.author || biblio.get_authors_from_MARC ) %] - Author(s): [% IF ( biblio.author ) %][% biblio.author | $raw %][% END %] + Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %] [% IF ( biblio.get_authors_from_MARC ) %] [% IF ( biblio.author ) %]; [% END %] [% FOREACH author IN biblio.get_authors_from_MARC %] [% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %] - [% subfield.separator | $raw %][% subfield.value | $raw %] + [% subfield.separator | html %][% subfield.value | html %] [% END %] [% UNLESS ( loop.last ) %];[% END %] [% END %] @@ -400,50 +399,50 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte [% IF ( biblioitem.isbn ) %] ISBN: [% FOREACH isbn IN biblioitem.isbn %] - [% isbn | $raw %] + [% isbn | html %] [% UNLESS ( loop.last ) %]; [% END %] [% END %]
          [% END %] [% IF ( biblioitem.publishercode ) %] - Published by: [% biblioitem.publishercode | $raw %] + Published by: [% biblioitem.publishercode | html %] [% IF ( biblioitem.publicationyear ) %] - in [% biblioitem.publicationyear | $raw %] + in [% biblioitem.publicationyear | html %] [% END %] [% IF ( biblioitem.pages ) %] - , [% biblioitem.pages | $raw %] + , [% biblioitem.pages | html %] [% END %]
          [% END %] [% IF ( biblio.seriestitle ) %] - Collection: [% biblio.seriestitle | $raw %] + Collection: [% biblio.seriestitle | html %]
          [% END %] [% IF ( biblio.copyrightdate ) %] - Copyright year: [% biblio.copyrightdate | $raw %] + Copyright year: [% biblio.copyrightdate | html %]
          [% END %] [% IF ( biblio.notes ) %] - Notes: [% biblio.notes | $raw %] + Notes: [% biblio.notes | html %]
          [% END %] [% IF ( biblio.unititle ) %] - Unified title: [% biblio.unititle | $raw %] + Unified title: [% biblio.unititle | html %]
          [% END %] [% IF ( biblio.serial ) %] - Serial: [% biblio.serial | $raw %] + Serial: [% biblio.serial | html %]
          [% END %] [% IF ( biblioitem.lccn ) %] - LCCN: [% biblioitem.lccn | $raw %] + LCCN: [% biblioitem.lccn | html %]
          [% END %] [% IF ( biblioitem.url ) %] @@ -454,16 +453,16 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte

          [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %] [% IF ( OPACBaseURL ) %] -

          In online catalog: [% OPACBaseURL | $raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

          +

          In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

          [% END %] [% IF ( biblio.items.count > 0 ) %]

          Items:

            [% FOREACH item IN biblio.items %]
          • - [% item.holding_branch.branchname | $raw %] - [% item.location | $raw %] - [% IF item.itemcallnumber %]([% item.itemcallnumber | $raw %])[% END %] - [% item.barcode | $raw %] + [% item.holding_branch.branchname | html %] + [% item.location | html %] + [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %] + [% item.barcode | html %]
          • [% END %]

          @@ -472,33 +471,32 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte
        2. [% END %]
        ", 'email','default' ), -('catalog','CART','','Send cart',1,'Your cart',"[%- USE raw -%] -

        Hi,

        -

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

        +('catalog','CART','','Send cart',1,'Your cart',"

        Hi,

        +

        [% borrower.firstname | html %] [% borrower.surname | html %] 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, Reference Manager or ProCite.


        -

        [% comment | $raw %]

        +

        [% comment | html %]


          [% FOREACH biblio IN biblios %]
        1. - [% biblio.title | $raw %] + [% biblio.title | html %] [% IF ( biblio.subtitle ) %] [% FOREACH subtitle IN biblio.subtitle.split(' | ') %] - [% subtitle | $raw %] + [% subtitle | html %] [% END %] [% END %] - [% biblio.part_number | $raw %] [% biblio.part_name | $raw %] + [% biblio.part_number | html %] [% biblio.part_name | html %]

          [% IF ( biblio.author || biblio.get_authors_from_MARC ) %] - Author(s): [% IF ( biblio.author ) %][% biblio.author | $raw %][% END %] + Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %] [% IF ( biblio.get_authors_from_MARC ) %] [% IF ( biblio.author ) %]; [% END %] [% FOREACH author IN biblio.get_authors_from_MARC %] [% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %] - [% subfield.separator | $raw %][% subfield.value | $raw %] + [% subfield.separator | html %][% subfield.value | html %] [% END %] [% UNLESS ( loop.last ) %];[% END %] [% END %] @@ -509,50 +507,50 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte [% IF ( biblioitem.isbn ) %] ISBN: [% FOREACH isbn IN biblioitem.isbn %] - [% isbn | $raw %] + [% isbn | html %] [% UNLESS ( loop.last ) %]; [% END %] [% END %]
          [% END %] [% IF ( biblioitem.publishercode ) %] - Published by: [% biblioitem.publishercode | $raw %] + Published by: [% biblioitem.publishercode | html %] [% IF ( biblioitem.publicationyear ) %] - in [% biblioitem.publicationyear | $raw %] + in [% biblioitem.publicationyear | html %] [% END %] [% IF ( biblioitem.pages ) %] - , [% biblioitem.pages | $raw %] + , [% biblioitem.pages | html %] [% END %]
          [% END %] [% IF ( biblio.seriestitle ) %] - Collection: [% biblio.seriestitle | $raw %] + Collection: [% biblio.seriestitle | html %]
          [% END %] [% IF ( biblio.copyrightdate ) %] - Copyright year: [% biblio.copyrightdate | $raw %] + Copyright year: [% biblio.copyrightdate | html %]
          [% END %] [% IF ( biblio.notes ) %] - Notes: [% biblio.notes | $raw %] + Notes: [% biblio.notes | html %]
          [% END %] [% IF ( biblio.unititle ) %] - Unified title: [% biblio.unititle | $raw %] + Unified title: [% biblio.unititle | html %]
          [% END %] [% IF ( biblio.serial ) %] - Serial: [% biblio.serial | $raw %] + Serial: [% biblio.serial | html %]
          [% END %] [% IF ( biblioitem.lccn ) %] - LCCN: [% biblioitem.lccn | $raw %] + LCCN: [% biblioitem.lccn | html %]
          [% END %] [% IF ( biblioitem.url ) %] @@ -563,16 +561,16 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte

          [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %] [% IF ( OPACBaseURL ) %] -

          In online catalog: [% OPACBaseURL | $raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

          +

          In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

          [% END %] [% IF ( biblio.items.count > 0 ) %]

          Items:

            [% FOREACH item IN biblio.items %]
          • - [% item.holding_branch.branchname | $raw %] - [% item.location | $raw %] - [% IF item.itemcallnumber %]([% item.itemcallnumber | $raw %])[% END %] - [% item.barcode | $raw %] + [% item.holding_branch.branchname | html %] + [% item.location | html %] + [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %] + [% item.barcode | html %]
          • [% END %]

          --- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql +++ a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql @@ -475,33 +475,32 @@ INSERT IGNORE INTO letter (module, code, name, title, content, message_transport [% END %] ", 'email'); -INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('catalog','LIST','','Send list',1,'Your list: [% listname | html %]',"[%- USE raw -%] -

          Hi,

          -

          [% borrower.firstname | $raw %] [% borrower.surname | $raw %] sent you a list from our online catalog called: [% listname | $raw %].

          +INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('catalog','LIST','','Send list',1,'Your list: [% listname | html %]',"

          Hi,

          +

          [% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %].

          Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.


          -

          [% comment | $raw %]

          +

          [% comment | html %]


            [% FOREACH biblio IN biblios %]
          1. - [% biblio.title | $raw %] + [% biblio.title | html %] [% IF ( biblio.subtitle ) %] [% FOREACH subtitle IN biblio.subtitle.split(' | ') %] - [% subtitle | $raw %] + [% subtitle | html %] [% END %] [% END %] - [% biblio.part_number | $raw %] [% biblio.part_name | $raw %] + [% biblio.part_number | html %] [% biblio.part_name | html %]

            [% IF ( biblio.author || biblio.get_authors_from_MARC ) %] - Author(s): [% IF ( biblio.author ) %][% biblio.author | $raw %][% END %] + Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %] [% IF ( biblio.get_authors_from_MARC ) %] [% IF ( biblio.author ) %]; [% END %] [% FOREACH author IN biblio.get_authors_from_MARC %] [% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %] - [% subfield.separator | $raw %][% subfield.value | $raw %] + [% subfield.separator | html %][% subfield.value | html %] [% END %] [% UNLESS ( loop.last ) %];[% END %] [% END %] @@ -512,50 +511,50 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte [% IF ( biblioitem.isbn ) %] ISBN: [% FOREACH isbn IN biblioitem.isbn %] - [% isbn | $raw %] + [% isbn | html %] [% UNLESS ( loop.last ) %]; [% END %] [% END %]
            [% END %] [% IF ( biblioitem.publishercode ) %] - Published by: [% biblioitem.publishercode | $raw %] + Published by: [% biblioitem.publishercode | html %] [% IF ( biblioitem.publicationyear ) %] - in [% biblioitem.publicationyear | $raw %] + in [% biblioitem.publicationyear | html %] [% END %] [% IF ( biblioitem.pages ) %] - , [% biblioitem.pages | $raw %] + , [% biblioitem.pages | html %] [% END %]
            [% END %] [% IF ( biblio.seriestitle ) %] - Collection: [% biblio.seriestitle | $raw %] + Collection: [% biblio.seriestitle | html %]
            [% END %] [% IF ( biblio.copyrightdate ) %] - Copyright year: [% biblio.copyrightdate | $raw %] + Copyright year: [% biblio.copyrightdate | html %]
            [% END %] [% IF ( biblio.notes ) %] - Notes: [% biblio.notes | $raw %] + Notes: [% biblio.notes | html %]
            [% END %] [% IF ( biblio.unititle ) %] - Unified title: [% biblio.unititle | $raw %] + Unified title: [% biblio.unititle | html %]
            [% END %] [% IF ( biblio.serial ) %] - Serial: [% biblio.serial | $raw %] + Serial: [% biblio.serial | html %]
            [% END %] [% IF ( biblioitem.lccn ) %] - LCCN: [% biblioitem.lccn | $raw %] + LCCN: [% biblioitem.lccn | html %]
            [% END %] [% IF ( biblioitem.url ) %] @@ -566,16 +565,16 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte

            [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %] [% IF ( OPACBaseURL ) %] -

            In online catalog: [% OPACBaseURL | $raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

            +

            In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

            [% END %] [% IF ( biblio.items.count > 0 ) %]

            Items:

              [% FOREACH item IN biblio.items %]
            • - [% item.holding_branch.branchname | $raw %] - [% item.location | $raw %] - [% IF item.itemcallnumber %]([% item.itemcallnumber | $raw %])[% END %] - [% item.barcode | $raw %] + [% item.holding_branch.branchname | html %] + [% item.location | html %] + [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %] + [% item.barcode | html %]
            • [% END %]

            @@ -584,33 +583,32 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte
          2. [% END %]
          ", 'email','default' ), -('catalog','CART','','Send cart',1,'Your cart',"[%- USE raw -%] -

          Hi,

          -

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

          +('catalog','CART','','Send cart',1,'Your cart',"

          Hi,

          +

          [% borrower.firstname | html %] [% borrower.surname | html %] 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, Reference Manager or ProCite.


          -

          [% comment | $raw %]

          +

          [% comment | html %]


            [% FOREACH biblio IN biblios %]
          1. - [% biblio.title | $raw %] + [% biblio.title | html %] [% IF ( biblio.subtitle ) %] [% FOREACH subtitle IN biblio.subtitle.split(' | ') %] - [% subtitle | $raw %] + [% subtitle | html %] [% END %] [% END %] - [% biblio.part_number | $raw %] [% biblio.part_name | $raw %] + [% biblio.part_number | html %] [% biblio.part_name | html %]

            [% IF ( biblio.author || biblio.get_authors_from_MARC ) %] - Author(s): [% IF ( biblio.author ) %][% biblio.author | $raw %][% END %] + Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %] [% IF ( biblio.get_authors_from_MARC ) %] [% IF ( biblio.author ) %]; [% END %] [% FOREACH author IN biblio.get_authors_from_MARC %] [% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %] - [% subfield.separator | $raw %][% subfield.value | $raw %] + [% subfield.separator | html %][% subfield.value | html %] [% END %] [% UNLESS ( loop.last ) %];[% END %] [% END %] @@ -621,50 +619,50 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte [% IF ( biblioitem.isbn ) %] ISBN: [% FOREACH isbn IN biblioitem.isbn %] - [% isbn | $raw %] + [% isbn | html %] [% UNLESS ( loop.last ) %]; [% END %] [% END %]
            [% END %] [% IF ( biblioitem.publishercode ) %] - Published by: [% biblioitem.publishercode | $raw %] + Published by: [% biblioitem.publishercode | html %] [% IF ( biblioitem.publicationyear ) %] - in [% biblioitem.publicationyear | $raw %] + in [% biblioitem.publicationyear | html %] [% END %] [% IF ( biblioitem.pages ) %] - , [% biblioitem.pages | $raw %] + , [% biblioitem.pages | html %] [% END %]
            [% END %] [% IF ( biblio.seriestitle ) %] - Collection: [% biblio.seriestitle | $raw %] + Collection: [% biblio.seriestitle | html %]
            [% END %] [% IF ( biblio.copyrightdate ) %] - Copyright year: [% biblio.copyrightdate | $raw %] + Copyright year: [% biblio.copyrightdate | html %]
            [% END %] [% IF ( biblio.notes ) %] - Notes: [% biblio.notes | $raw %] + Notes: [% biblio.notes | html %]
            [% END %] [% IF ( biblio.unititle ) %] - Unified title: [% biblio.unititle | $raw %] + Unified title: [% biblio.unititle | html %]
            [% END %] [% IF ( biblio.serial ) %] - Serial: [% biblio.serial | $raw %] + Serial: [% biblio.serial | html %]
            [% END %] [% IF ( biblioitem.lccn ) %] - LCCN: [% biblioitem.lccn | $raw %] + LCCN: [% biblioitem.lccn | html %]
            [% END %] [% IF ( biblioitem.url ) %] @@ -675,16 +673,16 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte

            [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %] [% IF ( OPACBaseURL ) %] -

            In online catalog: [% OPACBaseURL | $raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

            +

            In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

            [% END %] [% IF ( biblio.items.count > 0 ) %]

            Items:

              [% FOREACH item IN biblio.items %]
            • - [% item.holding_branch.branchname | $raw %] - [% item.location | $raw %] - [% IF item.itemcallnumber %]([% item.itemcallnumber | $raw %])[% END %] - [% item.barcode | $raw %] + [% item.holding_branch.branchname | html %] + [% item.location | html %] + [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %] + [% item.barcode | html %]
            • [% END %]

            --- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql +++ a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql @@ -494,33 +494,32 @@ INSERT IGNORE INTO letter (module, code, name, title, content, message_transport [% END %] ", 'email'); -INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('catalog','LIST','','Send list',1,'Your list: [% listname | html %]',"[%- USE raw -%] -

            Hi,

            -

            [% borrower.firstname | $raw %] [% borrower.surname | $raw %] sent you a list from our online catalog called: [% listname | $raw %].

            +INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('catalog','LIST','','Send list',1,'Your list: [% listname | html %]',"

            Hi,

            +

            [% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %].

            Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.


            -

            [% comment | $raw %]

            +

            [% comment | html %]


              [% FOREACH biblio IN biblios %]
            1. - [% biblio.title | $raw %] + [% biblio.title | html %] [% IF ( biblio.subtitle ) %] [% FOREACH subtitle IN biblio.subtitle.split(' | ') %] - [% subtitle | $raw %] + [% subtitle | html %] [% END %] [% END %] - [% biblio.part_number | $raw %] [% biblio.part_name | $raw %] + [% biblio.part_number | html %] [% biblio.part_name | html %]

              [% IF ( biblio.author || biblio.get_authors_from_MARC ) %] - Author(s): [% IF ( biblio.author ) %][% biblio.author | $raw %][% END %] + Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %] [% IF ( biblio.get_authors_from_MARC ) %] [% IF ( biblio.author ) %]; [% END %] [% FOREACH author IN biblio.get_authors_from_MARC %] [% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %] - [% subfield.separator | $raw %][% subfield.value | $raw %] + [% subfield.separator | html %][% subfield.value | html %] [% END %] [% UNLESS ( loop.last ) %];[% END %] [% END %] @@ -531,50 +530,50 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte [% IF ( biblioitem.isbn ) %] ISBN: [% FOREACH isbn IN biblioitem.isbn %] - [% isbn | $raw %] + [% isbn | html %] [% UNLESS ( loop.last ) %]; [% END %] [% END %]
              [% END %] [% IF ( biblioitem.publishercode ) %] - Published by: [% biblioitem.publishercode | $raw %] + Published by: [% biblioitem.publishercode | html %] [% IF ( biblioitem.publicationyear ) %] - in [% biblioitem.publicationyear | $raw %] + in [% biblioitem.publicationyear | html %] [% END %] [% IF ( biblioitem.pages ) %] - , [% biblioitem.pages | $raw %] + , [% biblioitem.pages | html %] [% END %]
              [% END %] [% IF ( biblio.seriestitle ) %] - Collection: [% biblio.seriestitle | $raw %] + Collection: [% biblio.seriestitle | html %]
              [% END %] [% IF ( biblio.copyrightdate ) %] - Copyright year: [% biblio.copyrightdate | $raw %] + Copyright year: [% biblio.copyrightdate | html %]
              [% END %] [% IF ( biblio.notes ) %] - Notes: [% biblio.notes | $raw %] + Notes: [% biblio.notes | html %]
              [% END %] [% IF ( biblio.unititle ) %] - Unified title: [% biblio.unititle | $raw %] + Unified title: [% biblio.unititle | html %]
              [% END %] [% IF ( biblio.serial ) %] - Serial: [% biblio.serial | $raw %] + Serial: [% biblio.serial | html %]
              [% END %] [% IF ( biblioitem.lccn ) %] - LCCN: [% biblioitem.lccn | $raw %] + LCCN: [% biblioitem.lccn | html %]
              [% END %] [% IF ( biblioitem.url ) %] @@ -585,16 +584,16 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte

              [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %] [% IF ( OPACBaseURL ) %] -

              In online catalog: [% OPACBaseURL | $raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

              +

              In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

              [% END %] [% IF ( biblio.items.count > 0 ) %]

              Items:

                [% FOREACH item IN biblio.items %]
              • - [% item.holding_branch.branchname | $raw %] - [% item.location | $raw %] - [% IF item.itemcallnumber %]([% item.itemcallnumber | $raw %])[% END %] - [% item.barcode | $raw %] + [% item.holding_branch.branchname | html %] + [% item.location | html %] + [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %] + [% item.barcode | html %]
              • [% END %]

              @@ -603,33 +602,32 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte
            2. [% END %]
            ", 'email','default' ), -('catalog','CART','','Send cart',1,'Your cart',"[%- USE raw -%] -

            Hi,

            -

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

            +('catalog','CART','','Send cart',1,'Your cart',"

            Hi,

            +

            [% borrower.firstname | html %] [% borrower.surname | html %] 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, Reference Manager or ProCite.


            -

            [% comment | $raw %]

            +

            [% comment | html %]


              [% FOREACH biblio IN biblios %]
            1. - [% biblio.title | $raw %] + [% biblio.title | html %] [% IF ( biblio.subtitle ) %] [% FOREACH subtitle IN biblio.subtitle.split(' | ') %] - [% subtitle | $raw %] + [% subtitle | html %] [% END %] [% END %] - [% biblio.part_number | $raw %] [% biblio.part_name | $raw %] + [% biblio.part_number | html %] [% biblio.part_name | html %]

              [% IF ( biblio.author || biblio.get_authors_from_MARC ) %] - Author(s): [% IF ( biblio.author ) %][% biblio.author | $raw %][% END %] + Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %] [% IF ( biblio.get_authors_from_MARC ) %] [% IF ( biblio.author ) %]; [% END %] [% FOREACH author IN biblio.get_authors_from_MARC %] [% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %] - [% subfield.separator | $raw %][% subfield.value | $raw %] + [% subfield.separator | html %][% subfield.value | html %] [% END %] [% UNLESS ( loop.last ) %];[% END %] [% END %] @@ -640,50 +638,50 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte [% IF ( biblioitem.isbn ) %] ISBN: [% FOREACH isbn IN biblioitem.isbn %] - [% isbn | $raw %] + [% isbn | html %] [% UNLESS ( loop.last ) %]; [% END %] [% END %]
              [% END %] [% IF ( biblioitem.publishercode ) %] - Published by: [% biblioitem.publishercode | $raw %] + Published by: [% biblioitem.publishercode | html %] [% IF ( biblioitem.publicationyear ) %] - in [% biblioitem.publicationyear | $raw %] + in [% biblioitem.publicationyear | html %] [% END %] [% IF ( biblioitem.pages ) %] - , [% biblioitem.pages | $raw %] + , [% biblioitem.pages | html %] [% END %]
              [% END %] [% IF ( biblio.seriestitle ) %] - Collection: [% biblio.seriestitle | $raw %] + Collection: [% biblio.seriestitle | html %]
              [% END %] [% IF ( biblio.copyrightdate ) %] - Copyright year: [% biblio.copyrightdate | $raw %] + Copyright year: [% biblio.copyrightdate | html %]
              [% END %] [% IF ( biblio.notes ) %] - Notes: [% biblio.notes | $raw %] + Notes: [% biblio.notes | html %]
              [% END %] [% IF ( biblio.unititle ) %] - Unified title: [% biblio.unititle | $raw %] + Unified title: [% biblio.unititle | html %]
              [% END %] [% IF ( biblio.serial ) %] - Serial: [% biblio.serial | $raw %] + Serial: [% biblio.serial | html %]
              [% END %] [% IF ( biblioitem.lccn ) %] - LCCN: [% biblioitem.lccn | $raw %] + LCCN: [% biblioitem.lccn | html %]
              [% END %] [% IF ( biblioitem.url ) %] @@ -694,16 +692,16 @@ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, conte

              [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %] [% IF ( OPACBaseURL ) %] -

              In online catalog: [% OPACBaseURL | $raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

              +

              In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]

              [% END %] [% IF ( biblio.items.count > 0 ) %]

              Items:

                [% FOREACH item IN biblio.items %]
              • - [% item.holding_branch.branchname | $raw %] - [% item.location | $raw %] - [% IF item.itemcallnumber %]([% item.itemcallnumber | $raw %])[% END %] - [% item.barcode | $raw %] + [% item.holding_branch.branchname | html %] + [% item.location | html %] + [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %] + [% item.barcode | html %]
              • [% END %]

              --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt @@ -1,160 +0,0 @@ -[% USE raw %] -[% USE HtmlToText %] -[% USE Koha %] - - -Your cart - - -
              - -[% FILTER html2text %] -

              Hi,

              - -

              Here is your cart, sent 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, - Reference Manager or ProCite.

              -
              -[% END %] - - - -[% FILTER html2text %] - - [% IF comment %] -

              [% comment | $raw %]

              -
              - [% END %] -
                - [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] -
              1. - - [% BIBLIO_RESULT.title | $raw %] - [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle | $raw %][% END %] - [% BIBLIO_RESULT.part_number | $raw %] [% BIBLIO_RESULT.part_name | $raw %] - - -

                - [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] - Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% 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 %] - [% END %] - [% UNLESS ( loop.last ) %];[% END %] - [% END %] - [% END %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.ISBN ) %] - - ISBN: [% BIBLIO_RESULT.ISBN | $raw %] -
                - [% END %] - - [% IF BIBLIO_RESULT.publishercode %] - - Published by: [% BIBLIO_RESULT.publishercode | $raw %] - [% IF ( BIBLIO_RESULT.publicationyear ) %] - in [% BIBLIO_RESULT.publicationyear | $raw %] - [% END %] - [% IF ( BIBLIO_RESULT.pages ) %] - , [% BIBLIO_RESULT.pages | $raw %] - [% END %] - [% IF BIBLIO_RESULT.item('size') %] - , [% BIBLIO_RESULT.item('size') | html %] - [% END %] -
                - [% END %] - - [% IF BIBLIO_RESULT.collection %] - - Collection: [% BIBLIO_RESULT.seriestitle | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.subject ) %] - - Subject: [% BIBLIO_RESULT.subject | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.copyrightdate ) %] - - Copyright year: [% BIBLIO_RESULT.copyrightdate | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.notes ) %] - - Notes : [% BIBLIO_RESULT.notes | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.unititle ) %] - - Unified title: [% BIBLIO_RESULT.unititle | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.serial ) %] - - Serial: [% BIBLIO_RESULT.serial | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.dewey ) %] - - Dewey: [% BIBLIO_RESULT.dewey | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.classification ) %] - - Classification: [% BIBLIO_RESULT.classification | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.lccn ) %] - - LCCN: [% BIBLIO_RESULT.lccn | $raw %] -
                - [% END %] - [% IF ( BIBLIO_RESULT.url ) %] - - URL: [% BIBLIO_RESULT.url | html %] - - [% END %] -

                - - [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %] - [% IF ( OPACBaseURL ) %] -

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

                - [% 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 %] -
                • [% END %] -
                -

                - [% END %] -
                -
              2. - [% END %] -
              - -[% END %] - --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt @@ -1,165 +0,0 @@ -[% USE raw %] - -Your list: [% shelfname | $raw %] - - -[% USE HtmlToText %] - -
              -[% FILTER html2text %] -

              Hi,

              - -

              Here is your list called [% shelfname | $raw %], sent 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, - Reference Manager or ProCite.

              -
              -[% END %] - - - - -[% FILTER html2text %] - - [% IF comment %] -

              [% comment | $raw %]

              -
              - [% END %] -
                - [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] -
              1. - - [% BIBLIO_RESULT.title | $raw %] - [% IF ( BIBLIO_RESULT.subtitle ) %] - [% FOREACH subtitle IN BIBLIO_RESULT.subtitle.split(' | ') %] - [% subtitle | $raw %] - [% END %] - [% END %] - [% BIBLIO_RESULT.part_number | $raw %] [% BIBLIO_RESULT.part_name | $raw %] - - -

                - [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] - Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% 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 %] - [% END %] - [% UNLESS ( loop.last ) %];[% END %] - [% END %] - [% END %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.ISBN ) %] - - ISBN: [% FOREACH isbn IN BIBLIO_RESULT.ISBN %] - [% isbn | $raw %] - [% UNLESS ( loop.last ) %]; [% END %] - [% END %] -
                - [% END %] - - [% IF BIBLIO_RESULT.publishercode %] - - Published by: [% BIBLIO_RESULT.publishercode | $raw %] - [% IF ( BIBLIO_RESULT.publicationyear ) %] - in [% BIBLIO_RESULT.publicationyear | $raw %] - [% END %] - [% IF ( BIBLIO_RESULT.pages ) %] - , [% BIBLIO_RESULT.pages | $raw %] - [% END %] - [% IF BIBLIO_RESULT.item('size') %] - , [% BIBLIO_RESULT.item('size') | html %] - [% END %] -
                - [% END %] - - [% IF BIBLIO_RESULT.collection %] - - Collection: [% BIBLIO_RESULT.seriestitle | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.subject ) %] - - Subject: [% BIBLIO_RESULT.subject | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.copyrightdate ) %] - - Copyright year: [% BIBLIO_RESULT.copyrightdate | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.notes ) %] - - Notes : [% BIBLIO_RESULT.notes | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.unititle ) %] - - Unified title: [% BIBLIO_RESULT.unititle | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.serial ) %] - - Serial: [% BIBLIO_RESULT.serial | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.dewey ) %] - - Dewey: [% BIBLIO_RESULT.dewey | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.classification ) %] - - Classification: [% BIBLIO_RESULT.classification | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.lccn ) %] - - LCCN: [% BIBLIO_RESULT.lccn | $raw %] -
                - [% END %] - [% IF ( BIBLIO_RESULT.url ) %] - - URL: [% BIBLIO_RESULT.url | html %] - - [% END %] -

                - - [% IF ( OPACBaseURL ) %] -

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

                - [% 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 %] -
                • [% END %] -
                -

                - [% END %] -
                -
              2. - [% END %] -
              - -[% END %] - --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt @@ -1,164 +0,0 @@ -[% USE raw %] -[% USE HtmlToText %] -[% USE Koha %] - - -Your cart - - -
              - -[% FILTER html2text %] -

              Hi,

              - -

              [% firstname | $raw %] [% surname | $raw %] 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, - Reference Manager or ProCite.

              -
              -[% END %] - - - -[% FILTER html2text %] - - [% IF comment %] -

              [% comment | $raw %]

              -
              - [% END %] -
                - [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] -
              1. - - [% BIBLIO_RESULT.title | $raw %] - [% IF ( BIBLIO_RESULT.subtitle ) %] - [% FOREACH subtitle IN BIBLIO_RESULT.subtitle.split(' | ') %] - [% subtitle | $raw %] - [% END %] - [% END %] - [% BIBLIO_RESULT.part_number | $raw %] [% BIBLIO_RESULT.part_name | $raw %] - - -

                - [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] - Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% 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 %] - [% END %] - [% UNLESS ( loop.last ) %];[% END %] - [% END %] - [% END %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.ISBN ) %] - - ISBN: [% BIBLIO_RESULT.ISBN | $raw %] -
                - [% END %] - - [% IF BIBLIO_RESULT.publishercode %] - - Published by: [% BIBLIO_RESULT.publishercode | $raw %] - [% IF ( BIBLIO_RESULT.publicationyear ) %] - in [% BIBLIO_RESULT.publicationyear | $raw %] - [% END %] - [% IF ( BIBLIO_RESULT.pages ) %] - , [% BIBLIO_RESULT.pages | $raw %] - [% END %] - [% IF BIBLIO_RESULT.item('size') %] - , [% BIBLIO_RESULT.item('size') | $raw %] - [% END %] -
                - [% END %] - - [% IF BIBLIO_RESULT.collection %] - - Collection: [% BIBLIO_RESULT.seriestitle | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.subject ) %] - - Subject: [% BIBLIO_RESULT.subject | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.copyrightdate ) %] - - Copyright year: [% BIBLIO_RESULT.copyrightdate | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.notes ) %] - - Notes : [% BIBLIO_RESULT.notes | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.unititle ) %] - - Unified title: [% BIBLIO_RESULT.unititle | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.serial ) %] - - Serial: [% BIBLIO_RESULT.serial | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.dewey ) %] - - Dewey: [% BIBLIO_RESULT.dewey | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.classification ) %] - - Classification: [% BIBLIO_RESULT.classification | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.lccn ) %] - - LCCN: [% BIBLIO_RESULT.lccn | $raw %] -
                - [% END %] - [% IF ( BIBLIO_RESULT.url ) %] - - URL: [% BIBLIO_RESULT.url | html %] - - [% END %] -

                - - [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %] - [% IF ( OPACBaseURL ) %] -

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

                - [% 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 %] -
                • [% END %] -
                -

                - [% END %] -
                -
              2. - [% END %] -
              - -[% END %] - --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt @@ -1,167 +0,0 @@ -[% USE raw %] - -Your list : [% shelfname | $raw %] - - -[% USE HtmlToText %] - -
              -[% FILTER html2text %] -

              Hi,

              - -

              [% firstname | $raw %] [% surname | $raw %] sent you from our online catalog, the - list called : [% shelfname | $raw %].

              - -

              Please note that the attached file is a MARC bibliographic records file - which can be imported into personal bibliographic software like EndNote, - Reference Manager or ProCite.

              -
              -[% END %] - - - - -[% FILTER html2text %] - - [% IF comment %] -

              [% comment | $raw %]

              -
              - [% END %] -
                - [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] -
              1. - - [% BIBLIO_RESULT.title | $raw %] - [% IF ( BIBLIO_RESULT.subtitle ) %] - [% FOREACH subtitle IN BIBLIO_RESULT.subtitle.split(' | ') %] - [% subtitle | $raw %] - [% END %] - [% END %] - [% BIBLIO_RESULT.part_number | $raw %] [% BIBLIO_RESULT.part_name | $raw %] - - -

                - [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] - Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% 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 %] - [% END %] - [% UNLESS ( loop.last ) %];[% END %] - [% END %] - [% END %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.ISBN ) %] - - ISBN: [% FOREACH isbn IN BIBLIO_RESULT.ISBN %] - [% isbn | $raw %] - [% UNLESS ( loop.last ) %]; [% END %] - [% END %] -
                - [% END %] - - [% IF BIBLIO_RESULT.publishercode %] - - Published by: [% BIBLIO_RESULT.publishercode | $raw %] - [% IF ( BIBLIO_RESULT.publicationyear ) %] - in [% BIBLIO_RESULT.publicationyear | $raw %] - [% END %] - [% IF ( BIBLIO_RESULT.pages ) %] - , [% BIBLIO_RESULT.pages | $raw %] - [% END %] - [% IF BIBLIO_RESULT.item('size') %] - , [% BIBLIO_RESULT.item('size') | html %] - [% END %] -
                - [% END %] - - [% IF BIBLIO_RESULT.collection %] - - Collection: [% BIBLIO_RESULT.seriestitle | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.subject ) %] - - Subject: [% BIBLIO_RESULT.subject | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.copyrightdate ) %] - - Copyright year: [% BIBLIO_RESULT.copyrightdate | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.notes ) %] - - Notes : [% BIBLIO_RESULT.notes | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.unititle ) %] - - Unified title: [% BIBLIO_RESULT.unititle | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.serial ) %] - - Serial: [% BIBLIO_RESULT.serial | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.dewey ) %] - - Dewey: [% BIBLIO_RESULT.dewey | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.classification ) %] - - Classification: [% BIBLIO_RESULT.classification | $raw %] -
                - [% END %] - - [% IF ( BIBLIO_RESULT.lccn ) %] - - LCCN: [% BIBLIO_RESULT.lccn | $raw %] -
                - [% END %] - [% IF ( BIBLIO_RESULT.url ) %] - - URL: [% BIBLIO_RESULT.url | html %] - - [% END %] -

                - - [% IF ( OPACBaseURL ) %] -

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

                - [% 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 %] -
                • [% END %] -
                -

                - [% END %] -
                -
              2. - [% END %] -
              - -[% END %] - - --