Bugzilla – Attachment 46798 Details for
Bug 13618
Add additional template filter methods and a filter presence test to Koha
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13618: Remove html filters at the intranet
Bug-13618-Remove-html-filters-at-the-intranet.patch (text/plain), 313.78 KB, created by
Jonathan Druart
on 2016-01-18 11:44:51 UTC
(
hide
)
Description:
Bug 13618: Remove html filters at the intranet
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2016-01-18 11:44:51 UTC
Size:
313.78 KB
patch
obsolete
>From dbe6023b5a1fea49ab6a073c5e69fd0a90a32a58 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@koha-community.org> >Date: Mon, 22 Jun 2015 17:13:15 +0200 >Subject: [PATCH] Bug 13618: Remove html filters at the intranet >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../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 | 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/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, 558 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 @@ > > <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post"> > <label for="title">Title: </label> <input type="text" id="title" name="title" size="15" value="[% title %]" /> >- <label for="searchsupplier">Vendor:</label> <input type="text" id="searchsupplier" name="name" size="15" value="[% name|html %]" /> >+ <label for="searchsupplier">Vendor:</label> <input type="text" id="searchsupplier" name="name" size="15" value="[% name %]" /> > <input type="hidden" id="do_search" name="do_search" value="do" /> > <span class="filteraction" id="filteraction_off" style="display:none"> <a href="#" onclick="$('#filters,.filteraction').toggle();">[-]</a></span> > <span class="filteraction" id="filteraction_on"> <a href="#" onclick="$('#filters,.filteraction').toggle();">[+]</a></span> >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 bb2d3a8..54c7c83 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) > <option value="is">is exactly</option> > [% END %] > </select> >- <input id="value_mainstr" style="width:400px;" type="text" name="value_mainstr" value="[% value_mainstr |html %]" /> >+ <input id="value_mainstr" style="width:400px;" type="text" name="value_mainstr" value="[% value_mainstr %]" /> > <div id="yvaluecontainermainmainentry"></div> > </li> > >@@ -168,7 +168,7 @@ function finderjumpfull(page) > <option value="is">is exactly</option> > [% END %] > </select> >- <input id="value_main" style="width:400px;" type="text" name="value_main" value="[% value_main |html %]" /> >+ <input id="value_main" style="width:400px;" type="text" name="value_main" value="[% value_main %]" /> > <div id="yvaluecontainermainentry"></div> > </li> > <li> >@@ -193,7 +193,7 @@ function finderjumpfull(page) > <option value="is">is exactly</option> > [% END %] > </select> >- <input type="text" name="value_match" value="[% value_match |html %]" /> >+ <input type="text" name="value_match" value="[% value_match %]" /> > </li> > <li> > <label for="marclistanywhere">Search entire record: </label> >@@ -217,7 +217,7 @@ function finderjumpfull(page) > <option value="is">is exactly</option> > [% END %] > </select> >- <input id="value_any" style="width:400px;" type="text" name="value_any" value="[% value_any |html %]" /> >+ <input id="value_any" style="width:400px;" type="text" name="value_any" value="[% value_any %]" /> > <div id="yvaluecontainermarclist"></div> > </li> > <li> >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' %] >- <span class="BT">BT: [% heading | html %]</span> >+ <span class="BT">BT: [% heading %]</span> > [% CASE 'narrower' %] >- <span class="NT">NT: [% heading | html %]</span> >+ <span class="NT">NT: [% heading %]</span> > [% CASE 'seefrom' %] >- <span class="UF">UF: [% heading | html %]</span> >+ <span class="UF">UF: [% heading %]</span> > [% CASE 'seealso' %] >- <span class="RT">RT: [% heading | html %]</span> >+ <span class="RT">RT: [% heading %]</span> > [% END %] > [% ELSE %] > <span class="heading"> > [% IF ( linkType=='seealso' ) %] > [% IF ( authid ) %] >- <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a> >+ <a href="[% authidurl | url %][% authid | url %]">[% heading %]</a> > [% ELSE %] >- <a href="[% searchurl | url %][% heading | html %]">[% heading | html %]</a> >+ <a href="[% searchurl | url %][% heading %]">[% heading %]</a> > [% END %] > [% ELSE %] >- [% heading | html %] >+ [% heading %] > [% END %] > </span> > [% 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 %] > </span> >@@ -50,7 +50,7 @@ > [% END %] > [% END %] > [% BLOCK authresult %] >- [% IF ( summary.label ) %][% summary.label | html %]:[% END %] >+ [% IF ( summary.label ) %][% summary.label %]:[% END %] > [% IF summary.summary %] > <div class="authority-summary"> > [% summary.summary %] >@@ -59,7 +59,7 @@ > [% UNLESS ( summary.summaryonly ) %] > <div class="authorizedheading"> > [% FOREACH authorize IN summary.authorized %] >- <span class="authorizedheading">[% authorize.heading | html %]</span> >+ <span class="authorizedheading">[% authorize.heading %]</span> > [% UNLESS loop.last %] | [% END %] > [% END %] > </div> >@@ -67,7 +67,7 @@ > [% IF summary.notes %] > <div class="authres_notes"> > [% FOREACH note IN summary.notes %] >- <span>[% note.note | html %]</span> >+ <span>[% note.note %]</span> > [% END %] > </div> > [% 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 d410dcc..6a1794f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >@@ -109,7 +109,7 @@ > <option value="is">is exactly</option> > [% END %] > </select> >- <input id="value_mainentry" type="text" name="value" value="[% value | html%]" class="head-searchbox" /> >+ <input id="value_mainentry" type="text" name="value" value="[% value %]" class="head-searchbox" /> > <select name="orderby"> > [% IF ( orderby == 'HeadingAsc' ) %] > <option value="HeadingAsc" selected="selected">Heading A-Z</option> >@@ -163,7 +163,7 @@ > <option value="is">is exactly</option> > [% END %] > </select> >- <input id="value_matchheading" type="text" name="value" value="[% value | html %]" class="head-searchbox" /> >+ <input id="value_matchheading" type="text" name="value" value="[% value %]" class="head-searchbox" /> > <select name="orderby"> > [% IF ( orderby == 'HeadingAsc' ) %] > <option value="HeadingAsc" selected="selected">Heading A-Z</option> >@@ -219,7 +219,7 @@ > <option value="is">is exactly</option> > [% END %] > </select> >- <input id="value_anywhere" type="text" name="value" value="[% value | html %]" class="head-searchbox" /> >+ <input id="value_anywhere" type="text" name="value" value="[% value %]" class="head-searchbox" /> > <select name="orderby"> > [% IF ( orderby == 'HeadingAsc' ) %] > <option value="HeadingAsc" selected="selected">Heading A-Z</option> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc >index 9e173c9..b7e80ed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc >@@ -8,9 +8,9 @@ > [% FOREACH node IN tree %] > <li id="hier[% node.authid %]" class="[% node.class %] authnode"> > [% IF ( node.current_value ) %] >- <span class='currentauth'>[% node.value | html %]</span> >+ <span class='currentauth'>[% node.value %]</span> > [% ELSE %] >- <a href="detail.pl?authid=[% node.authid %]" title="Term">[% node.value | html %]</a> >+ <a href="detail.pl?authid=[% node.authid %]" title="Term">[% node.value %]</a> > [% END %] > [% IF ( node.children && node.children.size > 0 ) %] > [% PROCESS showtree tree = node.children %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc >index 82e014c..ef66e98 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc >@@ -2,4 +2,4 @@ > [%- USE Koha -%] > [%- biblio = item.biblio -%] > [%- biblioitem = item.biblioitem -%] >-"[% biblio.title |html %] [% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %]by [% END %][% biblio.author |html %]", "[% (biblioitem.publicationyear || biblio.copyrightdate) |html %]", "[% biblioitem.publishercode |html %]", "[% biblioitem.collectiontitle |html %]", "[% item.barcode |html %]", "[% item.itemcallnumber |html %]", "[% Branches.GetName(item.homebranch) |html %]", "[% Branches.GetName(item.holdingbranch) |html %]", "[% item.location |html %]", "[% item.stocknumber |html %]", "[% item.status |html %]", "[% (item.issues || 0) |html %]"[% INCLUDE 'empty_line.inc' %] >+"[% biblio.title %] [% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %]by [% END %][% biblio.author %]", "[% (biblioitem.publicationyear || biblio.copyrightdate) %]", "[% biblioitem.publishercode %]", "[% biblioitem.collectiontitle %]", "[% item.barcode %]", "[% item.itemcallnumber %]", "[% Branches.GetName(item.homebranch) %]", "[% Branches.GetName(item.holdingbranch) %]", "[% item.location %]", "[% item.stocknumber %]", "[% item.status %]", "[% (item.issues || 0) %]"[% INCLUDE 'empty_line.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc >index 4085b94..b72878f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc >@@ -4,21 +4,21 @@ > [%- biblioitem = item.biblioitem -%] > [ > "[% FILTER escape_quotes = replace('"', '\"') ~%] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber %]" title="Go to record detail page">[% biblio.title |html %]</a>[% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %] by[% END %] [% biblio.author |html %] >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber %]" title="Go to record detail page">[% biblio.title %]</a>[% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %] by[% END %] [% biblio.author %] > [%~ END %]", >- "[% (biblioitem.publicationyear || biblio.copyrightdate) |html %]", >- "[% biblioitem.publishercode |html %]", >- "[% biblioitem.collectiontitle |html %]", >+ "[% (biblioitem.publicationyear || biblio.copyrightdate) %]", >+ "[% biblioitem.publishercode %]", >+ "[% biblioitem.collectiontitle %]", > "[% FILTER escape_quotes ~%] >- <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber %]#item[% item.itemnumber %]" title="Go to item details">[% item.barcode |html %]</a> >+ <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber %]#item[% item.itemnumber %]" title="Go to item details">[% item.barcode %]</a> > [%~ END %]", >- "[% item.itemcallnumber |html %]", >- "[% Branches.GetName(item.homebranch) |html %]", >- "[% Branches.GetName(item.holdingbranch) |html %]", >- "[% item.location |html %]", >- "[% item.stocknumber |html %]", >- "[% item.status |html %]", >- "[% (item.issues || 0) |html %]", >+ "[% item.itemcallnumber %]", >+ "[% Branches.GetName(item.homebranch) %]", >+ "[% Branches.GetName(item.holdingbranch) %]", >+ "[% item.location %]", >+ "[% item.stocknumber %]", >+ "[% item.status %]", >+ "[% (item.issues || 0) %]", > "[% FILTER escape_quotes ~%] > <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber %]&itemnumber=[% item.itemnumber %]">Edit</a> > [%~ END %]" >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc >index 3d0d15e..edf26f1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc >@@ -3,7 +3,7 @@ > <div id="search-facets"> > <h4>Refine your search</h4> > <ul> >- <li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi_not_availablity %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]&limit=available">Limit to currently available items</a>[% END %]</li></ul> >+ <li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi %][% limit_cgi_not_availablity %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi %][% limit_cgi %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]&limit=available">Limit to currently available items</a>[% END %]</li></ul> > [% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %])</li>[% END %] > </li> > >@@ -30,10 +30,10 @@ > [% IF facet.active %] > [% SET local_url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %] > <span class="facet-label">[% facet.facet_label_value %]</span> >- [<a href="[% local_url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>] >+ [<a href="[% local_url %]" title="Remove facet [% facet.facet_link_value %]">x</a>] > [% ELSE %] > [% SET local_url = url _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %] >- <span class="facet-label"><a href="[% local_url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span> >+ <span class="facet-label"><a href="[% local_url %]" title="[% facet.facet_title_value %]">[% facet.facet_label_value %]</a></span> > [% IF ( displayFacetCount ) %] > <span class="facet-count"> ([% facet.facet_count %])</span> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >index 111252a..f74e8ce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >@@ -31,7 +31,7 @@ > [% END %] > <label for="rec_[% record.biblionumber %]_[% subfield.subkey %]"><span class="subfield">[% subfield.subtag %]</span> / [% subfield.value %]</label> > <input type="hidden" name="tag_[% field.tag %]_code_[% subfield.subtag %]_[% field.key %]_[% subfield.subkey %]" value="[% subfield.subtag %]" /> >- <input type="hidden" name="tag_[% field.tag %]_subfield_[% subfield.subtag %]_[% subfield.key %]_[% subfield.subkey %]" value="[% subfield.value |html%]" /> >+ <input type="hidden" name="tag_[% field.tag %]_subfield_[% subfield.subtag %]_[% subfield.key %]_[% subfield.subkey %]" value="[% subfield.value %]" /> > </li> > [% END %] > </ul> >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 ) %]<div class="pages"> > <!-- Row of numbers corresponding to search result pages --> >- [% IF ( previous_page_offset.defined ) %]<a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% previous_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]"><< Previous</a>[% END %] >- [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %][% IF ( PAGE_NUMBER.highlight ) %]<span class="current">[% PAGE_NUMBER.pg %]</span>[% ELSE %] <a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% PAGE_NUMBER.offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">[% PAGE_NUMBER.pg %]</a>[% END %] >+ [% IF ( previous_page_offset.defined ) %]<a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi %][% limit_cgi %]&offset=[% previous_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]"><< Previous</a>[% END %] >+ [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %][% IF ( PAGE_NUMBER.highlight ) %]<span class="current">[% PAGE_NUMBER.pg %]</span>[% ELSE %] <a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi %][% limit_cgi %]&offset=[% PAGE_NUMBER.offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">[% PAGE_NUMBER.pg %]</a>[% END %] > [% END %] >- [% IF ( next_page_offset ) %]<a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% next_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">Next >></a>[% END %] >+ [% IF ( next_page_offset ) %]<a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi %][% limit_cgi %]&offset=[% next_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">Next >></a>[% END %] > </div>[% 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 34de2d4..d11d395 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 @@ > <form action="/cgi-bin/koha/admin/preferences.pl"> > <input type="hidden" name="tab" value="[% last_tab %]" /> > <input type="hidden" name="op" value="search" /> >- <input class="head-searchbox" type="text" size="40" name="searchfield" value="[% searchfield |html %]" /> >+ <input class="head-searchbox" type="text" size="40" name="searchfield" value="[% searchfield %]" /> > <input type="submit" class="submit" value="Search" /> > </form> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >index 7ca5b4a..2c0d0eb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >@@ -37,21 +37,21 @@ > > <table> > <caption>Server information</caption> >- <tr><th scope="row">Koha version: </th><td>[% kohaVersion |html %]</td></tr> >- <tr><th scope="row">OS version ('uname -a'): </th><td>[% osVersion |html %]</td></tr> >- <tr><th scope="row">Perl interpreter: </th><td>[% perlPath |html %]</td></tr> >- <tr><th scope="row">Perl version: </th><td>[% perlVersion |html %]</td></tr> >+ <tr><th scope="row">Koha version: </th><td>[% kohaVersion %]</td></tr> >+ <tr><th scope="row">OS version ('uname -a'): </th><td>[% osVersion %]</td></tr> >+ <tr><th scope="row">Perl interpreter: </th><td>[% perlPath %]</td></tr> >+ <tr><th scope="row">Perl version: </th><td>[% perlVersion %]</td></tr> > <tr><th scope="row">Perl @INC: </th><td> > [% FOREACH perlIncPat IN perlIncPath %] >- [% perlIncPat.perlinc |html %] <br /> >+ [% perlIncPat.perlinc %] <br /> > [% END %] > </td></tr> >- <tr><th scope="row">MySQL version: </th><td>[% mysqlVersion |html %]</td></tr> >- <tr><th scope="row">Apache version: </th><td>[% apacheVersion |html %]</td></tr> >+ <tr><th scope="row">MySQL version: </th><td>[% mysqlVersion %]</td></tr> >+ <tr><th scope="row">Apache version: </th><td>[% apacheVersion %]</td></tr> > [% IF (is_psgi) %] >- <tr><th scope="row">PSGI: </th><td>[% psgi_server |html %]</td></tr> >+ <tr><th scope="row">PSGI: </th><td>[% psgi_server %]</td></tr> > [% END %] >- <tr><th scope="row">Zebra version: </th><td>[% zebraVersion |html %]</td></tr> >+ <tr><th scope="row">Zebra version: </th><td>[% zebraVersion %]</td></tr> > [% IF (errZebraConnection == 10000) %] > <tr><th scope="row"><b>Error</b> </th><td>Zebra server seems not to be available. Is it started?</td></tr> > [% ELSIF (errZebraConnection) %] >@@ -826,7 +826,7 @@ > <tr class="[% loop.parity %]"> > [% FOREACH ro IN tabl.row2 %] > <td>[% ro.date %]</td> >- <td>[% ro.desc|html %]</td> >+ <td>[% ro.desc %]</td> > [% END %] > </tr> > [% 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 @@ > <form action="/cgi-bin/koha/acqui/addorder.pl" method="post"> > [% FOREACH var IN vars_loop %] > [% FOREACH val IN var.values %] >- <input type="hidden" name="[% var.name %]" value="[% val |html %]" /> >+ <input type="hidden" name="[% var.name %]" value="[% val %]" /> > [% END %] > [% END %] > <input type="hidden" name="confirm_budget_exceeding" value="1" /> >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 06dc0c5..5fa42f6 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' %] >-<title>Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</title> >+<title>Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname %] ([% basketno %]) for [% name %]</title> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >@@ -145,7 +145,7 @@ > [% INCLUDE 'acquisitions-search.inc' %] > > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name|html %]</a> › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname %] ([% basketno %]) for [% name %]</div> > > <div id="doc3" class="yui-t2"> > >@@ -228,7 +228,7 @@ > <p><strong>The following records could not be deleted:</strong></p> > <ul> > [% FOREACH cannotdelbiblio IN cannotdelbiblios %] >- <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cannotdelbiblio.biblionumber %]">[% cannotdelbiblio.title |html %]</a> by [% cannotdelbiblio.author %]: >+ <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cannotdelbiblio.biblionumber %]">[% cannotdelbiblio.title %]</a> by [% cannotdelbiblio.author %]: > <ul> > [% IF (cannotdelbiblio.itemcount) %]<li>[% cannotdelbiblio.itemcount %] item(s) attached.</li>[% END %] > [% IF (cannotdelbiblio.subscriptions) %]<li>[% cannotdelbiblio.subscriptions %] subscription(s) attached.</li>[% END %] >@@ -244,7 +244,7 @@ > <META HTTP-EQUIV=Refresh CONTENT="0; url=booksellers.pl"> > [% END %] > [% ELSE %] >- <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for <a href="supplier.pl?booksellerid=[% booksellerid %]">[% name|html %]</a></h1> >+ <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname %] ([% basketno %]) for <a href="supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a></h1> > [% IF ( basketno ) %] > <div id="acqui_basket_summary" class="yui-g"> > <div class="rows"> >@@ -454,7 +454,7 @@ > <p> > [% IF ( books_loo.order_received ) %] (rcvd)[% END %] > [% IF books_loo.title %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a>[% IF books_loo.author %] by [% books_loo.author %][% END %] >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title %]</a>[% IF books_loo.author %] by [% books_loo.author %][% END %] > [% ELSE %] > <em>Deleted bibliographic record, can't find title</em><br /> > [% END %] >@@ -471,12 +471,12 @@ > [% END %] > </p> > [% IF ( books_loo.order_internalnote ) %] >- <p class="ordernote"><strong>Internal note: </strong>[% books_loo.order_internalnote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal">Change internal note</a>]</p> >+ <p class="ordernote"><strong>Internal note: </strong>[% books_loo.order_internalnote %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal">Change internal note</a>]</p> > [% ELSE %] > [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal">Add internal note</a>] > [% END %] > [% IF ( books_loo.order_vendornote ) %] >- <p class="ordernote"><strong>Vendor note: </strong>[% books_loo.order_vendornote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=vendor">Change vendor note</a>]</p> >+ <p class="ordernote"><strong>Vendor note: </strong>[% books_loo.order_vendornote %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=vendor">Change vendor note</a>]</p> > [% ELSE %] > [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=vendor">Add vendor note</a>] > [% END %] >@@ -578,7 +578,7 @@ > <p> > [% IF ( order.order_received ) %] (rcvd)[% END %] > [% IF (order.title) %] >- [% order.title |html %][% IF order.author %] by [% order.author %][% END %] >+ [% order.title %][% IF order.author %] by [% order.author %][% END %] > [% ELSE %] > <em>Deleted bibliographic record, can't find title</em> > [% END %] >@@ -646,7 +646,7 @@ > <div id="closebasket_needsconfirmation" class="dialog alert"> > > <form action="/cgi-bin/koha/acqui/basket.pl" class="confirm"> >- <h1>Are you sure you want to close basket [% basketname|html %]?</h1> >+ <h1>Are you sure you want to close basket [% basketname %]?</h1> > [% IF ( CAN_user_acquisition_group_manage ) %] > <p> > <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label> >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 0bdd830..261edd3 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' %] >-<title>Koha › Basket grouping for [% booksellername |html %]</title> >+<title>Koha › Basket grouping for [% booksellername %]</title> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >@@ -129,9 +129,9 @@ function submitForm(form) { > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › > [% IF ( grouping ) %] >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> › <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket grouping</a> › Add basket group for [% booksellername |html %]</div> >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> › <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket grouping</a> › Add basket group for [% booksellername %]</div> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> › Basket grouping</div> >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> › Basket grouping</div> > [% END %] > > <div id="doc3" class="yui-t2"> >@@ -149,11 +149,11 @@ function submitForm(form) { > <div class="btn-group"><a href="[% script_name %]?op=delete&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="delbutton"><i class="fa fa-remove"></i> Delete basket group</a></div> > [% END %] > [% IF (name && closedbg) %] >- <h1>Basket group [% name %] ([% basketgroupid %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1> >+ <h1>Basket group [% name %] ([% basketgroupid %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a></h1> > [% ELSIF (name) %] >- <h1>Edit basket group [% name %] ([% basketgroupid %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1> >+ <h1>Edit basket group [% name %] ([% basketgroupid %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a></h1> > [% ELSE %] >- <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1> >+ <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a></h1> > [% END %] > <div id="basketgroupcolumns" class="yui-g"> > [% UNLESS (closedbg) %] >@@ -303,7 +303,7 @@ function submitForm(form) { > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid %]" class="btn btn-small" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div> > </div> >- <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1> >+ <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a></h1> > <div id="basket_groups" class="toptabs"> > <ul class="ui-tabs-nav"> > [% UNLESS ( listclosed) %]<li class="ui-tabs-active"><a href="#opened">Open</a></li> >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 988fd27..74eaa4b 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 %] > </td> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title %]</a> > <br />[% order.author %] <br /> [% order.isbn %] > </td> > <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id %]">[% order.name %]</a></td> >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 @@ > <div id="bd"> > <div id="yui-main"> > <div class="yui-b"> >- <h2>Files for invoice: [% invoicenumber | html %]</h2> >+ <h2>Files for invoice: [% invoicenumber %]</h2> > <p><b>Vendor: </b><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% suppliername %]</a></p> > <br /> > [% IF errors %] >@@ -62,9 +62,9 @@ > <tbody> > [% FOREACH f IN files %] > <tr> >- <td><a href="?invoiceid=[% invoiceid %]&op=download&view=1&file_id=[% f.file_id %]">[% f.file_name | html %]</a></td> >- <td>[% f.file_type | html %]</td> >- <td>[% f.file_description | html %]</td> >+ <td><a href="?invoiceid=[% invoiceid %]&op=download&view=1&file_id=[% f.file_id %]">[% f.file_name %]</a></td> >+ <td>[% f.file_type %]</td> >+ <td>[% f.file_description %]</td> > <td class="title-string"> > <span title="[% f.date_uploaded %]">[% f.date_uploaded | $KohaDates %]</span> > </td> >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 3c0991e..7cb26cc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -230,9 +230,9 @@ > <tbody> > [% FOREACH f IN files %] > <tr> >- <td><a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid %]&op=download&view=1&file_id=[% f.file_id %]">[% f.file_name | html %]</a></td> >- <td>[% f.file_type | html %]</td> >- <td>[% f.file_description | html %]</td> >+ <td><a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid %]&op=download&view=1&file_id=[% f.file_id %]">[% f.file_name %]</a></td> >+ <td>[% f.file_type %]</td> >+ <td>[% f.file_description %]</td> > <td class="title-string"> > <span title="[% f.date_uploaded %]">[% f.date_uploaded | $KohaDates %]</span> > </td> >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 ) %] > <form action="lateorders.pl" name="claim" method="post"> > <input type="hidden" name="op" value="send_alert" /> >- <input type="hidden" name="delay" value="[% delay | html%]" /> >+ <input type="hidden" name="delay" value="[% delay%]" /> > <input type="hidden" name="booksellerid" value="[% booksellerid %]" /> > [% IF ( letters ) %] > <p><label for="letter_code">Claim using notice: </label><select name="letter_code" id="letter_code"> >@@ -151,7 +151,7 @@ $(document).ready(function() { > ([% lateorder.supplierid %]) > </td> > <td> >- <b>[% lateorder.title |html %]</b> >+ <b>[% lateorder.title %]</b> > [% IF ( lateorder.author ) %]<br/><i>Author:</i> [% lateorder.author %][% END %] > [% IF ( lateorder.publisher ) %] > <br/><i>Published by:</i> [% lateorder.publisher %] >@@ -222,10 +222,10 @@ $(document).ready(function() { > <fieldset class="brief"> > <h4>Filter results:</h4> > [% FOREACH ERROR_LOO IN ERROR_LOOP %] >-[% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay | html %]) must be a number between 0 and 999.</p>[% END %] >+[% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay %]) must be a number between 0 and 999.</p>[% END %] > [% END %] > <ol> >- <li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay | html%]" /> days ago</li> >+ <li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay%]" /> days ago</li> > <li><label for="from">Estimated delivery date from: </label> > <input type="text" size="10" id="from" name="estimateddeliverydatefrom" value="[% estimateddeliverydatefrom %]" class="datepickerfrom" /> > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >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 @@ > <body id="acq_modordernotes" class="acq"> > [% INCLUDE 'header.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername|html %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketname|html %] ([% basketno %])</a> › Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketname %] ([% basketno %])</a> › Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note</div> > > <div id="doc" class="yui-t7"> > >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 037dc10..2d7364e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >@@ -74,7 +74,7 @@ > [% FOREACH biblio IN resultsloop %] > <tr> > <td> >- <p><span class="title">[% biblio.title |html %]</span> >+ <p><span class="title">[% biblio.title %]</span> > [% IF ( biblio.author ) %] by <span class="author">[% biblio.author %]</span>,[% END %]</p> > <p>[% 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 7638f02..45855ea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -309,10 +309,10 @@ $(document).ready(function() > <ol><li> > [% IF ( biblionumber ) %] > <span class="label">Title</span> >- <input type="hidden" name="title" value="[% title |html %]" /> <span class="title">[% title |html %]</span> >+ <input type="hidden" name="title" value="[% title %]" /> <span class="title">[% title %]</span> > [% ELSE %] > <label for="entertitle" class="required">Title: </label> >- <input type="text" id="entertitle" size="50" name="title" value="[% title |html %]" class="focus" /> >+ <input type="text" id="entertitle" size="50" name="title" value="[% title %]" class="focus" /> > <span class="required">Required</span> > [% END %] > </li> >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 %] > <tr data-reneweddate="[% sub.reneweddate %]" > > <td>[% sub.issn %]</td> >- <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid %]" class="button" title="subscription detail">[% IF (sub.title) %][% sub.title |html %][% ELSE %] >+ <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid %]" class="button" title="subscription detail">[% IF (sub.title) %][% sub.title %][% ELSE %] > --- > [% END %][% IF (sub.unititle) %], [% sub.unititle %][% END %]</a> > </td> >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 @@ > <tr> > <td>[% suggestions_loo.managedby %]</td> > <td> >- <p>[% suggestions_loo.title |html %] - [% suggestions_loo.author %]</p> >+ <p>[% suggestions_loo.title %] - [% suggestions_loo.author %]</p> > <p> > [% IF ( suggestions_loo.copyrightdate ) %]© [% suggestions_loo.copyrightdate %] [% END %] > [% IF ( suggestions_loo.volumedesc ) %]volume: <i>[% suggestions_loo.volumedesc %]</i> [% 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 31b08c5..26da5fc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -141,7 +141,7 @@ > > <fieldset class="rows"> > <legend>Catalog details</legend> >- <ol><li><span class="label">Title: </span><span class="title">[% title |html %]</span></li> >+ <ol><li><span class="label">Title: </span><span class="title">[% title %]</span></li> > <li> <span class="label">Author: </span> > [% author %]</li> > <li><span class="label">Copyright: </span> >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 05de288..1d942d5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -254,7 +254,7 @@ > </td> > <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td> > <td class="summaryfilterclass"> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title %]</a> > [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %] > [% IF ( loop_order.isbn ) %] – [% loop_order.isbn %][% END %] > [% IF ( loop_order.publishercode ) %]<br />Publisher:[% loop_order.publishercode %][% END %] >@@ -265,12 +265,12 @@ > [% END %] > <br /> > [% IF ( loop_order.order_internalnote ) %] >- <p class="ordernote"><strong>Internal note: </strong>[% loop_order.order_internalnote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=internal">Change internal note</a>]</p> >+ <p class="ordernote"><strong>Internal note: </strong>[% loop_order.order_internalnote %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=internal">Change internal note</a>]</p> > [% ELSE %] > [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=internal">Add internal note</a>] > [% END %] > [% IF ( loop_order.order_vendornote ) %] >- <p class="ordernote"><strong>Vendor note: </strong>[% loop_order.order_vendornote|html %]</p> >+ <p class="ordernote"><strong>Vendor note: </strong>[% loop_order.order_vendornote %]</p> > [% ELSE %] > [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=vendor">Add vendor note</a>] > [% END %] >@@ -401,7 +401,7 @@ > 0 > [% END %] > </td> >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title %]</a> > [% IF ( order.author ) %] / [% order.author %][% END %] > [% IF ( order.isbn ) %] - [% order.isbn %][% END %] > [% IF ( order.publishercode ) %]<br />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": > "<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber %]'>[% 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%]</a></span>", > "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' -%] >- "<a style='cursor:pointer' onclick='select_user(\"[% data.borrowernumber %]\", [% To.json(data) | html %] );'>Select</a>" >+ "<a style='cursor:pointer' onclick='select_user(\"[% data.borrowernumber %]\", [% To.json(data) %] );'>Select</a>" > [%- ELSE -%] > "<a style='cursor:pointer' onclick='add_user(\"[% data.borrowernumber %]\", \"[% data.firstname %] [% data.surname %]\");'>Select</a>" > [%- 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 68e76e4..00b106f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >@@ -95,7 +95,7 @@ > <tr> > <td><a href="neworderempty.pl?ordernumber=[% ordersloo.ordernumber %]">[% ordersloo.ordernumber %]</a></td> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber %]">[% ordersloo.title |html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber %]">[% ordersloo.title %]</a> > [% IF ( ordersloo.author ) %] by [% ordersloo.author %][% END %] > [% IF ( ordersloo.isbn ) %] – [% ordersloo.isbn %][% END %] > [% IF ( ordersloo.publishercode ) %]<br />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 6e1ad43..a585972 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 >@@ -108,7 +108,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <div class="yui-u first"> > <fieldset class="rows"> > <ol> >- <li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle" name="title" value="[% title |html %]" class="focus" /></li> >+ <li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle" name="title" value="[% title %]" class="focus" /></li> > <li><label for="isbn">ISBN: </label> <input type="text" id="isbn" name="isbn" value="[% isbn %]" /></li> > <li><label for="lccall">LC call number: </label> <input type="text" id="lccall" name="lccall" value="" /></li> > <li><label for="controlnumber">Control no.: </label> <input type="text" id="controlnumber" name="controlnumber" value="" /></li> >@@ -187,7 +187,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > > <tr> > <td>[% breeding_loo.server %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode %]&breedingid=[% breeding_loo.breedingid %]&booksellerid=[% booksellerid %]&basketno=[% basketno %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td> >- <td>[% breeding_loo.title |html %]</td> >+ <td>[% breeding_loo.title %]</td> > <td>[% breeding_loo.author %]</td> > <td>[% breeding_loo.isbn %]</td> > <td>[% breeding_loo.lccn %]</td> >@@ -216,7 +216,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <form method="post" action="z3950_search.pl" id="page_form" name="page_form" class="checkboxed"> > <input type="hidden" name="op" id="op" value="do_search" /> > <input type="hidden" name="current_page" id="current_page" value="[% current_page %]" /> >- <input type="hidden" id="searchtitle" name="title" value="[% title |html %]" /> >+ <input type="hidden" id="searchtitle" name="title" value="[% title %]" /> > <input type="hidden" id="isbn" name="isbn" value="[% isbn %]" /> > <input type="hidden" id="lccall" name="lccall" value="[% lccall %]" /> > <input type="hidden" id="author" name="author" value="[% author %]" /> >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 0d73b85..c508e4b 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 @@ > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetmenu_[% block_budget_id %]"> > <li> >- <a href="[% script_name %]?op=add_form&budget_period_id=[% block_budget_id |html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="[% script_name %]?op=add_form&budget_period_id=[% block_budget_id %]"><i class="fa fa-pencil"></i> Edit</a> > </li> > <li> > <a href="[% script_name %]?op=delete_confirm&budget_period_id=[% block_budget_id %]"><i class="fa fa-remove"></i> Delete</a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >index e2cae0e..58b78d7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >@@ -27,11 +27,11 @@ function displayMoreConstraint(numlayer){ > [% INCLUDE 'cat-search.inc' %] > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › > <a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a> › >- [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri%]">[% authtypecode |html%] framework</a> › >+ [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri%]">[% authtypecode%] framework</a> › > [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a> › > [% END %] >- [% IF ( else ) %]Authority MARC subfield structure for [% tagfield | html %] >- [% ELSE %]<a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&tagsubfield=[% tagsubfield %]&authtypecode=[% authtypecode |uri %]">Authority MARC subfield structure for [% tagfield | html %]</a> › >+ [% IF ( else ) %]Authority MARC subfield structure for [% tagfield %] >+ [% ELSE %]<a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&tagsubfield=[% tagsubfield %]&authtypecode=[% authtypecode |uri %]">Authority MARC subfield structure for [% tagfield %]</a> › > [% END %] > [% IF ( delete_confirm ) %]Confirm deletion of subfield [% tagsubfield %]?[% END %] > [% IF ( delete_confirmed ) %]Data deleted[% END %] >@@ -51,12 +51,12 @@ function displayMoreConstraint(numlayer){ > [% IF ( add_form ) %] > > <h1>[% IF ( use_heading_flags_p ) %] >- [% IF ( heading_edit_subfields_p ) %]Edit MARC subfields constraints for field [% tagfield | html %] authority [% authtypecode |html%][% END %] >+ [% IF ( heading_edit_subfields_p ) %]Edit MARC subfields constraints for field [% tagfield %] authority [% authtypecode%][% END %] > [% ELSE %][% action %][% END %]</h1> > <form action="[% script_name %]" name="Aform" method="post"> > <input type="hidden" name="op" value="add_validate" /> >- <input type="hidden" name="tagfield" value="[% tagfield | html %]" /> >- <input type="hidden" name="authtypecode" value="[% authtypecode | html%]" /> >+ <input type="hidden" name="tagfield" value="[% tagfield %]" /> >+ <input type="hidden" name="authtypecode" value="[% authtypecode%]" /> > <fieldset class="action"><input type="submit" class="submit" value="Save changes" /> <a class="cancel" href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&authtypecode=[% authtypecode |uri %]">Cancel</a></fieldset> > <div id="subfieldtabs" class="toptabs numbered"> > <ul> >@@ -222,16 +222,16 @@ function displayMoreConstraint(numlayer){ > <table><tr><th scope="row">Subfield:</th> <td>[% tagsubfield %]</td></tr> > <tr><th scope="row">Description:</th> <td>[% liblibrarian %]</td></tr></table> > <input type="hidden" name="searchfield" value="[% searchfield %]" /> >- <input type="hidden" name="tagfield" value="[% tagfield | html%]" /> >+ <input type="hidden" name="tagfield" value="[% tagfield%]" /> > <input type="hidden" name="tagsubfield" value="[% tagsubfield %]" /> >- <input type="hidden" name="authtypecode" value="[% authtypecode | html%]" /> >+ <input type="hidden" name="authtypecode" value="[% authtypecode%]" /> > <input type="submit" class="approve" value="Yes, delete this subfield" /> > </form> > <form action="[% delete_link %]" method="get"> > <input type="hidden" name="searchfield" value="[% searchfield %]" /> >- <input type="hidden" name="tagfield" value="[% tagfield | html %]" /> >+ <input type="hidden" name="tagfield" value="[% tagfield %]" /> > <input type="hidden" name="tagsubfield" value="[% tagsubfield %]" /> >- <input type="hidden" name="authtypecode" value="[% authtypecode |html%]" /> >+ <input type="hidden" name="authtypecode" value="[% authtypecode%]" /> > <input type="submit" class="deny" value="No, do not delete" /> > </form> > </form></div> >@@ -241,14 +241,14 @@ function displayMoreConstraint(numlayer){ > > <div class="dialog message"> <h3>Data deleted</h3> > <form action="[% script_name %]" method="post"> >- <input type="hidden" name="tagfield" value="[% tagfield | html %]" /> >+ <input type="hidden" name="tagfield" value="[% tagfield %]" /> > <input type="submit" class="approve" value="OK" /> > </form></div> > [% END %] > > > [% IF ( else ) %] >-<h1>Authority MARC subfield structure admin for [% tagfield | html %] (authority: [% authtypecode | html%])</h1> >+<h1>Authority MARC subfield structure admin for [% tagfield %] (authority: [% authtypecode %])</h1> > <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.</p> > <p>The column 'Koha field' shows that the subfield is linked with a Koha field.</p> > >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 2d9da9a..932511b 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 @@ > </li> > [% END %] > >- <li><label for="liblibrarian">Text for librarians: </label><input type="text" name="liblibrarian" id="liblibrarian" value="[% liblibrarian |html %]" size="40" maxlength="100" /></li> >- <li><label for="libopac">Text for opac: </label><input type="text" name="libopac" id="libopac" value="[% libopac |html %]" size="40" maxlength="100" /></li> >+ <li><label for="liblibrarian">Text for librarians: </label><input type="text" name="liblibrarian" id="liblibrarian" value="[% liblibrarian %]" size="40" maxlength="100" /></li> >+ <li><label for="libopac">Text for opac: </label><input type="text" name="libopac" id="libopac" value="[% libopac %]" size="40" maxlength="100" /></li> > <li><label for="repeatable">Repeatable: </label> > [% IF ( repeatable ) %] > <input type="checkbox" name="repeatable" id="repeatable" value="1" checked="checked" /> >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 5a82fbf..d28b871 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -91,7 +91,7 @@ > </li> > <li> > <label for="authtypetext" class="required">Description: </label> >- <input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="[% authority_type.authtypetext |html %]" class="required" required="required" /> >+ <input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="[% authority_type.authtypetext %]" class="required" required="required" /> > <span class="required">Required</span> > </li> > <li> >@@ -163,8 +163,8 @@ > <td>[% authority_type.summary %]</td> > <td>[% authority_type.auth_tag_to_report %]</td> > <td><a href="auth_tag_structure.pl?authtypecode=[% authority_type.authtypecode %]" class="button parameters" >MARC structure</a></td> >- <td><a href="/cgi-bin/koha/admin/authtypes.pl?op=add_form&authtypecode=[% authority_type.authtypecode |html %]">Edit</a></td> >- <td><a href="/cgi-bin/koha/admin/authtypes.pl?op=delete_confirm&authtypecode=[% authority_type.authtypecode |html %]">Delete</a></td> >+ <td><a href="/cgi-bin/koha/admin/authtypes.pl?op=add_form&authtypecode=[% authority_type.authtypecode %]">Edit</a></td> >+ <td><a href="/cgi-bin/koha/admin/authtypes.pl?op=delete_confirm&authtypecode=[% authority_type.authtypecode %]">Delete</a></td> > </tr> > [% END %] > <tbody> >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 52ce915..da7c4e7 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 >@@ -162,7 +162,7 @@ > [% END %] > <li> > <label for="description" class="required">Description: </label> >- <input type="text" name="frameworktext" id="description" size="40" maxlength="80" value="[% framework.frameworktext |html %]" required="required" class="required" /> >+ <input type="text" name="frameworktext" id="description" size="40" maxlength="80" value="[% framework.frameworktext %]" required="required" class="required" /> > <span class="required">Required</span> > </li> > </ol> >@@ -272,8 +272,8 @@ > <td>[% loo.frameworkcode %]</td> > <td>[% loo.frameworktext %]</td> > <td><a href="marctagstructure.pl?frameworkcode=[% loo.frameworkcode %]" >MARC structure</a></td> >- <td><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form&frameworkcode=[% loo.frameworkcode |html %]">Edit</a></td> >- <td><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=delete_confirm&frameworkcode=[% loo.frameworkcode |html %]">Delete</a></td> >+ <td><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form&frameworkcode=[% loo.frameworkcode %]">Edit</a></td> >+ <td><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=delete_confirm&frameworkcode=[% loo.frameworkcode %]">Delete</a></td> > <td> > > <!-- Button to trigger modal --> >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 305741a..71c3c95 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -142,17 +142,17 @@ tinyMCE.init({ > <li> > [% IF library %] > <span class="label">Library code: </span> >- <input type="hidden" name="branchcode" value="[% library.branchcode |html %]" /> >+ <input type="hidden" name="branchcode" value="[% library.branchcode %]" /> > [% library.branchcode %] > [% ELSE %] > <label for="branchcode" class="required">Library code: </label> >- <input type="text" name="branchcode" id="branchcode" size="10" maxlength="10" value="[% library.branchcode |html %]" class="required" required="required" /> >+ <input type="text" name="branchcode" id="branchcode" size="10" maxlength="10" value="[% library.branchcode %]" class="required" required="required" /> > <span class="required">Required</span> > [% END %] > </li> > <li> > <label for="branchname" class="required">Name: </label> >- <input type="text" name="branchname" id="branchname" size="80" value="[% library.branchname |html %]" class="required" required="required" /> >+ <input type="text" name="branchname" id="branchname" size="80" value="[% library.branchname %]" class="required" required="required" /> > <span class="required">Required</span> > </li> > </ol> >@@ -176,22 +176,22 @@ tinyMCE.init({ > [% END %] > <fieldset class="rows"> > <ol> >- <li><label for="branchaddress1">Address line 1: </label><input type="text" name="branchaddress1" id="branchaddress1" size="60" value="[% library.branchaddress1 |html %]" /></li> >- <li><label for="branchaddress2">Address line 2: </label><input type="text" name="branchaddress2" id="branchaddress2" size="60" value="[% library.branchaddress2 |html %]" /></li> >- <li><label for="branchaddress3">Address line 3: </label><input type="text" name="branchaddress3" id="branchaddress3" size="60" value="[% library.branchaddress3 |html %]" /></li> >- <li><label for="branchcity">City: </label><input type="text" name="branchcity" id="branchcity" size="60" value="[% library.branchcity |html %]" /></li> >- <li><label for="branchstate">State: </label><input type="text" name="branchstate" id="branchstate" size="60" value="[% library.branchstate |html %]" /></li> >- <li><label for="branchzip">ZIP/Postal code: </label><input type="text" name="branchzip" id="branchzip" size="25" maxlength="25" value="[% library.branchzip |html %]" /></li> >- <li><label for="branchcountry">Country: </label><input type="text" name="branchcountry" id="branchcountry" size="60" value="[% library.branchcountry |html %]" /></li> >- <li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% library.branchphone |html %]" /></li> >- <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% library.branchfax |html %]" /></li> >- <li><label for="branchemail">Email: </label><input type="text" name="branchemail" id="branchemail" class="email" size="80" value="[% library.branchemail |html %]" /></li> >- <li><label for="branchreplyto">Reply-To (if different to Email): </label> <input type="text" name="branchreplyto" id="branchreplyto" class="email" size="80" value="[% library.branchreplyto |html %]" /></li> >- <li><label for="branchreturnpath">Return-Path (if different to Email): </label> <input type="text" name="branchreturnpath" id="branchreturnpath" class="email" size="80" value="[% library.branchreturnpath |html %]" /></li> >- <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl" size="80" value="[% library.branchurl |html %]" class="url" /></li> >- <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% library.opac_info |html %]</textarea></li> >- <li><label for="branchip">IP: </label><input type="text" name="branchip" id="branchip" size="15" maxlength="15" value="[% library.branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li> >- <li><label for="branchnotes">Notes: </label><input type="text" name="branchnotes" id="branchnotes" size="80" value="[% library.branchnotes |html %]" /></li> >+ <li><label for="branchaddress1">Address line 1: </label><input type="text" name="branchaddress1" id="branchaddress1" size="60" value="[% library.branchaddress1 %]" /></li> >+ <li><label for="branchaddress2">Address line 2: </label><input type="text" name="branchaddress2" id="branchaddress2" size="60" value="[% library.branchaddress2 %]" /></li> >+ <li><label for="branchaddress3">Address line 3: </label><input type="text" name="branchaddress3" id="branchaddress3" size="60" value="[% library.branchaddress3 %]" /></li> >+ <li><label for="branchcity">City: </label><input type="text" name="branchcity" id="branchcity" size="60" value="[% library.branchcity %]" /></li> >+ <li><label for="branchstate">State: </label><input type="text" name="branchstate" id="branchstate" size="60" value="[% library.branchstate %]" /></li> >+ <li><label for="branchzip">ZIP/Postal code: </label><input type="text" name="branchzip" id="branchzip" size="25" maxlength="25" value="[% library.branchzip %]" /></li> >+ <li><label for="branchcountry">Country: </label><input type="text" name="branchcountry" id="branchcountry" size="60" value="[% library.branchcountry %]" /></li> >+ <li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% library.branchphone %]" /></li> >+ <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% library.branchfax %]" /></li> >+ <li><label for="branchemail">Email: </label><input type="text" name="branchemail" id="branchemail" class="email" size="80" value="[% library.branchemail %]" /></li> >+ <li><label for="branchreplyto">Reply-To (if different to Email): </label> <input type="text" name="branchreplyto" id="branchreplyto" class="email" size="80" value="[% library.branchreplyto %]" /></li> >+ <li><label for="branchreturnpath">Return-Path (if different to Email): </label> <input type="text" name="branchreturnpath" id="branchreturnpath" class="email" size="80" value="[% library.branchreturnpath %]" /></li> >+ <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl" size="80" value="[% library.branchurl %]" class="url" /></li> >+ <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% library.opac_info %]</textarea></li> >+ <li><label for="branchip">IP: </label><input type="text" name="branchip" id="branchip" size="15" maxlength="15" value="[% library.branchip %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li> >+ <li><label for="branchnotes">Notes: </label><input type="text" name="branchnotes" id="branchnotes" size="80" value="[% library.branchnotes %]" /></li> > </ol> > </fieldset> > <fieldset class="action"> >@@ -206,8 +206,8 @@ tinyMCE.init({ > <fieldset> > <legend>Confirm deletion of [% library.branchname %] ([% library.branchcode %])?</legend> > <input type="hidden" name="op" value="delete_confirmed" /> >- <input type="hidden" name="branchcode" value="[% library.branchcode |html %]" /> >- <input type="hidden" name="branchname" value="[% library.branchname |html %]"> >+ <input type="hidden" name="branchcode" value="[% library.branchcode %]" /> >+ <input type="hidden" name="branchname" value="[% library.branchname %]"> > <fieldset class="action"> > <input type="submit" value="Delete Library" /> > <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a> >@@ -234,34 +234,34 @@ tinyMCE.init({ > <tbody> > [% FOREACH library IN libraries %] > <tr> >- <td>[% library.branchname |html %]</td> >- <td>[% library.branchcode |html %]</td> >+ <td>[% library.branchname %]</td> >+ <td>[% library.branchcode %]</td> > <td> > [% IF library.branchaddress1 %] >- [% library.branchaddress1 |html %][% END %] >+ [% library.branchaddress1 %][% END %] > [% IF library.branchaddress2 %] >- <br />[% library.branchaddress2 |html %][% END %] >+ <br />[% library.branchaddress2 %][% END %] > [% IF library.branchaddress3 %] >- <br />[% library.branchaddress3 |html %][% END %] >+ <br />[% library.branchaddress3 %][% END %] > [% IF library.branchcity %] >- <br />[% library.branchcity |html %][% END %][% IF ( library.branchstate ) %], >- [% library.branchstate |html %][% END %] >+ <br />[% library.branchcity %][% END %][% IF ( library.branchstate ) %], >+ [% library.branchstate %][% END %] > [% IF library.branchzip %] >- [% library.branchzip |html %][% END %] >+ [% library.branchzip %][% END %] > [% IF library.branchcountry %] >- <br />[% library.branchcountry |html %][% END %] >+ <br />[% library.branchcountry %][% END %] > [% IF library.branchphone %] >- <br />Ph: [% library.branchphone |html %][% END %] >+ <br />Ph: [% library.branchphone %][% END %] > [% IF library.branchfax %] >- <br />Fax: [% library.branchfax |html %][% END %] >+ <br />Fax: [% library.branchfax %][% END %] > [% IF library.branchemail %] >- <br /><a href="mailto:[% library.branchemail %]">[% library.branchemail |html %]</a>[% END %] >+ <br /><a href="mailto:[% library.branchemail %]">[% library.branchemail %]</a>[% END %] > [% IF library.branchurl %] >- <br /><a href="[% library.branchurl %]">[% library.branchurl |html %]</a>[% END %] >+ <br /><a href="[% library.branchurl %]">[% library.branchurl %]</a>[% END %] > [% IF library.opac_info %] > <br />OPAC Info: <div>[% library.opac_info %]</div>[% END %] > [% IF library.branchnotes %] >- <br />Notes: [% library.branchnotes |html %][% END %] >+ <br />Notes: [% library.branchnotes %][% END %] > </td> > <td> > [% FOREACH category IN library.get_categories %] >@@ -339,7 +339,7 @@ tinyMCE.init({ > <li> > [% IF category.categorycode %] > <span class="label">Category code: </span> >- <input type="hidden" name="categorycode" id="categorycode" value="[% category.categorycode |html %]" /> >+ <input type="hidden" name="categorycode" id="categorycode" value="[% category.categorycode %]" /> > [% category.categorycode %] > [% ELSE %] > <label for="categorycode">Category code:</label> >@@ -348,11 +348,11 @@ tinyMCE.init({ > </li> > <li> > <label for="categoryname">Name: </label> >- <input type="text" name="categoryname" id="categoryname" size="32" maxlength="32" value="[% category.categoryname |html %]" /> >+ <input type="text" name="categoryname" id="categoryname" size="32" maxlength="32" value="[% category.categoryname %]" /> > </li> > <li> > <label for="codedescription">Description: </label> >- <input type="text" name="codedescription" id="codedescription" size="70" value="[% category.codedescription |html %]" /> >+ <input type="text" name="codedescription" id="codedescription" size="70" value="[% category.codedescription %]" /> > </li> > <li> > <label for="categorytype">Category type: </label> >@@ -363,7 +363,6 @@ tinyMCE.init({ > [% ELSE %] > <option value="searchdomain">Search domain</option> > <option value="properties">Properties</option> >- > [% END %] > </select> > </li> >@@ -386,7 +385,7 @@ tinyMCE.init({ > Are you sure you want to delete the group '[% category.codedescription %]' ([% category.categorycode %])? > <form action="/cgi-bin/koha/admin/branches.pl" method="post"> > <input type="hidden" name="op" value="delete_confirmed_category" /> >- <input type="hidden" name="categorycode" value="[% category.categorycode |html %]" /> >+ <input type="hidden" name="categorycode" value="[% category.categorycode %]" /> > <input type="submit" value="Delete" /> > <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >index d4d0130..79a54e0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >@@ -2,8 +2,8 @@ > [% USE KohaDates %] > [% USE Price %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>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 %] > </title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >@@ -107,8 +107,8 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'patrons-admin-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › [% IF op == 'add_form' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> › [% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %] >-[% IF op == 'delete_confirm' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> › [% IF ( patrons_in_category > 0 ) %]Cannot delete: Category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %] >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › [% IF op == 'add_form' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> › [% IF ( categorycode ) %]Modify category '[% categorycode %]'[% ELSE %]New category[% END %][% END %] >+[% IF op == 'delete_confirm' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> › [% IF ( patrons_in_category > 0 ) %]Cannot delete: Category [% categorycode %] in use[% ELSE %]Confirm deletion of category '[% categorycode %]'[% END %][% END %] > [% IF op == 'delete_confirmed' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> › Category deleted[% END %] > [% IF op == 'list' %]Patron categories[% END %]</div> > >@@ -145,7 +145,7 @@ > <input type="hidden" name="op" value="add_validate" /> > <input type="hidden" name="checked" value="0" /> > [% IF category %] >- <h1>Modify category [% categorycode |html %]</h1> >+ <h1>Modify category [% categorycode %]</h1> > [% ELSE %] > <h1>New category</h1> > [% END %] >@@ -153,8 +153,8 @@ > <ol> > [% IF category %] > <li> >- <span class="label">Category code: </span>[% categorycode |html %] >- <input type="hidden" name="categorycode" value="[% category.categorycode |html %]" /><input type="hidden" name="is_a_modif" value="1" /> >+ <span class="label">Category code: </span>[% categorycode %] >+ <input type="hidden" name="categorycode" value="[% category.categorycode %]" /><input type="hidden" name="is_a_modif" value="1" /> > </li> > [% ELSE %] > <li> >@@ -165,7 +165,7 @@ > [% END %] > <li> > <label for="description" class="required">Description: </label> >- <input type="text" name="description" id="description" size="40" maxlength="80" value="[% category.description |html %]" /> >+ <input type="text" name="description" id="description" size="40" maxlength="80" value="[% category.description %]" /> > <span class="required">Required</span> > </li> > <li> >@@ -316,9 +316,9 @@ > <fieldset> > <legend> > [% IF patrons_in_category > 0 %] >- Category [% categorycode |html %] is in use. Deletion not possible! >+ Category [% categorycode %] is in use. Deletion not possible! > [% ELSE %] >- Confirm deletion of category [% categorycode |html %] >+ Confirm deletion of category [% categorycode %] > [% END %] > </legend> > >@@ -328,8 +328,8 @@ > </div> > [% END %] > <table> >- <tr><th scope="row">Category code: </th><td>[% category.categorycode |html %]</td></tr> >- <tr><th scope="row">Description: </th><td>[% category.description |html %]</td></tr> >+ <tr><th scope="row">Category code: </th><td>[% category.categorycode %]</td></tr> >+ <tr><th scope="row">Description: </th><td>[% category.description %]</td></tr> > <tr><th scope="row">Enrollment period: </th> > <td> > [% IF category.enrolmentperiod %] >@@ -364,7 +364,7 @@ > <input type="submit" value="OK" /> > [% ELSE %] > <input type="hidden" name="op" value="delete_confirmed" /> >- <input type="hidden" name="categorycode" value="[% categorycode |html %]" /> >+ <input type="hidden" name="categorycode" value="[% categorycode %]" /> > <input type="submit" value="Delete this category" /> > <a class="cancel" href="/cgi-bin/koha/admin/categories.pl">Cancel</a> > [% END %] >@@ -409,9 +409,9 @@ > <tbody> > [% FOREACH category IN categories %] > <tr> >- <td>[% category.categorycode |html %]</td> >+ <td>[% category.categorycode %]</td> > <td> >- <a href="/cgi-bin/koha/admin/categories.pl?op=add_form&categorycode=[% category.categorycode |uri %]">[% category.description |html %]</a> >+ <a href="/cgi-bin/koha/admin/categories.pl?op=add_form&categorycode=[% category.categorycode |uri %]">[% category.description %]</a> > </td> > <td> > [% SWITCH category.category_type %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >index 7143661..01e27df 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -80,11 +80,11 @@ > [% END %] > <li> > <label for="city_name" class="required">City: </label> >- <input type="text" name="city_name" id="city_name" size="80" maxlength="100" value="[% city.city_name |html %]" required="required" class="required" /> <span class="required">Required</span> >+ <input type="text" name="city_name" id="city_name" size="80" maxlength="100" value="[% city.city_name %]" required="required" class="required" /> <span class="required">Required</span> > </li> > <li> > <label for="city_state">State: </label> >- <input type="text" name="city_state" id="city_state" size="80" maxlength="100" value="[% city.city_state |html %]" /> >+ <input type="text" name="city_state" id="city_state" size="80" maxlength="100" value="[% city.city_state %]" /> > </li> > <li> > <label for="city_zipcode" class="required">ZIP/Postal code: </label> >@@ -92,7 +92,7 @@ > </li> > <li> > <label for="city_country">Country: </label> >- <input type="text" name="city_country" id="city_country" size="80" maxlength="100" value="[% city.city_country |html %]" /> >+ <input type="text" name="city_country" id="city_country" size="80" maxlength="100" value="[% city.city_country %]" /> > </li> > </ol> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >index 3bea496..55fb9cf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >@@ -117,7 +117,7 @@ function CheckRuleForm(f) { > </li> > <li><label for="description">Description: </label> > <input type="text" id="description" name="description" size="50" maxlength="250" >- value="[% description |html %]" /> >+ value="[% description %]" /> > </li> > <li><label for="used">Source in use?</label> > [% IF ( used ) %]<input type="checkbox" id="used" name="used" value="used" checked="checked" />[% ELSE %] >@@ -165,7 +165,7 @@ function CheckRuleForm(f) { > </li> > <li><label for="description">Description: </label> > <input type="text" id="description" name="description" size="50" maxlength="250" >- value="[% description |html %]" /> >+ value="[% description %]" /> > </li> > <li><label for="sort_routine">Filing routine: </label> > <select id="sort_routine" name="sort_routine"> >@@ -256,8 +256,8 @@ function CheckRuleForm(f) { > <td>[% IF ( class_source.used ) %]Yes[% ELSE %]No[% END %]</td> > <td>[% class_source.sortrule %]</td> > <td> >- <a href="[% class_source.script_name %]?op=edit_source&class_source=[% class_source.code |html %]">Edit</a> >- <a href="[% class_source.script_name %]?op=delete_source&class_source=[% class_source.code |html %]">Delete</a> >+ <a href="[% class_source.script_name %]?op=edit_source&class_source=[% class_source.code %]">Edit</a> >+ <a href="[% class_source.script_name %]?op=delete_source&class_source=[% class_source.code %]">Delete</a> > </td> > </tr> > [% END %] >@@ -292,8 +292,8 @@ function CheckRuleForm(f) { > <td>[% class_sort_rule.description %]</td> > <td>[% class_sort_rule.sort_routine %]</td> > <td> >- <a href="[% class_sort_rule.script_name %]?op=edit_sort_rule&sort_rule=[% class_sort_rule.rule |html %]">Edit</a> >- <a href="[% class_sort_rule.script_name %]?op=delete_sort_rule&sort_rule=[% class_sort_rule.rule |html %]">Delete</a> >+ <a href="[% class_sort_rule.script_name %]?op=edit_sort_rule&sort_rule=[% class_sort_rule.rule %]">Edit</a> >+ <a href="[% class_sort_rule.script_name %]?op=delete_sort_rule&sort_rule=[% class_sort_rule.rule %]">Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >index 6c94bb2..6354b74 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -191,8 +191,8 @@ > <tr> > <td>[% loo.currency %]</td> > <td>[% loo.rate %]</td> >- <td>[% loo.symbol |html %]</td> >- <td>[% loo.isocode |html %]</td> >+ <td>[% loo.symbol %]</td> >+ <td>[% loo.isocode %]</td> > <td><span title="[% loo.timestamp %]">[% loo.timestamp | $KohaDates %]</span></td> > <td style="color:green;">[% IF ( loo.active ) %]â[% END %]</td> > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >index 6b2ab05..18ebfbb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -125,7 +125,7 @@ Item types administration > </li> > [% END %] > <li> >- <label for="description" class="required">Description: </label><input type="text" id="description" name="description" size="48" value="[% description |html %]" required="required" /> <span class="required">Required</span> >+ <label for="description" class="required">Description: </label><input type="text" id="description" name="description" size="48" value="[% description %]" required="required" /> <span class="required">Required</span> > <a href="/cgi-bin/koha/admin/localization.pl?entity=itemtypes&code=[% itemtype %]" title="Translate item type [% itemtype %]" rel="gb_page_center[600,500]"><i class="icon-edit"></i> Translate into other languages</a> > </li> > <li> >@@ -317,7 +317,7 @@ Item types administration > <tr> > [% UNLESS ( noItemTypeImages ) %] <td>[% IF ( loo.imageurl ) %]<img src="[% loo.imageurl %]" alt="" />[% ELSE %] [% END %]</td>[% END %] > <td> >- <a href="[% loo.script_name %]?op=add_form&itemtype=[% loo.itemtype |html %]"> >+ <a href="[% loo.script_name %]?op=add_form&itemtype=[% loo.itemtype %]"> > [% loo.itemtype %] > </a> > </td> >@@ -346,8 +346,8 @@ Item types administration > </td> > <td>[% loo.checkinmsg | html_line_break %]</td> > <td> >- <a href="[% loo.script_name %]?op=add_form&itemtype=[% loo.itemtype |html %]">Edit</a> >- <a href="[% loo.script_name %]?op=delete_confirm&itemtype=[% loo.itemtype |html %]">Delete</a> >+ <a href="[% loo.script_name %]?op=add_form&itemtype=[% loo.itemtype %]">Edit</a> >+ <a href="[% loo.script_name %]?op=delete_confirm&itemtype=[% loo.itemtype %]">Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >index bd76f43..ea573d4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >@@ -170,16 +170,16 @@ function populateHiddenCheckboxes(tab) { > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a> › <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]&searchfield=[% tagfield | uri %]">[% IF ( frameworkcode ) %][% frameworkcode %][% ELSE %]Default[% END %] framework structure</a> › > [% IF ( add_form ) %] > [% IF ( use_heading_flags_p ) %] >- [% IF ( heading_edit_subfields_p ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode %]">Tag [% tagfield | html %] subfield structure</a> › Edit subfields constraints >+ [% IF ( heading_edit_subfields_p ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode %]">Tag [% tagfield %] subfield structure</a> › Edit subfields constraints > [% END %] >- [% ELSE %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode %]">Tag [% tagfield | html %] Subfield structure</a> › [% action %] >+ [% ELSE %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield structure</a> › [% action %] > [% END %] > [% END %] >-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode %]">Tag [% tagfield | html %] Subfield structure</a> › Confirm deletion of subfield [% tagsubfield %] >+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield structure</a> › Confirm deletion of subfield [% tagsubfield %] > [% END %] >-[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode %]">Tag [% tagfield | html %] subfield structure</a> › Subfield deleted >+[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode %]">Tag [% tagfield %] subfield structure</a> › Subfield deleted > [% END %] >-[% IF ( else ) %]Tag [% tagfield | html %] Subfield structure[% END %] >+[% IF ( else ) %]Tag [% tagfield %] Subfield structure[% END %] > </div> > > <div id="doc" class="yui-t7"> >@@ -191,14 +191,14 @@ function populateHiddenCheckboxes(tab) { > [% IF ( add_form ) %] > <h1> > [% 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 %] > </h1> > <form action="[% script_name %]" name="Aform" method="post"> > <input type="hidden" name="op" value="add_validate" /> >- <input type="hidden" name="tagfield" value="[% tagfield | html %]" /> >+ <input type="hidden" name="tagfield" value="[% tagfield %]" /> > <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" /> > <div id="subfieldtabs" class="toptabs numbered"> > <ul> >@@ -352,7 +352,7 @@ function populateHiddenCheckboxes(tab) { > > <form action="[% delete_link %]" method="post"><input type="hidden" name="op" value="delete_confirmed" /> > <input type="hidden" name="searchfield" value="[% searchfield %]" /> >- <input type="hidden" name="tagfield" value="[% tagfield | html %]" /> >+ <input type="hidden" name="tagfield" value="[% tagfield %]" /> > <input type="hidden" name="tagsubfield" value="[% tagsubfield %]" /> > <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" /> > <input type="submit" value="Yes, delete this subfield" /> >@@ -360,7 +360,7 @@ function populateHiddenCheckboxes(tab) { > > <form action="[% script_name %]" method="post"> > <input type="hidden" name="searchfield" value="[% searchfield %]" /> >- <input type="hidden" name="tagfield" value="[% tagfield | html %]" /> >+ <input type="hidden" name="tagfield" value="[% tagfield %]" /> > <input type="hidden" name="tagsubfield" value="[% tagsubfield %]" /> > <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" /> > <input type="submit" value="No, do not delete" /> >@@ -371,14 +371,14 @@ function populateHiddenCheckboxes(tab) { > > <h3>Data deleted</h3> > <form action="[% script_name %]" method="post"> >- <input type="hidden" name="tagfield" value="[% tagfield | html %]" /> >+ <input type="hidden" name="tagfield" value="[% tagfield %]" /> > <input type="submit" value="OK" /> > </form> > [% END %] > > > [% IF ( else ) %] >-<h1>MARC subfield structure admin for [% tagfield | html %] [% IF ( frameworkcode ) %](framework [% frameworkcode %])[% ELSE %](default framework)[% END %]</h1> >+<h1>MARC subfield structure admin for [% tagfield %] [% IF ( frameworkcode ) %](framework [% frameworkcode %])[% ELSE %](default framework)[% END %]</h1> > <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.</p> > <p>The column 'Koha field' shows that the subfield is linked with a Koha field.</p> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >index bd42b65..2398312 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -77,8 +77,8 @@ $(document).ready(function() { > <span class="required">Required</span> > [% END %] > </li> >- <li><label for="liblibrarian">Label for lib: </label><input type="text" id="liblibrarian" name="liblibrarian" value="[% liblibrarian |html %]" size="40" maxlength="100" /></li> >- <li><label for="libopac">Label for opac: </label><input type="text" id="libopac" name="libopac" value="[% libopac |html %]" size="40" maxlength="100" /></li> >+ <li><label for="liblibrarian">Label for lib: </label><input type="text" id="liblibrarian" name="liblibrarian" value="[% liblibrarian %]" size="40" maxlength="100" /></li> >+ <li><label for="libopac">Label for opac: </label><input type="text" id="libopac" name="libopac" value="[% libopac %]" size="40" maxlength="100" /></li> > <li><label for="repeatable">Repeatable: </label> > [% IF ( repeatable ) %] > <input type="checkbox" name="repeatable" id="repeatable" value="1" checked="checked" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >index 64462fb..d74832c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >@@ -214,11 +214,11 @@ function CheckRuleForm(f) { > </li> > <li><label for="description" class="required">Description: </label> > <input type="text" id="description" name="description" size="50" maxlength="250" >- value="[% description |html %]" /> <span class="required">Required</span> >+ value="[% description %]" /> <span class="required">Required</span> > </li> > <li><label for="threshold" class="required">Match threshold: </label> > <input type="text" id="threshold" name="threshold" size="5" maxlength="5" >- value="[% threshold |html %]" /> <span class="required">Required</span> >+ value="[% threshold %]" /> <span class="required">Required</span> > </li> > <li><label for="record_type" class="required">Record type: </label> > <select id="record_type" name="record_type"> >@@ -249,14 +249,14 @@ function CheckRuleForm(f) { > <label for="mp_[% matchpoint.mp_num %]_search_index">Search index: </label> > <input type ="text" id="mp_[% matchpoint.mp_num %]_search_index" > name="mp_[% matchpoint.mp_num %]_search_index" size="20" >- value="[% matchpoint.index |html %]" >+ value="[% matchpoint.index %]" > maxlength="30" /> > </li> > <li> > <label for="mp_[% matchpoint.mp_num %]_score">Score: </label> > <input type ="text" id="mp_[% matchpoint.mp_num %]_score" > name="mp_[% matchpoint.mp_num %]_score" size="5" >- value="[% matchpoint.score |html %]" >+ value="[% matchpoint.score %]" > maxlength="5" /> > </li> > </ol> >@@ -268,28 +268,28 @@ function CheckRuleForm(f) { > <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_tag">Tag: </label> > <input type="text" id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_tag" > name="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_tag" >- value="[% component.tag |html %]" >+ value="[% component.tag %]" > size="3" maxlength="3" /> > </li> > <li> > <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_subfields">Subfields: </label> > <input type="text" id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_subfields" > name="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_subfields" >- value="[% component.subfields |html %]" >+ value="[% component.subfields %]" > size="10" maxlength="40" /> > </li> > <li> > <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_offset">Offset: </label> > <input type="text" id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_offset" > name="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_offset" >- value="[% component.offset |html %]" >+ value="[% component.offset %]" > size="5" maxlength="5" /> > </li> > <li> > <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_length">Length: </label> > <input type="text" id="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_length" > name="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_length" >- value="[% component.length |html %]" >+ value="[% component.length %]" > size="5" maxlength="5" /> > </li> > [% FOREACH norm IN component.norms %] >@@ -297,7 +297,7 @@ function CheckRuleForm(f) { > <label for="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_n__[% norm.norm_num %]_norm">Normalization rule: </label> > <input type="text" id="mp_[% norm.mp_num %]_c_[% component.comp_num %]_n__[% norm.norm_num %]_norm" > name="mp_[% matchpoint.mp_num %]_c_[% component.comp_num %]_n_[% norm.norm_num %]_norm" >- value="[% norm.norm |html %]" >+ value="[% norm.norm %]" > size="20" maxlength="50" /> > </li> > [% END %] >@@ -375,28 +375,28 @@ function CheckRuleForm(f) { > <label for="mc_[% src_component.mc_num %]_src_c_[% src_component.comp_num %]_tag">Tag: </label> > <input type="text" id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_tag" > name="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_tag" >- value="[% src_component.tag |html %]" >+ value="[% src_component.tag %]" > size="3" maxlength="3" /> > </li> > <li> > <label for="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_subfields">Subfields: </label> > <input type="text" id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_subfields" > name="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_subfields" >- value="[% src_component.subfields |html %]" >+ value="[% src_component.subfields %]" > size="10" maxlength="40" /> > </li> > <li> > <label for="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_offset">Offset: </label> > <input type="text" id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_offset" > name="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_offset" >- value="[% src_component.offset |html %]" >+ value="[% src_component.offset %]" > size="5" maxlength="5" /> > </li> > <li> > <label for="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_length">Length: </label> > <input type="text" id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_length" > name="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_length" >- value="[% src_component.length |html %]" >+ value="[% src_component.length %]" > size="5" maxlength="5" /> > </li> > [% FOREACH norm IN src_component.norms %] >@@ -404,7 +404,7 @@ function CheckRuleForm(f) { > <label for="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_n_[% norm.norm_num %]_norm">Normalization rule: </label> > <input type="text" id="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_n_[% norm.norm_num %]_norm" > name="mc_[% matchcheck.mc_num %]_src_c_[% src_component.comp_num %]_n_[% norm.norm_num %]_norm" >- value="[% norm.norm |html %]" >+ value="[% norm.norm %]" > size="20" maxlength="50" /> > </li> > [% END %] >@@ -419,28 +419,28 @@ function CheckRuleForm(f) { > <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_tag">Tag: </label> > <input type="text" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_tag" > name="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_tag" >- value="[% tgt_component.tag |html %]" >+ value="[% tgt_component.tag %]" > size="3" maxlength="3" /> > </li> > <li> > <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_subfields">Subfields: </label> > <input type="text" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_subfields" > name="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_subfields" >- value="[% tgt_component.subfields |html %]" >+ value="[% tgt_component.subfields %]" > size="10" maxlength="40" /> > </li> > <li> > <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_offset">Offset: </label> > <input type="text" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_offset" > name="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_offset" >- value="[% tgt_component.offset |html %]" >+ value="[% tgt_component.offset %]" > size="5" maxlength="5" /> > </li> > <li> > <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_length">Length: </label> > <input type="text" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_length" > name="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_length" >- value="[% tgt_component.length |html %]" >+ value="[% tgt_component.length %]" > size="5" maxlength="5" /> > </li> > [% FOREACH norm IN tgt_component.norms %] >@@ -448,7 +448,7 @@ function CheckRuleForm(f) { > <label for="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_n_[% norm.norm_num %]_norm">Normalization rule: </label> > <input type="text" id="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_n_[% norm.norm_num %]_norm" > name="mc_[% matchcheck.mc_num %]_tgt_c_[% tgt_component.comp_num %]_n_[% norm.norm_num %]_norm" >- value="[% norm.norm |html %]" >+ value="[% norm.norm %]" > size="20" maxlength="50" /> > </li> > [% END %] >@@ -571,8 +571,8 @@ function CheckRuleForm(f) { > <td>[% available_matching_rule.code %]</td> > <td>[% available_matching_rule.description %]</td> > <td> >- <a href="[% available_matching_rule.script_name %]?op=edit_matching_rule&matcher_id=[% available_matching_rule.matcher_id |html %]">Edit</a> >- <a href="[% available_matching_rule.script_name %]?op=delete_matching_rule&matcher_id=[% available_matching_rule.matcher_id |html %]">Delete</a> >+ <a href="[% available_matching_rule.script_name %]?op=edit_matching_rule&matcher_id=[% available_matching_rule.matcher_id %]">Edit</a> >+ <a href="[% available_matching_rule.script_name %]?op=delete_matching_rule&matcher_id=[% available_matching_rule.matcher_id %]">Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >index 5827f30..491513a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >+++ b/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 %] > </title> > [% 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 %] > </div> > >@@ -94,8 +94,8 @@ function CheckAttributeTypeForm(f) { > <li> > [% IF ( edit_attribute_type ) %] > <span class="label">Patron attribute type code: </span> >- <input type="hidden" name="code" value="[% code |html %]" /> >- [% code |html %] >+ <input type="hidden" name="code" value="[% code %]" /> >+ [% code %] > [% ELSE %] > <label for="code">Patron attribute type code: </label> > <input type="text" id="code" name="code" size="10" maxlength="10" /> >@@ -103,7 +103,7 @@ function CheckAttributeTypeForm(f) { > </li> > <li><label for="description">Description: </label> > <input type="text" id="description" name="description" size="50" maxlength="250" >- value="[% description |html %]" /> >+ value="[% description %]" /> > </li> > <li><label for="repeatable">Repeatable: </label> > [% IF ( repeatable_checked ) %] >@@ -249,10 +249,10 @@ function CheckAttributeTypeForm(f) { > [% END %] > > [% IF ( delete_attribute_type_form ) %] >-<div class="dialog alert"><h3>Confirm deletion of patron attribute type <span class="ex">'[% code |html %]' ([% description %])</span>?</h3> >+<div class="dialog alert"><h3>Confirm deletion of patron attribute type <span class="ex">'[% code %]' ([% description %])</span>?</h3> > <form action="[% script_name %]" name="Aform" method="post"> > <input type="hidden" name="op" value="[% confirm_op %]" /> >- <input type="hidden" name="code" value="[% code |html %]" /> >+ <input type="hidden" name="code" value="[% code %]" /> > <input type="submit" value="Delete patron attribute type" class="approve" /></form> > <form action="[% script_name %]" method="get"> > <input type="submit" value="No, do not delete" class="deny" /> >@@ -300,7 +300,7 @@ function CheckAttributeTypeForm(f) { > <tbody> > [% FOREACH item IN attribute.items %] > <tr> >- <td>[% item.code |html %]</td> >+ <td>[% item.code %]</td> > <td>[% item.description %]</td> > <td> > [% IF item.branches.size > 0 %] >@@ -320,8 +320,8 @@ function CheckAttributeTypeForm(f) { > [% END %] > </td> > <td> >- <a href="[% item.script_name %]?op=edit_attribute_type&code=[% item.code |html %]">Edit</a> >- <a href="[% item.script_name %]?op=delete_attribute_type&code=[% item.code |html %]">Delete</a> >+ <a href="[% item.script_name %]?op=edit_attribute_type&code=[% item.code %]">Edit</a> >+ <a href="[% item.script_name %]?op=delete_attribute_type&code=[% item.code %]">Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >index 9d4b95f..11340dc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -70,7 +70,7 @@ > [% END %] > [% IF ( search_not_found ) %] > <div class="dialog alert"> >- No system preferences matched your search for <strong>[% searchfield |html %]</strong>. You can try a different search or <a href="/cgi-bin/koha/admin/preferences.pl?tab=[% last_tab %]">return to where you were before.</a> >+ No system preferences matched your search for <strong>[% searchfield %]</strong>. You can try a different search or <a href="/cgi-bin/koha/admin/preferences.pl?tab=[% last_tab %]">return to where you were before.</a> > </div> > [% END %] > [% FOREACH TAB IN TABS %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >index eca3be5..c203be6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -103,19 +103,19 @@ > [% IF ( modify ) %]Modify > [% ELSE %]Add > [% END %] a system preference</legend><ol> >- <li><label for="explanation">Explanation: </label><input type="text" name="explanation" id="explanation" size="60" value="[% explanation |html %]" /><input type="hidden" name="op" value="add_validate" /></li> >+ <li><label for="explanation">Explanation: </label><input type="text" name="explanation" id="explanation" size="60" value="[% explanation %]" /><input type="hidden" name="op" value="add_validate" /></li> > <li>[% IF ( searchfield ) %]<span class="label">Variable: </span>[% searchfield %]<input type="hidden" name="variable" value="[% searchfield %]" /> > [% ELSE %]<label for="variable">Variable: </label><input type="text" name="variable" id="variable" size="60" />[% END %]</li> > <li><label for="value">Value: </label> > [% IF ( type_free ) %] >- <textarea id="value" name="value" cols="[% fieldlength %]">[% value |html %]</textarea> >+ <textarea id="value" name="value" cols="[% fieldlength %]">[% value %]</textarea> > [% ELSIF ( type_upload ) %] > <input type="file" name="value" /> > [% ELSIF ( type_textarea || type_htmlarea ) %] > [% IF ( type_htmlarea ) && ( Koha.Preference('UseWYSIWYGinSystemPreferences') ) %] >- <textarea class="mce" name="value" id="value" rows="[% rows %]" cols="[% cols %]">[% value |html %]</textarea> >+ <textarea class="mce" name="value" id="value" rows="[% rows %]" cols="[% cols %]">[% value %]</textarea> > [% ELSE %] >- <textarea name="value" id="value" rows="[% rows %]" cols="[% cols %]">[% value |html %]</textarea> >+ <textarea name="value" id="value" rows="[% rows %]" cols="[% cols %]">[% value %]</textarea> > [% END %] > [% ELSIF ( type_choice ) %] > <select name="value" id="value"> >@@ -328,7 +328,7 @@ > <tbody>[% FOREACH loo IN loop %] > <tr> > >- <td><strong><a href="[% loo.edit %]">[% loo.variable %]</a></strong></td><td> [% loo.explanation |html %]</td> >+ <td><strong><a href="[% loo.edit %]">[% loo.variable %]</a></strong></td><td> [% loo.explanation %]</td> > [% IF ( loo.oneline ) %] > <td class="single-line"> > [% ELSE %] >@@ -340,17 +340,17 @@ > <form action="/cgi-bin/koha/admin/systempreferences.pl" method="post"> > [% END %] > [% IF ( loo.type_free ) %] >- <input type="text" name="value" size="[% loo.fieldlength %]" value="[% loo.value |html %]" /> >+ <input type="text" name="value" size="[% loo.fieldlength %]" value="[% loo.value %]" /> > [% END %] > [% IF ( loo.type_upload ) %] >- <input type="file" name="value" value="[% loo.value |html %]" /> >+ <input type="file" name="value" value="[% loo.value %]" /> > [% END %] > [% IF ( loo.type_textarea ) || ( loo.type_htmlarea ) %] > [% IF ( loo.type_htmlarea ) && ( Koha.Preference('UseWYSIWYGinSystemPreferences') ) %] >- <textarea class="mce" name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value |html %]</textarea> >+ <textarea class="mce" name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value %]</textarea> > [% ELSE %] > <a class="expand-textarea" style="display: none" href="#">Click to edit</a> >- <textarea name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value |html %]</textarea> >+ <textarea name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value %]</textarea> > [% END %] > [% END %] > [% IF ( loo.type_choice ) %] >@@ -430,9 +430,9 @@ > [% END %] > <input type="hidden" name="op" value="add_validate" /> > <input type="hidden" name="variable" value="[% loo.variable %]" /> >- <input type="hidden" name="prefoptions" value="[% loo.prefoptions |html %]" /> >+ <input type="hidden" name="prefoptions" value="[% loo.prefoptions %]" /> > <input type="hidden" name="preftype" value="[% loo.type %]" /> >- <input type="hidden" name="explanation" value="[% loo.explanation |html %]" /> >+ <input type="hidden" name="explanation" value="[% loo.explanation %]" /> > <input type="submit" value="Save" /> > </form> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index 1cdf868..4cda5f9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -119,7 +119,7 @@ > [% END %] > <fieldset class="rows"> > <ol> >- <li><label for="name">Server name: </label><input type="text" name="servername" id="servername" size="65" maxlength="100" onblur="toUC(this)" value="[% server.servername | html %]"/></li> >+ <li><label for="name">Server name: </label><input type="text" name="servername" id="servername" size="65" maxlength="100" onblur="toUC(this)" value="[% server.servername %]"/></li> > > <li><label for="host" class="required">Hostname: </label> <input type="text" name="host" id="host" size="30" value="[% server.host %]" required="required" /> <span class="required">Required</span> > [% IF (server.servertype||type) == 'sru' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >index 2896886..31d7cbe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >@@ -43,7 +43,7 @@ > <form action="/cgi-bin/koha/mainpage.pl" method="post" name="loginform" id="loginform"> > <input type="hidden" name="koha_login_context" value="intranet" /> > [% FOREACH INPUT IN INPUTS %] >- <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" /> >+ <input type="hidden" name="[% INPUT.name %]" value="[% INPUT.value %]" /> > [% END %] > <p><label for="userid">Username:</label> > <input type="text" name="userid" id="userid" class="input focus" value="[% userid %]" size="20" tabindex="1" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt >index fd2e92b..cdb25c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt >@@ -75,7 +75,7 @@ function doauth(authid, index, repet) > <td> > [% IF resul.summary && resul.summary.authorized && resul.summary.authorized.size > 1 %] > [% FOREACH authorized IN resul.summary.authorized %] >- <a href="javascript:doauth('[% resul.authid %]', '[% index %]', '[% loop.count %]')" title="[% authorized.heading | html %]">[% loop.count %]</a> >+ <a href="javascript:doauth('[% resul.authid %]', '[% index %]', '[% loop.count %]')" title="[% authorized.heading %]">[% loop.count %]</a> > [% END %] > [% ELSE %] > <a href="javascript:doauth('[% resul.authid %]', '[% index %]', '')">choose</a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >index ff9095c..a5a5409 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >@@ -160,12 +160,12 @@ function batchDelete(){ > [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] > <h3> > [% 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 %] > <input type="checkbox" value="[% BIBLIO_RESULT.biblionumber %]" name="bib[% BIBLIO_RESULT.biblionumber %]" id="bib[% BIBLIO_RESULT.biblionumber %]" onclick="selRecord(value,checked)" /> >- [% 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(){ > > </td> [% END %] > <td><a href="#" onclick="openBiblio('[% BIBLIO_RESULT.dest %]',[% BIBLIO_RESULT.biblionumber %])"> >- [% BIBLIO_RESULT.title |html %] >+ [% BIBLIO_RESULT.title %] > </a> > [% BIBLIO_RESULT.author %] > <p>[% IF ( BIBLIO_RESULT.publishercode ) %]- [% BIBLIO_RESULT.publishercode %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >index 4c0c115..c8b88b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >+++ b/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 <i>[% bibliotitle |html %]</i> >+ MARC Details for <i>[% bibliotitle %]</i> > [% END %] > </div> > >@@ -53,7 +53,7 @@ function Changefwk(FwkList) { > [% INCLUDE 'cat-toolbar.inc' %] > > [% UNLESS ( popup ) %] >- <h1>MARC biblio : [% biblionumber %] ( [% bibliotitle |html %] )</h1> >+ <h1>MARC biblio : [% biblionumber %] ( [% bibliotitle %] )</h1> > > > [% END %] >@@ -90,10 +90,10 @@ function Changefwk(FwkList) { > <span class="subfield-label"> > [% UNLESS ( subfiel.hide_marc ) %]<span class="subfield-code">[% subfiel.marc_subfield %]</span>[% END %] > <span class="desc" title="[% subfiel.long_desc %]">[% subfiel.short_desc %]</span></span> >- [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value %]">[% subfiel.marc_value |html %]</a>[% ELSE %][% subfiel.marc_value |html %][% END %] >+ [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value %]">[% subfiel.marc_value %]</a>[% ELSE %][% subfiel.marc_value %][% END %] > [% IF ( subfiel.link ) %] > <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&idx=[% subfiel.link %],phr&type=intranet&q=[% subfiel.marc_value |url %]"> >- <img border="0" src="[% interface %]/[% theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" /> >+ <img border="0" src="[% interface %]/[% theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value %]" alt="Search on [% subfiel.marc_value %]" /> > </a> > [% END %] > [% IF ( subfiel.authority ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index f2fb6e2..598dc74 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/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 %] > </title> > [% INCLUDE 'doc-head-close.inc' %]<script type="text/JavaScript"> >@@ -317,7 +317,7 @@ function verify_images() { > [% IF ( unknownbiblionumber ) %] > Unknown record > [% ELSE %] >- Details for <i>[% title |html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</i> >+ Details for <i>[% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</i> > [% END %] > </div> > >@@ -369,9 +369,9 @@ function verify_images() { > <span class="results_summary"><span class="label">Tags:</span> > [% FOREACH TagLoo IN TagLoop %] > [% IF ( CAN_user_tools_moderate_tags ) %] >- <a href="/cgi-bin/koha/tags/list.pl?tag=[% TagLoo.term |url %]">[% TagLoo.term |html %]</a> >+ <a href="/cgi-bin/koha/tags/list.pl?tag=[% TagLoo.term |url %]">[% TagLoo.term %]</a> > [% ELSE %] >- [% TagLoo.term |html %] >+ [% TagLoo.term %] > [% END %] > <span class="weight">([% TagLoo.weight_total %])</span>[% IF ( loop.last ) %][% ELSE %], [% END %] > [% END %] >@@ -398,12 +398,12 @@ function verify_images() { > [% END %] > [% ELSE %] > >- <h3>[% title |html %]</h3> >+ <h3>[% title %]</h3> > [% FOREACH subtitl IN subtitle %] > <h4>[% subtitl.subfield %]</h4> > [% END %] > [% UNLESS ( item_level_itypes ) %]<img src="[% imageurl %]" alt="[% translated_description %]" title="[% translated_description %]">[% END %] >- [% IF ( unititle ) %]<p>[% unititle |html %]</p>[% END %] >+ [% IF ( unititle ) %]<p>[% unititle %]</p>[% END %] > [% IF ( author ) %]<p>By <a href="/cgi-bin/koha/catalogue/search.pl?q=au:[% author |url %]">[% author %]</a></p>[% END %] > <ul> > [% IF ( MARCAUTHORS ) %] >@@ -425,7 +425,7 @@ function verify_images() { > [% IF ( publishercode ) %] > <li><strong>Published by:</strong> > <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:[% publishercode |url %]"> >- [% publishercode |html %] >+ [% publishercode %] > </a> [% IF ( place ) %]([% place %])[% END %] [% IF ( publicationyear ) %], [% publicationyear %][% END %] [% IF ( editionstatement ) %][% editionstatement %][% END %] [% IF ( editionresponsability ) %][% editionresponsability %][% END %] > </li> > [% END %] >@@ -498,7 +498,7 @@ function verify_images() { > <li><strong>Subjects:</strong> > <ul> > [% FOREACH MARCSUBJCT IN MARCSUBJCTS %] >- <li>[% FOREACH MARCSUBJECT_SUBFIELDS_LOO IN MARCSUBJCT.MARCSUBJECT_SUBFIELDS_LOOP %] [% MARCSUBJECT_SUBFIELDS_LOO.separator %] <a title="â¡[% MARCSUBJECT_SUBFIELDS_LOO.code %] [% MARCSUBJECT_SUBFIELDS_LOO.value %]" href="/cgi-bin/koha/catalogue/search.pl?q=[% FOREACH link_loo IN MARCSUBJECT_SUBFIELDS_LOO.link_loop %][% link_loo.operator |url %][% link_loo.limit %]:[% link_loo.link |url %][% END %]">[% MARCSUBJECT_SUBFIELDS_LOO.value |html %]</a>[% END %]</li> >+ <li>[% FOREACH MARCSUBJECT_SUBFIELDS_LOO IN MARCSUBJCT.MARCSUBJECT_SUBFIELDS_LOOP %] [% MARCSUBJECT_SUBFIELDS_LOO.separator %] <a title="â¡[% MARCSUBJECT_SUBFIELDS_LOO.code %] [% MARCSUBJECT_SUBFIELDS_LOO.value %]" href="/cgi-bin/koha/catalogue/search.pl?q=[% FOREACH link_loo IN MARCSUBJECT_SUBFIELDS_LOO.link_loop %][% link_loo.operator |url %][% link_loo.limit %]:[% link_loo.link |url %][% END %]">[% MARCSUBJECT_SUBFIELDS_LOO.value %]</a>[% END %]</li> > [% END %] > </ul> > </li> >@@ -536,9 +536,9 @@ function verify_images() { > [% FOREACH TagLoo IN TagLoop %] > <li> > [% IF ( CAN_user_tools_moderate_tags ) %] >- <a href="/cgi-bin/koha/tags/list.pl?tag=[% TagLoo.term |url %]">[% TagLoo.term |html %]</a> >+ <a href="/cgi-bin/koha/tags/list.pl?tag=[% TagLoo.term |url %]">[% TagLoo.term %]</a> > [% ELSE %] >- [% TagLoo.term |html %] >+ [% TagLoo.term %] > [% END %] > <span class="weight">([% TagLoo.weight_total %])</span>[% IF ( loop.last ) %][% ELSE %], [% END %]</li> > [% END %] >@@ -997,7 +997,7 @@ function verify_images() { > <table> > [% FOREACH XISBN IN XISBNS %]<tr>[% IF ( AmazonCoverImages ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img src="https://images-na.ssl-images-amazon.com/images/P/[% XISBN.normalized_isbn %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %] > [% UNLESS ( item_level_itypes ) %]<td>[% IF ( noItemTypeImages ) %][% XISBN.description %][% ELSE %]<img src="[% XISBN.imageurl %]" alt="[% XISBN.description %]" title="[% XISBN.description %]">[% END %]</td>[% END %] >-<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber %]">[% XISBN.title |html %]</a> by [% XISBN.author %] ©[% XISBN.copyrightdate %] >+<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber %]">[% XISBN.title %]</a> by [% XISBN.author %] ©[% XISBN.copyrightdate %] > [% IF ( XISBN.publishercode ) %] > [% XISBN.publishercode %] [% IF ( XISBN.place ) %]([% XISBN.place %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear %][% END %] [% IF ( XISBN.editionstatement ) %][% XISBN.editionstatement %][% END %] [% IF ( XISBN.editionresponsability ) %][% XISBN.editionresponsability %][% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >index 60674d0..fdb59ba 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Catalog › Details for [% biblio.title |html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</title> >+<title>Koha › Catalog › Details for [% biblio.title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( LocalCoverImages == 1 ) %] > <script type="text/JavaScript"> >@@ -50,7 +50,7 @@ img.thumbnail { > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Images for <i>[% biblio.title |html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</i></div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Images for <i>[% biblio.title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</i></div> > > <div id="doc3" class="yui-t1"> > >@@ -61,7 +61,7 @@ img.thumbnail { > > [% INCLUDE 'cat-toolbar.inc' %] > >-<h3>Images for <i>[% biblio.title |html %]</i></h3> >+<h3>Images for <i>[% biblio.title %]</i></h3> > <h4>[% biblio.author %]</h4> > > [% IF ( LocalCoverImages == 1 ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index 89531f4..eb1a8f7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -1,7 +1,7 @@ > [% USE Koha %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Catalog › Checkout history for [% title |html %]</title> >+<title>Koha › Catalog › Checkout history for [% title %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <link rel="stylesheet" href="[% themelang %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] >@@ -22,7 +22,7 @@ $(document).ready(function() { > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Checkout history for <i>[% title |html %]</i></div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Checkout history for <i>[% title %]</i></div> > > <div id="doc3" class="yui-t2"> > >@@ -30,7 +30,7 @@ $(document).ready(function() { > <div id="yui-main"> > <div class="yui-b"> > >-<h1>Checkout history for [% title |html %]</h1> >+<h1>Checkout history for [% title %]</h1> > [% IF ( author ) %]<h3>by [% author %]</h3>[% END %] > > <div class="searchresults"> >@@ -91,7 +91,7 @@ $(document).ready(function() { > </table> > [% ELSE %] > <div class="dialog message"><p> >- <b>[% title |html %][% IF ( author ) %], by [% author %][% END %]</b> has never been checked out.</p></div> >+ <b>[% title %][% IF ( author ) %], by [% author %][% END %]</b> has never been checked out.</p></div> > > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index bde296d..ef87e27 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -20,7 +20,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Item details for <i>[% title |html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield|html %][% END %]</i></div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Item details for <i>[% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</i></div> > > <div id="doc3" class="yui-t2"> > >@@ -31,8 +31,8 @@ > > <div id="catalogue_detail_biblio"> > >- <h2>[% title |html %]</h2> >- [% IF ( subtitle ) %]<h4>[% FOREACH subtitl IN subtitle %] [% subtitl.subfield|html %][% END %]</h4>[% END %] >+ <h2>[% title %]</h2> >+ [% IF ( subtitle ) %]<h4>[% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</h4>[% END %] > [% IF ( author ) %]<h4>by [% author %]</h4>[% END %] > <ol class="bibliodetails"> > <li><span class="label">Biblionumber:</span> [% biblionumber %] </li> >@@ -41,7 +41,7 @@ > [% END %] > [% IF ( rentalcharge ) %]<li><span class="label">Rental charge:</span>[% rentalcharge %] </li>[% END %] > <li><span class="label">ISBN:</span> [% isbn %] </li> >- <li><span class="label">Publisher:</span>[% place %] [% publishercode |html %] [% publicationyear %] </li> >+ <li><span class="label">Publisher:</span>[% place %] [% publishercode %] [% publicationyear %] </li> > [% IF ( volumeddesc ) %]<li><span class="label">Volume:</span> [% volumeddesc %]</li>[% END %] > <li><span class="label">Physical details:</span> [% pages %] [% illus %] [% size %] </li> > [% IF ( bnotes ) %]<li><span class="label">Notes:</span> [% bnotes %]</li>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index 65f35f1..d196706 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Catalog › [% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title> >+<title>Koha › Catalog › [% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'browser-strings.inc' %] > [% IF BiblioDefaultViewmarc %] >@@ -108,7 +108,7 @@ $('#sort_by').change(function() { > [% SET number_of_private_shelves = 0 %] > [% FOREACH s IN add_to_some_private_shelves %] > [% IF shelfnumber != s.shelfnumber %] >- param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname |html %]<\/option>"; >+ param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname %]<\/option>"; > [% SET number_of_private_shelves = number_of_private_shelves + 1 %] > [% IF number_of_private_shelves == 10 %][% LAST %][% END %] > [% END %] >@@ -120,7 +120,7 @@ $('#sort_by').change(function() { > [% SET number_of_public_shelves = 0 %] > [% FOREACH s IN add_to_some_public_shelves %] > [% IF shelfnumber != s.shelfnumber %] >- param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname |html %]<\/option>"; >+ param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname %]<\/option>"; > [% SET number_of_public_shelves = number_of_public_shelves + 1 %] > [% IF number_of_public_shelves == 10 %][% LAST %][% END %] > [% END %] >@@ -290,7 +290,7 @@ var holdForPatron = function () { > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> > › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> >-› Search [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %] >+› Search [% IF ( query_desc ) %]for '[% query_desc %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc %]'[% END %] > </div> > > <div id="doc3" class="yui-t1"> >@@ -320,10 +320,10 @@ var holdForPatron = function () { > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="sortbyform"> > [% IF ( searchdesc ) %] > [% FOREACH QUERY_INPUT IN QUERY_INPUTS %] >- <input type="hidden" name="[% QUERY_INPUT.input_name |html %]" value="[% QUERY_INPUT.input_value |html %]"/> >+ <input type="hidden" name="[% QUERY_INPUT.input_name %]" value="[% QUERY_INPUT.input_value %]"/> > [% END %] > [% FOREACH LIMIT_INPUT IN LIMIT_INPUTS %] >- <input type="hidden" name="[% LIMIT_INPUT.input_name |html %]" value="[% LIMIT_INPUT.input_value |html %]"/> >+ <input type="hidden" name="[% LIMIT_INPUT.input_name %]" value="[% LIMIT_INPUT.input_value %]"/> > [% END %] > [% END %] > <!-- RE-SORT START --> >@@ -335,7 +335,7 @@ var holdForPatron = function () { > <!-- RESORT END --> > </form> > <h3> >- [% total %] result(s) found [% IF ( query_desc ) %]for <span style="font-weight: bold;">'[% query_desc |html %]'</span>[% END %][% IF limit_desc %] with limit(s): <span style="font-weight: bold;">'[% limit_desc | html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName %] Catalog[% END %].<br /> >+ [% total %] result(s) found [% IF ( query_desc ) %]for <span style="font-weight: bold;">'[% query_desc %]'</span>[% END %][% IF limit_desc %] with limit(s): <span style="font-weight: bold;">'[% limit_desc %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName %] Catalog[% END %].<br /> > </h3> > <div id="selection_ops" class="cartlist" style="display:none"> > <a href="#" onclick="selectAll(); return false;">Select all</a> >@@ -376,7 +376,7 @@ var holdForPatron = function () { > <h3>No results found</h3> > [% IF ( searchdesc ) %] > <p> >- No results match your search [% IF ( query_desc ) %]for <span style="font-weight: bold;">'[% query_desc |html %]'</span>[% END %][% IF ( limit_desc ) %] with limit(s): <span style="font-weight: bold;">'[% limit_desc | html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName %] Catalog[% END %]. >+ No results match your search [% IF ( query_desc ) %]for <span style="font-weight: bold;">'[% query_desc %]'</span>[% END %][% IF ( limit_desc ) %] with limit(s): <span style="font-weight: bold;">'[% limit_desc %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName %] Catalog[% END %]. > </p> > [% ELSE %] > <p>You did not specify any search criteria.</p> >@@ -442,7 +442,7 @@ var holdForPatron = function () { > [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] > [% IF ( loop.odd ) %]<tr>[% ELSE %]<tr class="highlight">[% END %] > <td> >- <a href="/cgi-bin/koha/catalogue/search.pl?idx=[% SEARCH_RESULT.scan_index_to_use %]&q=[% SEARCH_RESULT.scan_use |url %]"[% SEARCH_RESULT.title %]"">[% SEARCH_RESULT.title |html %]</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?idx=[% SEARCH_RESULT.scan_index_to_use %]&q=[% SEARCH_RESULT.scan_use |url %]"[% SEARCH_RESULT.title %]"">[% SEARCH_RESULT.title %]</a> > </td> > <td> > [% SEARCH_RESULT.author %] >@@ -457,10 +457,10 @@ var holdForPatron = function () { > <form action="/cgi-bin/koha/catalogue/search.pl" method="get" name="bookbag_form" id="bookbag_form"> > [% IF ( searchdesc ) %] > [% FOREACH QUERY_INPUT IN QUERY_INPUTS %] >- <input type="hidden" name="[% QUERY_INPUT.input_name |html %]" value="[% QUERY_INPUT.input_value |html %]"/> >+ <input type="hidden" name="[% QUERY_INPUT.input_name %]" value="[% QUERY_INPUT.input_value %]"/> > [% END %] > [% FOREACH LIMIT_INPUT IN LIMIT_INPUTS %] >- <input type="hidden" name="[% LIMIT_INPUT.input_name |html %]" value="[% LIMIT_INPUT.input_value |html %]"/> >+ <input type="hidden" name="[% LIMIT_INPUT.input_name %]" value="[% LIMIT_INPUT.input_value %]"/> > [% END %] > [% END %] > >@@ -506,7 +506,7 @@ var holdForPatron = function () { > [% biblionumber = SEARCH_RESULT.biblionumber %] > > [% INCLUDE 'biblio-default-view.inc' %] >- <b>[% IF ( SEARCH_RESULT.title ) %][% SEARCH_RESULT.title |html %][% ELSE %]No title[% END %]</b> >+ <b>[% IF ( SEARCH_RESULT.title ) %][% SEARCH_RESULT.title %][% ELSE %]No title[% END %]</b> > </a> > [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield %][% END %] > [% IF ( SEARCH_RESULT.seriestitle ) %][% SEARCH_RESULT.seriestitle %][% END %] >@@ -692,7 +692,7 @@ var holdForPatron = function () { > [% IF ( outer_sup_results_loo.inner_sup_results_loop ) %] > [% outer_sup_results_loo.servername %] > [% FOREACH inner_sup_results_loo IN outer_sup_results_loo.inner_sup_results_loop %] >- <div><a href="/cgi-bin/koha/catalogue/search.pl?[% inner_sup_results_loo.query_cgi %][% inner_sup_results_loo.limit_cgi |html %][% inner_sup_results_loo.sort_by %][% inner_sup_results_loo.link %]">[% inner_sup_results_loo.title |html %]</a></div> >+ <div><a href="/cgi-bin/koha/catalogue/search.pl?[% inner_sup_results_loo.query_cgi %][% inner_sup_results_loo.limit_cgi %][% inner_sup_results_loo.sort_by %][% inner_sup_results_loo.link %]">[% inner_sup_results_loo.title %]</a></div> > [% END %] > [% END %] > <!-- </div> --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >index 48310c1..044bc0e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >@@ -120,7 +120,7 @@ function enableCheckboxActions(form){ > <tr> > <td><input type="checkbox" name="id" value="[% s.id %]" /></td> > <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td> >- <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi %]">[% s.query_desc %]</a></td> > <td>[% s.total %]</td> > </tr> > [% END %] >@@ -156,7 +156,7 @@ function enableCheckboxActions(form){ > <tr> > <td><input type="checkbox" name="id" value="[% s.id %]" /></td> > <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td> >- <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi %]">[% s.query_desc %]</a></td> > <td>[% s.total %]</td> > </tr> > [% END %] >@@ -198,7 +198,7 @@ function enableCheckboxActions(form){ > <tr> > <td><input type="checkbox" name="id" value="[% s.id %]" /></td> > <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td> >- <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >+ <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi %]">[% s.query_desc %]</a></td> > <td>[% s.total %]</td> > </tr> > [% END %] >@@ -234,7 +234,7 @@ function enableCheckboxActions(form){ > <tr> > <td><input type="checkbox" name="id" value="[% s.id %]" /></td> > <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td> >- <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >+ <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi %]">[% s.query_desc %]</a></td> > <td>[% s.total %]</td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tt >index a6b23ad..71fa696 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tt >@@ -28,7 +28,7 @@ > [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] > [% IF ( SEARCH_RESULT.even ) %]<tr class="highlight">[% ELSE %]<tr>[% END %] > <td> >- <a href="/cgi-bin/koha/search.pl?type=[% IF ( SEARCH_RESULT.opac ) %]opac[% ELSE %]intra[% END %]&subjectitems=[% SEARCH_RESULT.subject2 |html %]">[% SEARCH_RESULT.subject %]</a> >+ <a href="/cgi-bin/koha/search.pl?type=[% IF ( SEARCH_RESULT.opac ) %]opac[% ELSE %]intra[% END %]&subjectitems=[% SEARCH_RESULT.subject2 %]">[% SEARCH_RESULT.subject %]</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >index 2b6b327..a29c12c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Cataloging › [% IF ( biblionumber ) %]Editing [% title |html %] (Record number [% biblionumber %])[% ELSE %]Add MARC record[% END %]</title> >+<title>Koha › Cataloging › [% IF ( biblionumber ) %]Editing [% title %] (Record number [% biblionumber %])[% ELSE %]Add MARC record[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script> > <script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script> >@@ -401,7 +401,7 @@ function Changefwk(FwkList) { > > [% INCLUDE 'header.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> › [% IF ( biblionumber ) %]Editing <em>[% title |html %]</em> (Record number [% biblionumber %])[% ELSE %]Add MARC record[% END %]</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> › [% IF ( biblionumber ) %]Editing <em>[% title %]</em> (Record number [% biblionumber %])[% ELSE %]Add MARC record[% END %]</div> > > <div id="doc" class="yui-t7"> > >@@ -410,7 +410,7 @@ function Changefwk(FwkList) { > <div class="yui-g"> > > <h1> >-[% IF ( biblionumber ) %]Editing <em>[% title |html %]</em> (Record number [% biblionumber %]) >+[% IF ( biblionumber ) %]Editing <em>[% title %]</em> (Record number [% biblionumber %]) > [% ELSE %]Add MARC record [% IF (circborrowernumber) %]<em>(fast cataloging)</em>[% END %] > [% END %] > </h1> >@@ -445,7 +445,7 @@ function Changefwk(FwkList) { > [% IF ( done ) %] > <script type="text/javascript"> > opener.document.forms['f'].biblionumber.value=[% biblionumber %]; >- opener.document.forms['f'].title.value='[% title |html %]'; >+ opener.document.forms['f'].title.value='[% title %]'; > window.close(); > </script> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >index 1a60e7e..61d58f1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -150,7 +150,7 @@ > <td><input type="checkbox" class="selection" id="bib[% resultsloo.biblionumber %]" name="biblionumber" value="[% resultsloo.biblionumber %]" /></td> > <td> > <p> >- <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% resultsloo.biblionumber %]">[% resultsloo.title |html %]</a> >+ <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% resultsloo.biblionumber %]">[% resultsloo.title %]</a> > [% FOREACH subtitl IN resultsloo.subtitle %][% subtitl.subfield %][% END %]</p> > [% IF ( resultsloo.summary ) %] > <p>[% resultsloo.summary %]</p> >@@ -236,7 +236,7 @@ > [% ELSE %] > <tr class="highlight"> > [% END %] >- <td>[% breeding_loo.title |html %] >+ <td>[% breeding_loo.title %] > [% breeding_loo.author %]</td> > <td>[% breeding_loo.isbn %]</td> > <td>[% breeding_loo.copyrightdate %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >index fd0054b..d7c1913 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -1,7 +1,7 @@ > [% USE ColumnsSettings %] > > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Cataloging › [% title |html %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %]) › Items</title> >+<title>Koha › Cataloging › [% title %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %]) › Items</title> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >@@ -117,7 +117,7 @@ function confirm_deletion() { > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> > › <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> >- › Edit <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]">[% title |html %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %])</a> >+ › Edit <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]">[% title %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %])</a> > › <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]">Items</a> > </div> > >@@ -126,7 +126,7 @@ function confirm_deletion() { > <div id="bd"> > <div id="yui-main"> > >-<h1>Items for [% title |html %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %])</h1> >+<h1>Items for [% title %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %])</h1> > > [% IF ( barcode_not_unique ) %]<div class="dialog alert"><strong>Error saving item</strong>: Barcode must be unique.</div>[% END %] > [% IF ( no_next_barcode ) %]<div class="dialog alert"><strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.</div>[% END %] >@@ -194,7 +194,7 @@ function confirm_deletion() { > </td> > [% END %] > [% FOREACH item_valu IN item_loo.item_value %] >- <td>[% item_valu.field |html %]</td> >+ <td>[% item_valu.field %]</td> > [% END %] > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >index 4261554..285c73c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt >@@ -5,7 +5,7 @@ > <body id="catalog_linkitem" class="catalog"> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> › Link a host item to <i>[% bibliotitle |html %]</i></div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> › Link a host item to <i>[% bibliotitle %]</i></div> > <div id="doc3" class="yui-t2"> > > [% IF ( error ) %] >@@ -20,7 +20,7 @@ > </form> > [% ELSE %] > [% IF ( success ) %] >- <div class="dialog">The item has successfully been linked to <i>[% bibliotitle |html %]</i>.</div> >+ <div class="dialog">The item has successfully been linked to <i>[% bibliotitle %]</i>.</div> > <form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post"> > <input type="submit" value="OK" /> > <input type="hidden" name="biblionumber" value="[% biblionumber %]" /> >@@ -40,7 +40,7 @@ > > [% IF ( missingbarcode ) %] > <fieldset id="barcode_fieldset"> >- <label for="barcode_fieldset">Select the host item to link[% IF ( bibliotitle ) %] to <i>[% bibliotitle |html %]</i>[% END %]</label> >+ <label for="barcode_fieldset">Select the host item to link[% IF ( bibliotitle ) %] to <i>[% bibliotitle %]</i>[% END %]</label> > <div class="hint">Enter item barcode:</div> > <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" /> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >index e998929..b848774 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >@@ -1,11 +1,11 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Attach an item to [% bibliotitle |html %]</title> >+<title>Attach an item to [% bibliotitle %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="catalog_moveitem" class="catalog"> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> › Attach an item to <i>[% bibliotitle |html %][% IF ( itemsloo.subtitle ) %][% itemsloo.subtitle %][% END %]</i></div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> › Attach an item to <i>[% bibliotitle %][% IF ( itemsloo.subtitle ) %][% itemsloo.subtitle %][% END %]</i></div> > <div id="doc" class="yui-t7"> > > [% BLOCK actions %] >@@ -52,7 +52,7 @@ > > [% ELSE %] > [% IF ( success ) %] >- <div class="dialog message">The item has successfully been attached to [% INCLUDE 'biblio-default-view.inc' %]<i>[% bibliotitle |html %]</i></a>. >+ <div class="dialog message">The item has successfully been attached to [% INCLUDE 'biblio-default-view.inc' %]<i>[% bibliotitle %]</i></a>. > <p> > [% INCLUDE actions %] > <input type="submit" class="approve" value="OK" /> >@@ -79,7 +79,7 @@ > [% END %] > > [% IF ( missingbarcode ) %] >- <h3>Attach an item[% IF ( bibliotitle ) %] to <i>[% bibliotitle |html %]</i>[% END %]</h3> >+ <h3>Attach an item[% IF ( bibliotitle ) %] to <i>[% bibliotitle %]</i>[% END %]</h3> > <fieldset id="barcode_fieldset"> > <label for="barcode">Enter the barcode of the item to attach:</label> > <p class="hint">The item you select will be moved to the target record.</p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt >index 9b7de75..e7755d5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt >@@ -43,17 +43,17 @@ > <tr> > <th>Espace\Temps</th> > [% FOREACH col_hd IN BIGLOO.col_hdr %] >- <th scope="col" id="[% col_hd.colvalue %]"> [% col_hd.collib |html %] <br /><input type="checkbox" name="[% col_hd.colvalue %]" onclick="check_col('[% col_hd.colvalue %]')" /> >+ <th scope="col" id="[% col_hd.colvalue %]"> [% col_hd.collib %] <br /><input type="checkbox" name="[% col_hd.colvalue %]" onclick="check_col('[% col_hd.colvalue %]')" /> > </th> > [% END %] > </tr> > [% FOREACH line IN BIGLOO.lines %] > <tr> >- <th scope="row" id="[% line.rowvalue %]"> [% line.rowlib |html %] <br /><input type="checkbox" name="[% line.rowvalue %]" onclick="check_row('[% line.rowvalue %]')" /> >+ <th scope="row" id="[% line.rowvalue %]"> [% line.rowlib %] <br /><input type="checkbox" name="[% line.rowvalue %]" onclick="check_row('[% line.rowvalue %]')" /> > </th> > [% FOREACH cell IN line.cells %] > <td headers="[% cell.rowvalue %] [% cell.colvalue %]"> >- <span title="[% FOREACH lib IN cell.libs %][% lib.lib |html %] - [% END %]"> >+ <span title="[% FOREACH lib IN cell.libs %][% lib.lib %] - [% END %]"> > [% cell.celvalue %] <br /><input type="checkbox" name="[% cell.celvalue %]" value="[% cell.celvalue %]" /> > </span> > </td> >@@ -67,17 +67,17 @@ > [% FOREACH List IN BIGLOO.Lists %] > <h3>[% List.lib %]</h3> > [% FOREACH liblis IN List.liblist %] >- <a href="#[% liblis.listvalue %]" onclick="check_multiple([% liblis.listvalue %])"> [% liblis.listlib |html %]</a><br /> >+ <a href="#[% liblis.listvalue %]" onclick="check_multiple([% liblis.listvalue %])"> [% liblis.listlib %]</a><br /> > [% END %] > [% END %] > [% END %] > [% UNLESS ( BIGLOO.Table ) %] > <!-- Listes simples :Onglets 0 et 9--> > [% FOREACH line IN BIGLOO.lines %] >- <h3>[% line.rowvalue |html %] - [% line.rowlib |html %] <input type="checkbox" name="[% line.rowvalue %]" onclick="check_row('[% line.rowvalue %]')" /></h3> >+ <h3>[% line.rowvalue %] - [% line.rowlib %] <input type="checkbox" name="[% line.rowvalue %]" onclick="check_row('[% line.rowvalue %]')" /></h3> > [% FOREACH cell IN line.cells %] >- <p>[% cell.celvalue |html %] - [% FOREACH lib IN cell.libs %] >- [% lib.lib |html %] >+ <p>[% cell.celvalue %] - [% FOREACH lib IN cell.libs %] >+ [% lib.lib %] > [% END %] > <input type="checkbox" name="[% cell.celvalue %]" value="[% cell.celvalue %]" /> > </p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt >index ba214da..f63e847 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt >@@ -171,9 +171,9 @@ > [% IF ( resul.even ) %]<td class="hilighted"> > [% ELSE %]<td>[% END %] > [% IF ( resul.MARC_ON ) %] >- <a_class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?biblionumber=[% resul.biblionumber |url %]">[% resul.title |html %]</a> >+ <a_class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?biblionumber=[% resul.biblionumber |url %]">[% resul.title %]</a> > [% ELSE %] >- <a_class="transparent resultlist" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% resul.biblionumber |url %]">[% resul.title |html %]</a> [% END %] >+ <a_class="transparent resultlist" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% resul.biblionumber |url %]">[% resul.title %]</a> [% END %] > <p>[% resul.author %] > [% IF ( resul.publishercode ) %]- [% resul.publishercode %][% END %] > [% IF ( resul.place ) %] ; [% resul.place %][% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt >index 458c199..a35a35a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt >@@ -130,9 +130,9 @@ > <option value="">All item types</option> > [% FOREACH itypeloo IN itypeloop %] > [% IF ( itypeloo.selected ) %] >- <option value="[% itypeloo.itemtype %]" selected="selected">[% itypeloo.description |html %]</option> >+ <option value="[% itypeloo.itemtype %]" selected="selected">[% itypeloo.description %]</option> > [% ELSE %] >- <option value="[% itypeloo.itemtype %]">[% itypeloo.description |html %]</option> >+ <option value="[% itypeloo.itemtype %]">[% itypeloo.description %]</option> > [% END %] > [% END %] > </select> >@@ -176,24 +176,24 @@ > [% IF ( resul.even ) %]<td class="hilighted"> > [% ELSE %]<td>[% END %] > [% IF ( resul.MARC_ON ) %] >- <a class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?biblionumber=[% resul.biblionumber |url %]">[% resul.title |html %]</a> >+ <a class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?biblionumber=[% resul.biblionumber |url %]">[% resul.title %]</a> > [% ELSE %] >- <a class="transparent resultlist" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% resul.biblionumber |url %]">[% resul.fulltitle |html %]</a>[% END %] >- <p>[% 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 %] >+ <a class="transparent resultlist" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% resul.biblionumber |url %]">[% resul.fulltitle %]</a>[% END %] >+ <p>[% 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 %] > </p> > </td> > [% IF ( resul.even ) %]<td align="center" class="hilighted"> > [% ELSE %]<td align="center">[% END %] >- [% resul.totitem |html %] >+ [% resul.totitem %] > </td> > [% IF ( resul.even ) %]<td class="hilighted"> > [% ELSE %]<td>[% END %] >- [% resul.CN |html %] >+ [% resul.CN %] > </td> > <td> > [% IF ( resul.biblionumber ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tt >index 4c59985..a35db12 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tt >@@ -33,7 +33,7 @@ > <option value="start">starts with</option> > <option value="is">is exactly</option> > </select> >- <input type="text" name="value_mainstr" value="[% value_mainstr |html %]" /> >+ <input type="text" name="value_mainstr" value="[% value_mainstr %]" /> > </li> > <li> > <label for="mainentry">Main entry</label> >@@ -45,7 +45,7 @@ > <option value="start">starts with</option> > <option value="is">is exactly</option> > </select> >- <input type="text" name="value_main" value="[% value_main |html %]" /> >+ <input type="text" name="value_main" value="[% value_main %]" /> > </li> > <li> > <label for="marclist">Anywhere</label> >@@ -57,7 +57,7 @@ > <option value="start">starts with</option> > <option value="is">is exactly</option> > </select> >- <input type="text" name="value_any" value="[% value_any |html %]" /> >+ <input type="text" name="value_any" value="[% value_any %]" /> > </li> > <li> > <label for="orderby">Sort by </label> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >index de1c781..92abc8a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >+++ b/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 : > <li><label for="srchany">Keyword (any): </label> <input type="text" id="srchany" name="srchany" value="" /></li> > <li><label for="nameany">Name (any): </label> <input type="text" id="nameany" name="nameany" value="" /></li> > <li><label for="authorany">Author (any): </label> <input type="text" id="authorany" name="authorany" value="" /></li> >- <li><label for="authorpersonal">Author (personal): </label> <input type="text" id="authorpersonal" name="authorpersonal" value="[% authorpersonal | html %]" /></li> >- <li><label for="authorcorp">Author (corporate): </label> <input type="text" id="authorcorp" name="authorcorp" value="[% authorcorp | html %]" /></li> >- <li><label for="authormeetingcon">Author (meeting/conference): </label> <input type="text" id="authormeetingcon" name="authormeetingcon" value="[% authormeetingcon | html %]" /></li> >+ <li><label for="authorpersonal">Author (personal): </label> <input type="text" id="authorpersonal" name="authorpersonal" value="[% authorpersonal %]" /></li> >+ <li><label for="authorcorp">Author (corporate): </label> <input type="text" id="authorcorp" name="authorcorp" value="[% authorcorp %]" /></li> >+ <li><label for="authormeetingcon">Author (meeting/conference): </label> <input type="text" id="authormeetingcon" name="authormeetingcon" value="[% authormeetingcon %]" /></li> > </ol> > </fieldset> > </div> >@@ -137,8 +137,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <ol> > <li><label for="subject">Subject heading: </label> <input type="text" id="subject" name="subject" value="" /></li> > <li><label for="subjectsubdiv">Subject sub-division: </label> <input type="text" id="subjectsubdiv" name="subjectsubdiv" value="" /></li> >- <li><label for="title">Title (any): </label> <input type="text" id="title" name="title" value="[% title | html %]" /></li> >- <li><label for="uniformtitle">Title (uniform): </label> <input type="text" id="uniformtitle" name="uniformtitle" value="[% uniformtitle | html %]" /></li> >+ <li><label for="title">Title (any): </label> <input type="text" id="title" name="title" value="[% title %]" /></li> >+ <li><label for="uniformtitle">Title (uniform): </label> <input type="text" id="uniformtitle" name="uniformtitle" value="[% uniformtitle %]" /></li> > </ol> > <p><a id="resetZ3950Search" href="#">Clear search form</a></p> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >index d66c007..41b1283 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >+++ b/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 : > <ol> > <li><label for="isbn">ISBN: </label> <input type="text" id="isbn" name="isbn" value="[% isbn %]" /></li> > <li><label for="issn">ISSN: </label> <input type="text" id="issn" name="issn" value="[% issn %]" /></li> >- <li><label for="title">Title: </label> <input type="text" id="title" name="title" value="[% title |html %]" /></li> >+ <li><label for="title">Title: </label> <input type="text" id="title" name="title" value="[% title %]" /></li> > <li><label for="author">Author: </label> <input type="text" id="author" name="author" value="[% author %]" /></li> > <li><label for="subject">Subject heading: </label> <input type="text" id="subject" name="subject" value="" /></li> > <li><label for="srchany">Keyword (any): </label> <input type="text" id="srchany" name="srchany" value="" /></li> >@@ -207,7 +207,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > > <tr id="row[% breeding_loo.breedingid %]"> > <td>[% breeding_loo.server %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid %]" class="previewData">Preview card</a> <a href="#" onclick="Import([% breeding_loo.breedingid %],[% breeding_loo.biblionumber %]); return false">Import</a><a href="#" onclick="closemenu();return false;" title="Close this menu"> X </a></div> </td> >- <td>[% breeding_loo.title |html %]</td> >+ <td>[% breeding_loo.title %]</td> > <td>[% breeding_loo.author %]</td> > <td>[% breeding_loo.date %]</td> > <td>[% breeding_loo.edition %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >index f7b4765..2c7e329 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >@@ -1,6 +1,6 @@ > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Circulation statistics for [% title |html %]</title> >+<title>Koha › Circulation › Circulation statistics for [% title %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript"> > $(document).ready(function(){ >@@ -13,7 +13,7 @@ $(document).ready(function(){ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'circ-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Circulation statistics for [% title |html %]</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Circulation statistics for [% title %]</div> > > <div id="doc3" class="yui-t2"> > >@@ -22,7 +22,7 @@ $(document).ready(function(){ > <div class="yui-b"> > > <h2> >-[% title |html %] [% IF ( author ) %] by [% author |html %][% END %]</h2> >+[% title %] [% IF ( author ) %] by [% author %][% END %]</h2> > <h3>Barcode [% barcode %]</h3> > <table> > <tr><th>Home library</th><th>Current library</th><th>Date arrived<br />at current library </th><th>Number of checkouts<br />since last transfer</th></tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >index ff3424d..eaef667 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >@@ -43,7 +43,7 @@ > [% overduesloo.date_due %] > </td> > <td> >- [% INCLUDE 'biblio-default-view.inc' biblionumber = overduesloo.biblionumber %][% overduesloo.title |html %] [% IF ( overduesloo.subtitle ) %][% overduesloo.subtitle %][% END %]</a> [% IF ( overduesloo.author ) %] by [% overduesloo.author %][% END %] >+ [% INCLUDE 'biblio-default-view.inc' biblionumber = overduesloo.biblionumber %][% overduesloo.title %] [% IF ( overduesloo.subtitle ) %][% overduesloo.subtitle %][% END %]</a> [% IF ( overduesloo.author ) %] by [% overduesloo.author %][% END %] > > <br />Barcode : [% overduesloo.barcode %] > </td> >@@ -51,7 +51,7 @@ > <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overduesloo.borrowernumber %]">[% overduesloo.borrowersurname %], [% overduesloo.borrowerfirstname %]</a> > <br />[% overduesloo.cardnumber %] > <br />[% overduesloo.borrowerphone %]<br /> >- [% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail %]?subject=Overdue: [% overduesloo.title |html %]"> >+ [% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail %]?subject=Overdue: [% overduesloo.title %]"> > [% overduesloo.borroweremail %]</a>[% END %] > </td> > <td>[% overduesloo.homebranch %] [% overduesloo.itemcallnumber %] >@@ -119,7 +119,7 @@ > </td> > <td> > <p> >- <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% todayoverduesloo.biblionumber %]">[% todayoverduesloo.title |html %]</a> >+ <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% todayoverduesloo.biblionumber %]">[% todayoverduesloo.title %]</a> > (<b>[% todayoverduesloo.description %]</b>) > <br />Barcode : [% todayoverduesloo.barcode %] > </p> >@@ -128,7 +128,7 @@ > <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% todayoverduesloo.borrowernumber %]">[% todayoverduesloo.borrowersurname %] [% todayoverduesloo.borrowerfirstname %]</a> > <br />[% todayoverduesloo.cardnumber %]<br /> > <br />[% todayoverduesloo.borrowerphone %]<br /> >- [% IF ( todayoverduesloo.borroweremail ) %]<a href="mailto:[% todayoverduesloo.borroweremail %]?subject=Overdue: [% todayoverduesloo.title |html %]"> >+ [% IF ( todayoverduesloo.borroweremail ) %]<a href="mailto:[% todayoverduesloo.borroweremail %]?subject=Overdue: [% todayoverduesloo.title %]"> > [% todayoverduesloo.borroweremail %]</a>[% END %] > </p> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >index e2916d9..3c2c397 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >@@ -187,7 +187,7 @@ > </tr> > [% FOREACH trsfitemloo IN trsfitemloop %] > <tr> >- <td class="tf-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% trsfitemloo.biblionumber %]">[% trsfitemloo.title |html %]</a></td> >+ <td class="tf-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% trsfitemloo.biblionumber %]">[% trsfitemloo.title %]</a></td> > <td class="tf-author">[% trsfitemloo.author %]</td> > <td class="tf-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% trsfitemloo.biblionumber %]&itemnumber=[% trsfitemloo.itemnumber %]#item[% trsfitemloo.itemnumber %]">[% trsfitemloo.barcode %]</a></td> > <td class="tf-location">[% trsfitemloo.location %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 7c5573a..ea6cfff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -348,7 +348,7 @@ $(document).ready(function() { > </p> > [% END %] > >- <input type="hidden" name="barcode" value="[% barcode |html %]" /> >+ <input type="hidden" name="barcode" value="[% barcode %]" /> > <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> > <input type="hidden" name="issueconfirmed" value="1" /> > [% IF ( DEBT ) %]<input type="hidden" name="debt_confirmed" value="1" />[% END %] >@@ -426,7 +426,7 @@ $(document).ready(function() { > [% END %] > > [% IF ( UNKNOWN_BARCODE ) %] >- <li>The barcode was not found [% barcode |html %] >+ <li>The barcode was not found [% barcode %] > [% IF ( fast_cataloging ) %] > [% IF ( CAN_user_editcatalogue_fast_cataloging ) %] > <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&barcode=[% barcode |uri %]&circborrowernumber=[% borrowernumber %]&branch=[% branch %]&duedatespec=[% duedatespec %]&stickyduedate=[% stickyduedate %]">Fast cataloging</a> >@@ -804,16 +804,16 @@ No patron matched <span class="ex">[% message %]</span> > [% FOREACH w IN WaitingHolds %] > <ul> > <li> >- <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber %]">[% w.biblio.title | html %]</a> >+ <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber %]">[% w.biblio.title %]</a> > ([% ItemTypes.GetDescription( w.item.effective_itemtype ) %]), >- [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %] >+ [% IF ( w.biblio.author ) %] by [% w.biblio.author %] [% END %] > [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber %]] [% END %] > Hold placed on [% w.reservedate | $KohaDates %]. > > <br/> > [% IF ( w.branch.branchcode == Branches.GetLoggedInBranchcode() ) %]<strong class="waitinghere">[% ELSE %]<strong>[% END %] > [% SET waiting_expires_on = w.waiting_expires_on %] >- Waiting at [% w.branch.branchname | html %] [% IF waiting_expires_on %] until [% waiting_expires_on | $KohaDates %] [% END %] >+ Waiting at [% w.branch.branchname %] [% IF waiting_expires_on %] until [% waiting_expires_on | $KohaDates %] [% END %] > </strong> > </li> > </ul> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >index 5c94e96..a9e9abf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >@@ -61,7 +61,7 @@ $(document).ready(function(){ > <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber %]">[%item.firstname %] [% item.surname %]</a> > </td> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber %]"><strong>[% item.title |html %]</strong></a>[% IF ( item.author ) %], by [% item.author %][% END %][% IF ( item.itemnotes ) %]- <span class="circ-hlt">[% item.itemnotes %]</span>[% END %] >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber %]"><strong>[% item.title %]</strong></a>[% IF ( item.author ) %], by [% item.author %][% END %][% IF ( item.itemnotes ) %]- <span class="circ-hlt">[% item.itemnotes %]</span>[% END %] > </td> > <td>[% item.itemcallnumber %]</td> > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >index 4ebc7d2..424fe97 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -90,12 +90,12 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] <span style="font-size:70% > > <p> > [% IF ( isfiltered ) %] >- <a href="overdue.pl?op=csv&[% csv_param_string |html %]">Download file of displayed overdues</a> >+ <a href="overdue.pl?op=csv&[% csv_param_string %]">Download file of displayed overdues</a> > [% ELSE %] > <a href="overdue.pl?op=csv">Download file of all overdues</a> > [% END %] > </p> >-<div class="sql"><pre>[% sql |html %]</pre></div> >+<div class="sql"><pre>[% sql %]</pre></div> > <div class="searchresults"> > <table id="overduest"> > <thead><tr> >@@ -114,10 +114,10 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] <span style="font-size:70% > <tr> > <td>[% overdueloo.duedate %]</td> > <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overdueloo.borrowernumber %]">[% overdueloo.surname %][% IF (overdueloo.firstname) %], [% overdueloo.firstname %][% END %] ([% overdueloo.cardnumber %])</a> >- [% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email %]?subject=[% INCLUDE subject %] [% overdueloo.title |html %]">email</a>][% END %] >+ [% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email %]?subject=[% INCLUDE subject %] [% overdueloo.title %]">email</a>][% END %] > [% IF ( overdueloo.phone ) %]([% overdueloo.phone %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro %])[% END %]</td> > <td>[% IF overdueloo.branchcode %][% Branches.GetName( overdueloo.branchcode ) %][% END %]</td> >- <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overdueloo.biblionumber %][% overdueloo.title |html %] [% overdueloo.subtitle %]</a> [% IF ( overdueloo.author ) %], by [% overdueloo.author %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron %][% END %] >+ <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overdueloo.biblionumber %][% overdueloo.title %] [% overdueloo.subtitle %]</a> [% IF ( overdueloo.author ) %], by [% overdueloo.author %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron %][% END %] > </td> > <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% overdueloo.biblionumber %]&itemnumber=[% overdueloo.itemnum %]#item[% overdueloo.itemnum %]">[% overdueloo.barcode %]</a></td> > <td>[% overdueloo.itemcallnumber %]</td> >@@ -146,10 +146,10 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] <span style="font-size:70% > </li> > </ol></fieldset> > <ol> >- <li><label>Name or cardnumber:</label><input type="text" name="borname" value="[% borname |html %]" /></li> >+ <li><label>Name or cardnumber:</label><input type="text" name="borname" value="[% borname %]" /></li> > <li><label>Patron category:</label><select name="borcat" id="borcat"><option value="">Any</option> > [% FOREACH borcatloo IN borcatloop %] >- [% IF ( borcatloo.selected ) %]<option value="[% borcatloo.value |html %]" selected="selected">[% borcatloo.catname %]</option>[% ELSE %]<option value="[% borcatloo.value |html %]">[% borcatloo.catname %]</option>[% END %] >+ [% IF ( borcatloo.selected ) %]<option value="[% borcatloo.value %]" selected="selected">[% borcatloo.catname %]</option>[% ELSE %]<option value="[% borcatloo.value %]">[% borcatloo.catname %]</option>[% END %] > [% END %] > </select> > </li> >@@ -169,14 +169,14 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] <span style="font-size:70% > <li> > <label>[% patron_attr_filter_loo.description %]:</label> > [% IF ( patron_attr_filter_loo.authorised_value_category ) %] >- <script type="text/javascript" x-code="[% patron_attr_filter_loo.code |html %]">create_auto_completion_responder([% patron_attr_filter_loo.domid %],"[% patron_attr_filter_loo.code |html %]");</script> >+ <script type="text/javascript" x-code="[% patron_attr_filter_loo.code %]">create_auto_completion_responder([% patron_attr_filter_loo.domid %],"[% patron_attr_filter_loo.code %]");</script> > <span id="pattrodue-getready-[% patron_attr_filter_loo.domid %]"> > <div class="pattrodue-autocomplete"> >- <input autocomplete="off" id="pattrodue-input-[% patron_attr_filter_loo.domid %]" name="patron_attr_filter_[% patron_attr_filter_loo.code |html %]" value="[% patron_attr_filter_loo.cgivalue |html %]" class="pattrodue-input" type="text" /> >+ <input autocomplete="off" id="pattrodue-input-[% patron_attr_filter_loo.domid %]" name="patron_attr_filter_[% patron_attr_filter_loo.code %]" value="[% patron_attr_filter_loo.cgivalue %]" class="pattrodue-input" type="text" /> > </div> > </span> > [% ELSE %] >- <input type="text" name="patron_attr_filter_[% patron_attr_filter_loo.code |html %]" value="[% patron_attr_filter_loo.cgivalue |html %]"/> >+ <input type="text" name="patron_attr_filter_[% patron_attr_filter_loo.code %]" value="[% patron_attr_filter_loo.cgivalue %]"/> > [% END %] > [% IF ( patron_attr_filter_loo.repeatable ) %] > <a href="#" onclick="clone_parent(this); return false;">Add</a> >@@ -193,8 +193,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] <span style="font-size:70% > > <li><label>Item type:</label><select name="itemtype" id="itemtype"><option value="">Any</option> > [% FOREACH itemtypeloo IN itemtypeloop %][% IF ( itemtypeloo.selected ) %] >- <option value="[% itemtypeloo.value |html %]" selected="selected">[% itemtypeloo.itemtypename %]</option>[% ELSE %] >- <option value="[% itemtypeloo.value |html %]">[% itemtypeloo.itemtypename %]</option>[% END %] >+ <option value="[% itemtypeloo.value %]" selected="selected">[% itemtypeloo.itemtypename %]</option>[% ELSE %] >+ <option value="[% itemtypeloo.value %]">[% itemtypeloo.itemtypename %]</option>[% END %] > [% END %] > </select> > </li> >@@ -204,8 +204,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] <span style="font-size:70% > <select name="homebranch" id="homebranch"> > <option value="">Any</option> > [% FOREACH homebranchloo IN homebranchloop %][% IF ( homebranchloo.selected ) %] >- <option value="[% homebranchloo.value |html %]" selected="selected">[% homebranchloo.branchname %]</option>[% ELSE %] >- <option value="[% homebranchloo.value |html %]">[% homebranchloo.branchname %]</option>[% END %] >+ <option value="[% homebranchloo.value %]" selected="selected">[% homebranchloo.branchname %]</option>[% ELSE %] >+ <option value="[% homebranchloo.value %]">[% homebranchloo.branchname %]</option>[% END %] > [% END %] > </select> > </li> >@@ -215,8 +215,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] <span style="font-size:70% > <select name="holdingbranch" id="holdingbranch"> > <option value="">Any</option> > [% FOREACH holdingbranchloo IN holdingbranchloop %][% IF ( holdingbranchloo.selected ) %] >- <option value="[% holdingbranchloo.value |html %]" selected="selected">[% holdingbranchloo.branchname %]</option>[% ELSE %] >- <option value="[% holdingbranchloo.value |html %]">[% holdingbranchloo.branchname %]</option>[% END %] >+ <option value="[% holdingbranchloo.value %]" selected="selected">[% holdingbranchloo.branchname %]</option>[% ELSE %] >+ <option value="[% holdingbranchloo.value %]">[% holdingbranchloo.branchname %]</option>[% END %] > [% END %] > </select> > </li> >@@ -226,8 +226,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] <span style="font-size:70% > <option value="">Any</option> > [% FOREACH branchloo IN branchloop %] > [% IF ( branchloo.selected ) %] >- <option value="[% branchloo.value |html %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %] >- <option value="[% branchloo.value |html %]">[% branchloo.branchname %]</option>[% END %] >+ <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %] >+ <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %] > [% END %] > </select> > </li> >@@ -253,8 +253,8 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] <span style="font-size:70% > </option> > [% END %] > [% FOREACH patron_attr_order_loo IN patron_attr_order_loop %] >- [% IF ( patron_attr_order_loo.selected ) %]<option value="[% patron_attr_order_loo.value |html %]" selected="selected">[% patron_attr_order_loo.label %]</option> >- [% ELSE %]<option value="[% patron_attr_order_loo.value |html %]">[% patron_attr_order_loo.label %]</option>[% END %] >+ [% IF ( patron_attr_order_loo.selected ) %]<option value="[% patron_attr_order_loo.value %]" selected="selected">[% patron_attr_order_loo.label %]</option> >+ [% ELSE %]<option value="[% patron_attr_order_loo.value %]">[% patron_attr_order_loo.label %]</option>[% END %] > [% END %] > </select></li> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >index 662926d..65fb5ec 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -117,7 +117,7 @@ $(document).ready(function() { > <td> > <p> > [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] >- [% reserveloo.title |html %]</a></p> >+ [% reserveloo.title %]</a></p> > [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author %]</p>[% END %] > </td> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >index 930bb06..e1f6ce0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >@@ -3,7 +3,7 @@ > > [% INCLUDE 'doc-head-open.inc' %] > >-<title>Koha › Circulation › Renew [% title |html %]</title> >+<title>Koha › Circulation › Renew [% title %]</title> > > [% INCLUDE 'doc-head-close.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index 67f4226..b377769 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -70,7 +70,7 @@ > <td><p>[% reserveloo.reservecount %]</p></td> > <td><p>[% reserveloo.itemcount %]</p></td> > <td><p class="ratiolimit">[% reserveloo.thisratio %]</p></td> >- <td> [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% reserveloo.title |html %] [% IF ( reserveloo.subtitle ) %][% FOREACH subtitl IN reserveloo.subtitle %][% subtitl.subfield %][% END %][% END %]</a>[% IF ( reserveloo.author ) %] by [% reserveloo.author %][% END %] >+ <td> [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% reserveloo.title %] [% IF ( reserveloo.subtitle ) %][% FOREACH subtitl IN reserveloo.subtitle %][% subtitl.subfield %][% END %][% END %]</a>[% IF ( reserveloo.author ) %] by [% reserveloo.author %][% END %] > </td> > <td><p>[% reserveloo.homebranch_list %]</p></td> > <td><p>[% reserveloo.holdingbranch_list %]</p></td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index 5895b60..5ded2ce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -6,7 +6,7 @@ > [% USE AuthorisedValues %] > > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Check in [% title |html %]</title> >+<title>Koha › Circulation › Check in [% title %]</title> > [% INCLUDE 'doc-head-close.inc' %] > > [% INCLUDE 'calendar.inc' %] >@@ -169,7 +169,7 @@ $(document).ready(function () { > </div> > [% END %] > <!-- case of a mistake in transfer loop --> >-[% IF ( WrongTransfer ) %]<div id="return2" class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% Branches.GetName( TransferWaitingAt ) %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&&branchcode=[% homebranch %]&op=slip'); return true;">Print slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&canceltransfer=1">Cancel transfer</a></h3> >+[% IF ( WrongTransfer ) %]<div id="return2" class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title %]</a> to [% Branches.GetName( TransferWaitingAt ) %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&&branchcode=[% homebranch %]&op=slip'); return true;">Print slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&canceltransfer=1">Cancel transfer</a></h3> > [% IF ( wborcnum ) %]<h5>Hold for:</h5> > <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]"> > [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li> >@@ -202,7 +202,7 @@ $(document).ready(function () { > <!-- waiting --> > > <div id="hold-found1" class="dialog message audio-alert-action"> >- <h3>Hold found (item is already waiting): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3> >+ <h3>Hold found (item is already waiting): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title %]</a></h3> > [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %] > <h4>Hold for:</h4> > <ul> >@@ -250,7 +250,7 @@ $(document).ready(function () { > [% IF ( diffbranch ) %] > <!-- diffbranch --> > <div id="transfer-needed" class="dialog message audio-alert-action"> >- <h3>Hold needing transfer found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3> >+ <h3>Hold needing transfer found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title %]</a></h3> > <h4>Hold for: </h4> > <ul> > <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li> >@@ -294,7 +294,7 @@ $(document).ready(function () { > [% IF ( transfer ) %] > <!-- transfer: item with no reservation, must be returned according to home library circulation rules --> > <div id="return1" class="dialog message audio-alert-action"> >- <h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title or "item" |html %]</a> to [% Branches.GetName( returnbranch ) %]<br/>( <a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% returnbranch %]&op=slip'); return true;">Print slip</a> )</h3> >+ <h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title or "item" %]</a> to [% Branches.GetName( returnbranch ) %]<br/>( <a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% returnbranch %]&op=slip'); return true;">Print slip</a> )</h3> > </div> > [% END %] > >@@ -328,7 +328,7 @@ $(document).ready(function () { > <!-- diffbranch --> > <h3 class="audio-alert-action">Item consigned:</h3> > <table> >- <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title |html %]</a></caption> >+ <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title %]</a></caption> > <tr> > <th>Hold for:</th> > <td>[% name %]</td> >@@ -356,7 +356,7 @@ $(document).ready(function () { > <!-- reserved --> > > <div id="hold-found2" class="dialog message audio-alert-action"> >- <h3>Hold found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3> >+ <h3>Hold found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title %]</a></h3> > [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %] > <h5>Hold for:</h5> > <ul> >@@ -581,7 +581,7 @@ $(document).ready(function () { > [% END %] > </td> > <td class="ci-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% riloo.itembiblionumber %]"> >- [% riloo.itemtitle |html %]</a></td> >+ [% riloo.itemtitle %]</a></td> > <td class="ci-author">[% riloo.itemauthor %]</td> > <td class="ci-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber %]&itemnumber=[% riloo.itemnumber %]#item[% riloo.itemnumber %]">[% riloo.barcode %]</a></td> > <td class="ci-homelibrary">[% Branches.GetName( riloo.homebranch ) %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt >index faaa963..0c0ce5c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt >@@ -34,10 +34,10 @@ Updated:<ul> > [% END %] > [% END %] > </ul> >-<form method="post" action="[% referer or "/cgi-bin/koha/circ/circulation.pl" |html %]"> >+<form method="post" action="[% referer or "/cgi-bin/koha/circ/circulation.pl" %]"> > <div class="noshow"> > [% FOREACH recycle_loo IN recycle_loop %] >- <input type="text" name="[% recycle_loo.param %]" value="[% recycle_loo.value |html %]" /> >+ <input type="text" name="[% recycle_loo.param %]" value="[% recycle_loo.value %]" /> > [% END %] > </div> > <button type="submit">Continue</button> >@@ -84,9 +84,9 @@ Updated:<ul> > </fieldset> > <div class="noshow"> > [% FOREACH recycle_loo IN recycle_loop %] >- <input type="text" name="[% recycle_loo.param %]" value="[% recycle_loo.value |html %]" /> >+ <input type="text" name="[% recycle_loo.param %]" value="[% recycle_loo.value %]" /> > [% END %] >- <input type="hidden" name="oldreferer" value="[% referer or "/cgi-bin/koha/circ/circulation.pl" |html %]" /> >+ <input type="hidden" name="oldreferer" value="[% referer or "/cgi-bin/koha/circ/circulation.pl" %]" /> > </div> > </form> > <!-- /updated --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt >index 5854fdb..99e1703 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt >@@ -16,7 +16,7 @@ window.close(); > <h3>Transfer to [% branchname %]</h3> > > <h3>ITEM</h3> >- <h4>[% biblio.title |html %]</h4> >+ <h4>[% biblio.title %]</h4> > <h5>[% biblio.author %] </h5> > <ul> > [% IF ( item.barcode ) %]<li>[% item.barcode %]</li>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >index 877be7c..d64395f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -60,7 +60,7 @@ $(document).ready(function() { > [% END %] > <td><p><span title="[% reser.datetransfer %]">[% reser.datetransfer | $KohaDates %]</span></p> [% IF ( reser.messcompa ) %]<span class="error">Transfer is [% reser.diff %] days late</span>[% END %]</td> > <td> >- [% INCLUDE 'biblio-default-view.inc' biblionumber = reser.biblionumber %][% reser.title |html %] [% IF ( reser.subtitle ) %] [% FOREACH subtitl IN reser.subtitle %][% subtitl.subfield %][% END %][% END %]</a> [% 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 %]</a> [% IF ( reser.author ) %]by [% reser.author %][% END %] > [% IF ( reser.itemtype ) %] (<b>[% reser.itemtype %]</b>)[% END %] > <br />Barcode: [% reser.barcode %] > </td> >@@ -72,7 +72,7 @@ $(document).ready(function() { > [% IF ( reser.borrowermail ) %] > <br /> > [% BLOCK subject %]Hold:[% END %] >- <a href="mailto:[% reser.borrowermail %]?subject=[% INCLUDE subject %] [% reser.title |html %]"> >+ <a href="mailto:[% reser.borrowermail %]?subject=[% INCLUDE subject %] [% reser.title %]"> > [% reser.borrowermail %] > </a> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >index e419bcd..5aacc66 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >@@ -68,7 +68,7 @@ $(document).ready(function() { > <tbody>[% FOREACH itemsloo IN itemsloop %] > <tr> > <td class="hq-title"> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itemsloo.biblionumber %]"><strong>[% itemsloo.title | html %]</strong> [% FOREACH s IN itemsloo.subtitle %] [% s %][% END %]</a></p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itemsloo.biblionumber %]"><strong>[% itemsloo.title %]</strong> [% FOREACH s IN itemsloo.subtitle %] [% s %][% END %]</a></p> > <p> > <div class="hq-biblionumber content_hidden">[% itemsloo.biblionumber %]</div> > <div class="hq-author">[% itemsloo.author %]</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >index 1028033..3ec4f1b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -90,7 +90,7 @@ > <tr> > <td><span title="[% reserveloo.waitingdate %]">[% reserveloo.waitingdate | $KohaDates %]</span></td> > <td>[% 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 %] > </a> > [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %] (<b>[% reserveloo.itemtype %]</b>)[% END %][% END %] > <br />Barcode: [% reserveloo.barcode %] >@@ -151,7 +151,7 @@ > <tbody>[% FOREACH overloo IN overloop %] > <tr> > <td><p><span title="[% overloo.waitingdate %]">[% overloo.waitingdate | $KohaDates %]</span></p></td> >- <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %] >+ <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title %] > [% FOREACH subtitl IN overloo.subtitle %] [% subtitl.subfield %][% END %] > </a> > [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %] (<b>[% overloo.itemtype %]</b>)[% END %][% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt >index c3509cd..dc2a254 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt >@@ -31,7 +31,7 @@ > <!-- login prompt time--> > <form action="/cgi-bin/koha/installer/install.pl" method="post" name="mainform" id="mainform"> > [% FOREACH INPUT IN INPUTS %] >- <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" /> >+ <input type="hidden" name="[% INPUT.name %]" value="[% INPUT.value %]" /> > [% END %] > <h3>Welcome to the Koha web installer</h3> > <p>Before we begin, please verify you have the correct credentials to continue. Please log in >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >index 3ae276f..6bcd69e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >@@ -232,7 +232,7 @@ > <p>Update report :</p> > <ul> > [% FOREACH update_repor IN update_report %] >- <li>[% update_repor.line |html %]</li> >+ <li>[% update_repor.line %]</li> > [% END %] > </ul> > [% END %] >@@ -240,7 +240,7 @@ > <p>Update errors :</p> > <ul> > [% FOREACH update_error IN update_errors %] >- <li class="update_error">[% update_error.line |html %]</li> >+ <li class="update_error">[% update_error.line %]</li> > [% END %] > </ul> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >index 017af77..e3c70c6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >@@ -132,7 +132,7 @@ > [% END %] > <li> <fieldset id="layout_string" class="brief"> > <label for="format_string">Data fields</label> >- <input type="text" name="format_string" id="format_string" size="80" value="[% format_string |html %]" /> >+ <input type="text" name="format_string" id="format_string" size="80" value="[% format_string %]" /> > <div class="hint"> > <p>Enter a comma separated list of fields to print. You may include any <em>Koha field</em> or MARC subfield.</p> > <p>See online help for advanced options</p> >@@ -185,7 +185,7 @@ > </li> > <li> > <label for="font_size">Font size: </label> >- <input type="text" name="font_size" id="font_size" size="2" value="[% font_size |html %]" /> >+ <input type="text" name="font_size" id="font_size" size="2" value="[% font_size %]" /> > </li> > <li> > <label for="oblique_title">Oblique title: </label> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >index 65dc131..9c3a253 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >@@ -69,7 +69,7 @@ > <input type="hidden" name="ccl_query" value="[% ccl_query %]" /> > [% FOREACH result_se IN result_set %] > <div style="border-bottom:1px solid #CCC;margin: .5em 0;"> >- <h4>[% result_se.title |html %]</h4> >+ <h4>[% result_se.title %]</h4> > <p>[% 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 ) %], <b>ISBN: </b>[% result_se.isbn %][% END %][% IF ( result_se.notes ) %],<br />[% result_se.notes %][% END %]</p> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index 824c41c..8228f61 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/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 ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&itemnumber=[% account.itemnumber %]">View item</a> [% END %][% account.title |html %]</td> >+ [% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&itemnumber=[% account.itemnumber %]">View item</a> [% END %][% account.title %]</td> > <td>[% account.note | html_line_break %]</td> > [% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount %]</td> > [% IF ( account.amountoutstandingcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >index e646890..abfad88 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -1024,7 +1024,7 @@ > [% FOREACH patron_attribute IN pa_loo.items %] > <li data-category_code="[% patron_attribute.category_code %]"> > <label for="[% patron_attribute.form_id %]">[% patron_attribute.description %]: </label> >- <input type="hidden" id="[% patron_attribute.form_id %]_code" name="[% patron_attribute.form_id %]_code" value="[% patron_attribute.code |html %]" /> >+ <input type="hidden" id="[% patron_attribute.form_id %]_code" name="[% patron_attribute.form_id %]_code" value="[% patron_attribute.code %]" /> > [% IF ( patron_attribute.use_dropdown ) %] > <select id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]"> > <option value=""></option> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >index d7637ec..daf3711 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >@@ -44,7 +44,7 @@ > [% FOREACH issue IN issues %] > [% IF ( issue.overdue ) %]<tr class="overdue">[% ELSE %]<tr>[% END %] > <td> >- [% issue.title |html %] >+ [% issue.title %] > <a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issue.itemnumber %]&biblionumber=[% issue.biblionumber %]&bi=[% issue.biblioitemnumber %]"></a> > </td> > <td>[% issue.author %]</td> >@@ -105,7 +105,7 @@ > <tr> > <td> > [% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&itemnumber=[% account.itemnumber %]">[% END %] >- [% account.description %] [% IF ( account.printtitle ) %] [% account.title |html %][% END %] >+ [% account.description %] [% IF ( account.printtitle ) %] [% account.title %][% END %] > [% IF ( account.itemnumber ) %]</a>[% END %] > </td> > <td>[% account.date | $KohaDates %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt >index c7d67a1..f57053a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt >@@ -23,7 +23,7 @@ Checked out to [% firstname %] [% surname %] <br /> > [% FOREACH issueloo IN issueloop %] > [% IF ( issueloo.red ) %][% ELSE %] > [% IF ( issueloo.today ) %] >-<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber %]&biblionumber=[% issueloo.biblionumber %]&bi=[% issueloo.biblioitemnumber %]">[% issueloo.title |html %]</a><br /> >+<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber %]&biblionumber=[% issueloo.biblionumber %]&bi=[% issueloo.biblioitemnumber %]">[% issueloo.title %]</a><br /> > Barcode: [% issueloo.barcode %]<br /> > Date due: [% issueloo.date_due %]<br /></p> > [% END %] >@@ -34,7 +34,7 @@ Date due: [% issueloo.date_due %]<br /></p> > <h4>Checked out</h4> > [% FOREACH issueloo IN issueloop %] > [% IF ( issueloo.red ) %][% ELSE %] >-<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber %]&biblionumber=[% issueloo.biblionumber %]&bi=[% issueloo.biblioitemnumber %]">[% issueloo.title |html %]</a><br /> >+<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber %]&biblionumber=[% issueloo.biblionumber %]&bi=[% issueloo.biblioitemnumber %]">[% issueloo.title %]</a><br /> > Barcode: [% issueloo.barcode %]<br /> > Date due: [% issueloo.date_due %]<br /></p> > [% END %] >@@ -48,7 +48,7 @@ Date due: [% issueloo.date_due %]<br /></p> > <h4>Overdues</h4> > [% FOREACH issueloo IN issueloop %] > [% IF ( issueloo.red ) %] >-<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber %]&biblionumber=[% issueloo.biblionumber %]&bi=[% issueloo.biblioitemnumber %]">[% issueloo.title |html %]</a><br /> >+<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber %]&biblionumber=[% issueloo.biblionumber %]&bi=[% issueloo.biblioitemnumber %]">[% issueloo.title %]</a><br /> > Barcode: [% issueloo.barcode %]<br /> > Date due: [% issueloo.date_due %]</p> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >index 6cf4270..1ee003b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >@@ -56,9 +56,9 @@ > <p> > <strong> > [% IF ( CAN_user_catalogue ) %] >- <a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% s.suggestionid %]&op=show">[% s.title |html %]</a> >+ <a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% s.suggestionid %]&op=show">[% s.title %]</a> > [% ELSE %] >- [% s.title |html %] >+ [% s.title %] > [% END %] > </strong> > </p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >index 6fb109e..40b6dbf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -94,7 +94,7 @@ > <td> > <span title="[% issue.issuestimestamp %]">[% issue.issuestimestamp | $KohaDates with_hours => 1 %]</span> > </td> >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issue.biblionumber %]">[% issue.title |html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issue.biblionumber %]">[% issue.title %]</a></td> > > <td>[% issue.author %]</td> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt >index 33cb95f..0cbc795 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt >+++ b/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": >- "<a style='cursor:pointer' onclick='select_user(\"[% data.borrowernumber %]\", [% To.json(data) | html %] );'>Select</a>" >+ "<a style='cursor:pointer' onclick='select_user(\"[% data.borrowernumber %]\", [% To.json(data) %] );'>Select</a>" > }[% UNLESS loop.last %],[% END %] > [% END %] > ] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt >index 930fdc7..4c0583b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt >@@ -13,21 +13,21 @@ > "<input type='checkbox' class='selection' name='borrowernumber' value='[% data.borrowernumber %]' />", > [% END %] > "dt_cardnumber": >- "[% data.cardnumber | html %]", >+ "[% data.cardnumber %]", > "dt_name": > "<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber %]'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 %]</a><br />[% INCLUDE escape_address data = data %]</span>", > "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 %]<span class='overdue'><strong>[% data.overdues %]</strong></span>[% ELSE %][% data.overdues %][% END %] / [% data.issues %]", > "dt_fines": >- "<span style='text-align: right; display: block;'>[% IF data.fines < 0 %]<span class='credit'>[% data.fines |html %]</span> [% ELSIF data.fines > 0 %] <span class='debit'><strong>[% data.fines |html %]</strong></span> [% ELSE %] [% data.fines |html%] [% END %]</span>", >+ "<span style='text-align: right; display: block;'>[% IF data.fines < 0 %]<span class='credit'>[% data.fines %]</span> [% ELSIF data.fines > 0 %] <span class='debit'><strong>[% data.fines %]</strong></span> [% ELSE %] [% data.fines %] [% END %]</span>", > "dt_borrowernotes": > "[% data.borrowernotes.replace('\\\\' , '\\\\') |html |html_line_break |collapse %]", > "dt_action": >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >index 714596f..51743a0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >@@ -80,9 +80,9 @@ function CheckForm(f) { > </div> > [% END %] > [% IF ( message.ERROR_no_borrower_from_item ) %]<p>Warning: Unable to determine patron from item barcode ([% message.badbarcode %]). Cannot check in.</p>[% END %] >- [% IF ( message.issue ) %]<p>Checked out <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a> ([% message.barcode %]) to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %] >- [% IF ( message.renew ) %]<p>Renewed <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a> ([% message.barcode %]) for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %] >- [% IF ( message.return ) %]<p>Checked in <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a> ([% message.barcode %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %] >+ [% IF ( message.issue ) %]<p>Checked out <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title %]</a> ([% message.barcode %]) to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %] >+ [% IF ( message.renew ) %]<p>Renewed <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title %]</a> ([% message.barcode %]) for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %] >+ [% IF ( message.return ) %]<p>Checked in <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title %]</a> ([% message.barcode %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %] > [% IF ( message.payment ) %]<p>Accepted payment ([% message.amount %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %] > [% END %] > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >index 50c7213..c16d6d1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >@@ -66,7 +66,7 @@ > </a> > </td> > <td> >- <a class="btn btn-mini" href="delete.pl?patron_list_id=[% l.patron_list_id %]" onclick='return ConfirmDelete("[% l.name | html %]")'> >+ <a class="btn btn-mini" href="delete.pl?patron_list_id=[% l.patron_list_id %]" onclick='return ConfirmDelete("[% l.name %]")'> > <i class="fa fa-trash"></i> Delete > </a> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >index 8532c09..58e1b0c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >@@ -194,7 +194,7 @@ > <ol> > <li> > <label for="field_1_text">Text: </label> >- <input type="text" name="field_1_text" id="field_1_text" size="60" value="[% field_1_text |html %]" /> >+ <input type="text" name="field_1_text" id="field_1_text" size="60" value="[% field_1_text %]" /> > </li> > <li> > <label for="field_1_font">Font: </label> >@@ -210,7 +210,7 @@ > </li> > <li> > <label for="field_1_font_size">Font size: </label> >- <input type="text" name="field_1_font_size" id="field_1_font_size" size="2" value="[% field_1_font_size |html %]" /> >+ <input type="text" name="field_1_font_size" id="field_1_font_size" size="2" value="[% field_1_font_size %]" /> > <span class="font_unit"> pt</span> > </li> > <li> >@@ -227,11 +227,11 @@ > </li> > <li> > <label for="field_1_llx">Lower left X coordinate: </label> >- <input type="text" name="field_1_llx" id="field_1_llx" size="2" value="[% field_1_llx |html %]" /> >+ <input type="text" name="field_1_llx" id="field_1_llx" size="2" value="[% field_1_llx %]" /> > </li> > <li> > <label for="field_1_lly">Lower left Y coordinate: </label> >- <input type="text" name="field_1_lly" id="field_1_lly" size="2" value="[% field_1_lly |html %]" /> >+ <input type="text" name="field_1_lly" id="field_1_lly" size="2" value="[% field_1_lly %]" /> > </li> > </ol> > </div> >@@ -248,7 +248,7 @@ > <ol> > <li> > <label for="field_2_text">Text: </label> >- <input type="text" name="field_2_text" id="field_2_text" size="60" value="[% field_2_text |html %]" /> >+ <input type="text" name="field_2_text" id="field_2_text" size="60" value="[% field_2_text %]" /> > </li> > <li> > <label for="field_2_font">Font: </label> >@@ -264,7 +264,7 @@ > </li> > <li> > <label for="field_2_font_size">Font size: </label> >- <input type="text" name="field_2_font_size" id="field_2_font_size" size="2" value="[% field_2_font_size |html %]" /> >+ <input type="text" name="field_2_font_size" id="field_2_font_size" size="2" value="[% field_2_font_size %]" /> > <span class="font_unit"> pt</span> > </li> > <li> >@@ -281,11 +281,11 @@ > </li> > <li> > <label for="field_2_llx">Lower left X coordinate: </label> >- <input type="text" name="field_2_llx" id="field_2_llx" size="2" value="[% field_2_llx |html %]" /> >+ <input type="text" name="field_2_llx" id="field_2_llx" size="2" value="[% field_2_llx %]" /> > </li> > <li> > <label for="field_2_lly">Lower left Y coordinate: </label> >- <input type="text" name="field_2_lly" id="field_2_lly" size="2" value="[% field_2_lly |html %]" /> >+ <input type="text" name="field_2_lly" id="field_2_lly" size="2" value="[% field_2_lly %]" /> > </li> > </ol> > </div> >@@ -302,7 +302,7 @@ > <ol> > <li> > <label for="field_3_text">Text: </label> >- <input type="text" name="field_3_text" id="field_3_text" size="60" value="[% field_3_text |html %]" /> >+ <input type="text" name="field_3_text" id="field_3_text" size="60" value="[% field_3_text %]" /> > </li> > <li> > <label for="field_3_font">Font: </label> >@@ -318,7 +318,7 @@ > </li> > <li> > <label for="field_3_font_size">Font size: </label> >- <input type="text" name="field_3_font_size" id="field_3_font_size" size="2" value="[% field_3_font_size |html %]" /> >+ <input type="text" name="field_3_font_size" id="field_3_font_size" size="2" value="[% field_3_font_size %]" /> > <span class="font_unit"> pt</span> > </li> > <li> >@@ -335,11 +335,11 @@ > </li> > <li> > <label for="field_3_llx">Lower left X coordinate: </label> >- <input type="text" name="field_3_llx" id="field_3_llx" size="2" value="[% field_3_llx |html %]" /> >+ <input type="text" name="field_3_llx" id="field_3_llx" size="2" value="[% field_3_llx %]" /> > </li> > <li> > <label for="field_3_lly">Lower left Y coordinate: </label> >- <input type="text" name="field_3_lly" id="field_3_lly" size="2" value="[% field_3_lly |html %]" /> >+ <input type="text" name="field_3_lly" id="field_3_lly" size="2" value="[% field_3_lly %]" /> > </li> > </ol> > </div> >@@ -384,11 +384,11 @@ > <ol> > <li> > <label for="barcode_llx">Lower left X coordinate: </label> >- <input type="text" name="barcode_llx" id="barcode_llx" size="2" value="[% barcode_llx |html %]" /> >+ <input type="text" name="barcode_llx" id="barcode_llx" size="2" value="[% barcode_llx %]" /> > </li> > <li> > <label for="barcode_lly">Lower left Y coordinate: </label> >- <input type="text" name="barcode_lly" id="barcode_lly" size="2" value="[% barcode_lly |html %]" /> >+ <input type="text" name="barcode_lly" id="barcode_lly" size="2" value="[% barcode_lly %]" /> > </li> > <li> > <label for="barcode_height_scale">Scale height (relative to card): </label> >@@ -463,15 +463,15 @@ > <ol> > <li> > <label for="image_1_Dx">Display height: </label> >- <input type="text" name="image_1_Dx" id="image_1_Dx" size="2" value="[% image_1_Dx |html %]" /> >+ <input type="text" name="image_1_Dx" id="image_1_Dx" size="2" value="[% image_1_Dx %]" /> > </li> > <li> > <label for="image_1_Tx">Lower left X coordinate: </label> >- <input type="text" name="image_1_Tx" id="image_1_Tx" size="2" value="[% image_1_Tx |html %]" /> >+ <input type="text" name="image_1_Tx" id="image_1_Tx" size="2" value="[% image_1_Tx %]" /> > </li> > <li> > <label for="image_1_Ty">Lower left Y coordinate: </label> >- <input type="text" name="image_1_Ty" id="image_1_Ty" size="2" value="[% image_1_Ty |html %]" /> >+ <input type="text" name="image_1_Ty" id="image_1_Ty" size="2" value="[% image_1_Ty %]" /> > </li> > </ol> > </div> >@@ -519,15 +519,15 @@ > <ol> > <li> > <label for="image_2_Dx">Display height: </label> >- <input type="text" name="image_2_Dx" id="image_2_Dx" size="2" value="[% image_2_Dx |html %]" /> >+ <input type="text" name="image_2_Dx" id="image_2_Dx" size="2" value="[% image_2_Dx %]" /> > </li> > <li> > <label for="image_2_Tx">Lower left X coordinate: </label> >- <input type="text" name="image_2_Tx" id="image_2_Tx" size="2" value="[% image_2_Tx |html %]" /> >+ <input type="text" name="image_2_Tx" id="image_2_Tx" size="2" value="[% image_2_Tx %]" /> > </li> > <li> > <label for="image_2_Ty">Lower left Y coordinate: </label> >- <input type="text" name="image_2_Ty" id="image_2_Ty" size="2" value="[% image_2_Ty |html %]" /> >+ <input type="text" name="image_2_Ty" id="image_2_Ty" size="2" value="[% image_2_Ty %]" /> > </li> > </ol> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt >index 39f6ece..5f8d95e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt >@@ -11,9 +11,9 @@ > "dt_name": > "<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber %]'>[% 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%]</a></span>", > "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": >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index 6125814..d59f88a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -571,7 +571,7 @@ canned reports and writing custom SQL reports.</p> > <td> > <select name="[% criteri.name %]_value"> > [% FOREACH value IN criteri.values %] >- <option value="[% value.availablevalues %]">[% IF ( value.default ) %]Default[% ELSE %][% value.display_value |html %][% END %]</option> >+ <option value="[% value.availablevalues %]">[% IF ( value.default ) %]Default[% ELSE %][% value.display_value %][% END %]</option> > [% END %] > </select> > </td> >@@ -668,7 +668,7 @@ canned reports and writing custom SQL reports.</p> > <h1>Confirm custom report</h1> > <p>Your report will be generated with the following SQL statement.</p> > <p> >-[% sql |html %] >+[% sql %] > </p> > > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post"> >@@ -684,7 +684,7 @@ canned reports and writing custom SQL reports.</p> > > [% IF ( save ) %] > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" class="validated"> >-<input type="hidden" name="sql" value="[% sql |html %]" /> >+<input type="hidden" name="sql" value="[% sql %]" /> > <input type="hidden" name="type" value="[% type %]" /> > <input type="hidden" name="area" value="[% area %]" /> > <input type="hidden" name="public" value="[% public %]" /> >@@ -801,7 +801,7 @@ canned reports and writing custom SQL reports.</p> > <h1>[% name %]</h1> > [% IF ( notes ) %]<p>[% notes %]</p>[% END %] > [% IF ( unlimited_total ) %]<p>Total number of rows matching the (unlimited) query is [% unlimited_total %].</p>[% END %] >-<pre id="sql_output">[% sql |html %]</pre> >+<pre id="sql_output">[% sql %]</pre> > > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get"> > <input type="hidden" name="phase" value="Run this report"/> >@@ -844,7 +844,7 @@ canned reports and writing custom SQL reports.</p> > <option value="tab">Tab separated text</option> > <option value="ods">Open Document Spreadsheet</option> > </select> >-<input type="hidden" name="sql" value="[% sql |html %]" /> >+<input type="hidden" name="sql" value="[% sql %]" /> > <input type="hidden" name="phase" value="Export" /> > <input type="submit" name="submit" value="Download" /></fieldset> > <input type="hidden" name="reportname" value="[% name %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >index 52f1cfa..e508e85 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >@@ -39,7 +39,7 @@ > <tr> > <th>[% mainloo.line %] / [% mainloo.column %]</th> > [% FOREACH loopco IN mainloo.loopcol %] >- <th>[% loopco.coltitle_display |html %]</th> >+ <th>[% loopco.coltitle_display %]</th> > [% END %] > <th>TOTAL</th> > </tr> >@@ -49,7 +49,7 @@ > [% ELSE %] > <tr class="highlight"> > [% END %] >- <td>[% loopro.rowtitle_display or "UNKNOWN VALUE" |html %]</td> >+ <td>[% loopro.rowtitle_display or "UNKNOWN VALUE" %]</td> > [% FOREACH loopcel IN loopro.loopcell %] > <td>[% loopcel.value %]</td> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >index e72f446..09f1b91 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >@@ -72,7 +72,7 @@ > [% FOREACH itemsloo IN itemsloop %] > <tr> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itemsloo.biblionumber %]" title="[% itemsloo.itemnotes %]">[% itemsloo.title |html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itemsloo.biblionumber %]" title="[% itemsloo.itemnotes %]">[% itemsloo.title %]</a> > </td> > <td>[% itemsloo.author %]</td> > <td>[% itemsloo.lib %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >index 641cbc6..b858345 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >@@ -113,7 +113,7 @@ > <tr> > <th>[% mainloo.line %] / [% mainloo.column %]</th> > [% FOREACH loopco IN mainloo.loopcol %] >- <th>[% loopco.coltitle_display |html %]</th> >+ <th>[% loopco.coltitle_display %]</th> > [% END %] > <th>TOTAL</th> > </tr> >@@ -123,7 +123,7 @@ > [% ELSE %] > <tr class="highlight"> > [% END %] >- <td>[% loopro.rowtitle_display or "UNKNOWN VALUE" |html %]</td> >+ <td>[% loopro.rowtitle_display or "UNKNOWN VALUE" %]</td> > [% FOREACH loopcel IN loopro.loopcell %] > <td align="center"> > [% IF ( loopcel.url_complement ) %]<a href="reserves_stats.pl?output=[% loopcel.output %]&[% loopcel.url_complement %]">[% loopcel.value %]</a>[% ELSE %][% loopcel.value %][% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >index 6e7b8ab..57f13ac 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >@@ -52,7 +52,7 @@ > <tr> > [% FOREACH data IN datas %] > <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% data.aqbooksellerid %]">[% data.name %]</a></td> >- <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% data.subscriptionid %]">[% data.title |html %]</a></td> >+ <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% data.subscriptionid %]">[% data.title %]</a></td> > <td>[% data.subscriptionid %]</td> > <td>[% Branches.GetName( data.branchcode ) %]</td> > <td>[% data.callnumber %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 3152f7f..b9f4a9e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -2,7 +2,7 @@ > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > [% UNLESS ( multi_hold ) %] >- <title>Koha › Circulation › Holds › Place a hold on [% title |html %]</title> >+ <title>Koha › Circulation › Holds › Place a hold on [% title %]</title> > [% ELSE %] > <title>Koha › Circulation › Holds › Confirm holds</title> > [% END %] >@@ -211,7 +211,7 @@ function checkMultiHold() { > [% INCLUDE 'circ-search.inc' %] > > [% UNLESS ( multi_hold ) %] >- <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]">[% title |html %]</a> › Place a hold on [% title |html %]</div> >+ <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]">[% title %]</a> › Place a hold on [% title %]</div> > [% ELSE %] > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Confirm holds</div> > [% END %] >@@ -242,7 +242,7 @@ function checkMultiHold() { > [% END %] > > [% UNLESS ( multi_hold ) %] >- <h1>Place a hold on [% INCLUDE 'biblio-default-view.inc' %][% title |html %]</a></h1> >+ <h1>Place a hold on [% INCLUDE 'biblio-default-view.inc' %][% title %]</a></h1> > [% ELSE %] > <h1>Confirm holds</h1> > [% END %] >@@ -370,12 +370,12 @@ function checkMultiHold() { > <input type="hidden" name="bad_bibs" id="bad_bibs" value=""/> > <input type="hidden" name="request" value="any"/> > [% FOREACH biblioloo IN biblioloop %] >- <input type="hidden" name="title_[% biblioloo.biblionumber %]" value="[% biblioloo.title |html %]"/> >+ <input type="hidden" name="title_[% biblioloo.biblionumber %]" value="[% biblioloo.title %]"/> > <input type="hidden" name="rank_[% biblioloo.biblionumber %]" value="[% biblioloo.rank %]"/> > [% END %] > [% ELSE %] > <input type="hidden" name="biblionumber" value="[% biblionumber %]" /> >- <input type="hidden" name="title" value="[% title |html %]" /> >+ <input type="hidden" name="title" value="[% title %]" /> > <input type="hidden" name="rank-request" value="[% fixedRank %]" /> > [% END %] > >@@ -581,7 +581,7 @@ function checkMultiHold() { > [% END %] > <td> > <ul> >- <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber %]">[% biblioloo.title |html %]</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber %]">[% biblioloo.title %]</a></li> > [% IF ( biblioloo.publicationyear ) %] > <li><span class="label">Publication year:</span> [% biblioloo.publicationyear %]</li> > [% END %] >@@ -660,7 +660,7 @@ function checkMultiHold() { > [% IF ( biblioloo.reserveloop ) %] > <table> > [% IF ( multi_hold ) %] >- <caption><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber %]">[% biblioloo.title |html %]</a></caption> >+ <caption><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber %]">[% biblioloo.title %]</a></caption> > [% END %] > <tr> > [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >index b609d83..d04ae91 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >@@ -50,7 +50,7 @@ > <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber %]">[% review.bibliotitle %]</a> > </td> > <td> >- [% review.review |html %] >+ [% review.review %] > </td> > <td> > [% IF ( status ) %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=unapprove&reviewid=[% review.reviewid %]">Unapprove</a>[% ELSE %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&reviewid=[% review.reviewid %]">Approve</a>[% END %] | >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt >index 43d4a8b..a5c09c2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt >@@ -106,7 +106,7 @@ > </tr> > [% FOREACH collectionItemsLoo IN collectionItemsLoop %] > <tr> >- <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = collectionItemsLoo.biblionumber %][% collectionItemsLoo.title |html %]</a></td> >+ <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = collectionItemsLoo.biblionumber %][% collectionItemsLoo.title %]</a></td> > <td>[% collectionItemsLoo.itemcallnumber %]</td> > <td>[% collectionItemsLoo.barcode %]</td> > <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId %]&barcode=[% collectionItemsLoo.barcode %]&removeItem=1&action=addItem">Remove</a></td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >index 657f91d..31e95e9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >@@ -112,7 +112,7 @@ > [% subscriptions_loo.issn %] > </td> > <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptions_loo.subscriptionid |url %]">[% IF ( subscriptions_loo.title ) %] >- [% subscriptions_loo.title |html %] >+ [% subscriptions_loo.title %] > [% ELSE %] > | > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >index dd77a73..52996f7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -240,7 +240,7 @@ > <span class="branch-[% missingissue.branchcode %]">[% Branches.GetName( missingissue.branchcode ) %]</span> > </td> > <td> >- <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% missingissue.subscriptionid %]">[% missingissue.title |html %]</a> >+ <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% missingissue.subscriptionid %]">[% missingissue.title %]</a> > </td> > <td>[% missingissue.issn %]</td> > <td>[% missingissue.serialseq %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt >index 11ecd18..0c6f574 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt >@@ -32,19 +32,19 @@ function GetIt(bibno,title) > </tr> > [% FOREACH resultsloo IN resultsloop %] > <tr> >- <td class="title">[% resultsloo.title |html %] [% resultsloo.subtitle |html %] >+ <td class="title">[% resultsloo.title %] [% resultsloo.subtitle %] > </td> > <td> >- [% resultsloo.author |html %] >+ [% resultsloo.author %] > </td> > <td> >- [% resultsloo.publishercode |html %] >+ [% resultsloo.publishercode %] > </td> > <td> >- [% resultsloo.publicationyear |html %] >+ [% resultsloo.publicationyear %] > </td> > <td> >- [% resultsloo.issn |html %] >+ [% resultsloo.issn %] > </td> > > <td><a href="#" onclick="GetIt('[% resultsloo.biblionumber %]',$(this));" title="Choose this record">Choose</a></td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt >index 5a23158..ea8e174 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt >@@ -19,7 +19,7 @@ > <td colspan="2"><h3>[% libraryname %]</h3></td> > </tr> > <tr> >- <td colspan="2"><b>Title:</b> [% title |html %]<br />[% issue %]</td> >+ <td colspan="2"><b>Title:</b> [% title %]<br />[% issue %]</td> > </tr> > <tr> > <td><b>Name</b></td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt >index 6892e1c..9438684 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt >+++ b/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' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> › <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% title |html %]</i></a> › Preview routing list</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> › <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% title %]</i></a> › Preview routing list</div> > > <div id="doc3" class="yui-t2"> > >@@ -24,7 +24,7 @@ function print_slip(subscriptionid,issue){ > <div id="yui-main"> > <div class="yui-b"> > >-<h2>Preview routing list for <i>[% title |html %]</i></h2> >+<h2>Preview routing list for <i>[% title %]</i></h2> > > <form method="post" action="routing-preview.pl"> > <input type="hidden" name="subscriptionid" value="[% subscriptionid %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >index 6fccab8..b1a7372 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Serials › [% title |html %] › [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %]</title> >+<title>Koha › Serials › [% title %] › [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript"> > <!-- >@@ -29,7 +29,7 @@ function reorder_item(sid,rid,rank){ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'serials-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> › <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% title |html %]</i></a> › [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %]</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> › <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% title %]</i></a> › [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %]</div> > > <div id="doc3" class="yui-t2"> > >@@ -39,9 +39,9 @@ function reorder_item(sid,rid,rank){ > > > [% IF ( op ) %] >-<h1>Create routing list for <i>[% title |html %]</i></h1> >+<h1>Create routing list for <i>[% title %]</i></h1> > [% ELSE %] >-<h1>Edit routing list for <i>[% title |html %]</i></h1> >+<h1>Edit routing list for <i>[% title %]</i></h1> > [% END %] > > <form method="post" action="routing.pl"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index bf1dc7a..85646d9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -303,7 +303,7 @@ $(document).ready(function() { > </td> > [% IF ( routing ) %] > <td> >- <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq.replace("'", "\\'") |html %] ([% serial.publisheddate | $KohaDates %])'); return false" >Print list</a> >+ <a href="" onclick="print_slip([% serial.subscriptionid %], '[% serial.serialseq.replace("'", "\\'") %] ([% serial.publisheddate | $KohaDates %])'); return false" >Print list</a> > </td> > [% END %] > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >index be67cfa..7f407dd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >@@ -61,29 +61,29 @@ > <ol> > <li> > <label for="issn">ISSN:</label> >- <input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter | html %]" /> >+ <input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter %]" /> > </li> > <li> > <label for="title">Title:</label> >- <input type="text" id="title" name="title_filter" value="[% title_filter | html %]" /> >+ <input type="text" id="title" name="title_filter" value="[% title_filter %]" /> > </li> > [% IF ( marcflavour == "UNIMARC" ) %] > <li> > <label for="ean">EAN:</label> >- <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter | html %]" /> >+ <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter %]" /> > </li> > [% END %] > <li> > <label for="callnumber">Call number:</label> >- <input type="text" id="callnumber" name="callnumber_filter" value="[% callnumber_filter | html %]" /> >+ <input type="text" id="callnumber" name="callnumber_filter" value="[% callnumber_filter %]" /> > </li> > <li> > <label for="publisher">Publisher:</label> >- <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" /> >+ <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter %]" /> > </li> > <li> > <label for="bookseller">Vendor:</label> >- <input type="text" id="bookseller" name="bookseller_filter" value="[% bookseller_filter | html %]" /> >+ <input type="text" id="bookseller" name="bookseller_filter" value="[% bookseller_filter %]" /> > </li> > <li> > <label for="branch">Library:</label> >@@ -189,7 +189,7 @@ > [% IF ( subscription.issn ) %][% subscription.issn %] > [% END %] > </td> >- <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" class="button" title="subscription detail">[% subscription.title |html %]</a> >+ <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" class="button" title="subscription detail">[% subscription.title %]</a> > </td> > <td>[% IF ( subscription.publicnotes ) %][% subscription.publicnotes %][% END %] > [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes %])[% END %] >@@ -306,7 +306,7 @@ > [% END %] > </td> > <td> >- <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" class="button" title="subscription detail">[% subscription.title |html %]</a> >+ <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" class="button" title="subscription detail">[% subscription.title %]</a> > </td> > <td> > [% IF ( subscription.notes ) %][% subscription.notes %][% END %] >@@ -381,29 +381,29 @@ > <ol> > <li> > <label for="issn">ISSN:</label> >- <input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter | html %]" /> >+ <input type="text" id="issn" name="ISSN_filter" value="[% ISSN_filter %]" /> > </li> > <li> > <label for="title">Title:</label> >- <input type="text" id="title" name="title_filter" value="[% title_filter | html %]" /> >+ <input type="text" id="title" name="title_filter" value="[% title_filter %]" /> > </li> > [% IF ( marcflavour == "UNIMARC" ) %] > <li> > <label for="ean">EAN:</label> >- <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter | html %]" /> >+ <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter %]" /> > </li> > [% END %] > <li> > <label for="callnumber">Call number:</label> >- <input type="text" id="callnumber" name="callnumber_filter" value="[% callnumber_filter | html %]" /> >+ <input type="text" id="callnumber" name="callnumber_filter" value="[% callnumber_filter %]" /> > </li> > <li> > <label for="publisher">Publisher:</label> >- <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter | html %]" /> >+ <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter %]" /> > </li> > <li> > <label for="bookseller">Vendor:</label> >- <input type="text" id="bookseller" name="bookseller_filter" value="[% bookseller_filter | html %]" /> >+ <input type="text" id="bookseller" name="bookseller_filter" value="[% bookseller_filter %]" /> > </li> > <li> > <label for="branch">Library:</label> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >index 136aa57..4d30856 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >@@ -1,7 +1,7 @@ > [% USE KohaDates %] > > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Serials › [% IF ( modify ) %][% bibliotitle |html %] › Modify subscription[% ELSE %]New subscription[% END %]</title> >+<title>Koha › Serials › [% IF ( modify ) %][% bibliotitle %] › Modify subscription[% ELSE %]New subscription[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > <style type="text/css"> >@@ -468,12 +468,12 @@ $(document).ready(function() { > [% INCLUDE 'header.inc' %] > [% INCLUDE 'serials-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> › [% IF ( modify ) %]<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% bibliotitle |html %]</i></a> › Modify subscription[% ELSE %]New subscription[% END %]</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> › [% IF ( modify ) %]<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% bibliotitle %]</i></a> › Modify subscription[% ELSE %]New subscription[% END %]</div> > > <div id="doc3" class="yui-t7"> > <div id="bd"> > <div class="yui-g"> >- <h1>[% IF ( modify ) %] Modify subscription for <i>[% bibliotitle |html %]</i>[% ELSE %]Add a new subscription[% END %] (<span id="page_number">1/2</span>)</h1> >+ <h1>[% IF ( modify ) %] Modify subscription for <i>[% bibliotitle %]</i>[% ELSE %]Add a new subscription[% END %] (<span id="page_number">1/2</span>)</h1> > <form method="post" name="f" action="/cgi-bin/koha/serials/subscription-add.pl" class="validated" onsubmit="return Check_page2();" > > [% IF ( modify ) %] > <input type="hidden" name="op" value="modsubscription" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt >index 6c710e8..9dfda24 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt >@@ -26,7 +26,7 @@ > <option value="">All</option> > [%- FOREACH itemtypeloo IN itemtypeloop %] > <option value="[% itemtypeloo.code %]"> >- [% itemtypeloo.description |html %] >+ [% itemtypeloo.description %] > </option> > [%- END %] > </select> >@@ -38,7 +38,7 @@ > <option value="">All</option> > [%- FOREACH ccodeloo IN ccodeloop %] > <option value="[% ccodeloo.code %]"> >- [% ccodeloo.description |html %] >+ [% ccodeloo.description %] > </option> > [%- END %] > </select> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt >index abb228e..b71df6e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt >@@ -11,7 +11,7 @@ > "dt_name": > "<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber %]'>[% 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%]</a></span>", > "dt_branch": >- "[% data.branchname |html %]", >+ "[% data.branchname %]", > "dt_action": > "<a style='cursor:pointer' onclick='add_user(\"[% data.borrowernumber %]\", \"[% data.firstname %] [% data.surname %]\"); return false;'>Add</a>" > }[% UNLESS loop.last %],[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 547265d..92389ac 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -205,13 +205,13 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > <fieldset class="rows"> > <legend>Bibliographic information</legend> > <ol> >- <li><span class="label">Title:</span>[% title |html %]</li> >- <li><span class="label">Author:</span>[% author |html %]</li> >- <li><span class="label">Copyright date:</span>[% copyrightdate |html %]</li> >- <li><span class="label">ISBN or ISSN or other standard number:</span>[% isbn |html %]</li> >- <li><span class="label">Publisher:</span>[% publishercode |html %]</li> >- <li><span class="label">Publication place:</span>[% place |html %]</li> >- <li><span class="label">Collection title:</span>[% collectiontitle |html %]</li> >+ <li><span class="label">Title:</span>[% title %]</li> >+ <li><span class="label">Author:</span>[% author %]</li> >+ <li><span class="label">Copyright date:</span>[% copyrightdate %]</li> >+ <li><span class="label">ISBN or ISSN or other standard number:</span>[% isbn %]</li> >+ <li><span class="label">Publisher:</span>[% publishercode %]</li> >+ <li><span class="label">Publication place:</span>[% place %]</li> >+ <li><span class="label">Collection title:</span>[% collectiontitle %]</li> > <li><span class="label">Document type:</span> > [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', itemtype, 0 ) %] > </li> >@@ -222,7 +222,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > [% END %] > </li> > [% END %] >- <li><span class="label">Notes:</span>[% note |html %]</li> >+ <li><span class="label">Notes:</span>[% note %]</li> > </ol> > </fieldset> > <fieldset class="rows"> <legend>Suggestion management</legend> >@@ -324,15 +324,15 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > <fieldset class="rows"> <legend>Bibliographic information</legend><ol> > <li> > <label for="title" class="required">Title:</label> >- <input type="text" id="title" name="title" size="80" maxlength="255" value="[% title |html %]" required="required" class="required" /> >+ <input type="text" id="title" name="title" size="80" maxlength="255" value="[% title %]" required="required" class="required" /> > <span class="required">Required</span> > </li> >- <li><label for="author">Author:</label><input type="text" id="author" name="author" size="50" maxlength="80" value="[% author | html %]"/></li> >- <li><label for="copyrightdate">Copyright date:</label><input type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" value="[% copyrightdate | html %]" /></li> >- <li><label for="isbn">ISBN or ISSN or other standard number:</label><input type="text" id="isbn" name="isbn" size="50" maxlength="80" value="[% isbn | html %]"/></li> >- <li><label for="publishercode">Publisher:</label><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" value="[% publishercode | html %]"/></li> >- <li><label for="place">Publication place:</label><input type="text" id="place" name="place" size="50" maxlength="80" value="[% place | html %]"/></li> >- <li><label for="collectiontitle">Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" size="50" maxlength="80" value="[% collectiontitle | html %]"/></li> >+ <li><label for="author">Author:</label><input type="text" id="author" name="author" size="50" maxlength="80" value="[% author %]"/></li> >+ <li><label for="copyrightdate">Copyright date:</label><input type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" value="[% copyrightdate %]" /></li> >+ <li><label for="isbn">ISBN or ISSN or other standard number:</label><input type="text" id="isbn" name="isbn" size="50" maxlength="80" value="[% isbn %]"/></li> >+ <li><label for="publishercode">Publisher:</label><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" value="[% publishercode %]"/></li> >+ <li><label for="place">Publication place:</label><input type="text" id="place" name="place" size="50" maxlength="80" value="[% place %]"/></li> >+ <li><label for="collectiontitle">Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" size="50" maxlength="80" value="[% collectiontitle %]"/></li> > <li><label for="itemtype">Document type:</label> > [% PROCESS 'av-build-dropbox.inc' name="itemtype", category="SUGGEST_FORMAT", size = 20, default=itemtype %] > </li> >@@ -514,12 +514,12 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > </td> > <td> > <a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid %]&op=show" title="suggestion" > >- [% suggestions_loo.title |html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author %][% END %]</a> >+ [% suggestions_loo.title %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author %][% END %]</a> > [<a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid %]&op=edit" title="suggestion" >edit</a>] > <br /> >- [% IF ( suggestions_loo.copyrightdate ) %]© [% suggestions_loo.copyrightdate |html %] [% END %] >- [% IF ( suggestions_loo.volumedesc ) %]; Volume:<i>[% suggestions_loo.volumedesc |html %]</i> [% END %] >- [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn |html %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode |html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear |html %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place |html %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle |html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<span class="note">[% suggestions_loo.note |html%]</span>[% END %] >+ [% IF ( suggestions_loo.copyrightdate ) %]© [% suggestions_loo.copyrightdate %] [% END %] >+ [% IF ( suggestions_loo.volumedesc ) %]; Volume:<i>[% suggestions_loo.volumedesc %]</i> [% END %] >+ [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<span class="note">[% suggestions_loo.note %]</span>[% END %] > </td> > <td> > [% IF ( suggestions_loo.emailsuggestedby ) %]<a href="mailto:[% suggestions_loo.emailsuggestedby %]">[% END %][% suggestions_loo.surnamesuggestedby %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby %])[% END %] [% IF ( suggestions_loo.emailsuggestedby ) %]</a>[% END %] >@@ -664,12 +664,12 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > <div style="display:block;" id="limits"> > > <fieldset class="brief"><h4 class="local_collapse"><a href="#">Bibliographic information</a></h4> >- <ol> <li><label for="title"> Title:</label><input type="text" id="title" name="title" value="[% title |html %]" /></li> >- <li><label for="author"> Author:</label><input type="text" id="author" name="author" value="[% author | html %]" /></li> >- <li><label for="isbn"> ISBN:</label><input type="text" id="isbn" name="isbn" value="[% isbn | html %]" /></li> >- <li><label for="publishercode"> Publisher:</label><input type="text" id="publishercode" name="publishercode" value="[% publishercode | html %]" /></li> >- <li><label for="copyrightdate_filter"> Copyright date:</label><input type="text" id="copyrightdate_filter" name="copyrightdate" value="[% copyrightdate | html %]" /></li> >- <li><label for="collectiontitle"> Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle | html %]" /></li><li><input type="submit" value="Go" /></li></ol> >+ <ol> <li><label for="title"> Title:</label><input type="text" id="title" name="title" value="[% title %]" /></li> >+ <li><label for="author"> Author:</label><input type="text" id="author" name="author" value="[% author %]" /></li> >+ <li><label for="isbn"> ISBN:</label><input type="text" id="isbn" name="isbn" value="[% isbn %]" /></li> >+ <li><label for="publishercode"> Publisher:</label><input type="text" id="publishercode" name="publishercode" value="[% publishercode %]" /></li> >+ <li><label for="copyrightdate_filter"> Copyright date:</label><input type="text" id="copyrightdate_filter" name="copyrightdate" value="[% copyrightdate %]" /></li> >+ <li><label for="collectiontitle"> Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" value="[% collectiontitle %]" /></li><li><input type="submit" value="Go" /></li></ol> > </fieldset> > <fieldset class="brief"><h4 class="local_collapse"><a href="#">Suggestion information</a></h4> > <ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >index f6ce767..b2bd84b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >@@ -52,17 +52,17 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > [% ELSE %] > <tr> > [% END %] >- <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = title.biblionumber %][% title.title |html %][% FOREACH subtitl IN title.subtitle %] [% subtitl.subfield %][% END %]</a> >+ <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = title.biblionumber %][% title.title %][% FOREACH subtitl IN title.subtitle %] [% subtitl.subfield %][% END %]</a> > [% title.author %] >- <p>[% IF ( title.publishercode ) %]- [% title.publishercode|html %] >+ <p>[% IF ( title.publishercode ) %]- [% title.publishercode %] > [% IF ( title.place ) %] [% title.place %][% END %][% END %] > [% IF ( title.pages ) %] - [% title.pages %][% IF ( title.size ) %] [% title.size %] > [% END %] > [% END %]</p> > [% IF ( title.notes ) %] >- <p>[% title.notes |html%]</p>[% END %] >+ <p>[% title.notes%]</p>[% END %] > [% IF ( title.TagLoop ) %]<p style="font-size:90%"><strong>Tagged with:</strong> [% FOREACH TagLoo IN title.TagLoop %] >- <a href="/cgi-bin/koha/tags/list.pl?tag=[% TagLoo.term %]">[% TagLoo.term |html %]</a> <span class="weight">([% TagLoo.weight_total %])</span>[% IF ( loop.last ) %][% ELSE %], [% END %] >+ <a href="/cgi-bin/koha/tags/list.pl?tag=[% TagLoo.term %]">[% TagLoo.term %]</a> <span class="weight">([% TagLoo.weight_total %])</span>[% IF ( loop.last ) %][% ELSE %], [% END %] > [% END %]</p> > [% END %] > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >index 92d3137..75c8d9f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >@@ -97,7 +97,7 @@ for( x=0; x<allColumns.length; x++ ){ > <tbody> > [% FOREACH item_loo IN item_loop %] <tr> [% IF ( show ) %][% IF ( item_loo.nomod ) %] <td class="error">Cannot edit</td>[% ELSE %]<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber %]" id="row[% item_loo.itemnumber %]" checked="checked" /></td>[% END %][% END %] > <td><label for="row[% item_loo.itemnumber %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber %]">[% item_loo.title %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author %][% END %]</label></td> >- [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field |html %]</td> >+ [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field %]</td> > [% END %] </tr> > [% END %] > </tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >index 38a76ce..677f808 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >@@ -132,7 +132,7 @@ $(document).ready(function(){ > <td> </td> > [% END %] > <td><label for="row[% item_loo.itemnumber %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber %]">[% item_loo.title %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author %][% END %]</label></td> >- [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field |html %]</td> >+ [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field %]</td> > [% END %] </tr> > [% END %] > </tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >index 182cc8b..9e1fd5a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >@@ -167,7 +167,7 @@ $(document).ready(function() { > <tr> > <td><input type="checkbox" name="record_id" id="record_id_[% biblio.biblionumber %]" value="[% biblio.biblionumber %]" data-items="[% biblio.itemnumbers.size %]" data-issues="[% biblio.issues_count %]" data-reserves="[% biblio.reserves.size %]" /></td> > <td><label for="record_id_[% biblio.biblionumber %]">[% biblio.biblionumber %]</label></td> >- <td>[% INCLUDE 'biblio-default-view.inc' biblionumber=biblio.biblionumber %][% biblio.title %][% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle %] [% subtitle.subfield |html %][% END %][% END %]</a></td> >+ <td>[% INCLUDE 'biblio-default-view.inc' biblionumber=biblio.biblionumber %][% biblio.title %][% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle %] [% subtitle.subfield %][% END %][% END %]</a></td> > <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber %]">[% biblio.itemnumbers.size %]</a></td> > <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber %]">[% biblio.reserves.size %]</a></td> > <td><a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio.biblionumber %]">[% biblio.issues_count %]</a></td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >index 5143b3c..85aedc3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -264,29 +264,29 @@ $(document).ready(function(){ > </td> > [% END %] > <td> >- [% result.barcode | html %] >+ [% result.barcode %] > </td> > <td> > [% Branches.GetName( result.homebranch ) %] >- [% result.location | html %] [% IF ( result.itemcallnumber ) %][[% result.itemcallnumber | html %]][% ELSE %][% END %] >+ [% result.location %] [% IF ( result.itemcallnumber ) %][[% result.itemcallnumber %]][% ELSE %][% END %] > </td> > <td> >- <p><a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% result.biblionumber %]" class="openWin">[% result.title | html %]</a></p><p>[% result.author | html %]</p> >+ <p><a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% result.biblionumber %]" class="openWin">[% result.title %]</a></p><p>[% result.author %]</p> > </td> > <td> >- [% result.notforloan | html %] >+ [% result.notforloan %] > </td> > <td> >- [% result.itemlost | html %] >+ [% result.itemlost %] > </td> > <td> >- [% result.damaged | html %] >+ [% result.damaged %] > </td> > <td> >- [% result.withdrawn | html %] >+ [% result.withdrawn %] > </td> > <td> >- [% result.datelastseen | $KohaDates | html %] >+ [% result.datelastseen | $KohaDates %] > </td> > <td> > [% IF result.problem == 'wrongplace' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >index 3ebed6f..f030e47 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >@@ -199,9 +199,9 @@ > </td> > <td> > [% IF ( loopro.module == 'CIRCULATION' ) %] >- <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% loopro.info %]&biblionumber=[% loopro.biblionumber %]&bi=[% loopro.biblioitemnumber %]#item[% loopro.info %]" title="Display detail for this item">Item [% loopro.barcode |html %]</a> >+ <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% loopro.info %]&biblionumber=[% loopro.biblionumber %]&bi=[% loopro.biblioitemnumber %]#item[% loopro.info %]" title="Display detail for this item">Item [% loopro.barcode %]</a> > [% ELSE %] >- [% loopro.info |html %] >+ [% loopro.info %] > [% END %] > </td> > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt >index 63974a9..755f191 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt >@@ -17,13 +17,13 @@ > <div id="custom-doc" class="yui-t7"> > <div id="bd"> > [% IF ( multiple ) %] >- <h1>Add [% total %] items to [% IF ( singleshelf ) %]<em>[% shelfname | html%]</em>: [% ELSE %]a list:[% END %]</h1> >+ <h1>Add [% total %] items to [% IF ( singleshelf ) %]<em>[% shelfname%]</em>: [% ELSE %]a list:[% END %]</h1> > [% ELSE %] >- <h1>Add to [% IF ( singleshelf ) %]<em>[% shelfname | html %]</em>[% ELSE %]a list:[% END %]</h1> >+ <h1>Add to [% IF ( singleshelf ) %]<em>[% shelfname %]</em>[% ELSE %]a list:[% END %]</h1> > [% END %] > <ul> > [% FOREACH biblio IN biblios %] >- <li> <span class="title">[% biblio.title |html %]</span> >+ <li> <span class="title">[% biblio.title %]</span> > [% IF ( biblio.author ) %]<span class="author"> [% biblio.author %] </span>[% END %] > </li> > [% END %] >@@ -46,21 +46,21 @@ > [% IF private_shelves.count %] > <optgroup label="Private lists"> > [% FOREACH private_shelf IN private_shelves %] >- <option value="[% private_shelf.shelfnumber %]">[% private_shelf.shelfname | html%]</option> >+ <option value="[% private_shelf.shelfnumber %]">[% private_shelf.shelfname %]</option> > [% END %] > </optgroup> > [% END %] > [% IF private_shelves_shared_with_me.count %] > <optgroup label="Private lists shared with me"> > [% FOREACH private_shelf IN private_shelves_shared_with_me %] >- <option value="[% private_shelf.shelfnumber %]">[% private_shelf.shelfname | html%]</option> >+ <option value="[% private_shelf.shelfnumber %]">[% private_shelf.shelfname %]</option> > [% END %] > </optgroup> > [% END %] > [% IF public_shelves.count %] > <optgroup label="Public lists"> > [% FOREACH public_shelf IN public_shelves %] >- <option value="[% public_shelf.shelfnumber %]">[% public_shelf.shelfname | html%]</option> >+ <option value="[% public_shelf.shelfnumber %]">[% public_shelf.shelfname %]</option> > [% END %] > </optgroup> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index b0bdabc..fbaa9b2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -3,7 +3,7 @@ > [% SET PRIVATE = 1 %] > [% SET PUBLIC = 2 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › [% IF op == 'view' %]Lists › Contents of [% shelf.shelfname | html %][% ELSE %]Lists[% END %][% IF op == 'add_form' %] › Create new list[% END %][% IF op == 'edit_form' %] › Edit list [% shelf.shelfname | html %][% END %]</title> >+<title>Koha › [% IF op == 'view' %]Lists › Contents of [% shelf.shelfname %][% ELSE %]Lists[% END %][% IF op == 'add_form' %] › Create new list[% END %][% IF op == 'edit_form' %] › Edit list [% shelf.shelfname %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] >@@ -136,7 +136,7 @@ $(document).ready(function(){ > [% SET number_of_private_shelves = 0 %] > [% FOREACH s IN add_to_some_private_shelves %] > [% IF shelfnumber != s.shelfnumber %] >- param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname |html %]<\/option>"; >+ param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname %]<\/option>"; > [% SET number_of_private_shelves = number_of_private_shelves + 1 %] > [% IF number_of_private_shelves == 10 %][% LAST %][% END %] > [% END %] >@@ -148,7 +148,7 @@ $(document).ready(function(){ > [% SET number_of_public_shelves = 0 %] > [% FOREACH s IN add_to_some_public_shelves %] > [% IF shelfnumber != s.shelfnumber %] >- param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname |html %]<\/option>"; >+ param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname %]<\/option>"; > [% SET number_of_public_shelves = number_of_public_shelves + 1 %] > [% IF number_of_public_shelves == 10 %][% LAST %][% END %] > [% END %] >@@ -308,7 +308,7 @@ function placeHold () { > [% END %] > [% END %] > >-[% IF op == 'view' %]› Contents of <i>[% shelf.shelfname | html %]</i>[% END %][% IF op == 'add_form' %] › Create new list[% END %][% IF op == 'edit_form' %] › Edit list <i>[% shelf.shelfname | html %]</i>[% END %]</div> >+[% IF op == 'view' %]› Contents of <i>[% shelf.shelfname %]</i>[% END %][% IF op == 'add_form' %] › Create new list[% END %][% IF op == 'edit_form' %] › Edit list <i>[% shelf.shelfname %]</i>[% END %]</div> > > <div id="doc3" class="yui-t2"> > <div id="bd"> >@@ -369,7 +369,7 @@ function placeHold () { > <div class="yui-g"> > [% IF itemsloop %] > >- <h3>Contents of <i>[% shelf.shelfname | html %]</i></h3> >+ <h3>Contents of <i>[% shelf.shelfname %]</i></h3> > <div class="pages">[% pagination_bar %]</div> > <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="listform" method="post" class="checkboxed"> > <input type="hidden" name="op" value="remove_biblios" /> >@@ -451,7 +451,7 @@ function placeHold () { > [% itemsloo.XSLTBloc %] > [% ELSE %] > [% INCLUDE 'biblio-default-view.inc' biblionumber = itemsloo.biblionumber %] >- [% itemsloo.title |html %][% FOREACH subtitl IN itemsloo.subtitle %] [% subtitl.subfield %][% END %]</a> >+ [% itemsloo.title %][% FOREACH subtitl IN itemsloo.subtitle %] [% subtitl.subfield %][% END %]</a> > [% END %] > <p class="hold"> > [% IF ( itemsloo.notforloan ) %] >@@ -499,7 +499,7 @@ function placeHold () { > <div class="yui-g"> > <form action="/cgi-bin/koha/virtualshelves/shelves.pl" method="post"> > <fieldset class="brief noprint"> >- <legend>Add an item to <i>[% shelfname | html %]</i></legend> >+ <legend>Add an item to <i>[% shelfname %]</i></legend> > <ol> > <li> > <label for="barcode">Barcode:</label> >@@ -525,14 +525,14 @@ function placeHold () { > <legend>Create a new list</legend> > <input type="hidden" name="op" value="add" /> > [% ELSE %] >- <legend>Edit list <i>[% shelf.shelfname | html %]</i></legend> >+ <legend>Edit list <i>[% shelf.shelfname %]</i></legend> > <input type="hidden" name="op" value="edit" /> > [% END %] > <input type="hidden" name="referer" value="[% referer %]" /> > <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber %]" /> > <ol> > <li> >- <label for="shelfname" class="required">Name: </label><input type="text" id="shelfname" name="shelfname" size="25" value="[% shelf.shelfname |html %]" required="required" class="required" /> >+ <label for="shelfname" class="required">Name: </label><input type="text" id="shelfname" name="shelfname" size="25" value="[% shelf.shelfname %]" required="required" class="required" /> > <span class="required">Required</span> > </li> > <li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >index 0304dbe..afed3a1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >@@ -10,7 +10,7 @@ > "dt_type": > "[% data.type %]", > "dt_shelfname": >- "<a href='/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% data.shelfnumber %]'>[% data.shelfname | html%]</a>", >+ "<a href='/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% data.shelfnumber %]'>[% data.shelfname %]</a>", > "dt_count": > "[% data.count %] item(s)", > "dt_owner": >-- >2.1.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 13618
:
35488
|
35516
|
40480
|
40481
|
40482
|
40483
|
40484
|
40485
|
40487
|
41346
|
41347
|
41348
|
41349
|
41350
|
41351
|
41352
|
41353
|
41354
|
41355
|
41746
|
41747
|
41776
|
42009
|
42054
|
42072
|
42073
|
42075
|
42078
|
42079
|
42087
|
42090
|
42091
|
42092
|
42093
|
42094
|
42095
|
42096
|
42097
|
45141
|
45784
|
45785
|
45788
|
46767
|
46768
|
46769
|
46770
|
46771
|
46772
|
46773
|
46774
|
46775
|
46776
|
46777
|
46778
|
46779
|
46780
|
46781
|
46782
|
46783
|
46784
|
46785
|
46786
|
46787
|
46788
|
46789
|
46790
|
46791
|
46792
|
46793
|
46794
|
46795
|
46796
|
46797
|
46798
|
46799
|
46800
|
46801
|
46802
|
46803
|
46804
|
46805
|
46806
|
46807
|
46808
|
46809
|
46810
|
46811
|
46812
|
46813
|
46814
|
46815
|
46816
|
46817
|
46818
|
46819
|
46820
|
46821
|
46822
|
47425
|
47426
|
47427
|
47428
|
47429
|
47430
|
47431
|
47432
|
47433
|
47434
|
47435
|
47436
|
47437
|
47438
|
47439
|
47440
|
47441
|
47442
|
47443
|
47444
|
47445
|
47446
|
47447
|
47448
|
47449
|
47450
|
47451
|
47452
|
47631
|
59983
|
59984
|
59987
|
77804
|
77805
|
77806
|
77807
|
77808
|
77809
|
77997
|
77998
|
78158
|
78274
|
78415
|
79404
|
79818
|
81183
|
83479
|
83480