From 11ee3cdf0b6ccb91d532407eae2024702f539777 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 22 Jun 2015 17:13:15 +0200 Subject: [PATCH] Bug 13618: Remove html filters at the intranet --- .../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 | 6 +- .../prog/en/includes/page-numbers.inc | 6 +- .../prog/en/includes/prefs-admin-search.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 18 ++--- .../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 | 80 +++++++++++----------- .../prog/en/modules/admin/categorie.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 | 18 ++--- .../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 | 16 ++--- .../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/reservereport.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 | 10 +-- .../prog/en/modules/virtualshelves/shelves.tt | 20 +++--- .../virtualshelves/tables/shelves_results.tt | 2 +- 130 files changed, 559 insertions(+), 559 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc index 5aebf54..74d9d95 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -12,7 +12,7 @@
- + [+] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc index 9adbc7f..7034fe7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc @@ -142,7 +142,7 @@ function finderjumpfull(page) [% END %] - +
@@ -168,7 +168,7 @@ function finderjumpfull(page) [% END %] - +
@@ -194,7 +194,7 @@ function finderjumpfull(page) [% END %] - +
  • @@ -219,7 +219,7 @@ function finderjumpfull(page) [% END %] - +
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc index a009c7d..8cedd31 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc @@ -12,24 +12,24 @@ [% IF marcflavour == 'UNIMARC' %] [% SWITCH type %] [% CASE 'broader' %] - BT: [% heading | 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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc index d7ce46d..94e1048 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc @@ -53,7 +53,7 @@ [% END %] - + - + - + - +
  • [% END %] @@ -69,7 +69,7 @@ [% IF ( fiel.value ) %] / [% fiel.value %] - + [% END %] [% IF ( fiel.subfield ) %] @@ -78,7 +78,7 @@
  • [% subfiel.subtag %] / [% subfiel.value %] - +
  • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc index 2992164..2ef952f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc @@ -1,7 +1,7 @@ [% IF ( PAGE_NUMBERS ) %]
    - [% IF ( previous_page_offset.defined ) %]<< Previous[% END %] - [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %][% IF ( PAGE_NUMBER.highlight ) %][% PAGE_NUMBER.pg %][% ELSE %] [% PAGE_NUMBER.pg %][% END %] + [% IF ( previous_page_offset.defined ) %]<< Previous[% END %] + [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %][% IF ( PAGE_NUMBER.highlight ) %][% PAGE_NUMBER.pg %][% ELSE %] [% PAGE_NUMBER.pg %][% END %] [% END %] - [% IF ( next_page_offset ) %]Next >>[% END %] + [% IF ( next_page_offset ) %]Next >>[% END %]
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc index a224c89..e3d6af4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc @@ -6,7 +6,7 @@ - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index 0163c5b..8df3ae1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -37,18 +37,18 @@ - - - - + + + + - - - + + + [% IF (errZebraConnection == 10000) %] [% ELSIF (errZebraConnection) %] @@ -772,7 +772,7 @@ [% FOREACH ro IN tabl.row2 %] - + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt index 322e535..909d78a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt @@ -15,7 +15,7 @@ [% FOREACH var IN vars_loop %] [% FOREACH val IN var.values %] - + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index de16aa0..d359d04 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -3,7 +3,7 @@ [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|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:

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt index b2e26aa..9703efa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt @@ -36,7 +36,7 @@
    -

    Files for invoice: [% invoicenumber | html %]

    +

    Files for invoice: [% invoicenumber %]

    Vendor: [% suppliername %]


    [% IF errors %] @@ -62,9 +62,9 @@
    [% FOREACH f IN files %] - - - + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 927697b..a49107d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -226,9 +226,9 @@ [% FOREACH f IN files %] - - - + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index f680401..99d7b0a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -98,7 +98,7 @@ $(document).ready(function() { [% IF ( lateorders ) %] - + [% IF ( letters ) %]

    - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt index 11ab144..a85e52f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -53,7 +53,7 @@ - [% ELSE %][% END %] - + @@ -191,7 +191,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index 5d7918d..d0b552c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -8,7 +8,7 @@
    Server information
    Koha version: [% kohaVersion |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 %]
    Zebra version: [% zebraVersion |html %]
    MySQL version: [% mysqlVersion %]
    Apache version: [% apacheVersion %]
    Zebra version: [% zebraVersion %]
    Error Zebra server seems not to be available. Is it started?
    [% ro.date %][% ro.desc|html %][% ro.desc %]

    [% IF ( books_loo.order_received ) %] (rcvd)[% END %] - [% books_loo.title |html %] by [% books_loo.author %] + [% books_loo.title %] by [% books_loo.author %]
    [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %] [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %] @@ -467,12 +467,12 @@ [% END %]

    [% IF ( books_loo.order_internalnote ) %] -

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

    +

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

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

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

    +

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

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

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

    -

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

    +

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

    [% IF ( CAN_user_acquisition_group_manage ) %]

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

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

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

    +

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

    [% ELSIF (name) %] -

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

    +

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

    [% ELSE %] -

    Add basket group for [% booksellername |html %]

    +

    Add basket group for [% booksellername %]

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

    Basket grouping for [% booksellername |html %]

    +

    Basket grouping for [% booksellername %]

      [% UNLESS ( listclosed) %]
    • Open
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt index 8cf89cc..e22a420 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -202,7 +202,7 @@ var MSG_REMOVE_PATRON = _("Remove"); [% END %]
    - [% 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' %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt index f17d5c2..081e013 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt @@ -12,7 +12,7 @@ [% INCLUDE 'header.inc' %] - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt index 4911b62..3e132a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt @@ -63,7 +63,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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index b0cc08c..6b81852 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -310,10 +310,10 @@ $(document).ready(function()

    1. [% IF ( biblionumber ) %] Title - [% title |html %] + [% title %] [% ELSE %] - + Required [% END %]
    2. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt index d6e65a0..1ae94c6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -70,7 +70,7 @@ [% FOREACH sub IN subs_loop %]
    [% sub.issn %][% IF (sub.title) %][% sub.title |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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index 08565a6..a652744 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -139,7 +139,7 @@

    Catalog details -
    1. Title: [% title |html %]
    2. +
      1. Title: [% title %]
      2. Author: [% author %]
      3. Copyright: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index a244f5f..6ee6e93 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -253,7 +253,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 %] @@ -264,12 +264,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 %] @@ -400,7 +400,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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt index 5ad87ff..805f596 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt @@ -11,12 +11,12 @@ "dt_name": "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames cardnumber = data.cardnumber invert_name = 1%]", "dt_branch": - "[% data.branchname |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 -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt index 0ba9a0e..5400e63 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt @@ -75,7 +75,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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index 9b89e91..8735510 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -97,7 +97,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
      -
    1. +
    2. @@ -176,7 +176,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% IF ( breeding_loo.toggle ) %]
    [% 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. Koha can manage a MARC interface, and a Koha interface. This link ensures that both DB are synchronized

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt index 0480bf5..4ac0ebd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -96,8 +96,8 @@ [% END %] -
  • -
  • +
  • +
  • [% IF ( repeatable ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt index 3fbc439..da12d5c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -68,7 +68,7 @@ [% END %]
  • - + Required
  • @@ -130,8 +130,8 @@ [% loo.summary %] [% loo.auth_tag_to_report %] MARC structure - Edit - Delete + Edit + Delete [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index 791e971..fc0ad93 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -124,7 +124,7 @@ [% END %]
  • - + Required
  • @@ -224,8 +224,8 @@ [% loo.frameworkcode %] [% loo.frameworktext %] MARC structure - Edit - Delete + Edit + Delete diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index 887b81f..bee671a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -99,16 +99,16 @@ tinyMCE.init({
    1. [% IF ( heading_branches_add_branch_p ) %] - Required + Required [% ELSE %] Library code: - + [% branchcode %] [% END %]
    2. - Required + Required
    @@ -128,21 +128,21 @@ 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. Can be entered as a single IP, or a subnet such as 192.168.1.*
    32. -
    33. +
    Cancel
    @@ -166,8 +166,8 @@ tinyMCE.init({ [% IF ( delete_confirm ) %]
    Confirm deletion of [% branchname %] ([% branchcode %])? - - + +
    Cancel
    [% END %] @@ -201,37 +201,37 @@ tinyMCE.init({ [% FOREACH branche IN branches %] - [% branche.branch_name |html %] - [% branche.branch_code |html %] + [% branche.branch_name %] + [% branche.branch_code %] [% IF ( branche.address_empty_p ) %] (nothing entered) [% ELSE %] [% IF ( branche.branchaddress1 ) %] - [% branche.branchaddress1 |html %][% END %] + [% branche.branchaddress1 %][% END %] [% IF ( branche.branchaddress2 ) %] -
    [% branche.branchaddress2 |html %][% END %] +
    [% branche.branchaddress2 %][% END %] [% IF ( branche.branchaddress3 ) %] -
    [% branche.branchaddress3 |html %][% END %] +
    [% branche.branchaddress3 %][% END %] [% IF ( branche.branchcity ) %] -
    [% branche.branchcity |html %][% END %][% IF ( branche.branchstate ) %], - [% branche.branchstate |html %][% END %] +
    [% branche.branchcity %][% END %][% IF ( branche.branchstate ) %], + [% branche.branchstate %][% END %] [% IF ( branche.branchzip ) %] - [% branche.branchzip |html %][% END %] + [% branche.branchzip %][% END %] [% IF ( branche.branchcountry ) %] -
    [% branche.branchcountry |html %][% END %] +
    [% branche.branchcountry %][% END %] [% IF ( branche.branchphone ) %] -
    Ph: [% branche.branchphone |html %][% END %] +
    Ph: [% branche.branchphone %][% END %] [% IF ( branche.branchfax ) %] -
    Fax: [% branche.branchfax |html %][% END %] +
    Fax: [% branche.branchfax %][% END %] [% IF ( branche.branchemail ) %] -
    [% branche.branchemail |html %][% END %] +
    [% branche.branchemail %][% END %] [% IF ( branche.branchurl ) %] -
    [% branche.branchurl |html %][% END %] +
    [% branche.branchurl %][% END %] [% IF ( branche.opac_info ) %]
    OPAC Info:
    [% branche.opac_info %]
    [% END %] [% IF ( branche.branchnotes ) %] -
    Notes: [% branche.branchnotes |html %][% END %] +
    Notes: [% branche.branchnotes %][% END %] [% END %] @@ -313,20 +313,20 @@ tinyMCE.init({
    1. [% IF ( categorycode ) %] Category code: - + [% categorycode %] [% ELSE %] - + [% END %]
    2. - +
    3. - +
    4. @@ -360,7 +360,7 @@ tinyMCE.init({ Confirm delete:
      - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt index 92a6a28..ae15fe5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt @@ -1,7 +1,7 @@ [% USE KohaDates -%] [% INCLUDE 'doc-head-open.inc' %] -Koha › Administration › Patron categories › [% IF ( add_form ) %][% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %] -[% IF ( 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 ( add_form ) %][% IF ( categorycode ) %]Modify category '[% categorycode %]'[% ELSE %]New category[% END %][% END %] +[% IF ( 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' %] @@ -96,8 +96,8 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patrons-admin-search.inc' %] -