@@ -, +, @@ --- .../prog/en/includes/acquisitions-search.inc | 2 +- .../prog/en/includes/auth-finder-search.inc | 8 +-- .../en/includes/authorities-search-results.inc | 22 +++--- .../prog/en/includes/authorities-search.inc | 6 +- .../intranet-tmpl/prog/en/includes/authorities.inc | 4 +- .../en/includes/catalogue/itemsearch_item.csv.inc | 2 +- .../en/includes/catalogue/itemsearch_item.json.inc | 24 +++---- .../intranet-tmpl/prog/en/includes/facets.inc | 6 +- .../prog/en/includes/merge-record.inc | 2 +- .../prog/en/includes/page-numbers.inc | 6 +- .../prog/en/includes/prefs-admin-search.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 20 +++--- .../prog/en/modules/acqui/addorder.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 18 ++--- .../prog/en/modules/acqui/basketgroup.tt | 14 ++-- .../prog/en/modules/acqui/histsearch.tt | 2 +- .../prog/en/modules/acqui/invoice-files.tt | 8 +-- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 6 +- .../prog/en/modules/acqui/lateorders.tt | 8 +-- .../prog/en/modules/acqui/modordernotes.tt | 2 +- .../prog/en/modules/acqui/neworderbiblio.tt | 2 +- .../prog/en/modules/acqui/neworderempty.tt | 4 +- .../prog/en/modules/acqui/newordersubscription.tt | 2 +- .../prog/en/modules/acqui/newordersuggestion.tt | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 8 +-- .../en/modules/acqui/tables/members_results.tt | 6 +- .../prog/en/modules/acqui/transferorder.tt | 2 +- .../prog/en/modules/acqui/z3950_search.tt | 6 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- .../en/modules/admin/auth_subfields_structure.tt | 24 +++---- .../prog/en/modules/admin/auth_tag_structure.tt | 4 +- .../prog/en/modules/admin/authtypes.tt | 6 +- .../prog/en/modules/admin/biblio_framework.tt | 6 +- .../prog/en/modules/admin/branches.tt | 79 +++++++++++----------- .../prog/en/modules/admin/categories.tt | 30 ++++---- .../intranet-tmpl/prog/en/modules/admin/cities.tt | 6 +- .../prog/en/modules/admin/classsources.tt | 12 ++-- .../prog/en/modules/admin/currency.tt | 4 +- .../prog/en/modules/admin/itemtypes.tt | 8 +-- .../en/modules/admin/marc_subfields_structure.tt | 22 +++--- .../prog/en/modules/admin/marctagstructure.tt | 4 +- .../prog/en/modules/admin/matching-rules.tt | 42 ++++++------ .../prog/en/modules/admin/patron-attr-types.tt | 20 +++--- .../prog/en/modules/admin/preferences.tt | 2 +- .../prog/en/modules/admin/systempreferences.tt | 22 +++--- .../prog/en/modules/admin/z3950servers.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 2 +- .../modules/authorities/searchresultlist-auth.tt | 2 +- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 6 +- .../prog/en/modules/catalogue/MARCdetail.tt | 8 +-- .../prog/en/modules/catalogue/detail.tt | 22 +++--- .../prog/en/modules/catalogue/imageviewer.tt | 6 +- .../prog/en/modules/catalogue/issuehistory.tt | 8 +-- .../prog/en/modules/catalogue/moredetail.tt | 8 +-- .../prog/en/modules/catalogue/results.tt | 26 +++---- .../prog/en/modules/catalogue/search-history.tt | 8 +-- .../prog/en/modules/catalogue/subject.tt | 2 +- .../prog/en/modules/cataloguing/addbiblio.tt | 8 +-- .../prog/en/modules/cataloguing/addbooks.tt | 4 +- .../prog/en/modules/cataloguing/additem.tt | 8 +-- .../prog/en/modules/cataloguing/linkitem.tt | 6 +- .../prog/en/modules/cataloguing/moveitem.tt | 8 +-- .../en/modules/cataloguing/value_builder/macles.tt | 14 ++-- .../value_builder/marc21_linking_section.tt | 4 +- .../cataloguing/value_builder/unimarc_field_4XX.tt | 24 +++---- .../value_builder/unimarc_field_686a.tt | 6 +- .../en/modules/cataloguing/z3950_auth_search.tt | 10 +-- .../prog/en/modules/cataloguing/z3950_search.tt | 4 +- .../prog/en/modules/circ/bookcount.tt | 6 +- .../prog/en/modules/circ/branchoverdues.tt | 8 +-- .../prog/en/modules/circ/branchtransfers.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 10 +-- .../prog/en/modules/circ/on-site_checkouts.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 38 +++++------ .../prog/en/modules/circ/pendingreserves.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/renew.tt | 2 +- .../prog/en/modules/circ/reserveratios.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 22 +++--- .../prog/en/modules/circ/selectbranchprinter.tt | 8 +-- .../prog/en/modules/circ/transfer-slip.tt | 2 +- .../prog/en/modules/circ/transferstoreceive.tt | 4 +- .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 4 +- .../prog/en/modules/installer/auth.tt | 2 +- .../prog/en/modules/installer/step3.tt | 4 +- .../prog/en/modules/labels/label-edit-layout.tt | 4 +- .../intranet-tmpl/prog/en/modules/labels/result.tt | 2 +- .../prog/en/modules/members/boraccount.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/members/moremember-print.tt | 4 +- .../prog/en/modules/members/moremember-receipt.tt | 6 +- .../en/modules/members/purchase-suggestions.tt | 4 +- .../prog/en/modules/members/readingrec.tt | 2 +- .../en/modules/members/tables/guarantor_search.tt | 4 +- .../en/modules/members/tables/members_results.tt | 8 +-- .../prog/en/modules/offline_circ/process_koc.tt | 6 +- .../prog/en/modules/patron_lists/lists.tt | 2 +- .../prog/en/modules/patroncards/edit-layout.tt | 40 +++++------ .../modules/patroncards/tables/members_results.tt | 4 +- .../en/modules/reports/guided_reports_start.tt | 10 +-- .../prog/en/modules/reports/issues_stats.tt | 4 +- .../prog/en/modules/reports/itemslost.tt | 2 +- .../prog/en/modules/reports/reserves_stats.tt | 4 +- .../prog/en/modules/reports/serials_stats.tt | 2 +- .../prog/en/modules/reserve/request.tt | 14 ++-- .../prog/en/modules/reviews/reviewswaiting.tt | 2 +- .../en/modules/rotating_collections/addItems.tt | 2 +- .../prog/en/modules/serials/checkexpiration.tt | 2 +- .../prog/en/modules/serials/claims.tt | 2 +- .../prog/en/modules/serials/result.tt | 10 +-- .../en/modules/serials/routing-preview-slip.tt | 2 +- .../prog/en/modules/serials/routing-preview.tt | 4 +- .../prog/en/modules/serials/routing.tt | 8 +-- .../prog/en/modules/serials/serials-collection.tt | 2 +- .../prog/en/modules/serials/serials-search.tt | 28 ++++---- .../prog/en/modules/serials/subscription-add.tt | 6 +- .../en/modules/serials/subscription-bib-search.tt | 4 +- .../en/modules/serials/tables/members_results.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 50 +++++++------- .../intranet-tmpl/prog/en/modules/tags/list.tt | 8 +-- .../prog/en/modules/tools/batchMod-del.tt | 2 +- .../prog/en/modules/tools/batchMod-edit.tt | 2 +- .../prog/en/modules/tools/batch_delete_records.tt | 2 +- .../prog/en/modules/tools/inventory.tt | 16 ++--- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 4 +- .../en/modules/virtualshelves/addbybiblionumber.tt | 12 ++-- .../prog/en/modules/virtualshelves/shelves.tt | 18 ++--- .../virtualshelves/tables/shelves_results.tt | 2 +- 129 files changed, 561 insertions(+), 562 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -12,7 +12,7 @@
- + [+] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc @@ -142,7 +142,7 @@ function finderjumpfull(page) [% END %] - +
@@ -168,7 +168,7 @@ function finderjumpfull(page) [% END %] - +
  • @@ -193,7 +193,7 @@ function finderjumpfull(page) [% END %] - +
  • @@ -217,7 +217,7 @@ function finderjumpfull(page) [% END %] - +
  • --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc @@ -12,24 +12,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 'broader' %](Broader heading) [% CASE 'narrower' %](Narrower heading) [% CASE 'parent' %](Immediate parent body) - [% CASE %][% IF type %]([% type | html %]) + [% CASE %][% IF type %]([% type %]) [% END %] [% END %] @@ -50,7 +50,7 @@ [% END %] [% END %] [% 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 %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc @@ -109,7 +109,7 @@ [% END %] - + - + - + - +
  • [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc @@ -1,7 +1,7 @@ [% IF ( PAGE_NUMBERS ) %]
    - [% IF ( previous_page_offset.defined ) %]<< Previous[% END %] - [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %][% IF ( PAGE_NUMBER.highlight ) %][% PAGE_NUMBER.pg %][% ELSE %] [% PAGE_NUMBER.pg %][% END %] + [% IF ( previous_page_offset.defined ) %]<< Previous[% END %] + [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %][% IF ( PAGE_NUMBER.highlight ) %][% PAGE_NUMBER.pg %][% ELSE %] [% PAGE_NUMBER.pg %][% END %] [% END %] - [% IF ( next_page_offset ) %]Next >>[% END %] + [% IF ( next_page_offset ) %]Next >>[% END %]
    [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc @@ -6,7 +6,7 @@ - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -37,21 +37,21 @@ - - - - + + + + - - + + [% IF (is_psgi) %] - + [% END %] - + [% IF (errZebraConnection == 10000) %] [% ELSIF (errZebraConnection) %] @@ -826,7 +826,7 @@ [% FOREACH ro IN tabl.row2 %] - + [% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt @@ -15,7 +15,7 @@ [% FOREACH var IN vars_loop %] [% FOREACH val IN var.values %] - + [% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -3,7 +3,7 @@ [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %] +Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname %] ([% basketno %]) for [% name %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] @@ -145,7 +145,7 @@ [% INCLUDE 'acquisitions-search.inc' %] - +
    @@ -228,7 +228,7 @@

    The following records could not be deleted:

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt @@ -36,7 +36,7 @@
    -

    Files for invoice: [% invoicenumber | html %]

    +

    Files for invoice: [% invoicenumber %]

    Vendor: [% suppliername %]


    [% IF errors %] @@ -62,9 +62,9 @@
    [% FOREACH f IN files %] - - - + + + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -230,9 +230,9 @@ [% FOREACH f IN files %] - - - + + + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -98,7 +98,7 @@ $(document).ready(function() { [% IF ( lateorders ) %] - + [% IF ( letters ) %]

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

    Filter results:

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

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

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

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

    [% END %] [% END %]
      -
    1. days ago
    2. +
    3. days ago
    4. [% INCLUDE 'date-format.inc' %]
      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt @@ -12,7 +12,7 @@ [% INCLUDE 'header.inc' %] - +
      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt @@ -74,7 +74,7 @@ [% FOREACH biblio IN resultsloop %]
    -

    [% biblio.title |html %] +

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

    [% IF ( biblio.isbn ) %] [% biblio.isbn %][% END %] [% IF ( biblio.pages ) %] - [% biblio.pages %][% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -309,10 +309,10 @@ $(document).ready(function()

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

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

    +

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

    [% IF ( suggestions_loo.copyrightdate ) %]© [% suggestions_loo.copyrightdate %] [% END %] [% IF ( suggestions_loo.volumedesc ) %]volume: [% suggestions_loo.volumedesc %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -141,7 +141,7 @@

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

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

    +

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

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

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

    +

    Vendor note: [% loop_order.order_vendornote %]

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

    Data deleted

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

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

    +

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

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

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

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -96,8 +96,8 @@ [% END %] -
  • -
  • +
  • +
  • [% IF ( repeatable ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -91,7 +91,7 @@
  • - + Required
  • @@ -163,8 +163,8 @@ [% authority_type.summary %] [% authority_type.auth_tag_to_report %] MARC structure - Edit - Delete + Edit + Delete [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -162,7 +162,7 @@ [% END %]
  • - + Required
  • @@ -272,8 +272,8 @@ [% loo.frameworkcode %] [% loo.frameworktext %] MARC structure - Edit - Delete + Edit + Delete --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -142,17 +142,17 @@ tinyMCE.init({
  • [% IF library %] Library code: - + [% library.branchcode %] [% ELSE %] - + Required [% END %]
  • - + Required
  • @@ -176,22 +176,22 @@ tinyMCE.init({ [% END %]
      -
    1. -
    2. -
    3. -
    4. -
    5. -
    6. -
    7. -
    8. -
    9. -
    10. -
    11. -
    12. -
    13. -
    14. -
    15. Can be entered as a single IP, or a subnet such as 192.168.1.*
    16. -
    17. +
    18. +
    19. +
    20. +
    21. +
    22. +
    23. +
    24. +
    25. +
    26. +
    27. +
    28. +
    29. +
    30. +
    31. +
    32. Can be entered as a single IP, or a subnet such as 192.168.1.*
    33. +
    @@ -206,8 +206,8 @@ tinyMCE.init({
    Confirm deletion of [% library.branchname %] ([% library.branchcode %])? - - + +
    Cancel @@ -234,34 +234,34 @@ tinyMCE.init({ [% FOREACH library IN libraries %] - [% library.branchname |html %] - [% library.branchcode |html %] + [% library.branchname %] + [% library.branchcode %] [% IF library.branchaddress1 %] - [% library.branchaddress1 |html %][% END %] + [% library.branchaddress1 %][% END %] [% IF library.branchaddress2 %] -
    [% library.branchaddress2 |html %][% END %] +
    [% library.branchaddress2 %][% END %] [% IF library.branchaddress3 %] -
    [% library.branchaddress3 |html %][% END %] +
    [% library.branchaddress3 %][% END %] [% IF library.branchcity %] -
    [% library.branchcity |html %][% END %][% IF ( library.branchstate ) %], - [% library.branchstate |html %][% END %] +
    [% library.branchcity %][% END %][% IF ( library.branchstate ) %], + [% library.branchstate %][% END %] [% IF library.branchzip %] - [% library.branchzip |html %][% END %] + [% library.branchzip %][% END %] [% IF library.branchcountry %] -
    [% library.branchcountry |html %][% END %] +
    [% library.branchcountry %][% END %] [% IF library.branchphone %] -
    Ph: [% library.branchphone |html %][% END %] +
    Ph: [% library.branchphone %][% END %] [% IF library.branchfax %] -
    Fax: [% library.branchfax |html %][% END %] +
    Fax: [% library.branchfax %][% END %] [% IF library.branchemail %] -
    [% library.branchemail |html %][% END %] +
    [% library.branchemail %][% END %] [% IF library.branchurl %] -
    [% library.branchurl |html %][% END %] +
    [% library.branchurl %][% END %] [% IF library.opac_info %]
    OPAC Info:
    [% library.opac_info %]
    [% END %] [% IF library.branchnotes %] -
    Notes: [% library.branchnotes |html %][% END %] +
    Notes: [% library.branchnotes %][% END %] [% FOREACH category IN library.get_categories %] @@ -339,7 +339,7 @@ tinyMCE.init({
  • [% IF category.categorycode %] Category code: - + [% category.categorycode %] [% ELSE %] @@ -348,11 +348,11 @@ tinyMCE.init({
  • - +
  • - +
  • @@ -363,7 +363,6 @@ tinyMCE.init({ [% ELSE %] - [% END %]
  • @@ -386,7 +385,7 @@ tinyMCE.init({ Are you sure you want to delete the group '[% category.codedescription %]' ([% category.categorycode %])?
    - + Cancel
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -2,8 +2,8 @@ [% USE KohaDates %] [% USE Price %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Administration › Patron categories › [% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %] -[% IF op == 'delete_confirm' %][% IF ( patrons_in_category > 0 ) %]Cannot delete: category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %] +<title>Koha › Administration › Patron categories › [% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode %]'[% ELSE %]New category[% END %][% END %] +[% IF op == 'delete_confirm' %][% IF ( patrons_in_category > 0 ) %]Cannot delete: category [% categorycode %] in use[% ELSE %]Confirm deletion of category '[% categorycode %]'[% END %][% END %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] @@ -107,8 +107,8 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patrons-admin-search.inc' %] - [% END %] - - + + [% FOREACH category IN categories %] - + [% END %] @@ -292,8 +292,8 @@ function CheckRuleForm(f) { [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -191,8 +191,8 @@ - - + + [% UNLESS Koha.Preference('noItemTypeImages') %] [% END %] @@ -376,8 +376,8 @@ Item types administration [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -170,16 +170,16 @@ function populateHiddenCheckboxes(tab) { HomeAdministrationMARC frameworks[% IF ( frameworkcode ) %][% frameworkcode %][% ELSE %]Default[% END %] framework structure › [% IF ( add_form ) %] [% IF ( use_heading_flags_p ) %] - [% IF ( heading_edit_subfields_p ) %] Tag [% tagfield | html %] subfield structure › Edit subfields constraints + [% IF ( heading_edit_subfields_p ) %] Tag [% tagfield %] subfield structure › Edit subfields constraints [% END %] - [% ELSE %] Tag [% tagfield | html %] Subfield structure › [% action %] + [% ELSE %] Tag [% tagfield %] Subfield structure › [% action %] [% END %] [% END %] -[% IF ( delete_confirm ) %] Tag [% tagfield | html %] Subfield structure › Confirm deletion of subfield [% tagsubfield %] +[% IF ( delete_confirm ) %] Tag [% tagfield %] Subfield structure › Confirm deletion of subfield [% tagsubfield %] [% END %] -[% IF ( delete_confirmed ) %] Tag [% tagfield | html %] subfield structure › Subfield deleted +[% IF ( delete_confirmed ) %] Tag [% tagfield %] subfield structure › Subfield deleted [% END %] -[% IF ( else ) %]Tag [% tagfield | html %] Subfield structure[% END %] +[% IF ( else ) %]Tag [% tagfield %] Subfield structure[% END %]
    @@ -191,14 +191,14 @@ function populateHiddenCheckboxes(tab) { [% IF ( add_form ) %]

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

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

      Data deleted

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

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

      +

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

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

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

      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -77,8 +77,8 @@ $(document).ready(function() { Required [% END %] -
    • -
    • +
    • +
    • [% IF ( repeatable ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -214,11 +214,11 @@ function CheckRuleForm(f) {
    • Required + value="[% description %]" /> Required
    • Required + value="[% threshold %]" /> Required
    • @@ -268,28 +268,28 @@ function CheckRuleForm(f) {
    • [% FOREACH norm IN component.norms %] @@ -297,7 +297,7 @@ function CheckRuleForm(f) { [% END %] @@ -375,28 +375,28 @@ function CheckRuleForm(f) {
    • [% FOREACH norm IN src_component.norms %] @@ -404,7 +404,7 @@ function CheckRuleForm(f) { [% END %] @@ -419,28 +419,28 @@ function CheckRuleForm(f) {
    • [% FOREACH norm IN tgt_component.norms %] @@ -448,7 +448,7 @@ function CheckRuleForm(f) { [% END %] @@ -571,8 +571,8 @@ function CheckRuleForm(f) {
    [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -8,7 +8,7 @@ [% END %] [% END %] [% IF ( delete_attribute_type_form ) %] - › Confirm deletion of patron attribute type "[% code |html %]" + › Confirm deletion of patron attribute type "[% code %]" [% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -62,7 +62,7 @@ function CheckAttributeTypeForm(f) { [% END %] [% END %] [% IF ( delete_attribute_type_form ) %] - › Confirm deletion of patron attribute type "[% code |html %]" + › Confirm deletion of patron attribute type "[% code %]" [% END %] @@ -94,8 +94,8 @@ function CheckAttributeTypeForm(f) {
  • [% IF ( edit_attribute_type ) %] Patron attribute type code: - - [% code |html %] + + [% code %] [% ELSE %] @@ -103,7 +103,7 @@ function CheckAttributeTypeForm(f) {
  • + value="[% description %]" />
  • [% IF ( repeatable_checked ) %] @@ -249,10 +249,10 @@ function CheckAttributeTypeForm(f) { [% END %] [% IF ( delete_attribute_type_form ) %] -

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

    +

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

    - +
    @@ -300,7 +300,7 @@ function CheckAttributeTypeForm(f) {
  • [% FOREACH item IN attribute.items %] - + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -70,7 +70,7 @@ [% END %] [% IF ( search_not_found ) %]
    - No system preferences matched your search for [% searchfield |html %]. You can try a different search or return to where you were before. + No system preferences matched your search for [% searchfield %]. You can try a different search or return to where you were before.
    [% END %] [% FOREACH TAB IN TABS %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -103,19 +103,19 @@ [% IF ( modify ) %]Modify [% ELSE %]Add [% END %] a system preference
      -
    1. +
    2. [% IF ( searchfield ) %]Variable: [% searchfield %] [% ELSE %][% END %]
    3. [% IF ( type_free ) %] - + [% ELSIF ( type_upload ) %] [% ELSIF ( type_textarea || type_htmlarea ) %] [% IF ( type_htmlarea ) && ( Koha.Preference('UseWYSIWYGinSystemPreferences') ) %] - + [% ELSE %] - + [% END %] [% ELSIF ( type_choice ) %]
    [% FOREACH loo IN loop %] - + [% IF ( loo.oneline ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -119,7 +119,7 @@ [% END %]
      -
    1. +
    2. Required [% IF (server.servertype||type) == 'sru' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt @@ -43,7 +43,7 @@
      [% FOREACH INPUT IN INPUTS %] - + [% END %]

      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt @@ -75,7 +75,7 @@ function doauth(authid, index, repet)

    [% END %] [% END %] - --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -1,7 +1,7 @@ [% USE ColumnsSettings %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Cataloging › [% title |html %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %]) › Items +Koha › Cataloging › [% title %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %]) › Items [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] @@ -117,7 +117,7 @@ function confirm_deletion() { @@ -126,7 +126,7 @@ function confirm_deletion() {
    -

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

    +

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

    [% IF ( barcode_not_unique ) %]
    Error saving item: Barcode must be unique.
    [% END %] [% IF ( no_next_barcode ) %]
    Error saving items: Unable to automatically determine values for barcodes. No item has been inserted.
    [% END %] @@ -194,7 +194,7 @@ function confirm_deletion() { [% END %] [% FOREACH item_valu IN item_loo.item_value %] -
    + [% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt @@ -5,7 +5,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
    [% IF ( error ) %] @@ -20,7 +20,7 @@ [% ELSE %] [% IF ( success ) %] -
    The item has successfully been linked to [% bibliotitle |html %].
    +
    The item has successfully been linked to [% bibliotitle %].
    @@ -40,7 +40,7 @@ [% IF ( missingbarcode ) %]
    - +
    Enter item barcode:
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt @@ -1,11 +1,11 @@ [% INCLUDE 'doc-head-open.inc' %] -Attach an item to [% bibliotitle |html %] +Attach an item to [% bibliotitle %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
    [% BLOCK actions %] @@ -52,7 +52,7 @@ [% ELSE %] [% IF ( success ) %] -
    The item has successfully been attached to [% INCLUDE 'biblio-default-view.inc' %][% bibliotitle |html %]. +
    The item has successfully been attached to [% INCLUDE 'biblio-default-view.inc' %][% bibliotitle %].

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

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

    +

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

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

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt @@ -43,17 +43,17 @@
    [% FOREACH col_hd IN BIGLOO.col_hdr %] - [% END %] [% FOREACH line IN BIGLOO.lines %] - [% FOREACH cell IN line.cells %] @@ -67,17 +67,17 @@ [% FOREACH List IN BIGLOO.Lists %]

    [% List.lib %]

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

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

    +

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

    [% FOREACH cell IN line.cells %] -

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

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

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt @@ -171,9 +171,9 @@ [% IF ( resul.even ) %] [% IF ( resul.even ) %] [% IF ( resul.even ) %] - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt @@ -1,6 +1,6 @@ [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Circulation statistics for [% title |html %] +Koha › Circulation › Circulation statistics for [% title %] [% INCLUDE 'doc-head-close.inc' %] +
    - +
    [% ELSE %] - + [% END %] [% IF ( patron_attr_filter_loo.repeatable ) %] Add @@ -193,8 +193,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] [% FOREACH itemtypeloo IN itemtypeloop %][% IF ( itemtypeloo.selected ) %] - [% ELSE %] - [% END %] + [% ELSE %] + [% END %] [% END %] @@ -204,8 +204,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] [% FOREACH homebranchloo IN homebranchloop %][% IF ( homebranchloo.selected ) %] - [% ELSE %] - [% END %] + [% ELSE %] + [% END %] [% END %] @@ -215,8 +215,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] [% FOREACH holdingbranchloo IN holdingbranchloop %][% IF ( holdingbranchloo.selected ) %] - [% ELSE %] - [% END %] + [% ELSE %] + [% END %] [% END %] @@ -226,8 +226,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] Any [% FOREACH branchloo IN branchloop %] [% IF ( branchloo.selected ) %] - [% ELSE %] - [% END %] + [% ELSE %] + [% END %] [% END %] @@ -253,8 +253,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] [% patron_attr_order_loo.label %] - [% ELSE %][% END %] + [% IF ( patron_attr_order_loo.selected ) %] + [% ELSE %][% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -117,7 +117,7 @@ $(document).ready(function() { [% ELSE %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -3,7 +3,7 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Renew [% title |html %] +Koha › Circulation › Renew [% title %] [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt @@ -70,7 +70,7 @@ - --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -6,7 +6,7 @@ [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Check in [% title |html %] +Koha › Circulation › Check in [% title %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] @@ -135,7 +135,7 @@ $(document).ready(function () { [% IF ( collectionItemNeedsTransferred ) %]

    Please transfer item to: [% collectionBranch %]

    -

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

    +

    [% itembarcode %]: [% title %]

    This item is part of a rotating collection.

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

    Cannot check in

    -

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

    +

    [% itembarcode %]: [% title %]

    NOT CHECKED IN

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

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

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

    -

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

    +

    [% itembarcode %]: [% title %]

    [% IF ( wborcnum ) %]
    Hold for:
    Category code: [% category.categorycode |html %]
    Description: [% category.description |html %]
    Category code: [% category.categorycode %]
    Description: [% category.description %]
    Enrollment period: [% IF category.enrolmentperiod %] @@ -364,7 +364,7 @@ [% ELSE %] - + Cancel [% END %] @@ -409,9 +409,9 @@
    [% category.categorycode |html %][% category.categorycode %] - [% category.description |html %] + [% category.description %] [% SWITCH category.category_type %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -80,11 +80,11 @@ [% END %]
  • - Required + Required
  • - +
  • @@ -92,7 +92,7 @@
  • - +
  • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -117,7 +117,7 @@ function CheckRuleForm(f) {
  • + value="[% description %]" />
  • [% IF ( used ) %][% ELSE %] @@ -165,7 +165,7 @@ function CheckRuleForm(f) {
  • + value="[% description %]" />
  • [% IF ( class_source.used ) %]Yes[% ELSE %]No[% END %] [% class_source.sortrule %] - Edit - Delete + Edit + Delete
    [% class_sort_rule.description %] [% class_sort_rule.sort_routine %] - Edit - Delete + Edit + Delete
    [% loo.currency %] [% loo.rate %][% loo.symbol |html %][% loo.isocode |html %][% loo.symbol %][% loo.isocode %] [% loo.timestamp | $KohaDates %] [% IF ( loo.active ) %]✓[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -139,7 +139,7 @@ Item types administration [% END %]
  • - Required + Required Translate into other languages
  • @@ -347,7 +347,7 @@ Item types administration
  • [% IF itemtype.image_location %][% ELSE %] [% END %] - + [% itemtype.itemtype %] [% itemtype.checkinmsg | html_line_break %] - Edit - Delete + Edit + Delete
    [% available_matching_rule.code %] [% available_matching_rule.description %] - Edit - Delete + Edit + Delete
    [% item.code |html %][% item.code %] [% item.description %] [% IF item.branches.size > 0 %] @@ -320,8 +320,8 @@ function CheckAttributeTypeForm(f) { [% END %] - Edit - Delete + Edit + Delete
    [% loo.variable %] [% loo.explanation |html %][% loo.variable %] [% loo.explanation %] [% ELSE %] @@ -340,17 +340,17 @@ [% END %] [% IF ( loo.type_free ) %] - + [% END %] [% IF ( loo.type_upload ) %] - + [% END %] [% IF ( loo.type_textarea ) || ( loo.type_htmlarea ) %] [% IF ( loo.type_htmlarea ) && ( Koha.Preference('UseWYSIWYGinSystemPreferences') ) %] - + [% ELSE %] - + [% END %] [% END %] [% IF ( loo.type_choice ) %] @@ -430,9 +430,9 @@ [% END %] - + - + [% IF resul.summary && resul.summary.authorized && resul.summary.authorized.size > 1 %] [% FOREACH authorized IN resul.summary.authorized %] - [% loop.count %] + [% loop.count %] [% END %] [% ELSE %] choose --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -160,12 +160,12 @@ function batchDelete(){ [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]

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

    - [% BIBLIO_RESULT.title |html %] + [% BIBLIO_RESULT.title %] [% BIBLIO_RESULT.author %]

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

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

    +

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

    [% END %] @@ -90,10 +90,10 @@ function Changefwk(FwkList) {   [% UNLESS ( subfiel.hide_marc ) %][% subfiel.marc_subfield %][% END %] [% subfiel.short_desc %] - [% IF ( subfiel.is_url ) %][% subfiel.marc_value |html %][% ELSE %][% subfiel.marc_value |html %][% END %] + [% IF ( subfiel.is_url ) %][% subfiel.marc_value %][% ELSE %][% subfiel.marc_value %][% END %] [% IF ( subfiel.link ) %] - Search on [% subfiel.marc_value |html %] + Search on [% subfiel.marc_value %] [% END %] [% IF ( subfiel.authority ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -22,7 +22,7 @@ [% IF ( unknownbiblionumber ) %] Unknown record [% ELSE %] - Details for [% title |html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %] + Details for [% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %] [% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -401,7 +401,7 @@ function Changefwk(FwkList) { [% INCLUDE 'header.inc' %] - +
    @@ -410,7 +410,7 @@ function Changefwk(FwkList) {

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

    @@ -445,7 +445,7 @@ function Changefwk(FwkList) { [% IF ( done ) %] [% ELSE %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -150,7 +150,7 @@

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

    [% IF ( resultsloo.summary ) %]

    [% resultsloo.summary %]

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

    [% resul.author %] [% IF ( resul.publishercode ) %]- [% resul.publishercode %][% END %] [% IF ( resul.place ) %] ; [% resul.place %][% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt @@ -130,9 +130,9 @@ [% FOREACH itypeloo IN itypeloop %] [% IF ( itypeloo.selected ) %] - + [% ELSE %] - + [% END %] [% END %] @@ -176,24 +176,24 @@ [% IF ( resul.even ) %]

    [% ELSE %][% END %] [% IF ( resul.MARC_ON ) %] - [% resul.title |html %] + [% resul.title %] [% ELSE %] - [% resul.fulltitle |html %][% END %] -

    [% resul.author |html %] - [% IF ( resul.publishercode ) %]- [% resul.publishercode |html %][% END %] - [% IF ( resul.place ) %] ; [% resul.place |html %][% END %] - [% IF ( resul.pages ) %] - [% resul.pages |html %][% END %] - [% IF ( resul.notes ) %] : [% resul.notes |html %][% END %] - [% IF ( resul.item('size') ) %] ; [% resul.item('size') |html %][% END %] + [% resul.fulltitle %][% END %] +

    [% resul.author %] + [% IF ( resul.publishercode ) %]- [% resul.publishercode %][% END %] + [% IF ( resul.place ) %] ; [% resul.place %][% END %] + [% IF ( resul.pages ) %] - [% resul.pages %][% END %] + [% IF ( resul.notes ) %] : [% resul.notes %][% END %] + [% IF ( resul.item('size') ) %] ; [% resul.item('size') %][% END %]

    [% ELSE %][% END %] - [% resul.totitem |html %] + [% resul.totitem %] [% ELSE %][% END %] - [% resul.CN |html %] + [% resul.CN %] [% IF ( resul.biblionumber ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tt @@ -33,7 +33,7 @@ - +
  • @@ -45,7 +45,7 @@ - +
  • @@ -57,7 +57,7 @@ - +
  • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt @@ -126,9 +126,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
  • -
  • -
  • -
  • +
  • +
  • +
  • @@ -137,8 +137,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
    1. -
    2. -
    3. +
    4. +

    Clear search form

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt @@ -127,7 +127,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
    1. -
    2. +
    3. @@ -207,7 +207,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
    [% breeding_loo.server %] [% breeding_loo.title |html %][% breeding_loo.title %] [% breeding_loo.author %] [% breeding_loo.date %] [% breeding_loo.edition %]

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

    + [% reserveloo.title %]

    [% IF ( reserveloo.author ) %]

    by [% reserveloo.author %]

    [% END %]

    [% reserveloo.reservecount %]

    [% reserveloo.itemcount %]

    [% reserveloo.thisratio %]

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

    [% reserveloo.homebranch_list %]

    [% reserveloo.holdingbranch_list %]

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

    Hold found

    -

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

    +

    [% itembarcode %]: [% title %]

    [% IF ( reservenotes ) %]

    Notes: [% reservenotes %]

    [% END %]
    Hold for:
    + [% riloo.itemtitle %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt @@ -34,10 +34,10 @@ Updated:
      [% END %] [% END %]
    - +
    [% FOREACH recycle_loo IN recycle_loop %] - + [% END %]
    @@ -84,9 +84,9 @@ Updated:
      [% FOREACH recycle_loo IN recycle_loop %] - + [% END %] - +
      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt @@ -16,7 +16,7 @@ window.close();

      Transfer to [% branchname %]

      ITEM

      -

      [% biblio.title |html %]

      +

      [% biblio.title %]

      [% biblio.author %]
        [% IF ( item.barcode ) %]
      • [% item.barcode %]
      • [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt @@ -60,7 +60,7 @@ $(document).ready(function() { [% END %]
    @@ -72,7 +72,7 @@ $(document).ready(function() { [% IF ( reser.borrowermail ) %]
    [% BLOCK subject %]Hold:[% END %] - + [% reser.borrowermail %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -68,7 +68,7 @@ $(document).ready(function() { [% FOREACH itemsloo IN itemsloop %] [% FOREACH overloo IN overloop %] - +  [% IF ( account.itemnumber ) %]View item [% END %][% account.title %] [% IF ( account.amountcredit ) %] [% IF ( account.amountoutstandingcredit ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -1025,7 +1025,7 @@ [% FOREACH patron_attribute IN pa_loo.items %]
  • - + [% IF ( patron_attribute.use_dropdown ) %]
  • [% ELSE %][% END %] @@ -105,7 +105,7 @@ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt @@ -23,7 +23,7 @@ Checked out to [% firstname %] [% surname %]
    [% FOREACH issueloo IN issueloop %] [% IF ( issueloo.red ) %][% ELSE %] [% IF ( issueloo.today ) %] -

    [% issueloo.title |html %]
    +

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

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

    Checked out

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

    [% issueloo.title |html %]
    +

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

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

    Overdues

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

    [% issueloo.title |html %]
    +

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

    [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt @@ -57,9 +57,9 @@

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

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -97,7 +97,7 @@ - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt @@ -9,7 +9,7 @@ [% FOREACH data IN aaData %] { "dt_cardnumber": - "[% data.cardnumber |html %]", + "[% data.cardnumber %]", "dt_name": "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames cardnumber = data.cardnumber invert_name = 1%]", "dt_dateofbirth": @@ -17,7 +17,7 @@ "dt_address": "[% INCLUDE escape_address data=data %]", "dt_action": - "Select" + "Select" }[% UNLESS loop.last %],[% END %] [% END %] ] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt @@ -13,21 +13,21 @@ "", [% END %] "dt_cardnumber": - "[% data.cardnumber | html %]", + "[% data.cardnumber %]", "dt_name": "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 %]
    [% INCLUDE escape_address data = data %]
    ", "dt_dateofbirth": "[% data.dateofbirth | $KohaDates %]", "dt_category": - "[% data.category_description |html %] ([% data.category_type |html %])", + "[% data.category_description %] ([% data.category_type %])", "dt_branch": - "[% data.branchname |html %]", + "[% data.branchname %]", "dt_dateexpiry": "[% data.dateexpiry %]", "dt_od_checkouts": "[% IF data.overdues %][% data.overdues %][% ELSE %][% data.overdues %][% END %] / [% data.issues %]", "dt_fines": - "[% IF data.fines < 0 %][% data.fines |html %] [% ELSIF data.fines > 0 %] [% data.fines |html %] [% ELSE %] [% data.fines |html%] [% END %]", + "[% IF data.fines < 0 %][% data.fines %] [% ELSIF data.fines > 0 %] [% data.fines %] [% ELSE %] [% data.fines %] [% END %]", "dt_borrowernotes": "[% data.borrowernotes.replace('\\\\' , '\\\\') |html |html_line_break |collapse %]", "dt_action": --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt @@ -80,9 +80,9 @@ function CheckForm(f) { [% END %] [% IF ( message.ERROR_no_borrower_from_item ) %]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    Confirm custom report

    Your report will be generated with the following SQL statement.

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

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

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

    [% name %]

    [% IF ( notes ) %]

    [% notes %]

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

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

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

    - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt @@ -39,7 +39,7 @@ [% FOREACH loopco IN mainloo.loopcol %] - + [% END %] @@ -49,7 +49,7 @@ [% ELSE %] [% END %] - + [% FOREACH loopcel IN loopro.loopcell %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt @@ -72,7 +72,7 @@ [% FOREACH itemsloo IN itemsloop %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt @@ -113,7 +113,7 @@ [% FOREACH loopco IN mainloo.loopcol %] - + [% END %] @@ -123,7 +123,7 @@ [% ELSE %] [% END %] - + [% FOREACH loopcel IN loopro.loopcell %] [% FOREACH data IN datas %] - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -2,7 +2,7 @@ [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] [% UNLESS ( multi_hold ) %] - Koha › Circulation › Holds › Place a hold on [% title |html %] + Koha › Circulation › Holds › Place a hold on [% title %] [% ELSE %] Koha › Circulation › Holds › Confirm holds [% END %] @@ -211,7 +211,7 @@ function checkMultiHold() { [% INCLUDE 'circ-search.inc' %] [% UNLESS ( multi_hold ) %] - + [% ELSE %] [% END %] @@ -243,7 +243,7 @@ function checkMultiHold() { [% END %] [% UNLESS ( multi_hold ) %] -

    Place a hold on [% INCLUDE 'biblio-default-view.inc' %][% title |html %]

    +

    Place a hold on [% INCLUDE 'biblio-default-view.inc' %][% title %]

    [% ELSE %]

    Confirm holds

    [% END %] @@ -371,12 +371,12 @@ function checkMultiHold() { [% FOREACH biblioloo IN biblioloop %] - + [% END %] [% ELSE %] - + [% END %] @@ -582,7 +582,7 @@ function checkMultiHold() { [% END %]
    [% title |html %][% title %]
    Hold for: [% name %] - [% riloo.itemtitle |html %] [% riloo.itemauthor %] [% riloo.barcode %] [% Branches.GetName( riloo.homebranch ) %]

    [% reser.datetransfer | $KohaDates %]

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

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

    +

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

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

    [% overloo.waitingdate | $KohaDates %]

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

    Welcome to the Koha web installer

    Before we begin, please verify you have the correct credentials to continue. Please log in --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -232,7 +232,7 @@

    Update report :

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

    Update errors :

      [% FOREACH update_error IN update_errors %] -
    • [% update_error.line |html %]
    • +
    • [% update_error.line %]
    • [% END %]
    [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt @@ -132,7 +132,7 @@ [% END %]
  • - +

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

    See online help for advanced options

    @@ -185,7 +185,7 @@
  • - +
  • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt @@ -69,7 +69,7 @@ [% FOREACH result_se IN result_set %]
    -

    [% result_se.title |html %]

    +

    [% result_se.title %]

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

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -100,7 +100,7 @@ $(document).ready(function() { [% CASE %][% account.accounttype %] [%- END -%] [%- IF account.description %], [% account.description %][% END %] -  [% IF ( account.itemnumber ) %]View item [% END %][% account.title |html %]
  • [% account.note | html_line_break %][% ELSE %][% END %][% account.amount %][% ELSE %][% END %][% account.amountoutstanding %]
    - [% issue.title |html %] + [% issue.title %] [% issue.author %]
    [% IF ( account.itemnumber ) %][% END %] - [% account.description %] [% IF ( account.printtitle ) %] [% account.title |html %][% END %] + [% account.description %] [% IF ( account.printtitle ) %] [% account.title %][% END %] [% IF ( account.itemnumber ) %][% END %] [% account.date | $KohaDates %] [% issue.issuestimestamp | $KohaDates with_hours => 1 %] [% issue.title |html %][% issue.title %] [% issue.author %] - + Delete
    [% mainloo.line %] / [% mainloo.column %][% loopco.coltitle_display |html %][% loopco.coltitle_display %]TOTAL
    [% loopro.rowtitle_display or "UNKNOWN VALUE" |html %][% loopro.rowtitle_display or "UNKNOWN VALUE" %][% loopcel.value %]
    - [% itemsloo.title |html %] + [% itemsloo.title %] [% itemsloo.author %] [% itemsloo.lib %]
    [% mainloo.line %] / [% mainloo.column %][% loopco.coltitle_display |html %][% loopco.coltitle_display %]TOTAL
    [% loopro.rowtitle_display or "UNKNOWN VALUE" |html %][% loopro.rowtitle_display or "UNKNOWN VALUE" %] [% IF ( loopcel.url_complement ) %][% loopcel.value %][% ELSE %][% loopcel.value %][% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt @@ -52,7 +52,7 @@
    [% data.name %][% data.title |html %][% data.title %] [% data.subscriptionid %] [% Branches.GetName( data.branchcode ) %] [% data.callnumber %]
      -
    • [% biblioloo.title |html %]
    • +
    • [% biblioloo.title %]
    • [% IF ( biblioloo.publicationyear ) %]
    • Publication year: [% biblioloo.publicationyear %]
    • [% END %] @@ -661,7 +661,7 @@ function checkMultiHold() { [% IF ( biblioloo.reserveloop ) %] [% IF ( multi_hold ) %] - + [% END %] [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt @@ -50,7 +50,7 @@ [% review.bibliotitle %] [% FOREACH collectionItemsLoo IN collectionItemsLoop %] - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt @@ -112,7 +112,7 @@ [% subscriptions_loo.issn %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt @@ -32,19 +32,19 @@ function GetIt(bibno,title) [% FOREACH resultsloo IN resultsloop %] - --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt @@ -19,7 +19,7 @@ - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt @@ -16,7 +16,7 @@ function print_slip(subscriptionid,issue){ [% INCLUDE 'header.inc' %] [% INCLUDE 'serials-search.inc' %] - +
      @@ -24,7 +24,7 @@ function print_slip(subscriptionid,issue){
      -

      Preview routing list for [% title |html %]

      +

      Preview routing list for [% title %]

      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Serials › [% title |html %] › [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %] +Koha › Serials › [% title %] › [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %] [% INCLUDE 'doc-head-close.inc' %]
      [% biblioloo.title |html %][% biblioloo.title %]
      - [% review.review |html %] + [% review.review %] [% IF ( status ) %]Unapprove[% ELSE %]Approve[% END %] | --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt @@ -106,7 +106,7 @@
      [% INCLUDE 'biblio-default-view.inc' biblionumber = collectionItemsLoo.biblionumber %][% collectionItemsLoo.title |html %][% INCLUDE 'biblio-default-view.inc' biblionumber = collectionItemsLoo.biblionumber %][% collectionItemsLoo.title %] [% collectionItemsLoo.itemcallnumber %] [% collectionItemsLoo.barcode %] Remove [% IF ( subscriptions_loo.title ) %] - [% subscriptions_loo.title |html %] + [% subscriptions_loo.title %] [% ELSE %] | [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt @@ -240,7 +240,7 @@ [% Branches.GetName( missingissue.branchcode ) %] - [% missingissue.title |html %] + [% missingissue.title %] [% missingissue.issn %] [% missingissue.serialseq %]
      [% resultsloo.title |html %] [% resultsloo.subtitle |html %] + [% resultsloo.title %] [% resultsloo.subtitle %] - [% resultsloo.author |html %] + [% resultsloo.author %] - [% resultsloo.publishercode |html %] + [% resultsloo.publishercode %] - [% resultsloo.publicationyear |html %] + [% resultsloo.publicationyear %] - [% resultsloo.issn |html %] + [% resultsloo.issn %] Choose

      [% libraryname %]

      Title: [% title |html %]
      [% issue %]
      Title: [% title %]
      [% issue %]
      Name