Bugzilla – Attachment 59983 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: Use Template::Stash::AutoEscaping to use the html filter
Bug-13618-Use-TemplateStashAutoEscaping-to-use-the.patch (text/plain), 633.49 KB, created by
Jonathan Druart
on 2017-02-07 15:49:43 UTC
(
hide
)
Description:
Bug 13618: Use Template::Stash::AutoEscaping to use the html filter
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-02-07 15:49:43 UTC
Size:
633.49 KB
patch
obsolete
>From f9d5b7cd27d8fedf5d6a466f6ee8ec366cc1e080 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Fri, 23 Jan 2015 13:18:54 +0100 >Subject: [PATCH] Bug 13618: Use Template::Stash::AutoEscaping to use the html > filter >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Test plan: >0/ sudo cpanm Template::Stash::AutoEscaping >1/ Verify don't reproduce the XSS issue described on bug 13609 and other >xss related bugs. >2/ Try to find some encoding issues (detail page, search results, >facets, etc.) > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Remove html filters at the OPAC > >This patch removes the html filters at the OPAC, if necessary. > >Generated with: > perl -p -i -e 's/\ ?\|\ ?html(\ ?)%/\1%/g' **/*.tt **/*.inc > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Specific places where we don't need to escape variables > >There is no need to escape the html generated by the XSLT. > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Remove html filters at the intranet > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Specific places where we don't need to escape variables - intra > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Specific for pagination_bar > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Specific for the ISBD view > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Fix error 'Not a GLOB reference' > >The interpolation of a variable on including a file caused an unexpected >error: >Template process failed: undef error - Not a GLOB reference at >/usr/lib/i386-linux-gnu/perl5/5.20/Template/Provider.pm line 619. > >The easier fix is to replace it with a SWITCH. > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Specific for IntranetUser* and OPACUser* prefs > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Specific for ColumnsSettings > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618 - memberentrygen.tt errors Not a GLOB reference > >Like Jonathan said: >The interpolation of a variable on including a file caused an unexpected >error: >Template process failed: undef error - Not a GLOB reference at >/usr/lib/i386-linux-gnu/perl5/5.20/Template/Provider.pm line 619. > >Replaced it with a SWITCH, like the other patch for this similar error. > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Specific for other prefs > >opacmainuserblock >opacnav >opacnavright >opaccredits >opacheader >opaccustomsearch >opacmysummaryhtml >opacmysummarynote >opacnavbottom >opacnoresultsfound >opacresultssidebar >opacsearchfortitlein >restrictedpagecontent >PatronSelfRegistrationAdditionalInstructions >intranetmainuserblock >intranetnav >intranetslipprinterjs >OpacSuppressionMessage >SCOUserCSS >SCOUserJS >SelfCheckHelpMessage >NoLoginInstructions > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Specific for Salutation on editing a patron > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Specific for XSLTBloc > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Fix escape on sending baskets or shelves by email > >Test plan: >Send baskets and shelves by email. >With or without this patch, you should not see any changes. > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Fix for news > >Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: Fix last occurrences recently introduced to master > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: followup to remove tabs > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >This followup on top of remote branch >Only remove tabs and trailing spaces to make koha-qa pass > >Bug 13618: Fix for edit biblios and items > >On editing biblios or items, the marc_lib, marc_value and javascript >values are often populated with html code which needs to be displayed >raw. > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: (follow-up) Specific for ColumnsSettings > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> > >Bug 13618: (follow-up) add missing lines for opac-shelves > >Proposed patch to fix opac-shelves > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> > >Bug 13618: Remove html filters for newly pushed code > >Bug 13618: Fix for system preference description > >If a syspref description contains html tag, do not display them > >Bug 13618: Do not display and html tags in item fields content > >Note that there might be other occurrences to fix! > >Bug 13618: Do not display html tags in patron's notices > >Bug 13618: Fix for debarredcomment and patron messages > >At the OPAC and intranet. > >Bug 13618: (follow-up) Specific for other prefs > >follow-up for SlipCSS and printslip >--- > C4/Installer/PerlDependencies.pm | 5 ++ > C4/Templates.pm | 2 + > .../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 | 8 +-- > .../intranet-tmpl/prog/en/includes/authorities.inc | 4 +- > .../prog/en/includes/borrower_debarments.inc | 4 +- > .../en/includes/catalogue/itemsearch_item.csv.inc | 2 +- > .../prog/en/includes/catalogue/itemsearch_item.inc | 2 +- > .../en/includes/catalogue/itemsearch_item.json.inc | 24 +++---- > .../intranet-tmpl/prog/en/includes/circ-menu.inc | 23 +++--- > .../prog/en/includes/doc-head-close.inc | 2 +- > .../intranet-tmpl/prog/en/includes/facets.inc | 6 +- > .../intranet-tmpl/prog/en/includes/header.inc | 2 +- > .../prog/en/includes/html_helpers.inc | 4 +- > .../prog/en/includes/members-toolbar.inc | 2 +- > .../prog/en/includes/merge-record.inc | 2 +- > .../prog/en/includes/page-numbers.inc | 6 +- > .../prog/en/includes/patron-title.inc | 16 ++--- > .../prog/en/includes/prefs-admin-search.inc | 2 +- > .../prog/en/includes/serials-search.inc | 6 +- > .../intranet-tmpl/prog/en/includes/slip-print.inc | 4 +- > .../prog/en/includes/subscriptions-search.inc | 14 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 24 +++---- > .../prog/en/modules/acqui/addorder.tt | 2 +- > .../prog/en/modules/acqui/addorderiso2709.tt | 4 +- > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 20 +++--- > .../prog/en/modules/acqui/basketgroup.tt | 14 ++-- > .../intranet-tmpl/prog/en/modules/acqui/edimsg.tt | 2 +- > .../prog/en/modules/acqui/histsearch.tt | 4 +- > .../prog/en/modules/acqui/invoice-files.tt | 8 +-- > .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 6 +- > .../prog/en/modules/acqui/lateorders.tt | 10 +-- > .../prog/en/modules/acqui/modordernotes.tt | 2 +- > .../prog/en/modules/acqui/neworderbiblio.tt | 4 +- > .../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 | 56 +++++++-------- > .../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 | 78 ++++++++++---------- > .../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 | 6 +- > .../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 | 38 +++++----- > .../prog/en/modules/admin/patron-attr-types.tt | 22 +++--- > .../prog/en/modules/admin/preferences.tt | 4 +- > .../prog/en/modules/admin/systempreferences.tt | 22 +++--- > .../prog/en/modules/admin/z3950servers.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 2 +- > .../prog/en/modules/authorities/authorities.tt | 8 +-- > .../modules/authorities/searchresultlist-auth.tt | 2 +- > .../en/modules/authorities/searchresultlist.tt | 4 +- > .../intranet-tmpl/prog/en/modules/basket/basket.tt | 6 +- > .../prog/en/modules/basket/sendbasket.tt | 46 ++++++------ > .../prog/en/modules/basket/sendbasketform.tt | 2 +- > .../prog/en/modules/catalogue/ISBDdetail.tt | 4 +- > .../prog/en/modules/catalogue/MARCdetail.tt | 12 ++-- > .../prog/en/modules/catalogue/detail.tt | 30 ++++---- > .../prog/en/modules/catalogue/imageviewer.tt | 6 +- > .../prog/en/modules/catalogue/issuehistory.tt | 8 +-- > .../prog/en/modules/catalogue/itemsearch.tt | 2 +- > .../prog/en/modules/catalogue/labeledMARCdetail.tt | 6 +- > .../prog/en/modules/catalogue/moredetail.tt | 14 ++-- > .../prog/en/modules/catalogue/results.tt | 32 ++++----- > .../prog/en/modules/catalogue/search-history.tt | 8 +-- > .../prog/en/modules/cataloguing/addbiblio.tt | 16 ++--- > .../prog/en/modules/cataloguing/addbooks.tt | 6 +- > .../prog/en/modules/cataloguing/additem.tt | 16 ++--- > .../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 | 5 +- > .../value_builder/unimarc_field_210c.tt | 4 +- > .../cataloguing/value_builder/unimarc_field_4XX.tt | 22 +++--- > .../value_builder/unimarc_field_686a.tt | 6 +- > .../en/modules/cataloguing/z3950_auth_search.tt | 10 +-- > .../prog/en/modules/cataloguing/z3950_search.tt | 58 +++++++-------- > .../prog/en/modules/circ/article-requests.tt | 4 +- > .../prog/en/modules/circ/bookcount.tt | 6 +- > .../prog/en/modules/circ/branchoverdues.tt | 8 +-- > .../prog/en/modules/circ/branchtransfers.tt | 8 +-- > .../prog/en/modules/circ/circulation.tt | 28 ++++---- > .../en/modules/circ/circulation_batch_checkouts.tt | 4 +- > .../prog/en/modules/circ/on-site_checkouts.tt | 2 +- > .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 26 +++---- > .../prog/en/modules/circ/pendingreserves.tt | 2 +- > .../prog/en/modules/circ/printslip.tt | 4 +- > .../intranet-tmpl/prog/en/modules/circ/renew.tt | 2 +- > .../prog/en/modules/circ/request-article.tt | 4 +- > .../prog/en/modules/circ/reserveratios.tt | 2 +- > .../intranet-tmpl/prog/en/modules/circ/returns.tt | 24 +++---- > .../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 +- > .../intranet-tmpl/prog/en/modules/intranet-main.tt | 4 +- > .../prog/en/modules/labels/label-edit-batch.tt | 2 +- > .../prog/en/modules/labels/label-edit-layout.tt | 4 +- > .../intranet-tmpl/prog/en/modules/labels/result.tt | 2 +- > .../prog/en/modules/labels/spinelabel-print.tt | 4 +- > .../prog/en/modules/members/boraccount.tt | 2 +- > .../prog/en/modules/members/member.tt | 2 +- > .../prog/en/modules/members/memberentrygen.tt | 82 ++++++++++++---------- > .../prog/en/modules/members/moremember-print.tt | 4 +- > .../prog/en/modules/members/moremember-receipt.tt | 8 +-- > .../prog/en/modules/members/moremember.tt | 63 +++++++++-------- > .../prog/en/modules/members/notices.tt | 2 +- > .../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/patroncards/edit-layout.tt | 44 ++++++------ > .../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 | 4 +- > .../prog/en/modules/reports/orders_by_budget.tt | 12 ++-- > .../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 | 4 +- > .../en/modules/rotating_collections/addItems.tt | 2 +- > .../prog/en/modules/serials/acqui-search-result.tt | 2 +- > .../prog/en/modules/serials/add_fields.tt | 4 +- > .../prog/en/modules/serials/checkexpiration.tt | 10 +-- > .../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-edit.tt | 12 ++-- > .../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/services/itemrecorddisplay.tt | 6 +- > .../prog/en/modules/suggestion/suggestion.tt | 50 ++++++------- > .../intranet-tmpl/prog/en/modules/tags/list.tt | 8 +-- > .../intranet-tmpl/prog/en/modules/tags/review.tt | 2 +- > .../prog/en/modules/tools/batchMod-del.tt | 2 +- > .../prog/en/modules/tools/batchMod-edit.tt | 7 +- > .../prog/en/modules/tools/batch_delete_records.tt | 2 +- > .../prog/en/modules/tools/inventory.tt | 16 ++--- > .../prog/en/modules/tools/koha-news.tt | 4 +- > .../prog/en/modules/tools/picture-upload.tt | 4 +- > .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 18 ++--- > .../en/modules/virtualshelves/addbybiblionumber.tt | 12 ++-- > .../prog/en/modules/virtualshelves/sendshelf.tt | 50 ++++++------- > .../en/modules/virtualshelves/sendshelfform.tt | 2 +- > .../prog/en/modules/virtualshelves/shelves.tt | 22 +++--- > .../virtualshelves/tables/shelves_results.tt | 2 +- > .../en/includes/authorities-search-results.inc | 22 +++--- > .../opac-tmpl/bootstrap/en/includes/bodytag.inc | 10 +-- > .../bootstrap/en/includes/doc-head-close.inc | 4 +- > .../bootstrap/en/includes/masthead-sco.inc | 2 +- > .../opac-tmpl/bootstrap/en/includes/masthead.inc | 12 ++-- > .../opac-tmpl/bootstrap/en/includes/navigation.inc | 4 +- > .../bootstrap/en/includes/opac-authorities.inc | 4 +- > .../bootstrap/en/includes/opac-bottom.inc | 6 +- > .../bootstrap/en/includes/opac-detail-sidebar.inc | 2 +- > .../bootstrap/en/includes/opac-facets.inc | 6 +- > .../bootstrap/en/includes/page-numbers.inc | 6 +- > .../bootstrap/en/includes/shelfbrowser.inc | 6 +- > .../opac-tmpl/bootstrap/en/modules/maintenance.tt | 2 +- > .../bootstrap/en/modules/opac-ISBDdetail.tt | 2 +- > .../bootstrap/en/modules/opac-MARCdetail.tt | 20 +++--- > .../bootstrap/en/modules/opac-addbybiblionumber.tt | 14 ++-- > .../bootstrap/en/modules/opac-auth-MARCdetail.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 4 +- > .../en/modules/opac-authoritiessearchresultlist.tt | 29 +++++++- > .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 14 ++-- > .../opac-tmpl/bootstrap/en/modules/opac-blocked.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/opac-browser.tt | 6 +- > .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 42 +++++------ > .../bootstrap/en/modules/opac-downloadcart.tt | 2 +- > .../bootstrap/en/modules/opac-downloadshelf.tt | 12 ++-- > .../bootstrap/en/modules/opac-imageviewer.tt | 4 +- > .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 8 +-- > .../bootstrap/en/modules/opac-memberentry.tt | 4 +- > .../bootstrap/en/modules/opac-mymessages.tt | 10 +-- > .../bootstrap/en/modules/opac-news-rss.tt | 6 +- > .../bootstrap/en/modules/opac-opensearch.tt | 52 +++++++------- > .../bootstrap/en/modules/opac-overdrive-search.tt | 8 +-- > .../bootstrap/en/modules/opac-readingrecord.tt | 10 +-- > .../en/modules/opac-registration-confirmation.tt | 4 +- > .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +- > .../bootstrap/en/modules/opac-restrictedpage.tt | 2 +- > .../bootstrap/en/modules/opac-results-grouped.tt | 16 ++--- > .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 40 +++++------ > .../opac-tmpl/bootstrap/en/modules/opac-review.tt | 10 +-- > .../bootstrap/en/modules/opac-search-history.tt | 8 +-- > .../bootstrap/en/modules/opac-sendbasket.tt | 52 +++++++------- > .../bootstrap/en/modules/opac-sendbasketform.tt | 2 +- > .../bootstrap/en/modules/opac-sendshelf.tt | 52 +++++++------- > .../bootstrap/en/modules/opac-sendshelfform.tt | 2 +- > .../bootstrap/en/modules/opac-serial-issues.tt | 4 +- > .../bootstrap/en/modules/opac-shareshelf.tt | 6 +- > .../bootstrap/en/modules/opac-shelves-rss.tt | 8 +-- > .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 75 ++++++++++---------- > .../bootstrap/en/modules/opac-showreviews-rss.tt | 20 +++--- > .../bootstrap/en/modules/opac-showreviews.tt | 6 +- > .../bootstrap/en/modules/opac-suggestions.tt | 18 ++--- > .../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 13 ++-- > .../bootstrap/en/modules/opac-tags_subject.tt | 2 +- > .../bootstrap/en/modules/opac-topissues.tt | 4 +- > .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 15 ++-- > .../opac-tmpl/bootstrap/en/modules/sco/help.tt | 8 +-- > .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 14 ++-- > .../bootstrap/en/modules/svc/suggestion.tt | 2 +- > 228 files changed, 1266 insertions(+), 1229 deletions(-) > >diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm >index 4e1f75f..8942f23 100644 >--- a/C4/Installer/PerlDependencies.pm >+++ b/C4/Installer/PerlDependencies.pm >@@ -852,6 +852,11 @@ our $PERL_DEPS = { > required => 1, > min_ver => '0.28', > }, >+ 'Template::Stash::AutoEscaping' => { >+ 'usage' => 'Code', >+ 'required' => '1', >+ 'min_ver' => '0.0303', >+ }, > }; > > 1; >diff --git a/C4/Templates.pm b/C4/Templates.pm >index eebff11..4db5c64 100644 >--- a/C4/Templates.pm >+++ b/C4/Templates.pm >@@ -5,6 +5,7 @@ use warnings; > use Carp; > use CGI qw ( -utf8 ); > use List::MoreUtils qw/ any uniq /; >+use Template::Stash::AutoEscaping; > > # Copyright 2009 Chris Cormack and The Koha Dev Team > # >@@ -71,6 +72,7 @@ sub new { > COMPILE_DIR => $use_template_cache ? C4::Context->config('template_cache_dir') : '', > INCLUDE_PATH => \@includes, > FILTERS => {}, >+ STASH => Template::Stash::AutoEscaping->new, > ENCODING => 'UTF-8', > } > ) or die Template->error(); >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 26ab7f1..4a652a6 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="#" class="toggle_element" data-element="#filters,.filteraction">[-]</a></span> > <span class="filteraction" id="filteraction_on"> <a href="#" class="toggle_element" data-element="#filters,.filteraction">[+]</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 16a666e..f6606d6 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 c635b07..29399fa 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"><abbr title="Broader Term">BT</abbr>: [% heading | html %]</span> >+ <span class="BT"><abbr title="Broader Term">BT</abbr>: [% heading %]</span> > [% CASE 'narrower' %] >- <span class="NT"><abbr title="Narrower Term">NT</abbr>: [% heading | html %]</span> >+ <span class="NT"><abbr title="Narrower Term">NT</abbr>: [% heading %]</span> > [% CASE 'seefrom' %] >- <span class="UF"><abbr title="Used For">UF</abbr>: [% heading | html %]</span> >+ <span class="UF"><abbr title="Used For">UF</abbr>: [% heading %]</span> > [% CASE 'seealso' %] >- <span class="RT"><abbr title="Related Term">RT</abbr>: [% heading | html %]</span> >+ <span class="RT"><abbr title="Related Term">RT</abbr>: [% 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 45517c8..1901032 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >@@ -53,7 +53,7 @@ > <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> >@@ -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/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >index 7b4b25d..42e991e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >@@ -58,9 +58,9 @@ > </td> > <td> > [% IF d.comment.search('OVERDUES_PROCESS') %] >- Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') %] >+ Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ').raw %] > [% ELSE %] >- [% d.comment %] >+ [% d.comment.raw %] > [% END %] > </td> > <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td> >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 5e38a58..6ebc792 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 %]" >+"[% 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) %]" >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc >index 8f65913..828fc7e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc >@@ -5,7 +5,7 @@ > <tr> > <td> > <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 |html %] >+ [% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %] by[% END %] [% biblio.author %] > </td> > <td>[% biblioitem.publicationyear || biblio.copyrightdate %]</td> > <td>[% biblioitem.publishercode %]</td> >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/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >index 083a88c..ed15242 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >@@ -8,33 +8,34 @@ > <ul class="patronbriefinfo"> > [% IF ( patronimages ) %] > [% IF ( picture ) %] >- <li><img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrowernumber | uri %]" id="patronimage" alt="[% firstname | html %] [% surname | html %] ([% cardnumber | html %])" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li> >+ <li><img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrowernumber | uri %]" id="patronimage" alt="[% firstname %] [% surname %] ([% cardnumber %])" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li> > [% ELSE %] >- <li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% firstname | html %] [% surname | html %] ([% cardnumber | html %])" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li> >+ <li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% firstname %] [% surname %] ([% cardnumber %])" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li> > [% END %] > [% END %] >- [% IF Koha.Preference( 'AddressFormat' ) %] >- [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] >- [% ELSE %] >- [% INCLUDE 'member-display-address-style-us.inc' %] >+ [% SWITCH Koha.Preference( 'AddressFormat' ) %] >+ [% CASE 'de' %] >+ [% INCLUDE 'member-display-address-style-de.inc' %] >+ [% CASE # us %] >+ [% INCLUDE 'member-display-address-style-us.inc' %] > [% END %] > > [% IF ( phone ) %]<li class="patronphone"> >- <a href="tel:[% phone | url %]">[% phone | html %]</a> >+ <a href="tel:[% phone | url %]">[% phone %]</a> > [% ELSE %] > [% IF ( mobile ) %] >- <a href="tel:[% mobile | url %]">[% mobile | html %]</a> >+ <a href="tel:[% mobile | url %]">[% mobile %]</a> > [% ELSE %] > [% IF ( phonepro ) %] >- <a href="tel:[% phonepro | url %]">[% phonepro | html %]</a> >+ <a href="tel:[% phonepro | url %]">[% phonepro %]</a> > [% END %] > [% END %]</li> > [% END %] > [% IF ( email ) %] >- <li class="email"> <a href="mailto:[% email | url %]" title="[% email | html %]">[% email | html %]</a></li> >+ <li class="email"> <a href="mailto:[% email | url %]" title="[% email %]">[% email %]</a></li> > [% ELSE %] > [% IF ( emailpro ) %] >- <li class="email"> <a href="mailto:[% emailpro | url %]" title="[% emailpro | html %]">[% emailpro | html %]</a></li> >+ <li class="email"> <a href="mailto:[% emailpro | url %]" title="[% emailpro %]">[% emailpro %]</a></li> > [% END %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >index 48484f6..3895411 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >@@ -21,7 +21,7 @@ > [% IF ( login ) %] > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/login.css" /> > [% END %] >-[% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %] >+[% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS.raw %]</style>[% END %] > > [% UNLESS ( footerjs ) %] > [% INCLUDE js_includes.inc %] >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/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc >index 2c88c6c..28c4c45 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc >@@ -14,7 +14,7 @@ > [% IF ( intranetbookbag ) %] > <li><a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li> > [% END %] >- [% IntranetNav %] >+ [% IntranetNav.raw %] > <li class="dropdown"> > <a href="/cgi-bin/koha/mainpage.pl" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a> > <ul class="dropdown-menu"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc >index 4e970c7..a6e19b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc >@@ -1,9 +1,9 @@ > [% BLOCK options_for_libraries %] > [% FOREACH l IN libraries %] > [% IF l.selected %] >- <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname %]</option> >+ <option value="[% l.branchcode %]" selected="selected">[% l.branchname %]</option> > [% ELSE %] >- <option value="[% l.branchcode | html %]">[% l.branchname %]</option> >+ <option value="[% l.branchcode %]">[% l.branchname %]</option> > [% END%] > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >index 68dd762..c1fa5db 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >@@ -225,7 +225,7 @@ function searchToHold(){ > <label for="message_type">Add a message for:</label> > <select name="message_type" id="message_type"> > <option value="L">Staff - Internal note</option> >- <option value="B">OPAC - [% firstname | html %] [% surname | html %]</option> >+ <option value="B">OPAC - [% firstname %] [% surname %]</option> > </select> > </div> > [% bor_notes = AuthorisedValues.Get( 'BOR_NOTES' ) %] >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 df79d8e..2d77a2f 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.recordid %]_[% 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/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >index caf45d6..dbcab25 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >@@ -1,27 +1,27 @@ > [%- IF ( borrower.borrowernumber ) %] > [%- IF borrower.category_type == 'I' %] >- [%- borrower.surname | html %] [% IF borrower.othernames %] ([% borrower.othernames | html %]) [% END %] >+ [%- borrower.surname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %] > [%- ELSE %] > [%- IF invert_name %] >- [%- borrower.surname | html %], [% borrower.firstname | html %] [% IF borrower.othernames %] ([% borrower.othernames | html %]) [% END %] >+ [%- borrower.surname %], [% borrower.firstname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %] > [%- ELSE %] >- [%- borrower.firstname | html %] [% IF borrower.othernames %] ([% borrower.othernames | html %]) [% END %] [% borrower.surname | html %] >+ [%- borrower.firstname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %] [% borrower.surname %] > [%- END -%] > [%- END -%] > [%- IF ( borrower.cardnumber ) -%] >- ([% borrower.cardnumber | html %]) >+ ([% borrower.cardnumber %]) > [%- END %] > [%- ELSIF ( borrowernumber ) %] > [%- IF category_type == 'I' %] >- [%- surname | html %] [% IF othernames %] ([% othernames | html %]) [% END %] >+ [%- surname %] [% IF othernames %] ([% othernames %]) [% END %] > [%- ELSE %] > [%- IF invert_name %] >- [%- surname | html %], [% firstname | html %] [% IF othernames %] ([% othernames | html %]) [% END %] >+ [%- surname %], [% firstname %] [% IF othernames %] ([% othernames %]) [% END %] > [%- ELSE %] >- [%- firstname | html %] [% IF othernames %] ([% othernames | html %]) [% END %] [% surname | html %] >+ [%- firstname %] [% IF othernames %] ([% othernames %]) [% END %] [% surname %] > [%- END %] > [%- END -%] > [%- IF ( cardnumber ) -%] >- ([% cardnumber | html %]) >+ ([% cardnumber %]) > [%- END %] > [%- END -%] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc >index c7b2bba..fdaadea 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 >@@ -7,7 +7,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/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >index cb78faf..86a3683 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >@@ -9,12 +9,12 @@ > <input type="hidden" name="routing" value="[% routing %]" /> > [% END %] > <input type="hidden" name="searched" value="1" /> >- <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" /> >+ <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter %]" /> > > [% IF (UNIMARC) %] >- <label for="EAN_filter">EAN:</label> <input type="text" size="20" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter | html %]" /> >+ <label for="EAN_filter">EAN:</label> <input type="text" size="20" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter %]" /> > [% END %] >- <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" /> >+ <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter %]" /> > <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/serials/serials-search.pl">Advanced search</a> > </form> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc >index 413f4bb..e17afd6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc >@@ -1,10 +1,10 @@ > <script type="text/javascript"> > [% IF ( Koha.Preference('IntranetSlipPrinterJS') ) %] >- [% Koha.Preference('IntranetSlipPrinterJS') %] >+ [% Koha.Preference('IntranetSlipPrinterJS').raw %] > [% ELSE %] > function printThenClose() { > window.print(); > setTimeout('window.close()', 1); > } > [% END %] >-</script> >\ No newline at end of file >+</script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc >index 7fdea9c..c1a7347 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc >@@ -7,25 +7,25 @@ > <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 Koha.Preference( '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="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="supplier">Vendor:</label> >- <input type="text" id="supplier" name="supplier_filter" value="[% supplier_filter | html %]" /> >+ <input type="text" id="supplier" name="supplier_filter" value="[% supplier_filter %]" /> > </li> > <li> > <label for="branch">Library:</label> >@@ -38,10 +38,10 @@ > </ol> > <input type="hidden" name="searched" value="1" /> > [% IF (booksellerid) %] >- <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >+ <input type="hidden" name="booksellerid" value="[% booksellerid %]" /> > [% END %] > [% IF (basketno) %] >- <input type="hidden" name="basketno" value="[% basketno | html %]" /> >+ <input type="hidden" name="basketno" value="[% basketno %]" /> > [% END %] > <fieldset class="action"> > <input type="submit" value="Search" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >index 78e4b54..46c8eae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >@@ -30,25 +30,25 @@ > > <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">Memcached: </th> > <td> >- Servers: [% IF memcached_servers %]<span>[% memcached_servers | html %]</span> >+ Servers: [% IF memcached_servers %]<span>[% memcached_servers %]</span> > [% ELSE %]<span>undefined</span>[% END %] | >- Namespace: [% IF memcached_namespace %]<span>[% memcached_namespace | html %]</span> >+ Namespace: [% IF memcached_namespace %]<span>[% memcached_namespace %]</span> > [% ELSE %]<span>undefined</span>[% END %] | > Status: [% IF memcached_servers %] > [% IF memcached_running and is_memcached_still_active %] >@@ -78,7 +78,7 @@ > [% END %] > </td> > </tr> >- <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) %] >@@ -888,7 +888,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 5656b80..532d6fd 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/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index aab8a4a..249a146 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -336,9 +336,9 @@ > [% FOREACH iteminformatio IN item.iteminformation %]<li style="[% iteminformatio.hidden %];"> > <div class="subfield_line" id="subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]"> > [% IF (iteminformatio.mandatory) %] >- <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >+ <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib.raw %]</label> > [% ELSE %] >- <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >+ <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib.raw %]</label> > [% END %] > > [% IF ( iteminformatio.marc_value.type == 'select' ) %] >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 43af8be..f907e6c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -4,7 +4,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="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >@@ -167,7 +167,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"> > >@@ -288,7 +288,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 %] >@@ -321,7 +321,7 @@ > [% END %] > </div> > [% END %] >- <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"> >@@ -541,7 +541,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 %] >@@ -558,12 +558,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 %] >@@ -666,7 +666,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 %] >@@ -739,7 +739,7 @@ > <div id="closebasket_needsconfirmation" class="dialog alert"> > > <form action="/cgi-bin/koha/acqui/basket.pl"> >- <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> >@@ -763,7 +763,7 @@ > <div id="closebasket_needsconfirmation" class="dialog alert"> > > <form action="/cgi-bin/koha/acqui/basket.pl"> >- <h1>Are you sure you want to generate an EDIFACT order and close basket [% basketname|html %]?</h1> >+ <h1>Are you sure you want to generate an EDIFACT order and 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 1ee7083..352cd3c 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="[% interface %]/[% theme %]/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"> >@@ -148,11 +148,11 @@ function submitForm(form) { > </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) %] >@@ -288,7 +288,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-default btn-sm" 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/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt >index 0307e47..aa29e62 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt >@@ -21,7 +21,7 @@ > [% ELSE %] > <ul> > [% FOREACH seg IN segments %] >- <li>[% seg | html %]</li> >+ <li>[% seg %]</li> > [% END %] > </ul> > [% END %] >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 a3ef54a..795cbd6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -13,7 +13,7 @@ > //<![CDATA[ > var MSG_REMOVE_PATRON = _("Remove"); > $(document).ready(function() { >- var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'histsearch', 'histsearcht', 'json' ) %]; >+ var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'histsearch', 'histsearcht', 'json' ).raw %]; > KohaTable("#histsearcht", { > "aoColumnDefs": [ > { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, >@@ -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 92c31fe..47264da 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 9d156ef..8ddc73d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -239,9 +239,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 2363765..80812ce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -25,7 +25,7 @@ function check_uncheck() { > > $(document).ready(function() { > >- var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'lateorders', 'late_orders', 'json' ) %]; >+ var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'lateorders', 'late_orders', 'json' ).raw %]; > late_orderst = KohaTable("#late_orders", { > "aoColumnDefs": [ > { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false }, >@@ -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"> >@@ -150,7 +150,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 %] >@@ -221,10 +221,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 3796d18..a8fd3df 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >@@ -46,7 +46,7 @@ > > [% IF ( total ) %] > <b>[% total %] results found </b> >-<div class="pages">[% pagination_bar %]</div> >+<div class="pages">[% pagination_bar.raw %]</div> > [% ELSE %] > <h3> No results found</h3> > <p> >@@ -74,7 +74,7 @@ > [% FOREACH biblio IN resultsloop %] > <tr> > <td> >- <p><span class="title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber %]">[% biblio.title | html %]</a></span> >+ <p><span class="title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber %]">[% biblio.title %]</a></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 45c2852..1f55c20 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -310,10 +310,10 @@ $(document).ready(function() > <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 b97b20a..4227aa4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >@@ -71,7 +71,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 d50adf4..8a9acd4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >@@ -55,7 +55,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 b6e790c..8aa4fed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -143,7 +143,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 82bca90..7f013f0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -267,7 +267,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 %] >@@ -278,12 +278,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 %] >@@ -414,7 +414,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 1ff3156..9b27434 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 = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(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 class=\"btn btn-default btn-xs select_user\" href=\"#\" data-borrowernumber=\"[% data.borrowernumber %]\" data-borrowerdata=\"[% To.json(data) | html %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber %]\" name=\"borrower_data[% data.borrowernumber %]\" value=\"[% To.json(data) | html %]\" />" >+ "<a class=\"btn btn-default btn-xs select_user\" href=\"#\" data-borrowernumber=\"[% data.borrowernumber %]\" data-borrowerdata=\"[% To.json(data) %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber %]\" name=\"borrower_data[% data.borrowernumber %]\" value=\"[% To.json(data) %]\" />" > [%- ELSE -%] > "<a href=\"#\" data-borrowernumber=\"[% data.borrowernumber %]\" data-firstname=\"[% data.firstname %]\" data-surname=\"[% data.surname %]\" class=\"btn btn-default btn-xs add_user\"><i class=\"fa fa-plus\"></i> Add</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 d9d8bbc..40f9dae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >@@ -100,7 +100,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 ddf104a..a750e00 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 >@@ -51,7 +51,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > [% INCLUDE 'header.inc' %] > [% 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 | uri %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a> › [% IF ( opsearch ) %]Order from external source[% ELSE %]<a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">Order from external source</a> › Search results[% END %]</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 | uri %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno %]</a> › [% IF ( opsearch ) %]Order from external source[% ELSE %]<a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">Order from external source</a> › Search results[% END %]</div> > > <div id="doc3" class="yui-t7"> > <div id="bd"> >@@ -63,12 +63,12 @@ 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="isbn">ISBN: </label> <input type="text" id="isbn" name="isbn" value="[% isbn | html %]" /></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> >- <li><label for="author">Author: </label> <input type="text" id="author" name="author" value="[% author | html %]" /></li> >- <li><label for="issn">ISSN: </label> <input type="text" id="issn" name="issn" value="[% issn | html %]" /></li> >+ <li><label for="author">Author: </label> <input type="text" id="author" name="author" value="[% author %]" /></li> >+ <li><label for="issn">ISSN: </label> <input type="text" id="issn" name="issn" value="[% issn %]" /></li> > <li><label for="subject">Subject heading: </label> <input type="text" id="subject" name="subject" value="" /></li> > <li><label for="dewey">Dewey: </label> <input type="text" id="dewey" name="dewey" value="" /></li> > <li><label for="frameworkcode" >Select MARC framework:</label> >@@ -82,9 +82,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <li><a id="resetZ3950Search" href="#"><i class="fa fa-trash"></i> Clear search form</a></li> > </ol> > </fieldset> >- <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" /> >- <input type="hidden" name="basketno" value="[% basketno | html %]" /> >- <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >+ <input type="hidden" name="biblionumber" value="[% biblionumber %]" /> >+ <input type="hidden" name="basketno" value="[% basketno %]" /> >+ <input type="hidden" name="booksellerid" value="[% booksellerid %]" /> > </div> > <div class="yui-u second"> > <h2>Search targets</h2> >@@ -113,14 +113,14 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <h2>Search results</h2> > > <p>You searched for: >- [% IF ( title ) %]<em>Title: </em><span class=term>[% title | html %]</span> [% END %] >- [% IF ( author ) %]<em>Author: </em><span class=term>[% author | html %]</span> [% END %] >- [% IF ( isbn ) %]<em>ISBN: </em><span class=term>[% isbn | html %]</span> [% END %] >- [% IF ( issn ) %]<em>ISSN: </em><span class=term>[% issn | html %]</span> [% END %] >- [% IF ( lccall ) %]<em>LC call number: </em><span class=term>[% lccall | html %]</span> [% END %] >- [% IF ( subject ) %]<em>Subject heading: </em><span class=term>[% subject | html %]</span> [% END %] >- [% IF ( controlnumber ) %]<em>Control no: </em><span class=term>[% controlnumber | html %]</span> [% END %] >- [% IF ( dewey ) %]<em>Dewey: </em><span class=term>[% dewey | html %]</span> [%END %] >+ [% IF ( title ) %]<em>Title: </em><span class=term>[% title %]</span> [% END %] >+ [% IF ( author ) %]<em>Author: </em><span class=term>[% author %]</span> [% END %] >+ [% IF ( isbn ) %]<em>ISBN: </em><span class=term>[% isbn %]</span> [% END %] >+ [% IF ( issn ) %]<em>ISSN: </em><span class=term>[% issn %]</span> [% END %] >+ [% IF ( lccall ) %]<em>LC call number: </em><span class=term>[% lccall %]</span> [% END %] >+ [% IF ( subject ) %]<em>Subject heading: </em><span class=term>[% subject %]</span> [% END %] >+ [% IF ( controlnumber ) %]<em>Control no: </em><span class=term>[% controlnumber %]</span> [% END %] >+ [% IF ( dewey ) %]<em>Dewey: </em><span class=term>[% dewey %]</span> [%END %] > </p> > > [% IF ( breeding_loop ) %] >@@ -139,7 +139,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 | uri %]&breedingid=[% breeding_loo.breedingid %]&booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">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> >@@ -172,17 +172,17 @@ 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="isbn" name="isbn" value="[% isbn | html %]" /> >- <input type="hidden" id="lccall" name="lccall" value="[% lccall | html %]" /> >- <input type="hidden" id="author" name="author" value="[% author | html %]" /> >- <input type="hidden" id="subject" name="subject" value="[% subject | html %]" /> >- <input type="hidden" id="dewey" name="dewey" value="[% dewey | html %]" /> >- <input type="hidden" name="frameworkcode" value="[% frameworkcode | html %]" /> >- <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" /> >- <input type="hidden" name="controlnumber" value="[% controlnumber | html %]" /> >- <input type="hidden" name="basketno" value="[% basketno | html %]" /> >- <input type="hidden" name="booksellerid" value="[% booksellerid | 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 %]" /> >+ <input type="hidden" id="subject" name="subject" value="[% subject %]" /> >+ <input type="hidden" id="dewey" name="dewey" value="[% dewey %]" /> >+ <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" /> >+ <input type="hidden" name="biblionumber" value="[% biblionumber %]" /> >+ <input type="hidden" name="controlnumber" value="[% controlnumber %]" /> >+ <input type="hidden" name="basketno" value="[% basketno %]" /> >+ <input type="hidden" name="booksellerid" value="[% booksellerid %]" /> > > [% FOREACH server IN servers %] > <input type="hidden" name="id" id="z3950_[% server.id %]" value="[% server.id %]" /> >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 a74329c..e3a59f7 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-trash"></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 c8ef5c9..bfcc15b 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 >@@ -14,11 +14,11 @@ > [% 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 %] >@@ -38,12 +38,12 @@ > [% 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> >@@ -239,16 +239,16 @@ > </table> > <input type="hidden" name="searchfield" value="[% searchfield %]" /> > <input type="hidden" name="tagfield" value="[% tagfield%]" /> >- <input type="hidden" name="tagsubfield" value="[% tagsubfield | html %]" /> >- <input type="hidden" name="authtypecode" value="[% authtypecode | html %]" /> >+ <input type="hidden" name="tagsubfield" value="[% tagsubfield %]" /> >+ <input type="hidden" name="authtypecode" value="[% authtypecode %]" /> > <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this subfield</button> > </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 %]" /> > <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button> > </form> > </form></div> >@@ -258,14 +258,14 @@ > > <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 7281091..cab89d9 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 >@@ -97,8 +97,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 699549e3..7599fa9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -94,7 +94,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> >@@ -169,8 +169,8 @@ > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authtypeactions[% authority_type.authtypecode %]"> > <li><a href="auth_tag_structure.pl?authtypecode=[% authority_type.authtypecode %]" class="button parameters"><i class="fa fa-eye"></i> MARC structure</a></li> >- <li><a href="/cgi-bin/koha/admin/authtypes.pl?op=add_form&authtypecode=[% authority_type.authtypecode |html %]"><i class="fa fa-pencil"></i> Edit</a></li> >- [% IF authority_type.authtypecode %]<li><a href="/cgi-bin/koha/admin/authtypes.pl?op=delete_confirm&authtypecode=[% authority_type.authtypecode |html %]"><i class="fa fa-trash"></i> Delete</a></li>[% END %] >+ <li><a href="/cgi-bin/koha/admin/authtypes.pl?op=add_form&authtypecode=[% authority_type.authtypecode %]"><i class="fa fa-pencil"></i> Edit</a></li> >+ [% IF authority_type.authtypecode %]<li><a href="/cgi-bin/koha/admin/authtypes.pl?op=delete_confirm&authtypecode=[% authority_type.authtypecode %]"><i class="fa fa-trash"></i> Delete</a></li>[% END %] > </ul> > </div> > </td> >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 7da5110..9707768 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 >@@ -92,7 +92,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> >@@ -217,8 +217,8 @@ > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode %]"> > <li><a href="marctagstructure.pl?frameworkcode=[% loo.frameworkcode %]"><i class="fa fa-eye"></i> MARC structure</a></li> >- <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form&frameworkcode=[% loo.frameworkcode |html %]"><i class="fa fa-pencil"></i> Edit</a></li> >- <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=delete_confirm&frameworkcode=[% loo.frameworkcode |html %]"><i class="fa fa-trash"></i> Delete</a></li> >+ <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form&frameworkcode=[% loo.frameworkcode %]"><i class="fa fa-pencil"></i> Edit</a></li> >+ <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=delete_confirm&frameworkcode=[% loo.frameworkcode %]"><i class="fa fa-trash"></i> Delete</a></li> > <!-- Trigger modal --> > <li><a href="#" data-toggle="modal" data-target="#exportModal_[% loo.frameworkcode %][% loop.count %]" title="Export framework structure (fields, subfields) to a spreadsheet file (.csv, .xml, .ods)"><i class="fa fa-upload"></i> Export</a></li> > <!-- 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 5c1f98f..00b46aa 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({ > <form action="/cgi-bin/koha/admin/branches.pl" method="post"> > <h3>Are you sure you want to delete [% library.branchname %] ([% library.branchcode %])?</h3> > <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 %]"> > <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button> > </form> > <form action="/cgi-bin/koha/admin/branches.pl" method="get"> >@@ -233,34 +233,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 %] >@@ -333,7 +333,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" class="required">Category code:</label> >@@ -343,12 +343,12 @@ tinyMCE.init({ > </li> > <li> > <label for="categoryname" class="required">Name: </label> >- <input type="text" name="categoryname" id="categoryname" size="32" maxlength="32" value="[% category.categoryname |html %]" class="required" required="required" /> >+ <input type="text" name="categoryname" id="categoryname" size="32" maxlength="32" value="[% category.categoryname %]" class="required" required="required" /> > <span class="required">Required</span> > </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> >@@ -385,7 +385,7 @@ tinyMCE.init({ > <h3>Are you sure you want to delete the group '[% category.codedescription %]' ([% category.categorycode %])?</h3> > <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 %]" /> > <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button> > </form> > <form action="/cgi-bin/koha/admin/branches.pl" method="get"> >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 b28b634..53fb8f1 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' %] >@@ -21,8 +21,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> > >@@ -59,7 +59,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 %] >@@ -67,8 +67,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> >@@ -79,7 +79,7 @@ > [% END %] > <li> > <label for="description" class="required">Description: </label> >- <input type="text" name="description" id="description" size="40" maxlength="80" class="required" required="required" value="[% category.description |html %]" /> >+ <input type="text" name="description" id="description" size="40" maxlength="80" class="required" required="required" value="[% category.description %]" /> > <span class="required">Required</span> > </li> > <li> >@@ -254,9 +254,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> > >@@ -266,8 +266,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 %] >@@ -318,7 +318,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 %] >@@ -365,9 +365,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 7acb4d6..b45f82d 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 bb79c38..87299d3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >@@ -69,7 +69,7 @@ > [% END %] > </li> > <li><label class="required" for="description">Description: </label> >- <input class="required" required="required" type="text" id="description" name="description" size="50" maxlength="250" value="[% description |html %]" /> >+ <input class="required" required="required" type="text" id="description" name="description" size="50" maxlength="250" value="[% description %]" /> > <span class="required">Required</span> > </li> > <li><label for="used">Source in use?</label> >@@ -119,7 +119,7 @@ > [% END %] > </li> > <li><label for="description" class="required">Description: </label> >- <input class="required" required="required" type="text" id="description" name="description" size="50" maxlength="250" value="[% description |html %]" /> >+ <input class="required" required="required" type="text" id="description" name="description" size="50" maxlength="250" value="[% description %]" /> > <span class="required">Required</span> > </li> > <li><label for="sort_routine" class="required">Filing routine: </label> >@@ -217,8 +217,8 @@ > <td>[% IF ( class_source.used ) %]Yes[% ELSE %]No[% END %]</td> > <td>[% class_source.sortrule %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="[% class_source.script_name %]?op=edit_source&class_source=[% class_source.code |html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="[% class_source.script_name %]?op=delete_source&class_source=[% class_source.code |html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% class_source.script_name %]?op=edit_source&class_source=[% class_source.code %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="[% class_source.script_name %]?op=delete_source&class_source=[% class_source.code %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -250,8 +250,8 @@ > <td>[% class_sort_rule.description %]</td> > <td>[% class_sort_rule.sort_routine %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="[% class_sort_rule.script_name %]?op=edit_sort_rule&sort_rule=[% class_sort_rule.rule |html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="[% class_sort_rule.script_name %]?op=delete_sort_rule&sort_rule=[% class_sort_rule.rule |html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% class_sort_rule.script_name %]?op=edit_sort_rule&sort_rule=[% class_sort_rule.rule %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="[% class_sort_rule.script_name %]?op=delete_sort_rule&sort_rule=[% class_sort_rule.rule %]"><i class="fa fa-trash"></i> 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 3f2c5bf..e8d4497 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -24,7 +24,7 @@ > } > > $(document).ready(function() { >- columns_settings = [% ColumnsSettings.GetColumns( 'admin', 'currency', 'currencies-table', 'json' ) %] >+ columns_settings = [% ColumnsSettings.GetColumns( 'admin', 'currency', 'currencies-table', 'json' ).raw %] > var issuest = KohaTable("#currencies-table", { > dom: 'B<"clearfix">t', > "columnDefs": [ >@@ -218,8 +218,8 @@ > <tr> > <td>[% currency.currency %]</td> > <td>[% currency.rate %]</td> >- <td>[% currency.symbol |html %]</td> >- <td>[% currency.isocode |html %]</td> >+ <td>[% currency.symbol %]</td> >+ <td>[% currency.isocode %]</td> > <td><span title="[% currency.timestamp %]">[% currency.timestamp | $KohaDates %]</span></td> > <td style="color:green;">[% IF currency.active %]â[% END %]</td> > <td>[% IF currency.archived %]Yes[% END %]</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 1d8c2cf..9bcc772 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -142,7 +142,7 @@ Item types administration > [% END %] > <li> > <label for="description" class="required">Description: </label> >- <input type="text" id="description" name="description" size="48" value="[% itemtype.description |html %]" required="required" /> <span class="required">Required</span> >+ <input type="text" id="description" name="description" size="48" value="[% itemtype.description %]" required="required" /> <span class="required">Required</span> > [% IF can_be_translated %] > <a href="/cgi-bin/koha/admin/localization.pl?entity=itemtypes&code=[% itemtype.itemtype %]" title="Translate item type [% itemtype.itemtype %]" rel="gb_page_center[600,500]"><i class="fa fa-pencil"></i> Translate into other languages</a> > [% END %] >@@ -360,7 +360,7 @@ Item types administration > </td> > [% END %] > <td> >- <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype |html %]"> >+ <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype %]"> > [% itemtype.itemtype %] > </a> > </td> >@@ -389,8 +389,8 @@ Item types administration > </td> > <td>[% itemtype.checkinmsg | html_line_break %]</td> > <td class="actions"> >- <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype |html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&itemtype=[% itemtype.itemtype |html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> >+ <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&itemtype=[% itemtype.itemtype %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> 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 75ee022..1a0d6f8 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 >@@ -12,16 +12,16 @@ > <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="doc3" class="yui-t2"> >@@ -33,14 +33,14 @@ > [% 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> >@@ -218,7 +218,7 @@ > > <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 %]" /> > <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this subfield</button> >@@ -227,7 +227,7 @@ > > <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 %]" /> > <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button> >@@ -240,14 +240,14 @@ > > <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 b85885b..e8c75ee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -83,8 +83,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 ff878e9..f93e5a7 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 >@@ -247,11 +247,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"> >@@ -282,14 +282,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> >@@ -301,28 +301,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 %] >@@ -414,28 +414,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 %] >@@ -459,28 +459,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 %] >@@ -625,14 +625,14 @@ function CheckRuleForm(f) { > <td>[% available_matching_rule.code %]</td> > <td>[% available_matching_rule.description %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name %]?op=edit_matching_rule&matcher_id=[% available_matching_rule.matcher_id |html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name %]?op=delete_matching_rule&matcher_id=[% available_matching_rule.matcher_id |html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name %]?op=edit_matching_rule&matcher_id=[% available_matching_rule.matcher_id %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name %]?op=delete_matching_rule&matcher_id=[% available_matching_rule.matcher_id %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] > </table>[% ELSE %]<p>There are no saved matching rules.</p>[% END %] > >-<div class="pages">[% pagination_bar %]</div> >+<div class="pages">[% pagination_bar.raw %]</div> > > [% END %] > [% IF ( matching_rule_form ) %] >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 f9f148d..4afc90b 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 >@@ -9,7 +9,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' %] >@@ -37,7 +37,7 @@ $(document).ready(function() { > [% END %] > [% END %] > [% IF ( delete_attribute_type_form ) %] >- › Confirm deletion of patron attribute type "[% code |html %]" >+ › Confirm deletion of patron attribute type "[% code %]" > [% END %] > </div> > >@@ -69,8 +69,8 @@ $(document).ready(function() { > <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" class="required">Patron attribute type code: </label> > <input type="text" id="code" name="code" required="required" class="required" size="10" maxlength="10" /> >@@ -78,7 +78,7 @@ $(document).ready(function() { > [% END %] > </li> > <li><label for="description" class="required">Description: </label> >- <input type="text" id="description" name="description" required="required" class="required" size="50" maxlength="250" value="[% description |html %]" /> >+ <input type="text" id="description" name="description" required="required" class="required" size="50" maxlength="250" value="[% description %]" /> > <span class="required">Required</span> > </li> > <li><label for="repeatable">Repeatable: </label> >@@ -202,10 +202,10 @@ $(document).ready(function() { > > [% IF ( delete_attribute_type_form ) %] > <div class="dialog alert"> >- <h3>Confirm deletion of patron attribute type <span class="ex">'[% code |html %]' ([% description %])</span>?</h3> >+ <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 %]" /> > <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete patron attribute type</button> > </form> > <form action="[% script_name %]" method="get"> >@@ -255,7 +255,7 @@ $(document).ready(function() { > <tbody> > [% FOREACH item IN attribute.items %] > <tr> >- <td>[% item.code |html %]</td> >+ <td>[% item.code %]</td> > <td>[% item.description %]</td> > <td> > [% IF ( item.branches && item.branches.size > 0 ) %] >@@ -275,8 +275,8 @@ $(document).ready(function() { > [% END %] > </td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="[% item.script_name %]?op=edit_attribute_type&code=[% item.code |html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="[% item.script_name %]?op=delete_attribute_type&code=[% item.code |html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% item.script_name %]?op=edit_attribute_type&code=[% item.code %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="[% item.script_name %]?op=delete_attribute_type&code=[% item.code %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -287,7 +287,7 @@ $(document).ready(function() { > <p>There are no saved patron attribute types.</p> > [% END %] > >-<div class="pages">[% pagination_bar %]</div> >+<div class="pages">[% pagination_bar.raw %]</div> > > [% 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 22fb001..4264c51 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -74,7 +74,7 @@ > [% END %] > [% IF ( search_not_found ) %] > <div class="dialog alert"> >- No system preferences matched your search for: <strong>[% searchfield |html %]</strong> >+ No system preferences matched your search for: <strong>[% searchfield %]</strong> > </div> > [% END %] > [% FOREACH TAB IN TABS %] >@@ -120,7 +120,7 @@ > <td><div> > [% FOREACH CHUNK IN LINE.CHUNKS %] > [% IF ( CHUNK.type_text ) %] >- [% CHUNK.contents %] >+ [% CHUNK.contents.raw %] > [% ELSIF ( CHUNK.type_input ) %] > <input type="[%IF CHUNK.input_type %][% CHUNK.input_type %][% ELSE %]text[% END %]" name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "short" %]" value="[% CHUNK.value %]" autocomplete="off" /> [% IF ( CHUNK.dateinput ) %]<span class="hint">[% INCLUDE 'date-format.inc' %]</span>[% END %] > [% ELSIF ( CHUNK.type_select ) %] >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 4f8f511..6f9c632 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"> >@@ -327,7 +327,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 %] >@@ -339,17 +339,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 ) %] >@@ -429,9 +429,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 %]" /> > <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button> > </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 4a6a968..d78872b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -127,7 +127,7 @@ > <fieldset class="rows"> > <ol> > <li><label for="name">Server name: </label> >- <input type="text" name="servername" id="servername" size="65" maxlength="100" value="[% server.servername | html %]"/> >+ <input type="text" name="servername" id="servername" size="65" maxlength="100" 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> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >index c6a050c..9f1a337 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >@@ -45,7 +45,7 @@ > <form action="[% script_name %]" 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/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >index ceb6e60..6435aea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -63,7 +63,7 @@ function AreMandatoriesNotOk(){ > [% FOREACH subfield_loo IN innerloo.subfield_loop %] > [% IF ( subfield_loo.mandatory ) %]mandatories.push("[% subfield_loo.id %]"); > tab.push("[% BIG_LOO.number %]"); >- label.push("[% subfield_loo.marc_lib |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"); >+ label.push("[% subfield_loo.marc_lib.raw |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"); > [% END %] > [% END %] > [% END %] >@@ -319,7 +319,7 @@ function confirmnotdup(redirect){ > <img class="buttonUp" src="[% interface %]/[% theme %]/img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag %][% subfield_loo.subfield %][% subfield_loo.random %]')" alt="Move Up" title="Move Up" /> > [% END %] > <input type="text" >- title="[% subfield_loo.marc_lib %]" >+ title="[% subfield_loo.marc_lib.raw %]" > style=" [% IF ( subfield_loo.fixedfield ) %]display:none; [% END %]border:0;" > name="tag_[% subfield_loo.tag %]_code_[% subfield_loo.subfield %]_[% subfield_loo.index %]_[% subfield_loo.index_subfield %]" > value="[% subfield_loo.subfield %]" >@@ -336,7 +336,7 @@ function confirmnotdup(redirect){ > > [% UNLESS advancedMARCEditor %] > [% IF ( subfield_loo.mandatory ) %]<span class="subfield subfield_mandatory">[% ELSE %]<span class="subfield">[% END %] >- [% subfield_loo.marc_lib %] >+ [% subfield_loo.marc_lib.raw %] > [% IF ( subfield_loo.mandatory ) %]<span class="mandatory_marker" title="This field is mandatory">*</span>[% END %] > </span> > </label> >@@ -363,7 +363,7 @@ function confirmnotdup(redirect){ > [% ELSE %] > <a href="#" id="buttonDot_[% mv.id %]" class="buttonDot tag_editor" title="Tag editor">...</a> > [% END %] >- [% mv.javascript %] >+ [% mv.javascript.raw %] > [% ELSIF ( mv.type == 'text' ) %] > <input type="text" id="[%- mv.id -%]" name="[%- mv.name -%]" value="[%- mv.value -%]" class="input_marceditor" tabindex="1" size="67" maxlength="[%- mv.maxlength -%]" /> > [% ELSIF ( mv.type == 'textarea' ) %] >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/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >index 563c44e..4900219 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >@@ -57,7 +57,7 @@ function searchauthority() { > > <div id="merge_in_progress"></div> > [% IF ( total ) %] >-<div class="pages">[% pagination_bar %]</div> >+<div class="pages">[% pagination_bar.raw %]</div> > > <p id="authorities_searchresultlist_current_page_info"> > Results [% from %] to [% to %] of [% total %] >@@ -107,7 +107,7 @@ function searchauthority() { > </table> > </div> > >-<div class="pages">[% pagination_bar %]</div> >+<div class="pages">[% pagination_bar.raw %]</div> > > [% ELSE %] > No results found >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 c4f0e11..e393767 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >@@ -77,12 +77,12 @@ > [% 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" class="select_record" value="[% BIBLIO_RESULT.biblionumber %]" name="bib[% BIBLIO_RESULT.biblionumber %]" id="bib[% BIBLIO_RESULT.biblionumber %]" /> >- [% BIBLIO_RESULT.title |html %] >+ [% BIBLIO_RESULT.title %] > [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %] > [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %] > [% END %] >@@ -253,7 +253,7 @@ > > </td> [% END %] > <td><a href="[% BIBLIO_RESULT.dest %]?biblionumber=[% BIBLIO_RESULT.biblionumber %]" class="open_title"> >- [% 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/basket/sendbasket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt >index 68e735c..b82cd86 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt >@@ -23,26 +23,26 @@ Your cart > [% FILTER html2text %] > > [% IF comment %] >- <p>[% comment %]</p> >+ <p>[% comment.raw %]</p> > <hr/> > [% END %] > <ol> > [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] > <li> > <span> >- [% BIBLIO_RESULT.title %] >- [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %] >+ [% BIBLIO_RESULT.title.raw %] >+ [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle.raw %][% END %] > </span> > > <p> > [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] >- <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %] >+ <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author.raw %][% END %] > > [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %] > [% IF ( BIBLIO_RESULT.author ) %]; [% END %] > [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %] > [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %] >- [% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %] >+ [% MARCAUTHOR_SUBFIELDS_LOO.separator.raw %][% MARCAUTHOR_SUBFIELDS_LOO.value.raw %] > [% END %] > [% UNLESS ( loop.last ) %];[% END %] > [% END %] >@@ -52,18 +52,18 @@ Your cart > > [% IF ( BIBLIO_RESULT.ISBN ) %] > <span> >- ISBN: [% BIBLIO_RESULT.ISBN %] >+ ISBN: [% BIBLIO_RESULT.ISBN.raw %] > </span><br/> > [% END %] > > [% IF BIBLIO_RESULT.publishercode %] > <span> >- Published by: [% BIBLIO_RESULT.publishercode %] >+ Published by: [% BIBLIO_RESULT.publishercode.raw %] > [% IF ( BIBLIO_RESULT.publicationyear ) %] >- in [% BIBLIO_RESULT.publicationyear %] >+ in [% BIBLIO_RESULT.publicationyear.raw %] > [% END %] > [% IF ( BIBLIO_RESULT.pages ) %] >- , [% BIBLIO_RESULT.pages %] >+ , [% BIBLIO_RESULT.pages.raw %] > [% END %] > [% IF BIBLIO_RESULT.item('size') %] > , [% BIBLIO_RESULT.item('size') %] >@@ -73,55 +73,55 @@ Your cart > > [% IF BIBLIO_RESULT.collection %] > <span> >- Collection: [% BIBLIO_RESULT.seriestitle %] >+ Collection: [% BIBLIO_RESULT.seriestitle.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.subject ) %] > <span> >- Subject: [% BIBLIO_RESULT.subject %] >+ Subject: [% BIBLIO_RESULT.subject.raw %] > <span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.copyrightdate ) %] > <span> >- Copyright year: [% BIBLIO_RESULT.copyrightdate %] >+ Copyright year: [% BIBLIO_RESULT.copyrightdate.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.notes ) %] > <span> >- Notes : [% BIBLIO_RESULT.notes %] >+ Notes : [% BIBLIO_RESULT.notes.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.unititle ) %] > <span> >- Unified title: [% BIBLIO_RESULT.unititle %] >+ Unified title: [% BIBLIO_RESULT.unititle.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.serial ) %] > <span> >- Serial: [% BIBLIO_RESULT.serial %] >+ Serial: [% BIBLIO_RESULT.serial.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.dewey ) %] > <span> >- Dewey: [% BIBLIO_RESULT.dewey %] >+ Dewey: [% BIBLIO_RESULT.dewey.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.classification ) %] > <span> >- Classification: [% BIBLIO_RESULT.classification %] >+ Classification: [% BIBLIO_RESULT.classification.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.lccn ) %] > <span> >- LCCN: [% BIBLIO_RESULT.lccn %] >+ LCCN: [% BIBLIO_RESULT.lccn.raw %] > </span><br/> > [% END %] > [% IF ( BIBLIO_RESULT.url ) %] >@@ -134,17 +134,17 @@ Your cart > [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %] > [% IF ( OPACBaseURL ) %] > <p> >- In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %] >+ In online catalog: [% OPACBaseURL.raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %] > </p> > [% END %] > [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %] > <p>Items: > <ul> > [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]<li> >- [% ITEM_RESULT.branchname %] >- [% ITEM_RESULT.location %] >- [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %] >- [% ITEM_RESULT.barcode %] >+ [% ITEM_RESULT.branchname.raw %] >+ [% ITEM_RESULT.location.raw %] >+ [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber.raw %])[% END %] >+ [% ITEM_RESULT.barcode.raw %] > </li>[% END %] > </ul> > </p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt >index b78a650..ece3a1b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt >@@ -7,7 +7,7 @@ > > [% IF ( SENT ) %] > <h3>Message sent</h3> >- <p>The cart was sent to: [% email_add |html %]</p> >+ <p>The cart was sent to: [% email_add %]</p> > <p><a class="focus close" href="#">Close window</a></p> > [% END %] > [% IF ( error ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >index abe3ea2..4b0c470 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >@@ -3,7 +3,7 @@ > [% IF ( unknownbiblionumber ) %] > Unknown record > [% ELSE %] >- ISBD details for [% title | html %] >+ ISBD details for [% title %] > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -46,7 +46,7 @@ > <span class="Z3988" title="[% ocoins %]"></span> > [% END %] > <div id="catalogue_ISBDdetail"> >- [% ISBD %] >+ [% ISBD.raw %] > </div> > </div> > </div> >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 004d77f..1f6580c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >@@ -3,7 +3,7 @@ > [% IF ( unknownbiblionumber ) %] > Unknown record > [% ELSE %] >- MARC details for [% bibliotitle | html %] >+ MARC details for [% bibliotitle %] > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -41,7 +41,7 @@ function Changefwk(FwkList) { > [% IF ( unknownbiblionumber ) %] > Unknown record > [% ELSE %] >- MARC Details for <i>[% bibliotitle |html %]</i> >+ MARC Details for <i>[% bibliotitle %]</i> > [% END %] > </div> > >@@ -56,7 +56,7 @@ function Changefwk(FwkList) { > [% INCLUDE 'cat-toolbar.inc' %] > > [% UNLESS ( popup ) %] >- <h1>MARC biblio : [% biblionumber %] ( [% bibliotitle |html %] )</h1> >+ <h1>MARC biblio : [% biblionumber %] ( [% bibliotitle %] )</h1> > > > [% END %] >@@ -97,10 +97,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 src="[% interface %]/[% theme %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value |html %]" alt="Search on [% subfiel.marc_value |html %]" /> >+ <img 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 ) %] >@@ -181,7 +181,7 @@ function Changefwk(FwkList) { > [% FOREACH item IN item_loop %] > <tr> > [% FOREACH sf_code IN item_subfield_codes %] >- <td>[% item.$sf_code %]</td> >+ <td>[% item.$sf_code.raw %]</td> > [% END %] > </tr> > [% END %] >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 b9bf9ed..7098c21 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -23,7 +23,7 @@ > [% IF ( unknownbiblionumber ) %] > Unknown record > [% ELSE %] >- Details for [% title |html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield | html %][% END %] >+ Details for [% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %] > [% END %] > </title> > >@@ -347,7 +347,7 @@ function verify_images() { > [% IF ( unknownbiblionumber ) %] > Unknown record > [% ELSE %] >- Details for <i>[% title |html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield | html %][% END %]</i> >+ Details for <i>[% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</i> > [% END %] > </div> > >@@ -385,7 +385,7 @@ function verify_images() { > [% END %] > > [% IF ( XSLTDetailsDisplay ) %] >- [% XSLTBloc %] >+ [% XSLTBloc.raw %] > > [% IF shelves.count %] > <span class="results_summary"><span class="label">Lists that include this title: </span> >@@ -399,9 +399,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 %] >@@ -441,18 +441,18 @@ 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 ( author ) %]<p>By <a href="/cgi-bin/koha/catalogue/search.pl?q=au:[% author |url %]">[% author | html %]</a></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 ) %] > <li><strong>Additional authors:</strong><ul> > [% FOREACH MARCAUTHOR IN MARCAUTHORS %] >- <li>[% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% MARCAUTHOR_SUBFIELDS_LOO.separator %]<a title="â¡[% MARCAUTHOR_SUBFIELDS_LOO.code %] [% MARCAUTHOR_SUBFIELDS_LOO.value |url %]" href="/cgi-bin/koha/catalogue/search.pl?q=[% FOREACH link_loo IN MARCAUTHOR_SUBFIELDS_LOO.link_loop %][% link_loo.operator |url %][% link_loo.limit %]:[% link_loo.link |url %][% END %]">[% MARCAUTHOR_SUBFIELDS_LOO.value | html %]</a>[% END %]</li> >+ <li>[% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% MARCAUTHOR_SUBFIELDS_LOO.separator %]<a title="â¡[% MARCAUTHOR_SUBFIELDS_LOO.code %] [% MARCAUTHOR_SUBFIELDS_LOO.value |url %]" href="/cgi-bin/koha/catalogue/search.pl?q=[% FOREACH link_loo IN MARCAUTHOR_SUBFIELDS_LOO.link_loop %][% link_loo.operator |url %][% link_loo.limit %]:[% link_loo.link |url %][% END %]">[% MARCAUTHOR_SUBFIELDS_LOO.value %]</a>[% END %]</li> > [% END %] > > </ul> >@@ -468,7 +468,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 %] >@@ -519,7 +519,7 @@ function verify_images() { > <div class="yui-u" style="margin-top: 1em;"> > <ul> > [% IF ( MARCISBNS ) %] >- <li><strong>ISBN:</strong><ul>[% FOREACH MARCISBN IN MARCISBNS %]<li>[% MARCISBN | html %]</li>[% END %]</ul></li> >+ <li><strong>ISBN:</strong><ul>[% FOREACH MARCISBN IN MARCISBNS %]<li>[% MARCISBN %]</li>[% END %]</ul></li> > [% ELSE %] > [% IF ( normalized_isbn ) %] > <li><strong>ISBN:</strong> [% normalized_isbn %]</li> >@@ -537,7 +537,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> >@@ -575,9 +575,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 %] >@@ -1047,7 +1047,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 | html %] ©[% 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 7e6fffd..b896e4f 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"> >@@ -55,7 +55,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"> > >@@ -66,7 +66,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 ed58a96..5747fde 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -2,7 +2,7 @@ > [% USE KohaDates %] > [% USE Branches %] > [% 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="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] >@@ -23,7 +23,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"> > >@@ -31,7 +31,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"> >@@ -94,7 +94,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/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >index ff0a930..453561d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -488,7 +488,7 @@ > [% END %] > > <div class="pages"> >- [% pagination_bar %] >+ [% pagination_bar.raw %] > </div> > > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >index c56a3cc..12d7734 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >@@ -4,7 +4,7 @@ > [% IF ( unknownbiblionumber ) %] > Unknown record > [% ELSE %] >- Labeled MARC details for [% bibliotitle | html %] >+ Labeled MARC details for [% bibliotitle %] > [% END %] > </title> > >@@ -43,7 +43,7 @@ > [% IF ( unknownbiblionumber ) %] > Unknown record > [% ELSE %] >- MARC details for <i>[% bibliotitle | html %]</i> >+ MARC details for <i>[% bibliotitle %]</i> > [% END %] > </div> > >@@ -60,7 +60,7 @@ > [% INCLUDE 'cat-toolbar.inc' %] > > [% UNLESS ( popup ) %] >- <h1>Labeled MARC biblio : [% biblionumber %] ( [% bibliotitle | html %] )</h1> >+ <h1>Labeled MARC biblio : [% biblionumber %] ( [% bibliotitle %] )</h1> > [% END %] > <p><b>With framework: > <select name="Frameworks" id="Frameworks" size="1" onchange="Changefwk(this);"> >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 b04fd39..99b1652 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -1,7 +1,7 @@ > [% USE Koha %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Catalog › Item details for [% title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield | html %][% END %]</title> >+<title>Koha › Catalog › Item details for [% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css">h3{padding-top: 1em; border-top: 2px solid #CCCCCC;}#exportLabelexportModal_{border-top: 0px;}</style> > [% INCLUDE 'browser-strings.inc' %] >@@ -21,7 +21,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"> > >@@ -32,17 +32,17 @@ > > <div id="catalogue_detail_biblio"> > >- <h2>[% title |html %]</h2> >- [% IF ( subtitle ) %]<h4>[% FOREACH subtitl IN subtitle %] [% subtitl.subfield|html %][% END %]</h4>[% END %] >- [% IF ( author ) %]<h4>by [% author | html %]</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> > [% UNLESS ( item_level_itypes ) %] > <li><span class="label">Item type:</span> [% itemtypename %] </li> > [% END %] > [% IF ( rentalcharge ) %]<li><span class="label">Rental charge:</span>[% rentalcharge %] </li>[% END %] >- <li><span class="label">ISBN:</span> [% isbn | html %] </li> >- <li><span class="label">Publisher:</span>[% place %] [% publishercode |html %] [% publicationyear %] </li> >+ <li><span class="label">ISBN:</span> [% isbn %] </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 b9861bc..d2d98cc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -1,7 +1,7 @@ > [% USE Koha %] > [% USE Biblio %] > [% 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 %] >@@ -109,7 +109,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 %] >@@ -121,7 +121,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 %] >@@ -153,7 +153,7 @@ $('#sort_by').change(function() { > $(".selection").show(); > [% IF ( query_desc ) %] > toHighlight = $("p,span.results_summary,a.title"); >- var query_desc = "[% query_desc |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') | html %]"; >+ var query_desc = "[% query_desc |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; > q_array = query_desc.split(" "); > // ensure that we don't have "" at the end of the array, which can > // break the highlighter >@@ -316,7 +316,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"> >@@ -346,10 +346,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 --> >@@ -361,7 +361,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="#" id="select_all"><i class="fa fa-check"></i> Select all</a> >@@ -402,7 +402,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> >@@ -423,7 +423,7 @@ var holdForPatron = function () { > <tr> > <td> > [% IF ( scan_search_term_to_use ) %] >- Scan Index for: <input type="text" name="q" id="scan-index" size="35" value="[% scan_search_term_to_use | html %]" /> >+ Scan Index for: <input type="text" name="q" id="scan-index" size="35" value="[% scan_search_term_to_use %]" /> > [% ELSE %] > Scan Index for: <input type="text" name="q" id="scan-index" size="35" value="" /> > [% END %] >@@ -472,7 +472,7 @@ var holdForPatron = function () { > [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] > <tr> > <td> >- <a href="/cgi-bin/koha/catalogue/search.pl?idx=[% 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=[% scan_index_to_use %]&q=[% SEARCH_RESULT.scan_use |url %]"[% SEARCH_RESULT.title %]"">[% SEARCH_RESULT.title %]</a> > </td> > <td> > [% SEARCH_RESULT.author %] >@@ -487,10 +487,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 %] > >@@ -530,13 +530,13 @@ var holdForPatron = function () { > <td> > [% IF ( SEARCH_RESULT.XSLTResultsRecord ) %] > [% SEARCH_RESULT.result_number %]. >- [% SEARCH_RESULT.XSLTResultsRecord %] >+ [% SEARCH_RESULT.XSLTResultsRecord.raw %] > [% ELSE %] > <p>[% SEARCH_RESULT.result_number %]. > [% 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 %] >@@ -737,7 +737,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 f55d4fc..aec95c3 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 >@@ -161,7 +161,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/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 %] >@@ -241,7 +241,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 %] >@@ -278,7 +278,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/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >index 7a50096..edfe04f 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="[% interface %]/[% theme %]/js/cataloging.js"></script> >@@ -244,7 +244,7 @@ function AreMandatoriesNotOk(){ > [% FOREACH subfield_loo IN innerloo.subfield_loop %] > [% IF ( subfield_loo.mandatory ) %]mandatories.push("[% subfield_loo.id %]"); > tab.push("[% BIG_LOO.number %]"); >- label.push("[% subfield_loo.marc_lib %]"); >+ label.push("[% subfield_loo.marc_lib.raw %]"); > [% END %] > [% END %] > [% END %] >@@ -401,7 +401,7 @@ function Changefwk() { > > [% 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() { > <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> >@@ -438,7 +438,7 @@ function Changefwk() { > [% 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 %] >@@ -636,7 +636,7 @@ function Changefwk() { > <img class="buttonUp" src="[% interface %]/[% theme %]/img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag %][% subfield_loo.subfield %][% subfield_loo.random %]')" alt="Move Up" title="Move Up" /> > [% END %] > <input type="text" >- title="[% subfield_loo.marc_lib %]" >+ title="[% subfield_loo.marc_lib.raw %]" > style=" [% IF ( subfield_loo.fixedfield ) %]display:none; [% END %]border:0;" > name="tag_[% subfield_loo.tag %]_code_[% subfield_loo.subfield %]_[% subfield_loo.index %]_[% subfield_loo.index_subfield %]" > value="[% subfield_loo.subfield %]" >@@ -648,7 +648,7 @@ function Changefwk() { > > [% UNLESS advancedMARCEditor %] > [% IF ( subfield_loo.mandatory ) %]<span class="subfield subfield_mandatory">[% ELSE %]<span class="subfield">[% END %] >- [% subfield_loo.marc_lib %] >+ [% subfield_loo.marc_lib.raw %] > [% IF ( subfield_loo.mandatory ) %]<span class="mandatory_marker" title="This field is mandatory">*</span>[% END %] > </span> > </label> >@@ -673,7 +673,7 @@ function Changefwk() { > <a href="#" id="buttonDot_[% mv.id %]" class="buttonDot tag_editor framework_plugin" tabindex="1" title="Tag editor">Tag editor</a> > [% END %] > </span> >- [% mv.javascript %] >+ [% mv.javascript.raw %] > [% ELSIF ( mv.type == 'hidden' ) %] > <input tabindex="1" type="hidden" id="[%- mv.id -%]" name="[%- mv.name -%]" size="[%- mv.size -%]" maxlength="[%- mv.maxlength -%]" value="[%- mv.value -%]" /> > [% ELSIF ( mv.type == 'textarea' ) %] >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 d6d39d8..923a548 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -134,7 +134,7 @@ > [% total %] result(s) found in catalog, > <a href="#searchresult-breeding">[% breeding_count %] result(s) found in reservoir</a> > </div> >-<div class="pages">[% pagination_bar %]</div> >+<div class="pages">[% pagination_bar.raw %]</div> > <div class="searchresults"> > <table> > <tr> >@@ -148,7 +148,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> >@@ -238,7 +238,7 @@ > </tr> > [% FOREACH breeding_loo IN breeding_loop %] > <tr> >- <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 7eaec91..19bb378 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -2,7 +2,7 @@ > [% USE ColumnsSettings %] > > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Cataloging › [% title |html %] [% IF ( author ) %] by [% author | html %][% 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="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >@@ -51,7 +51,7 @@ $(document).ready(function(){ > }); > }); > >- var columns_settings = [% ColumnsSettings.GetColumns( 'cataloguing', 'additem', 'itemst', 'json' ) %] >+ var columns_settings = [% ColumnsSettings.GetColumns( 'cataloguing', 'additem', 'itemst', 'json' ).raw %] > // Skip the first column > columns_settings.unshift( { cannot_be_toggled: "1" } ); > >@@ -146,7 +146,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 | html %][% 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> > >@@ -155,7 +155,7 @@ function confirm_deletion() { > <div id="bd"> > <div id="yui-main"> > >-<h1>Items for [% title |html %] [% IF ( author ) %] by [% author | html %][% 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 %] >@@ -226,7 +226,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 %] >@@ -257,9 +257,9 @@ function confirm_deletion() { > [% FOREACH ite IN item %] > <li><div class="subfield_line" style="[% ite.visibility %]" id="subfield[% ite.tag %][% ite.subfield %][% ite.random %]"> > [% IF ( ite.mandatory ) %] >- <label class="required">[% ite.subfield %] - [% ite.marc_lib %]</label> >+ <label class="required">[% ite.subfield %] - [% ite.marc_lib.raw %]</label> > [% ELSE %] >- <label>[% ite.subfield %] - [% ite.marc_lib %]</label> >+ <label>[% ite.subfield %] - [% ite.marc_lib.raw %]</label> > [% END %] > > [% SET mv = ite.marc_value %] >@@ -290,7 +290,7 @@ function confirm_deletion() { > [% ELSE %] > <a href="#" id="buttonDot_[%- mv.id -%]" class="[%- mv.class -%]" title="Tag editor">...</a> > [% END %] >- [%- mv.javascript -%] >+ [%- mv.javascript.raw -%] > [% ELSIF ( mv.type == 'text' ) %] > <input type="text" id="[%- mv.id -%]" name="field_value" class="input_marceditor" size="50" maxlength="[%- mv.maxlength -%]" value="[%- mv.value -%]" /> > [% ELSIF ( mv.type == 'textarea' ) %] >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..1836a78 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 f11dc7d..64cf756 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 %] > <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button> >@@ -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 efa30fa..cd1e725 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..159d396 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,10 @@ > [% 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_210c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt >index 043e700..2aa0f3d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt >@@ -41,7 +41,7 @@ > [% IF ( total ) %] > <h3>Authority search results</h3> > <div class="pages"> >- [% pagination_bar %] >+ [% pagination_bar.raw %] > </div>[% END %] > <p> > [% IF ( total ) %] >@@ -74,7 +74,7 @@ > [% END %] > > [% IF ( total ) %]<div class="pages"> >- [% pagination_bar %] >+ [% pagination_bar.raw %] > </div> > [% END %] > <script type="text/javascript"> >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 b784c3a..5fe9c6c 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 >@@ -129,7 +129,7 @@ > <select name="itype" id="itypeloop"> > <option value="">All item types</option> > [% FOREACH itypeloo IN itypeloop %] >- <option value="[% itypeloo.itemtype %]">[% itypeloo.description |html %]</option> >+ <option value="[% itypeloo.itemtype %]">[% itypeloo.description %]</option> > [% END %] > </select> > </p> >@@ -172,24 +172,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 6e6de65..c55d1c0 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 >@@ -72,9 +72,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> >@@ -83,8 +83,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> > <li><a id="resetZ3950Search" href="#"><i class="fa fa-trash"></i> Clear search form</a></li> > </ol> > </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 733c6b5..29d49d9 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 >@@ -70,10 +70,10 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <div class="yui-u first"> > <fieldset class="rows"> > <ol> >- <li><label for="isbn">ISBN: </label> <input type="text" id="isbn" name="isbn" value="[% isbn | html %]" /></li> >- <li><label for="issn">ISSN: </label> <input type="text" id="issn" name="issn" value="[% issn | html %]" /></li> >- <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 %]" /></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 %]" /></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> > <li><label for="lccall">LC call number: </label> <input type="text" id="lccall" name="lccall" value="" /></li> >@@ -82,8 +82,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <li><label for="stdid">Standard ID: </label> <input type="text" id="stdid" name="stdid" value="" /></li> > <li><a id="resetZ3950Search" href="#"><i class="fa fa-trash"></i> Clear search form</a></li> > </ol> >- <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" /> >- <input type="hidden" name="frameworkcode" value="[% frameworkcode | html %]" /> >+ <input type="hidden" name="biblionumber" value="[% biblionumber %]" /> >+ <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" /> > </div> > <div class="yui-g"> > <h2>Search targets</h2> >@@ -109,16 +109,16 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > [% ELSE %] > <h2>Results</h2> > <p>You searched for: >- [% IF ( title ) %]<em>Title: </em><span class=term>[% title | html %]</span> [% END %] >- [% IF ( author ) %]<em>Author: </em><span class=term>[% author | html %]</span> [% END %] >- [% IF ( isbn ) %]<em>ISBN: </em><span class=term>[% isbn | html %]</span> [% END %] >- [% IF ( issn ) %]<em>ISSN: </em><span class=term>[% issn | html %]</span> [% END %] >- [% IF ( lccall ) %]<em>LC call number: </em><span class=term>[% lccall | html %]</span> [% END %] >- [% IF ( subject ) %]<em>Subject heading: </em><span class=term>[% subject | html %]</span> [% END %] >- [% IF ( controlnumber ) %]<em>Control no: </em><span class=term>[% controlnumber | html %]</span> [% END %] >- [% IF ( dewey ) %]<em>Dewey: </em><span class=term>[% dewey | html %]</span> [%END %] >- [% IF ( srchany ) %]<em>Raw (any): </em><span class=term>[% srchany | html %]</span> [% END %] >- [% IF ( stdid ) %]<em>Standard ID: </em><span class=term>[% stdid | html %]</span> [% END %] >+ [% IF ( title ) %]<em>Title: </em><span class=term>[% title %]</span> [% END %] >+ [% IF ( author ) %]<em>Author: </em><span class=term>[% author %]</span> [% END %] >+ [% IF ( isbn ) %]<em>ISBN: </em><span class=term>[% isbn %]</span> [% END %] >+ [% IF ( issn ) %]<em>ISSN: </em><span class=term>[% issn %]</span> [% END %] >+ [% IF ( lccall ) %]<em>LC call number: </em><span class=term>[% lccall %]</span> [% END %] >+ [% IF ( subject ) %]<em>Subject heading: </em><span class=term>[% subject %]</span> [% END %] >+ [% IF ( controlnumber ) %]<em>Control no: </em><span class=term>[% controlnumber %]</span> [% END %] >+ [% IF ( dewey ) %]<em>Dewey: </em><span class=term>[% dewey %]</span> [%END %] >+ [% IF ( srchany ) %]<em>Raw (any): </em><span class=term>[% srchany %]</span> [% END %] >+ [% IF ( stdid ) %]<em>Standard ID: </em><span class=term>[% stdid %]</span> [% END %] > </p> > [% IF ( errconn ) %] > <div class="dialog alert"> >@@ -153,7 +153,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="#" class="import_record" data-breedingid="[% breeding_loo.breedingid %]" data-biblionumber="[% breeding_loo.biblionumber %]" data-frameworkcode="[% frameworkcode | uri %]">Import</a><a href="#" id="close_menu" 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> >@@ -185,17 +185,17 @@ 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="title" name="title" value="[% title | html %]" /> >- <input type="hidden" id="isbn" name="isbn" value="[% isbn | html %]" /> >- <input type="hidden" id="lccall" name="lccall" value="[% lccall | html %]" /> >- <input type="hidden" id="controlnumber" name="controlnumber" value="[% controlnumber | html %]" /> >- <input type="hidden" id="srchany" name="srchany" value="[% srchany | html %]" /> >- <input type="hidden" id="author" name="author" value="[% author | html %]" /> >- <input type="hidden" id="subject" name="subject" value="[% subject | html %]" /> >- <input type="hidden" id="dewey" name="dewey" value="[% dewey | html %]" /> >- <input type="hidden" id="stdid" name="stdid" value="[% stdid | html %]" /> >- <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" /> >- <input type="hidden" name="frameworkcode" value="[% frameworkcode | html %]" /> >+ <input type="hidden" id="title" 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="controlnumber" name="controlnumber" value="[% controlnumber %]" /> >+ <input type="hidden" id="srchany" name="srchany" value="[% srchany %]" /> >+ <input type="hidden" id="author" name="author" value="[% author %]" /> >+ <input type="hidden" id="subject" name="subject" value="[% subject %]" /> >+ <input type="hidden" id="dewey" name="dewey" value="[% dewey %]" /> >+ <input type="hidden" id="stdid" name="stdid" value="[% stdid %]" /> >+ <input type="hidden" name="biblionumber" value="[% biblionumber %]" /> >+ <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" /> > > [% FOREACH server IN servers %] > <input type="hidden" name="id" id="z3950_[% server.id %]" value="[% server.id %]" /> >@@ -214,7 +214,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > [% ELSE %] > <div class="dialog message">Nothing found.</div> > [% END %] >-<p><form method="get" action="/cgi-bin/koha/cataloguing/z3950_search.pl"><input type="hidden" name="biblionumber" value="[% biblionumber | html %]"/><input type="hidden" name="frameworkcode" value="[% frameworkcode | html %]"/><input type="submit" value="Try another search"/></form></p> >+<p><form method="get" action="/cgi-bin/koha/cataloguing/z3950_search.pl"><input type="hidden" name="biblionumber" value="[% biblionumber %]"/><input type="hidden" name="frameworkcode" value="[% frameworkcode %]"/><input type="submit" value="Try another search"/></form></p> > > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >index b695dc6..ef5a37d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >@@ -182,7 +182,7 @@ > <td class="ar-title"> > <p> > <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% ar.biblionumber %]"> >- <strong>[% ar.biblio.title | html %]</strong> >+ <strong>[% ar.biblio.title %]</strong> > [% FOREACH s IN itemsloo.subtitle %] [% s %][% END %] > </a> > </p> >@@ -310,7 +310,7 @@ > <td class="ar-title"> > <p> > <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ar.biblionumber %]"> >- <strong>[% ar.biblio.title | html %]</strong> >+ <strong>[% ar.biblio.title %]</strong> > [% FOREACH s IN itemsloo.subtitle %] [% s %][% END %] > </a> > </p> >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 9257027..68d54e7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >@@ -1,7 +1,7 @@ > [% USE KohaDates %] > [% USE Branches %] > [% 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 88329f9..d4ba723 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >@@ -44,7 +44,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> >@@ -52,7 +52,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>[% Branches.GetName( overduesloo.homebranch ) %] [% overduesloo.itemcallnumber %] >@@ -120,7 +120,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> >@@ -129,7 +129,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 ede0767..d531981 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >@@ -41,7 +41,7 @@ > <input type="hidden" name="itemnumber" value="[% itemnumber %]" /> > <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> > [% IF ( waiting ) %] >- <input type="hidden" name="barcode" value="[% barcode | html %]" /> >+ <input type="hidden" name="barcode" value="[% barcode %]" /> > <input type="hidden" name="request" value="KillWaiting" /> > <input type="submit" value="Cancel" /> > [% END %] >@@ -65,7 +65,7 @@ > <input type="hidden" name="biblionumber" value="[% biblionumber %]" /> > <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> > <input type="hidden" name="tobranchcd" value="[% tobranchcd %]" /> >- <input type="hidden" name="barcode" value="[% barcode | html %]" /> >+ <input type="hidden" name="barcode" value="[% barcode %]" /> > <input type="hidden" name="request" value="KillReserved" /> > <input type="submit" value="Cancel" /> > </form> >@@ -108,7 +108,7 @@ > <ul> > [% FOREACH errmsgloo IN errmsgloop %] > [% IF ( errmsgloo.errbadcode ) %] >- <li>No Item with barcode: [% errmsgloo.msg | html %]</li> >+ <li>No Item with barcode: [% errmsgloo.msg %]</li> > [% END %] > [% IF ( errmsgloo.errispermanent ) %] > <li>Please return item to home library: [% Branches.GetName( errmsgloo.msg ) %]</li> >@@ -180,7 +180,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 d6608d7..5a57871 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -50,7 +50,7 @@ var relatives_borrowernumbers = new Array(); > var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); > var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone."); > >-columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %] >+columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ).raw %] > > [% IF borrowernumber and borrower %] > if($.cookie("holdfor") != [% borrowernumber %]){ >@@ -346,7 +346,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" /> > <input type="hidden" name="override_high_holds" value="[% override_high_holds %]"/> >@@ -433,7 +433,7 @@ $(document).ready(function() { > [% END %] > > [% IF ( UNKNOWN_BARCODE ) %] >- <li>The barcode was not found: <span class="ex">[% barcode |html %]</span> >+ <li>The barcode was not found: <span class="ex">[% barcode %]</span> > [% 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 %]">Add record using fast cataloging</a> >@@ -556,7 +556,7 @@ $(document).ready(function() { > [% IF ( message ) %] > [% INCLUDE 'patron-toolbar.inc' %] > <h4> >-No patron matched <span class="ex">[% message | html %]</span> >+No patron matched <span class="ex">[% message %]</span> > </h4> > [% END %] > >@@ -774,12 +774,12 @@ No patron matched <span class="ex">[% message | html %]</span> > > [% IF ( debarredcomment ) %] > with the explanation: <br/><i> >- [% IF debarredcomment.search('OVERDUES_PROCESS') %] >- Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %] >- [% ELSE %] >- [% debarredcomment | html_line_break %] >- [% END %] >- </i> >+ [% IF debarredcomment.search('OVERDUES_PROCESS') %] >+ Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ').raw | html_line_break %] >+ [% ELSE %] >+ [% debarredcomment.raw | html_line_break %] >+ [% END %] >+ </i> > [% END %] > <br/> > <a class="btn btn-default btn-sm" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a> >@@ -825,16 +825,16 @@ No patron matched <span class="ex">[% message | html %]</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> >@@ -866,7 +866,7 @@ No patron matched <span class="ex">[% message | html %]</span> > [% IF message.manager_id %] > ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.manager_id %]">[% message.get_column('manager_firstname') %] [% message.get_column('manager_surname') %]</a> ) > [% END %] >- <i>"[% message.message %]"</i> >+ <i>"[% message.message.raw %]"</i> > </span> > [% IF message.branchcode == branch OR Koha.Preference('AllowAllMessageDeletion') %] > <a class="btn btn-link btn-sm" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% message.message_id %]&borrowernumber=[% message.borrowernumber %]" onclick="return confirm(MSG_CONFIRM_DELETE_MESSAGE);"><i class="fa fa-trash"></i> Delete</a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >index e1c7c14..81d1e8e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >@@ -137,7 +137,7 @@ $(document).ready(function() { > [% END %] > <td>[% checkout_info.barcode %]</td> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout_info.item.biblionumber %]&type=intra"><strong>[% checkout_info.item.title |html %][% FOREACH subtitl IN checkout_info.item.subtitle %] [% subtitl.subfield %][% END %]</strong></a>[% IF checkout_info.item.author %], by [% checkout_info.item.author %][% END %][% IF ( checkout_info.itme.itemnotes ) %]- <span class="circ-hlt">[% checkout_info.item.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout_info.item.biblionumber %]&itemnumber=[% checkout_info.item.itemnumber %]#item[% checkout_info.item.itemnumber %]">[% checkout_info.item.barcode %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout_info.item.biblionumber %]&type=intra"><strong>[% checkout_info.item.title %][% FOREACH subtitl IN checkout_info.item.subtitle %] [% subtitl.subfield %][% END %]</strong></a>[% IF checkout_info.item.author %], by [% checkout_info.item.author %][% END %][% IF ( checkout_info.itme.itemnotes ) %]- <span class="circ-hlt">[% checkout_info.item.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout_info.item.biblionumber %]&itemnumber=[% checkout_info.item.itemnumber %]#item[% checkout_info.item.itemnumber %]">[% checkout_info.item.barcode %]</a> > </td> > <td> > [% IF checkout_info.NEEDSCONFIRMATION %] >@@ -267,7 +267,7 @@ $(document).ready(function() { > <li><i class="fa fa-li fa-exclamation"></i>Too many checked out.</li> > [% END %] > [% IF checkout_info.UNKNOWN_BARCODE %] >- <li><i class="fa fa-li fa-exclamation"></i>The barcode was not found [% checkout_info.barcode |html %].</li> >+ <li><i class="fa fa-li fa-exclamation"></i>The barcode was not found [% checkout_info.barcode %].</li> > [% END %] > [% IF checkout_info.DEBT %] > <li><i class="fa fa-li fa-exclamation"></i>The patron has a debt of [% checkout_info.DEBT %].</li> <!-- Need debt_confirmed --> >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 483c24e..c6d3bd7 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 6c3ee80..3f226ff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -88,13 +88,13 @@ > > <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> >@@ -114,10 +114,10 @@ > <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> >+ <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> > <td>[% overdueloo.replacementprice %]</td> >@@ -156,10 +156,10 @@ > </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> >@@ -179,14 +179,14 @@ > <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> >@@ -203,8 +203,8 @@ > > <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> >@@ -254,8 +254,8 @@ > </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 11c7a0f..675afd1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -114,7 +114,7 @@ $(document).ready(function() { > <td> > <p> > [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] >- [% reserveloo.title |html %] [% FOREACH s IN reserveloo.subtitle %] [% s %][% END %]</a></p> >+ [% reserveloo.title %] [% FOREACH s IN reserveloo.subtitle %] [% s %][% END %]</a></p> > [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author %]</p>[% END %] > </td> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >index 93ff49b..875b998 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >@@ -14,7 +14,7 @@ > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print.css" /> > [% IF ( Koha.Preference('SlipCSS') ) %] >-<link rel="stylesheet" type="text/css" href="[% Koha.Preference('SlipCSS') %]" /> >+<link rel="stylesheet" type="text/css" href="[% Koha.Preference('SlipCSS').raw %]" /> > [% END %] > > [% INCLUDE 'slip-print.inc' #printThenClose %] >@@ -27,7 +27,7 @@ > [% IF ( slip ) %][% slip %][% ELSE %]No slip template found[% END %] > </pre> > [% ELSE %] >-[% IF ( slip ) %][% slip %][% ELSE %]No slip template found[% END %] >+[% IF ( slip ) %][% slip.raw %][% ELSE %]No slip template found[% END %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >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 acac079..d115400 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/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >index 0a6d6f6..b13c6ad 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >@@ -102,7 +102,7 @@ $(document).ready(function() { > › > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> > › >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]">[% biblio.title | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]">[% biblio.title %]</a> > › > Request article > </div> >@@ -112,7 +112,7 @@ $(document).ready(function() { > <div id="yui-main"> > <div class="yui-b"> > >- <h1>Request article from <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.id %]">[% biblio.title | html %]</a></h1> >+ <h1>Request article from <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.id %]">[% biblio.title %]</a></h1> > [% IF no_patrons_found %] > <div class="dialog alert"> > <h3>Patron not found</h3> >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 ec92cb7..9e6b297 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -74,7 +74,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> > <ul> >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 50a65d5..5a48957 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -22,7 +22,7 @@ > [% END %] > > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Circulation › Check in [% title |html %]</title> >+<title>Koha › Circulation › Check in [% title %]</title> > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >@@ -177,7 +177,7 @@ $(document).ready(function () { > [% IF ( collectionItemNeedsTransferred ) %] > <div id="rotating-collection" class="dialog message"> > <h3>Please transfer item to: [% Branches.GetName( collectionBranch ) %]</h3> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode %]: [% title %]</a></p> > <p>This item is part of a rotating collection.</p> > <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% collectionBranch %]&op=slip"><i class="fa fa-print"></i> Print slip</button></p> > </div> >@@ -213,7 +213,7 @@ $(document).ready(function () { > > [% IF ( wrongbranch ) %] > <div class="dialog alert"><h3>Cannot check in</h3> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode %]: [% title %]</a></p> > </p><strong>NOT CHECKED IN</strong></p> > <p>This item must be checked in at following library: <strong>[% Branches.GetName( rightbranch ) %]</strong></p> > </div> >@@ -223,7 +223,7 @@ $(document).ready(function () { > <div id="return2" class="dialog message"> > <!-- WrongTransfer --> > <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) %]</h3> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode %]: [% title %]</a></p> > <button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&&branchcode=[% homebranch %]&op=slip"><i class="fa fa-print"></i> Print transfer slip</button> > <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button> > [% IF ( wborcnum ) %]<h5>Hold for:</h5> >@@ -262,7 +262,7 @@ $(document).ready(function () { > Hold found (item is already waiting): > <br/> > <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]"> >- [% itembarcode |html %]: [% title |html %] >+ [% itembarcode %]: [% title %] > </a> > </h3> > </div> >@@ -354,7 +354,7 @@ $(document).ready(function () { > <!-- diffbranch --> > <div id="transfer-needed" class="dialog message audio-alert-action"> > <h3>Hold needing transfer found</h3> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode %]: [% title %]</a></p> > <h4>Hold for: </h4> > <ul> > <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li> >@@ -399,7 +399,7 @@ $(document).ready(function () { > <!-- 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 item to: [% Branches.GetName( returnbranch ) %]</h3> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode %]: [% title %]</a></p> > <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% returnbranch %]&op=slip"><i class="fa fa-print"></i> Print slip</button></p> > </div> > [% END %] >@@ -434,7 +434,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> >@@ -469,7 +469,7 @@ $(document).ready(function () { > Hold found: > <br/> > <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]"> >- [% itembarcode |html %]: [% title |html %] >+ [% itembarcode %]: [% title %] > </a> > </div> > >@@ -580,7 +580,7 @@ $(document).ready(function () { > <div class="dialog alert audio-alert-warning"> > <h3>Check in message</h3> > [% IF itembiblionumber %] >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode %]: [% title %]</a></p> > [% END %] > [% FOREACH errmsgloo IN errmsgloop %] > [% IF ( errmsgloo.NotForLoanStatusUpdated ) %] >@@ -601,7 +601,7 @@ $(document).ready(function () { > </p> > [% END %] > [% IF ( errmsgloo.badbarcode ) %] >- <p class="problem">No item with barcode: [% errmsgloo.msg | html %]</p> >+ <p class="problem">No item with barcode: [% errmsgloo.msg %]</p> > [% END %] > [% IF ( errmsgloo.ispermanent ) %] > <p class="problem">Please return item to: [% Branches.GetName( errmsgloo.msg ) %]</p> >@@ -756,7 +756,7 @@ $(document).ready(function () { > [% END %] > </td> > <td class="ci-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% riloo.itembiblionumber %]"> >- [% riloo.itemtitle |html %] >+ [% riloo.itemtitle %] > </a> > [% IF ( riloo.enumchron ) %] > <br/> >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 4b3933d..bf1d2c3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt >@@ -35,10 +35,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> >@@ -79,9 +79,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 fc3a91f..d187732 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 549b563..4ad2910 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 >@@ -146,7 +146,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 4c242af..cc5aad4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -96,7 +96,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 %] >@@ -161,7 +161,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/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >index fa5cde8..56416f6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -170,7 +170,7 @@ > [% IF ( IntranetmainUserblock ) %] > <div class="yui-g" id="area-userblock"> > <div class="user-info"> >- [% IntranetmainUserblock %] >+ [% IntranetmainUserblock.raw %] > </div> > </div> > [% END %] >@@ -183,7 +183,7 @@ > [% SET newsdisp = Koha.Preference('NewsAuthorDisplay') %] > [% FOREACH koha_new IN koha_news %] > <div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4> >- <div class="newsbody">[% koha_new.content %]</div> >+ <div class="newsbody">[% koha_new.content.raw %]</div> > <p class="newsfooter"> Posted on [% koha_new.newdate %][% IF( ( newsdisp == 'staff' || newsdisp == 'both' ) && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title %] </span>[% koha_new.author_firstname %] [% koha_new.author_surname %]<br />[% END %] > [% IF ( CAN_user_tools ) %] > <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=[% koha_new.idnew %]">Edit</a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >index ed905a9..f09186f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >@@ -266,7 +266,7 @@ > [% IF ( text_field.select_field ) %] > <td> > <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/labels/label-edit-batch.pl?op=remove&batch_id=[% batch_id |url %]&label_id=[% text_field.field_value |url %]"><i class="fa fa-trash"></i> Delete</a> >- <a class="btn btn-default btn-xs export" href="#" data-batch-id="[% batch_id %]" data-label-id="[% text_field.field_value |html %]"><i class="fa fa-share-square-o"></i> Export</a> >+ <a class="btn btn-default btn-xs export" href="#" data-batch-id="[% batch_id %]" data-label-id="[% text_field.field_value %]"><i class="fa fa-share-square-o"></i> Export</a> > </td> > <td><input type="checkbox" name="action" value="[% text_field.field_value %]"></td> > [% ELSE %] >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 402ea9e..d053b45 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 >@@ -135,7 +135,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> >@@ -188,7 +188,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 e8e0180..94de816 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >@@ -82,7 +82,7 @@ > <input type="hidden" name="ccl_query" value="[% ccl_query %]" /> > [% FOREACH result_se IN result_set %] > <div style="border-bottom:1px solid #CCC;padding:1em 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/labels/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >index 85aaae4..a38801c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >@@ -10,13 +10,13 @@ > .noprint { display: none; } > } > </style> >-[% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %] >+[% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS.raw %]</style>[% END %] > [% IF ( IntranetUserJS ) %] > <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ >- [% IntranetUserJS %] >+ [% IntranetUserJS.raw %] > //]]> > </script> > [% END %] >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 a8e3667..486c87d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -106,7 +106,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 %]">[% account.title |html %]</a>[% END %]</td> >+ [% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&itemnumber=[% account.itemnumber %]">[% account.title %]</a>[% END %]</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/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >index 6938f57..8451979 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -160,7 +160,7 @@ $(document).ready(function() { > }); > > // Apply DataTables on the results table >- var columns_settings = [% ColumnsSettings.GetColumns( 'members', 'member', 'memberresultst', 'json' ) %]; >+ var columns_settings = [% ColumnsSettings.GetColumns( 'members', 'member', 'memberresultst', 'json' ).raw %]; > dtMemberResults = KohaTable("#memberresultst", { > 'bServerSide': true, > 'sAjaxSource': "/cgi-bin/koha/svc/members/search", >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 ff3ef68..b570eff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -107,7 +107,7 @@ $(document).ready(function() { > [% INCLUDE 'patron-search.inc' %] > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> › >-[% IF (firstname || surname ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% IF (firstname) %][% firstname | html %] [% END %][% IF (surname) %][% surname | html %] [% END %]</a> ›[% END %] >+[% IF (firstname || surname ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]</a> ›[% END %] > <strong>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron ([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</strong> > </div> > [% IF ( opadd ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %] >@@ -129,7 +129,7 @@ $(document).ready(function() { > [% INCLUDE 'noadd-warnings.inc' %] > > [% UNLESS ( no_add ) %] >- <h1>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname | html %] [% END %][% IF (surname) %][% surname | html %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</h1> >+ <h1>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</h1> > > [% IF quickadd && opadd && !check_member %] > <a href="#" class="toggle_quick_add"><i class="fa fa-plus-square"></i> Show full form</a> >@@ -304,7 +304,7 @@ $(document).ready(function() { > <label for="firstname"> > [% END %] > First name: </label> >- <input type="text" id="firstname" name="firstname" size="20" value="[% UNLESS opduplicate %][% firstname | html %][% END %]" /> >+ <input type="text" id="firstname" name="firstname" size="20" value="[% UNLESS opduplicate %][% firstname %][% END %]" /> > [% IF ( mandatoryfirstname ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] >@@ -332,7 +332,7 @@ $(document).ready(function() { > <label for="initials"> > [% END %] > Initials: </label> >- <input type="text" id="initials" name="initials" size="20" value="[% UNLESS opduplicate %][% initials | html %][% END %]" /> >+ <input type="text" id="initials" name="initials" size="20" value="[% UNLESS opduplicate %][% initials %][% END %]" /> > [% IF ( mandatoryinitials ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] >@@ -345,7 +345,7 @@ $(document).ready(function() { > <label for="othernames"> > [% END %] > Other name: </label> >- <input type="text" id="othernames" name="othernames" size="20" value="[% UNLESS opduplicate %][% othernames | html %][% END %]" /> >+ <input type="text" id="othernames" name="othernames" size="20" value="[% UNLESS opduplicate %][% othernames %][% END %]" /> > [% IF ( mandatoryothernames ) %]<span class="required">Required</span>[% END %] > [% IF ( I ) %]<input type="hidden" name="sex" value="N" />[% END %] > </li> >@@ -403,9 +403,9 @@ $(document).ready(function() { > <label for="contactname">Organization name: </label> > [% IF ( guarantorid ) %] > <span>[% contactname %]</span> >- <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname | html %]" /> >+ <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname %]" /> > [% ELSE %] >- <input name="contactname" id="contactname" type="text" size="20" value="[% contactname | html %]" /> >+ <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" /> > [% END %] > </li> > [% ELSE %] >@@ -422,9 +422,9 @@ $(document).ready(function() { > <label for="contactname">Surname: </label> > [% IF ( guarantorid ) %] > <span>[% contactname %]</span> >- <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname | html %]" /> >+ <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname %]" /> > [% ELSE %] >- <input name="contactname" id="contactname" type="text" size="20" value="[% contactname | html %]" /> >+ <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" /> > [% END %] > </li> > [% END %] >@@ -433,9 +433,9 @@ $(document).ready(function() { > <label for="contactfirstname">First name: </label> > [% IF ( guarantorid ) %] > <span>[% contactfirstname %]</span> >- <input name="contactfirstname" id="contactfirstname" type="hidden" size="20" value="[% contactfirstname | html %]" /> >+ <input name="contactfirstname" id="contactfirstname" type="hidden" size="20" value="[% contactfirstname %]" /> > [% ELSE %] >- <input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname | html %]" /> >+ <input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname %]" /> > [% END %] > </li> > [% END %] >@@ -484,11 +484,12 @@ $(document).ready(function() { > > [% END %] > [% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %] >- [% IF Koha.Preference( 'AddressFormat' ) %] >- [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] >- [% ELSE %] >- [% INCLUDE 'member-main-address-style-us.inc' %] >- [% END %] >+ [% SWITCH Koha.Preference( 'AddressFormat' ) %] >+ [% CASE 'de' %] >+ [% INCLUDE 'member-main-address-style-de.inc' %] >+ [% CASE # us %] >+ [% INCLUDE 'member-main-address-style-us.inc' %] >+ [% END %] > [% END # nostreet && nocity etc group%] > > [% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %] >@@ -502,7 +503,7 @@ $(document).ready(function() { > <label for="phone"> > [% END %] > Primary phone: </label> >- <input type="text" id="phone" name="phone" value="[% phone | html %]" /> >+ <input type="text" id="phone" name="phone" value="[% phone %]" /> > [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div> > > </li> >@@ -515,7 +516,7 @@ $(document).ready(function() { > <label for="phonepro"> > [% END %] > Secondary phone: </label> >- <input type="text" id="phonepro" name="phonepro" value="[% phonepro | html %]" /> >+ <input type="text" id="phonepro" name="phonepro" value="[% phonepro %]" /> > [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] >@@ -527,7 +528,7 @@ $(document).ready(function() { > <label for="mobile"> > [% END %] > Other phone: </label> >- <input type="text" id="mobile" name="mobile" value="[% mobile | html %]" /> >+ <input type="text" id="mobile" name="mobile" value="[% mobile %]" /> > [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] >@@ -539,7 +540,7 @@ $(document).ready(function() { > <label for="email"> > [% END %] > Primary email: </label> >- <input type="text" id="email" name="email" size="45" value="[% email | html %]" /> >+ <input type="text" id="email" name="email" size="45" value="[% email %]" /> > [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div> > > </li> >@@ -552,7 +553,7 @@ $(document).ready(function() { > <label for="emailpro"> > [% END %] > Secondary email: </label> >- <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro | html %]" /> >+ <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro %]" /> > [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] >@@ -564,7 +565,7 @@ $(document).ready(function() { > <label for="fax"> > [% END %] > Fax: </label> >- <input type="text" id="fax" name="fax" value="[% fax | html %]" /> >+ <input type="text" id="fax" name="fax" value="[% fax %]" /> > [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] >@@ -577,20 +578,23 @@ $(document).ready(function() { > [% IF ( step_6 ) %] > > [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %] >- [% IF Koha.Preference( 'AddressFormat' ) %] >- [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] >- [% ELSE %] >+ [% SWITCH Koha.Preference( 'AddressFormat' ) %] >+ [% CASE 'de' %] >+ [% INCLUDE 'member-alt-address-style-de.inc' %] >+ [% CASE # us %] > [% INCLUDE 'member-alt-address-style-us.inc' %] >- [% END %] >+ [% END %] >+ > [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %] > [% END %] > [% IF ( step_2 ) %] > [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %] >- [% IF Koha.Preference( 'AddressFormat' ) %] >- [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] >- [% ELSE %] >+ [% SWITCH Koha.Preference( 'AddressFormat' ) %] >+ [% CASE 'de' %] >+ [% INCLUDE 'member-alt-contact-style-de.inc' %] >+ [% CASE # us %] > [% INCLUDE 'member-alt-contact-style-us.inc' %] >- [% END %] >+ [% END %] > [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %] > > [% END %] >@@ -612,19 +616,19 @@ $(document).ready(function() { > Card number: </label> > [% END %] > [% IF minlength_cardnumber == maxlength_cardnumber %] >- <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" minlength="[% minlength_cardnumber %]" maxlength="[% maxlength_cardnumber %]" /> >+ <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber %]" minlength="[% minlength_cardnumber %]" maxlength="[% maxlength_cardnumber %]" /> > [% IF mandatorycardnumber and not autoMemberNum %]<span class="required">Required</span>[% END %] > <div class="hint">Card number must be exactly [% minlength_cardnumber %] characters.</div> > [% ELSIF minlength_cardnumber && maxlength_cardnumber %] >- <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" minlength="[% minlength_cardnumber %]" maxlength="[% maxlength_cardnumber %]" /> >+ <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber %]" minlength="[% minlength_cardnumber %]" maxlength="[% maxlength_cardnumber %]" /> > [% IF mandatorycardnumber and not autoMemberNum %]<span class="required">Required</span>[% END %] > <div class="hint">Card number must be between [% minlength_cardnumber %] and [% maxlength_cardnumber %] characters.</div> > [% ELSIF maxlength_cardnumber %] >- <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" maxlength="[% maxlength_cardnumber %]" /> >+ <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber %]" maxlength="[% maxlength_cardnumber %]" /> > [% IF mandatorycardnumber and not autoMemberNum %]<span class="required">Required</span>[% END %] > <div class="hint">Card number can be up to [% maxlength_cardnumber %] characters.</div> > [% ELSE %] >- <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" /> >+ <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber %]" /> > [% IF mandatorycardnumber and not autoMemberNum %]<span class="required">Required</span>[% END %] > <div class="hint">There is no minimum or maximum character length.</div> > [% END %] >@@ -779,7 +783,7 @@ $(document).ready(function() { > <label for="opacnote"> > [% END %] > OPAC note: </label> >- <textarea id="opacnote" name="opacnote" cols="55" rows="5">[% UNLESS opduplicate %][% opacnote | html %][% END %]</textarea> >+ <textarea id="opacnote" name="opacnote" cols="55" rows="5">[% UNLESS opduplicate %][% opacnote %][% END %]</textarea> > <div class="hint">This message appears on this patron's user page in the OPAC</div> > [% IF ( mandatoryopacnote ) %]<span class="required">Required</span>[% END %] > </li> >@@ -792,7 +796,7 @@ $(document).ready(function() { > <label for="borrowernotes"> > [% END %] > Circulation note: </label> >- <textarea id="borrowernotes" name="borrowernotes" cols="55" rows="5">[% UNLESS opduplicate %][% borrowernotes | html %][% END %]</textarea> >+ <textarea id="borrowernotes" name="borrowernotes" cols="55" rows="5">[% UNLESS opduplicate %][% borrowernotes %][% END %]</textarea> > <div class="hint">This message displays when checking out to this patron</div> > [% IF ( mandatoryborrowernotes ) %]<span class="required">Required</span>[% END %] > </li> >@@ -979,9 +983,9 @@ $(document).ready(function() { > <td>[% d.type %]</td> > <td> > [% IF d.comment.search('OVERDUES_PROCESS') %] >- Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') %] >+ Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ').raw %] > [% ELSE %] >- [% d.comment %] >+ [% d.comment.raw %] > [% END %] > </td> > <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td> >@@ -1082,7 +1086,7 @@ $(document).ready(function() { > [% 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 66f13d7..cc96da2 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 >@@ -49,7 +49,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> >@@ -109,7 +109,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 b91a69e..5e9da0c 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 >@@ -24,7 +24,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 %] >@@ -35,7 +35,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 %] >@@ -49,7 +49,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 %] >@@ -62,7 +62,7 @@ Date due: [% issueloo.date_due %]</p> > <!-- [% koha_news_count %] recent news item(s) --> > [% FOREACH koha_new IN koha_news %] > <div class="newsitem" id="news[% koha_new.idnew %]"><h5 style="margin-bottom: 1px; margin-top: 1px"><b>[% koha_new.title %]</b></h5> >- <p style="margin-bottom: 1px; margin-top: 1px">[% koha_new.content %]</p> >+ <p style="margin-bottom: 1px; margin-top: 1px">[% koha_new.content.raw %]</p> > <p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px"> Posted on [% koha_new.newdate %] > > </p><hr /></div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 271b30b..08f070e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -45,7 +45,7 @@ var relatives_borrowernumbers = new Array(); > > var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); > >-columns_settings = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) %] >+columns_settings = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ).raw %] > > $(document).ready(function() { > $('#finesholdsissues').tabs({ >@@ -199,9 +199,9 @@ function validate1(date) { > [% IF ( debarredcomment ) %] > with the explanation: <i> > [% IF debarredcomment.search('OVERDUES_PROCESS') %] >- Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %] >+ Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ').raw | html_line_break %] > [% ELSE %] >- [% debarredcomment | html_line_break %] >+ [% debarredcomment.raw | html_line_break %] > [% END %] > </i> > [% END %] >@@ -215,35 +215,36 @@ function validate1(date) { > [% END %] > > <h3>[% UNLESS ( I ) %] >- [% title | html %] [% firstname | html %] [% END %] [% surname | html %] ([% cardnumber | html %])</h3> >+ [% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3> > <div class="yui-u first"> > <div id="patron-information" style="padding : .5em;"> > >- [% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames | html %]”[% END %] >+ [% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %] > > <div class = "address"> >- [% IF Koha.Preference( 'AddressFormat' ) %] >- [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] >- [% ELSE %] >- [% INCLUDE 'member-display-address-style-us.inc' %] >+ [% SWITCH Koha.Preference( 'AddressFormat' ) %] >+ [% CASE 'de' %] >+ [% INCLUDE 'member-display-address-style-de.inc' %] >+ [% CASE # us %] >+ [% INCLUDE 'member-display-address-style-us.inc' %] > [% END %] > </div> > > <div class="rows"> > <ol> > [% IF ( I ) %] >- [% IF ( phonepro ) %]<li><span class="label">Organization phone: </span><a href="tel:[% phonepro %]">[% phonepro | html %]</a></li>[% END %] >- [% IF ( emailpro ) %]<li class="email"><span class="label">Organization email: </span>[% emailpro | html %]</li>[% END %] >+ [% IF ( phonepro ) %]<li><span class="label">Organization phone: </span><a href="tel:[% phonepro %]">[% phonepro %]</a></li>[% END %] >+ [% IF ( emailpro ) %]<li class="email"><span class="label">Organization email: </span>[% emailpro %]</li>[% END %] > [% ELSE %] >- [% IF ( phone ) %]<li><span class="label">Primary phone: </span><a href="tel:[% phone %]">[% phone | html %]</a></li>[% END %] >- [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span><a href="tel:[% phonepro %]">[% phonepro | html %]</a></li>[% END %] >- [% IF ( mobile ) %]<li><span class="label">Other phone: </span><a href="tel:[% mobile %]">[% mobile | html %]</a></li>[% END %] >+ [% IF ( phone ) %]<li><span class="label">Primary phone: </span><a href="tel:[% phone %]">[% phone %]</a></li>[% END %] >+ [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span><a href="tel:[% phonepro %]">[% phonepro %]</a></li>[% END %] >+ [% IF ( mobile ) %]<li><span class="label">Other phone: </span><a href="tel:[% mobile %]">[% mobile %]</a></li>[% END %] > [% END %] > > [% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %] > [% UNLESS ( I ) %] >- [% IF ( email ) %]<li class="email"><span class="label">Primary email:</span><a title="[% email %]" href="mailto:[% email | url %]">[% email | html %]</a></li>[% END %] >- [% IF ( emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a title="[% emailpro %]" href="mailto:[% emailpro | url %]">[% emailpro | html %]</a></li>[% END %] >+ [% IF ( email ) %]<li class="email"><span class="label">Primary email:</span><a title="[% email %]" href="mailto:[% email | url %]">[% email %]</a></li>[% END %] >+ [% IF ( emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a title="[% emailpro %]" href="mailto:[% emailpro | url %]">[% emailpro %]</a></li>[% END %] > [% END %] > [% IF ( initials ) %]<li><span class="label">Initials: </span>[% initials %]</li>[% END %] > [% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth | $KohaDates %] ([% age %] years)</li>[% END %] >@@ -255,7 +256,7 @@ function validate1(date) { > <span class="label">Guarantees:</span> > <ul> > [% FOREACH guarantee IN guarantees %] >- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></li> >+ <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber %]">[% guarantee.firstname %] [% guarantee.surname %]</a></li> > [% END %] > </ul> > </li> >@@ -263,9 +264,9 @@ function validate1(date) { > <li> > <span class="label">Guarantor:</span> > [% IF guarantor.borrowernumber %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber %]">[% guarantor.firstname %] [% guarantor.surname %]</a> > [% ELSE %] >- [% guarantor.firstname | html %] [% guarantor.surname | html %] >+ [% guarantor.firstname %] [% guarantor.surname %] > [% END %] > </li> > [% END %] >@@ -289,15 +290,15 @@ function validate1(date) { > <fieldset class="brief"> > [% IF ( picture ) %] > <legend>Manage patron image</legend> >- <div class="hint">To update the image for [% title | html %] [% surname | html %], select a new image file and click 'Upload.' <br />Click the 'Delete' button to remove the current image. >+ <div class="hint">To update the image for [% title %] [% surname %], select a new image file and click 'Upload.' <br />Click the 'Delete' button to remove the current image. > [% ELSE %] > <legend>Upload patron image</legend> >- <div class="hint">[% title %] [% firstname | html %] [% surname | html %] does not currently have an image available. To import an image for [% title %] [% surname | html %], enter the name of an image file to upload. >+ <div class="hint">[% title %] [% firstname %] [% surname %] does not currently have an image available. To import an image for [% title %] [% surname %], enter the name of an image file to upload. > [% END %] > <br />Only PNG, GIF, JPEG, XPM formats are supported. > </div> > <input type="hidden" id="image" name="filetype" value="image" /> >- <input type="hidden" id="cardnumber" name="cardnumber" value="[% cardnumber | html %]" /> >+ <input type="hidden" id="cardnumber" name="cardnumber" value="[% cardnumber %]" /> > <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> > <ol> > <li> >@@ -483,15 +484,15 @@ function validate1(date) { > > <div id="patron-alternative-contact" style="padding-top: 1em;"> > <h3>Alternative contact</h3> >- <div class="rows"> <ol><li><span class="label">Surname: </span>[% altcontactsurname | html %]</li> >- <li><span class="label">First name: </span>[% altcontactfirstname | html %]</li> >- <li><span class="label">Address: </span>[% altcontactaddress1 | html %]</li> >- <li><span class="label">Address 2: </span>[% altcontactaddress2 | html %]</li> >- <li><span class="label">City: </span>[% altcontactaddress3 | html %]</li> >- [% IF ( altcontactstate ) %]<li><span class="label">State: </span>[% altcontactstate | html %]</li>[% END %] >- <li><span class="label">ZIP/Postal code: </span>[% altcontactzipcode | html %]</li> >- [% IF ( altcontactcountry ) %]<li><span class="label">Country: </span>[% altcontactcountry | html %]</li>[% END %] >- [% IF ( altcontactphone ) %]<li><span class="label">Phone: </span><a href="tel:[% altcontactphone | url %]">[% altcontactphone | html %]</a></li>[% END %] >+ <div class="rows"> <ol><li><span class="label">Surname: </span>[% altcontactsurname %]</li> >+ <li><span class="label">First name: </span>[% altcontactfirstname %]</li> >+ <li><span class="label">Address: </span>[% altcontactaddress1 %]</li> >+ <li><span class="label">Address 2: </span>[% altcontactaddress2 %]</li> >+ <li><span class="label">City: </span>[% altcontactaddress3 %]</li> >+ [% IF ( altcontactstate ) %]<li><span class="label">State: </span>[% altcontactstate %]</li>[% END %] >+ <li><span class="label">ZIP/Postal code: </span>[% altcontactzipcode %]</li> >+ [% IF ( altcontactcountry ) %]<li><span class="label">Country: </span>[% altcontactcountry %]</li>[% END %] >+ [% IF ( altcontactphone ) %]<li><span class="label">Phone: </span><a href="tel:[% altcontactphone | url %]">[% altcontactphone %]</a></li>[% END %] > </ol></div> > </div> > <div class="action"><a href="memberentry.pl?op=modify&borrowernumber=[% borrowernumber %]&step=2">Edit</a></div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >index cea5b0d..299b9d3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -59,7 +59,7 @@ > <td> > <a class="notice-title" data-noticeid="[% QUEUED_MESSAGE.message_id %]" href="#">[% QUEUED_MESSAGE.subject %]</a> > <div id="notice[% QUEUED_MESSAGE.message_id %]" class="notice"> >- [% QUEUED_MESSAGE.content FILTER html_line_break %] >+ [% QUEUED_MESSAGE.content.raw FILTER html_line_break %] > </div> > </td> > <td> >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 a6f1e8f..4904064 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 >@@ -58,9 +58,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 5f2e1d8..12e16ac 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -96,7 +96,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 f1bb9a1..e892f44 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 href=\"#\" class=\"btn btn-default btn-xs select_user\" data-borrowernumber=\"[% data.borrowernumber %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber %]\" name=\"borrower_data[% data.borrowernumber %]\" value=\"[% To.json(data) | html %]\" />" >+ "<a href=\"#\" class=\"btn btn-default btn-xs select_user\" data-borrowernumber=\"[% data.borrowernumber %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber %]\" name=\"borrower_data[% data.borrowernumber %]\" value=\"[% To.json(data) %]\" />" > }[% 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 666b59c..63e1c33 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 >@@ -14,15 +14,15 @@ > "<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 = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) invert_name = 1 %]</a><br />[% INCLUDE escape_address data = data %][% IF data.email %]<br/>Email: <a href='mailto:[% data.email | html %]'>[% data.email | html %]</a>[% END %]</span>", >+ "<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 = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) invert_name = 1 %]</a><br />[% INCLUDE escape_address data = data %][% IF data.email %]<br/>Email: <a href='mailto:[% data.email %]'>[% data.email %]</a>[% END %]</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": >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 26937d9..e739c55 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 >@@ -87,9 +87,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/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >index 5b078eb..ee3d616 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,19 +384,19 @@ > <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> >- <input type="text" name="barcode_height_scale" id="barcode_height_scale" size="2" value="[% barcode_height_scale |html %]" /> >+ <input type="text" name="barcode_height_scale" id="barcode_height_scale" size="2" value="[% barcode_height_scale %]" /> > </li> > <li> > <label for="barcode_width_scale">Scale width (relative to card): </label> >- <input type="text" name="barcode_width_scale" id="barcode_width_scale" size="2" value="[% barcode_width_scale |html %]" /> >+ <input type="text" name="barcode_width_scale" id="barcode_width_scale" size="2" value="[% barcode_width_scale %]" /> > </li> > <li> > <label for="barcode_type">Barcode type: </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 61c34d0..4d96869 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 = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(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 ad53c08..bcf52f0 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 >@@ -608,7 +608,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> >@@ -705,7 +705,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"> >@@ -721,7 +721,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 %]" /> >@@ -824,7 +824,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" id="limitselect"> > <input type="hidden" name="phase" value="Run this report"/> >@@ -847,7 +847,7 @@ canned reports and writing custom SQL reports.</p> > </select> > </form> > >-<div class="pages">[% pagination_bar %]</div> >+<div class="pages">[% pagination_bar.raw %]</div> > [% UNLESS ( errors ) %] > <table> > <tr>[% FOREACH header_ro IN header_row %]<th>[% header_ro.cell %]</th>[% END %]</tr> >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 1ae51ea..1836c52 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 >@@ -61,13 +61,13 @@ > <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> > [% FOREACH loopro IN mainloo.looprow %] > <tr> >- <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 || 0 %]</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 c6f9661..1041f63 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >@@ -9,7 +9,7 @@ > <script type='text/javascript'> > //<![CDATA[ > $(document).ready(function() { >- var columns_settings = [% ColumnsSettings.GetColumns( 'reports', 'lostitems', 'lostitems-table', 'json' ) %]; >+ var columns_settings = [% ColumnsSettings.GetColumns( 'reports', 'lostitems', 'lostitems-table', 'json' ).raw %]; > var lostitems_table = KohaTable("#lostitems-table", { > "dom": 'B<"clearfix">t', > "aaSorting": [], >@@ -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/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >index fc4eef7..d39db62 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >@@ -72,11 +72,11 @@ > [% UNLESS ( loop.odd ) %]<tr class="highlight"> > [% ELSE %] <tr> > [% END %] >- <td>[% ordersloo.budget_name |html %]</td> >- <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ordersloo.basketno %]"> [% ordersloo.basketno |html %]</a></td> >- <td>[% ordersloo.basketname |html %]</td> >+ <td>[% ordersloo.budget_name %]</td> >+ <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ordersloo.basketno %]"> [% ordersloo.basketno %]</a></td> >+ <td>[% ordersloo.basketname %]</td> > <td>[% ordersloo.authorisedbyname %]</td> >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber %]"> [% ordersloo.title |html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber %]"> [% ordersloo.title %]</a></td> > <td>[% ordersloo.currency %]</td> > <td>[% ordersloo.listprice | $Price %]</td> > <td>[% ordersloo.rrp | $Price %]</td> >@@ -86,8 +86,8 @@ > <td>[% ordersloo.total_ecost | $Price %]</td> > <td>[% ordersloo.entrydate %]</td> > <td>[% ordersloo.datereceived %]</td> >- <td>[% ordersloo.order_internalnote |html %]</td> >- <td>[% ordersloo.order_vendornote |html %]</td> >+ <td>[% ordersloo.order_internalnote %]</td> >+ <td>[% ordersloo.order_vendornote %]</td> > </tr> > [% END %] > </tbody> >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 ec9fda9..41a3e3b 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 >@@ -114,13 +114,13 @@ > <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> > [% FOREACH loopro IN mainloo.looprow %] > <tr> >- <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 3b9ac4c..cf612be 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 12b4e1b..5848ce0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -5,7 +5,7 @@ > [% USE ItemTypes %] > [% 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 %] >@@ -202,7 +202,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 %] >@@ -234,7 +234,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 %] >@@ -345,12 +345,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 %] > >@@ -624,7 +624,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 %] >@@ -703,7 +703,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 5373fc3..e0d73c0 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 %]" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Unapprove</a>[% ELSE %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&reviewid=[% review.reviewid %]" class="btn btn-default btn-xs"><i class="fa fa-check"></i> Approve</a>[% END %] >@@ -59,7 +59,7 @@ > </tr> > [% END %]</tbody> > </table> >- <div class="pages">[% pagination_bar %]</div> >+ <div class="pages">[% pagination_bar.raw %]</div> > [% ELSE %] > [% IF ( status ) %]<p><b>No comments have been approved.</b></p>[% ELSE %]<p><b>No comments to moderate.</b></p>[% END %] > [% 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/acqui-search-result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt >index ccd6cfa..6516237 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt >@@ -43,7 +43,7 @@ $(document).ready(function(){ > [% FOREACH loop_supplier IN loop_suppliers %] > <tr> > <td>[% loop_supplier.name %]</td> >- <td><a class="btn btn-default btn-xs select_vendor" href="#" data-vendorid="[% loop_supplier.aqbooksellerid %]" data-vendorname="[% loop_supplier.name |html%]">Choose</a></td> >+ <td><a class="btn btn-default btn-xs select_vendor" href="#" data-vendorid="[% loop_supplier.aqbooksellerid %]" data-vendorname="[% loop_supplier.name%]">Choose</a></td> > </tr> > [% END %] > </table> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >index c74bf15..f4c45e6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >@@ -130,7 +130,7 @@ > <ol> > <li> > <label for="name" class="required">Name: </label> >- <input type="text" name="name" id="name" value="[% field.name | html %]" class="required" required="required" /> >+ <input type="text" name="name" id="name" value="[% field.name %]" class="required" required="required" /> > <span class="required">Required</span> > </li> > <li> >@@ -142,7 +142,7 @@ > </li> > <li> > <label for="marcfield">Marc field: </label> >- <input type="text" name="marcfield" id="marcfield" value="[% field.marcfield| html %]" /> >+ <input type="text" name="marcfield" id="marcfield" value="[% field.marcfield %]" /> > </li> > <li> > <label for="searchable">Searchable: </label> >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 8a59bbe..d350a7a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >@@ -41,10 +41,10 @@ > > <ol> > <li><label for="title">Title:</label> >- <input id="title" type="text" name="title" size="15" value="[% title | html %]" /></li> >+ <input id="title" type="text" name="title" size="15" value="[% title %]" /></li> > > <li><label for="issn">ISSN:</label> >- <input id="issn" type="text" name="issn" size="15" value="[% issn | html %]" /></li> >+ <input id="issn" type="text" name="issn" size="15" value="[% issn %]" /></li> > [% IF can_change_library %] > <li><label for="branch">Library:</label> > <select id="branch" name="branch"> >@@ -68,11 +68,11 @@ > <p> > <b>[% numsubscription %]</b> subscription(s) > [% IF ( title ) %] >- with title matching <span class="title">[% title | html %]</class> >+ with title matching <span class="title">[% title %]</class> > [% IF ( issn ) %]and [% END %] > [% END %] > [% IF ( issn ) %] >- with ISSN matching <b>[% issn | html %]</b> >+ with ISSN matching <b>[% issn %]</b> > [% END %] > will expire before <b>[% date | $KohaDates %]</b> > </p> >@@ -92,7 +92,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 59beed1..cd39492 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -246,7 +246,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 2c5a14f..aaa0ed9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt >@@ -38,19 +38,19 @@ > </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 class="btn btn-default btn-xs select_title" data-biblionumber="[% resultsloo.biblionumber %]" href="#" title="Choose this record">Choose</a></td> > </tr> >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 5019820..d29a392 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 >@@ -27,7 +27,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 7478b11..ec15645 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 >@@ -19,7 +19,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"> > >@@ -27,7 +27,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" id="subscriptionid" 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 b0b32ad..e6359a6 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"> > $(document).ready(function(){ >@@ -36,7 +36,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"> > >@@ -46,9 +46,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 628276e..3aeadc4 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 >@@ -309,7 +309,7 @@ $(document).ready(function() { > </td> > [% IF ( routing ) %] > <td class="actions"> >- <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq.replace("'", "\\'") |html %] ([% serial.publisheddate | $KohaDates %])'); return false" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print list</a> >+ <a href="" onclick="print_slip([% serial.subscriptionid %], '[% serial.serialseq.replace("'", "\\'") %] ([% serial.publisheddate | $KohaDates %])'); return false" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print list</a> > </td> > [% END %] > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >index b678081..e183657 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >@@ -225,9 +225,9 @@ $(document).ready(function() { > <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li> > <div class="subfield_line" style="[% iteminformatio.hidden %]" id="subfield[% item.serialid %][% item.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]"> > [% IF (iteminformatio.mandatory) %] >- <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >+ <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib.raw %]</label> > [% ELSE %] >- <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >+ <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib.raw %]</label> > [% END %] > [% IF ( iteminformatio.marc_value.type == 'select' ) %] > <select name="field_value" size="1"> >@@ -240,7 +240,7 @@ $(document).ready(function() { > [% END %] > </select> > [% ELSE %] >- [% iteminformatio.marc_value %] >+ [% iteminformatio.marc_value.raw %] > [% END %] > <input type="hidden" name="itemid" value="[% item.itemid %]" /> > <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" /> >@@ -371,9 +371,9 @@ $(document).ready(function() { > <ol>[% FOREACH iteminformatio IN newserialloo.iteminformation %]<li> > <div class="subfield_line" style="[% iteminformatio.hidden %]" id="subfield[% newserialloo.serialid %][% newserialloo.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]"> > [% IF (iteminformatio.mandatory) %] >- <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >+ <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib.raw %]</label> > [% ELSE %] >- <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >+ <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib.raw %]</label> > [% END %] > [% IF ( iteminformatio.marc_value.type == 'select' ) %] > <select name="field_value" size="1"> >@@ -386,7 +386,7 @@ $(document).ready(function() { > [% END %] > </select> > [% ELSE %] >- [% iteminformatio.marc_value %] >+ [% iteminformatio.marc_value.raw %] > [% END %] > <input type="hidden" name="itemid" value="[% newserialloo.itemid %]" /> > <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" /> >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 1728fb0..4bf44d1 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 >@@ -66,29 +66,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> >@@ -178,7 +178,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 %] >@@ -299,7 +299,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 %] >@@ -374,29 +374,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 ff918b0..fa71450 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 >@@ -2,7 +2,7 @@ > [% USE Branches %] > > [% 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"> >@@ -513,12 +513,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" id="subscription_add_form" name="f" action="/cgi-bin/koha/serials/subscription-add.pl" class="validated"> > [% 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 2379369..abaa27a 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 = To.json(data.firstname) surname = To.json(data.surname) othernames = To.json(data.othernames) cardnumber = data.cardnumber invert_name = 1%]</a></span>", > "dt_branch": >- "[% data.branchname |html %]", >+ "[% data.branchname %]", > "dt_action": > "<a href=\"#\" class=\"add_user btn btn-default btn-xs\" data-borrowernumber=\"[% data.borrowernumber %]\" data-firstname=\"[% data.firstname %]\" data-surname=\"[% data.surname %]\">Add</a>" > }[% UNLESS loop.last %],[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt >index d55268a..d738b06 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt >@@ -7,9 +7,9 @@ > [% END %] > <div class="subfield_line" id="subfield[% iteminfo.serialid %][% iteminfo.countitems %][% iteminfo.subfield %][% iteminfo.random %]"> > [% IF (iteminfo.mandatory) %] >- <label class="required">[% iteminfo.subfield %] - [% iteminfo.marc_lib %]</label> >+ <label class="required">[% iteminfo.subfield %] - [% iteminfo.marc_lib.raw %]</label> > [% ELSE %] >- <label>[% iteminfo.subfield %] - [% iteminfo.marc_lib %]</label> >+ <label>[% iteminfo.subfield %] - [% iteminfo.marc_lib.raw %]</label> > [% END %] > [% IF ( iteminfo.marc_value.type == 'select' ) %] > <select name="field_value" size="1"> >@@ -22,7 +22,7 @@ > [% END %] > </select> > [% ELSE %] >- [% iteminfo.marc_value %] >+ [% iteminfo.marc_value.raw %] > [% END %] > <input type="hidden" name="itemid" value="1" /> > <input type="hidden" name="kohafield" value="[% iteminfo.kohafield %]" /> >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 7b1a934..70afca1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -210,13 +210,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> >@@ -227,7 +227,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> >@@ -329,15 +329,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> >@@ -545,12 +545,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 %] >@@ -697,12 +697,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 798e252..06b3d52 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >@@ -48,17 +48,17 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > > [% FOREACH title IN titles %] > <tr> >- <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/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >index 9b7ecd1..bd01ee9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -231,7 +231,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > [% END %] > [% IF ( pagination_bar ) %] > <div class="pages" id="pagination_top"> >- [% pagination_bar %] >+ [% pagination_bar.raw %] > </div> > [% END %] > [% IF ( tagloop ) %] >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 d66d15d..b92fc80 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 >@@ -101,7 +101,7 @@ $(document).ready(function(){ > <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 2fd838f..377eb90 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 >@@ -152,7 +152,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> >@@ -194,13 +194,14 @@ $(document).ready(function(){ > [% ELSE %] > <label for="tag_[% ite.tag %]_subfield_[% ite.subfield %]_[% ite.random %]"> > [% END %] >- [% ite.subfield %] - [% ite.marc_lib %] >+ [% ite.subfield %] - [% ite.marc_lib.raw %] > </label> > > [% SET mv = ite.marc_value %] > [% IF ( mv.type == 'select' ) -%] > <select name="[%- mv.name -%]" id="[%- mv.id -%]" size="1" tabindex="1" class="input_marceditor"> > [%- FOREACH aval IN mv.values %] >+ [% ite.subfield %] - > [% IF aval == mv.default %] > <option value="[%- aval -%]" selected="selected">[%- mv.labels.$aval -%]</option> > [% ELSE %] >@@ -218,7 +219,7 @@ $(document).ready(function(){ > [% ELSE %] > <a href="#" id="buttonDot_[% mv.id %]" class="buttonDot" title="Tag editor">...</a> > [% END %] >- [% mv.javascript %] >+ [% mv.javascript.raw %] > [% ELSIF ( mv.type == 'text' ) %] > <input type="text" tabindex="1" id="[%- mv.id -%]" name="field_value" class="input_marceditor" size="50" maxlength="255" value="[%- mv.value -%]" /> > [% ELSIF ( mv.type == 'hidden' ) %] >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 7962a9f..6f1e943 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 >@@ -175,7 +175,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 b682d55..309b1fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -261,29 +261,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/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >index dd1ae84..b9d9d0a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >@@ -162,7 +162,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> > [% END %] > </li> > <li><label for="content">News: </label> >- <textarea name="content" id="content" cols="75" rows="10">[% new_detail.content %]</textarea> >+ <textarea name="content" id="content" cols="75" rows="10">[% new_detail.content.raw %]</textarea> > </li> > </ol> > </fieldset> >@@ -254,7 +254,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> > <td>[% opac_new.title %]</td> > <td>[% opac_new.author_title %] [% opac_new.author_firstname %] [% opac_new.author_surname %]</td> > <td> >- [% opac_new.content %] >+ [% opac_new.content.raw %] > </td> > <td class="actions"> > <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=[% opac_new.idnew %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >index 958f810..b4e8718 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >@@ -67,8 +67,8 @@ > [% IF ( COUNT.TCOUNTS ) %]<li>[% COUNT.TCOUNTS %] image(s) moved into the database:</li>[% END %] > [% FOREACH filename IN COUNT.filenames %] > <tr> >- <td>[% filename.source | html %]</td> >- <td><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% filename.cardnumber | url %]">[% filename.cardnumber | html %]</a></td> >+ <td>[% filename.source %]</td> >+ <td><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% filename.cardnumber | url %]">[% filename.cardnumber %]</a></td> > <td> > [% IF ( filename.filerrors ) %] > [% FOREACH filerror IN filename.filerrors %] >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 e5706c6..9e2e78a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >@@ -84,12 +84,12 @@ > [% IF ( do_it ) %] > <input type="hidden" name="do_it" value="[% do_it %]" /> > [% END %] >- <input type="hidden" name="src" value="[% src | html %]" /> >+ <input type="hidden" name="src" value="[% src %]" /> > <fieldset class="rows"> > <ol> > <li> > <label for="user">Librarian:</label> >- <input type="text" name="user" id="user" value="[% user | html %]" /> >+ <input type="text" name="user" id="user" value="[% user %]" /> > </li> > <li> > <label for="modules">Modules:</label> >@@ -128,11 +128,11 @@ > </li> > <li> > <label for="object">Object: </label> >- <input type="text" id="object" name="object" value="[% object | html %]" /> >+ <input type="text" id="object" name="object" value="[% object %]" /> > </li> > <li> > <label for="info">Info:</label> >- <input type="text" id="info" name="info" value="[% info | html %]" /> >+ <input type="text" id="info" name="info" value="[% info %]" /> > </li> > <li> > <label for="interfaces">Interface:</label> >@@ -153,11 +153,11 @@ > </select> > </li> > <li> >- <label for="from"> Display from: </label> <input type="text" size="10" id="from" name="from" value="[% datefrom | html %]" class="datepickerfrom" /> >+ <label for="from"> Display from: </label> <input type="text" size="10" id="from" name="from" value="[% datefrom %]" class="datepickerfrom" /> > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > <li> >- <label for="to">Display to: </label> <input size="10" id="to" name="to" type="text" value="[% dateto | html %]" class="datepickerto" /> >+ <label for="to">Display to: </label> <input size="10" id="to" name="to" type="text" value="[% dateto %]" class="datepickerto" /> > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > </ol> >@@ -239,9 +239,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> > <td>[% PROCESS translate_log_interface interface=loopro.interface %]</td> >@@ -253,7 +253,7 @@ > <div class="dialog alert"> > No log found > [% IF ( CATALOGUING ) %] >- for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% object | url %]">Bibliographic record [% object | html %]</a> >+ for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% object | url %]">Bibliographic record [% object %]</a> > [% END %] > [% IF ( MEMBERS ) %] > for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% object | url %]">[% INCLUDE 'patron-title.inc' %]</a> >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..5239026 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/sendshelf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt >index e63d6f5..7f83b8b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt >@@ -1,5 +1,5 @@ > <SUBJECT> >-Your list: [% shelfname %] >+Your list: [% shelfname.raw %] > <END_SUBJECT> > > [% USE HtmlToText %] >@@ -8,7 +8,7 @@ Your list: [% shelfname %] > [% FILTER html2text %] > <p>Hi,</p> > >- <p>Here is your list called [% shelfname %], sent from our online catalog.</p> >+ <p>Here is your list called [% shelfname.raw %], sent from our online catalog.</p> > > <p>Please note that the attached file is a MARC bibliographic records file > which can be imported into personal bibliographic software like EndNote, >@@ -22,30 +22,30 @@ Your list: [% shelfname %] > [% FILTER html2text %] > > [% IF comment %] >- <p>[% comment %]</p> >+ <p>[% comment.raw %]</p> > <hr/> > [% END %] > <ol> > [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] > <li> > <span> >- [% BIBLIO_RESULT.title %] >+ [% BIBLIO_RESULT.title.raw %] > [% IF ( BIBLIO_RESULT.subtitle.size ) %] > [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %] >- [% subtitle.subfield %] >+ [% subtitle.subfield.raw %] > [% END %] > [% END %] > </span> > > <p> > [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] >- <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %] >+ <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author.raw %][% END %] > > [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %] > [% IF ( BIBLIO_RESULT.author ) %]; [% END %] > [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %] > [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %] >- [% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %] >+ [% MARCAUTHOR_SUBFIELDS_LOO.separator.raw %][% MARCAUTHOR_SUBFIELDS_LOO.value.raw %] > [% END %] > [% UNLESS ( loop.last ) %];[% END %] > [% END %] >@@ -56,7 +56,7 @@ Your list: [% shelfname %] > [% IF ( BIBLIO_RESULT.ISBN ) %] > <span> > ISBN: [% FOREACH isbn IN BIBLIO_RESULT.ISBN %] >- [% isbn %] >+ [% isbn.raw %] > [% UNLESS ( loop.last ) %]; [% END %] > [% END %] > </span><br/> >@@ -64,12 +64,12 @@ Your list: [% shelfname %] > > [% IF BIBLIO_RESULT.publishercode %] > <span> >- Published by: [% BIBLIO_RESULT.publishercode %] >+ Published by: [% BIBLIO_RESULT.publishercode.raw %] > [% IF ( BIBLIO_RESULT.publicationyear ) %] >- in [% BIBLIO_RESULT.publicationyear %] >+ in [% BIBLIO_RESULT.publicationyear.raw %] > [% END %] > [% IF ( BIBLIO_RESULT.pages ) %] >- , [% BIBLIO_RESULT.pages %] >+ , [% BIBLIO_RESULT.pages.raw %] > [% END %] > [% IF BIBLIO_RESULT.item('size') %] > , [% BIBLIO_RESULT.item('size') %] >@@ -79,55 +79,55 @@ Your list: [% shelfname %] > > [% IF BIBLIO_RESULT.collection %] > <span> >- Collection: [% BIBLIO_RESULT.seriestitle %] >+ Collection: [% BIBLIO_RESULT.seriestitle.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.subject ) %] > <span> >- Subject: [% BIBLIO_RESULT.subject %] >+ Subject: [% BIBLIO_RESULT.subject.raw %] > <span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.copyrightdate ) %] > <span> >- Copyright year: [% BIBLIO_RESULT.copyrightdate %] >+ Copyright year: [% BIBLIO_RESULT.copyrightdate.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.notes ) %] > <span> >- Notes : [% BIBLIO_RESULT.notes %] >+ Notes : [% BIBLIO_RESULT.notes.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.unititle ) %] > <span> >- Unified title: [% BIBLIO_RESULT.unititle %] >+ Unified title: [% BIBLIO_RESULT.unititle.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.serial ) %] > <span> >- Serial: [% BIBLIO_RESULT.serial %] >+ Serial: [% BIBLIO_RESULT.serial.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.dewey ) %] > <span> >- Dewey: [% BIBLIO_RESULT.dewey %] >+ Dewey: [% BIBLIO_RESULT.dewey.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.classification ) %] > <span> >- Classification: [% BIBLIO_RESULT.classification %] >+ Classification: [% BIBLIO_RESULT.classification.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.lccn ) %] > <span> >- LCCN: [% BIBLIO_RESULT.lccn %] >+ LCCN: [% BIBLIO_RESULT.lccn.raw %] > </span><br/> > [% END %] > [% IF ( BIBLIO_RESULT.url ) %] >@@ -139,17 +139,17 @@ Your list: [% shelfname %] > > [% IF ( OPACBaseURL ) %] > <p> >- In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %] >+ In online catalog: [% OPACBaseURL.raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %] > </p> > [% END %] > [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %] > <p>Items: > <ul> > [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]<li> >- [% ITEM_RESULT.branchname %] >- [% ITEM_RESULT.location %] >- [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %] >- [% ITEM_RESULT.barcode %] >+ [% ITEM_RESULT.branchname.raw %] >+ [% ITEM_RESULT.location.raw %] >+ [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber.raw %])[% END %] >+ [% ITEM_RESULT.barcode.raw %] > </li>[% END %] > </ul> > </p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt >index 814384f..8c44afa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt >@@ -6,7 +6,7 @@ > > [% IF ( SENT ) %] > <h3>Message sent</h3> >- <p>The list was sent to: [% email | html %]</p> >+ <p>The list was sent to: [% email %]</p> > <p><a class="close focus" href="#">Close window</a></p> > [% END %] > [% IF ( error ) %] >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 a276236..f421d31 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="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] >@@ -141,7 +141,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 %] >@@ -153,7 +153,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 %] >@@ -313,7 +313,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"> >@@ -374,8 +374,8 @@ function placeHold () { > <div class="yui-g"> > [% IF itemsloop %] > >- <h3>Contents of <i>[% shelf.shelfname | html %]</i></h3> >- <div class="pages">[% pagination_bar %]</div> >+ <h3>Contents of <i>[% shelf.shelfname %]</i></h3> >+ <div class="pages">[% pagination_bar.raw %]</div> > <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="listform" method="post" class="checkboxed"> > <input type="hidden" name="op" value="remove_biblios" /> > <input type="hidden" name="referer" value="view" /> >@@ -452,7 +452,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 ) %] >@@ -489,7 +489,7 @@ function placeHold () { > </tr> > [% END %]<!-- /itemsloop --> > </table> >- <div class="pages">[% pagination_bar %]</div> >+ <div class="pages">[% pagination_bar.raw %]</div> > </form> > > [% END %] >@@ -506,14 +506,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 | html %]" /> >+ <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 bf1305a..3695f88 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": >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc >index 536d500..48d6075 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc >@@ -11,24 +11,24 @@ > [% IF marcflavour == 'UNIMARC' %] > [% SWITCH type %] > [% CASE 'broader' %] >- <span class="BT"><abbr title="Broader Term">BT</abbr>: [% heading | html %]</span> >+ <span class="BT"><abbr title="Broader Term">BT</abbr>: [% heading %]</span> > [% CASE 'narrower' %] >- <span class="NT"><abbr title="Narrower Term">NT</abbr>: [% heading | html %]</span> >+ <span class="NT"><abbr title="Narrower Term">NT</abbr>: [% heading %]</span> > [% CASE 'seefrom' %] >- <span class="UF"><abbr title="Used For">UF</abbr>: [% heading | html %]</span> >+ <span class="UF"><abbr title="Used For">UF</abbr>: [% heading %]</span> > [% CASE 'seealso' %] >- <span class="RT"><abbr title="Related Term">RT</abbr>: [% heading | html %]</span> >+ <span class="RT"><abbr title="Related Term">RT</abbr>: [% 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 'narrower' %](Narrower heading) > [% CASE 'parent' %](Immediate parent body) > [% CASE %] >- [% IF type %]([% type | html %])[% END %] >+ [% IF type %]([% type %])[% END %] > [% END %] > </span> > [% END # / UNLESS seefrom %] >@@ -50,7 +50,7 @@ > [% END # / BLOCK showreference %] > > [% BLOCK authresult %] >- [% IF ( summary.label ) %][% summary.label | html %]:[% END %] >+ [% IF ( summary.label ) %][% summary.label %]:[% END %] > [% IF summary.summary %] > <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/opac-tmpl/bootstrap/en/includes/bodytag.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc >index 487d7e9..c2c6005 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc >@@ -1,15 +1,15 @@ > [% classprop = 'class="' %] > [% IF LoginBranchcode.defined %] >- [% classprop = classprop _ 'branch-' _ LoginBranchcode %] >+ [% classprop = classprop.raw _ 'branch-' _ LoginBranchcode %] > [% ELSE %] >- [% classprop = classprop _ 'branch-default' %] >+ [% classprop = classprop.raw _ 'branch-default' %] > [% END %] > [% IF bodyclass.defined %] >- [% classprop = classprop _ ' ' _ bodyclass %] >+ [% classprop = classprop.raw _ ' ' _ bodyclass %] > [% END %] >-[% classprop = classprop _ '"' %] >+[% classprop = classprop.raw _ '"' %] > > [% IF bodyid.defined %] > [% idprop = 'ID="' _ bodyid _ '" ' %] > [% END %] >-<body [%idprop%][% classprop %] > >+<body [%idprop%][% classprop.raw %] > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >index 5635cdc..251948c 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >@@ -34,11 +34,11 @@ > [% IF ( bidi ) %] > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" /> > [% END %] >-[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %] >+[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS.raw %]</style>[% END %] > [% IF SCO_login %] > [% SET SCOUserCSS = Koha.Preference('SCOUserCSS') %] > [% IF SCOUserCSS %] >- <style type="text/css">[% SCOUserCSS %]</style> >+ <style type="text/css">[% SCOUserCSS.raw %]</style> > [% END %] > [% END %] > <link rel="unapi-server" type="application/xml" title="unAPI" href="[% OPACBaseURL %]/cgi-bin/koha/unapi" /> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc >index e2d707b..06708d0 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc >@@ -27,7 +27,7 @@ > <div class="container-fluid"> > <div class="row-fluid"> > <div id="opacheader"> >- [% opacheader %] >+ [% opacheader.raw %] > </div> > </div> > </div> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index 10ea161..fc6fe01 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -42,7 +42,7 @@ > <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=2" tabindex="-1" role="menuitem"><strong>Public lists</strong></a></li> > [% SET number_of_public_shelves = 0 %] > [% FOREACH s IN some_public_shelves %] >- <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber %]&sortfield=[% s.sortfield %]" tabindex="-1" role="menuitem">[% s.shelfname |html %]</a></li> >+ <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber %]&sortfield=[% s.sortfield %]" tabindex="-1" role="menuitem">[% s.shelfname %]</a></li> > [% SET number_of_public_shelves = number_of_public_shelves + 1 %] > [% IF number_of_public_shelves >= 10 %][% LAST %][% END %] > [% END %] >@@ -59,7 +59,7 @@ > [% IF some_private_shelves.count %] > [% SET number_of_private_shelves = 0 %] > [% FOREACH s IN some_private_shelves %] >- <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber %]&sortfield=[% s.sortfield %]" tabindex="-1" role="menuitem">[% s.shelfname |html %]</a></li> >+ <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber %]&sortfield=[% s.sortfield %]" tabindex="-1" role="menuitem">[% s.shelfname %]</a></li> > [% SET number_of_private_shelves = number_of_private_shelves + 1 %] > [% IF number_of_private_shelves >= 10 %][% LAST %][% END %] > [% END %] >@@ -124,7 +124,7 @@ > <div class="container-fluid"> > <div class="row-fluid"> > <div id="opacheader"> >- [% opacheader %] >+ [% opacheader.raw %] > </div> > </div> > </div> >@@ -210,7 +210,7 @@ > <div class="input-append nolibrarypulldown"> > [% END %] > [% IF ( ms_value ) %] >- <input type="text" title="Type search term" class="transl1" id = "translControl1" name="q" value="[% ms_value |html %]" /><span id="translControl"></span> >+ <input type="text" title="Type search term" class="transl1" id = "translControl1" name="q" value="[% ms_value %]" /><span id="translControl"></span> > [% ELSE %] > <input type="text" title="Type search term" class="transl1" id = "translControl1" name="q" /><span id="translControl"></span> > [% END # /ms_value %] >@@ -261,7 +261,7 @@ > > </form> > [% ELSE # / Koha.Preference('OpacCustomSearch') == '' %] >- [% Koha.Preference('OpacCustomSearch') %] >+ [% Koha.Preference('OpacCustomSearch').raw %] > [% END # / Koha.Preference('OpacCustomSearch') == '' %] > </div> <!-- / .mastheadsearch --> > [% END # / UNLESS advsearch %] >@@ -325,7 +325,7 @@ > [% END %] > [% IF Koha.Preference( 'NoLoginInstructions' ) %] > <div id="nologininstructions-modal"> >- [% Koha.Preference( 'NoLoginInstructions' ) %] >+ [% Koha.Preference( 'NoLoginInstructions' ).raw %] > </div> > [% END %] > [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<div id="mpatronregistration"><p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p></div>[% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc >index 1926c1e..7737089 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc >@@ -1,5 +1,5 @@ >-<div id="opacnav">[% OpacNav %]</div> >+<div id="opacnav">[% OpacNav.raw %]</div> > [% IF IsPatronPage %] > <div id="usermenu">[% INCLUDE usermenu.inc %]</div> > [% END %] >-<div id="opacnavbottom">[% OpacNavBottom %]</div> >+<div id="opacnavbottom">[% OpacNavBottom.raw %]</div> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc >index aed68e5..fc17f53 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc >@@ -9,9 +9,9 @@ > [% FOREACH node IN tree %] > <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="opac-authoritiesdetail.pl?authid=[% node.authid %]" title="Term">[% node.value | html %]</a> >+ <a href="opac-authoritiesdetail.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/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >index bf221f4..0295eb8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -5,7 +5,7 @@ > <div class="row-fluid"> > <div class="span12"> > <div id="opaccredits" class="noprint"> >- [% opaccredits %] >+ [% opaccredits.raw %] > </div> > </div> > </div> >@@ -250,7 +250,7 @@ $(document).ready(function() { > [% IF ( OPACUserJS ) %] > <script type="text/javascript"> > //<![CDATA[ >- [% OPACUserJS %] >+ [% OPACUserJS.raw %] > //]]> > </script> > [% END %] >@@ -259,7 +259,7 @@ $(document).ready(function() { > [% IF ( SCOUserJS ) %] > <script type="text/javascript"> > //<![CDATA[ >- [% SCOUserJS %] >+ [% SCOUserJS.raw %] > //]]> > </script> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc >index 17fd0e8..c11eb87 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc >@@ -80,7 +80,7 @@ > <a id="furthersearches" class="dropdown-toggle" data-toggle="dropdown" href="#">More searches <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="furthersearches"> > <li><a href="#" class="menu-inactive">Search for this title in:</a></li> >- [% OPACSearchForTitleIn %] >+ [% OPACSearchForTitleIn.raw %] > </ul> > </div> > </div> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc >index e83243e..5c0b8ab 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc >@@ -39,10 +39,10 @@ > [% IF facet.active %] > [% SET local_url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %] > <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 %] >@@ -63,7 +63,7 @@ > > [% IF ( OPACResultsSidebar ) %] > <div id="opacresultssidebar"> >- [% OPACResultsSidebar %] >+ [% OPACResultsSidebar.raw %] > </div> > [% END %] > [% END # / IF opacfacets && facets_loop %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc >index f18c9ce..175c378 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc >@@ -2,17 +2,17 @@ > <div class="pagination pagination-small noprint"> > <ul> > [% IF ( previous_page_offset.defined ) %] >- <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% previous_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |html %][% END %]">« Previous</a></li> >+ <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]&offset=[% previous_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by %][% END %]">« Previous</a></li> > [% END %] > [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %] > [% IF ( PAGE_NUMBER.highlight ) %] > <li class="active"><a href="#">[% PAGE_NUMBER.pg %]</a></li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% PAGE_NUMBER.offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |html%][% END %]">[% PAGE_NUMBER.pg %]</a></li> >+ <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]&offset=[% PAGE_NUMBER.offset %][% IF ( sort_by ) %]&sort_by=[% sort_by%][% END %]">[% PAGE_NUMBER.pg %]</a></li> > [% END %] > [% END %] > [% IF ( next_page_offset ) %] >- <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&offset=[% next_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by |html %][% END %]">Next »</a></li> >+ <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]&offset=[% next_page_offset %][% IF ( sort_by ) %]&sort_by=[% sort_by %][% END %]">Next »</a></li> > [% END %] > </ul> > </div> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >index 161f279..df3f615 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >@@ -60,7 +60,7 @@ > [% IF ( BakerTaylorEnabled ) %] > [% bt_id = ( item.browser_normalized_upc || item.browser_normalized_isbn ) %] > [% IF ( bt_id ) %] >- <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |html %][% bt_id %]" /> >+ <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL %][% bt_id %]" /> > [% ELSE %] > <span class="no-image">No cover image available</span> > [% END %] >@@ -82,10 +82,10 @@ > <td class="top"> > [% item.itemcallnumber %] > <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber %]&shelfbrowse_itemnumber=[% item.itemnumber %]#shelfbrowser"> >- [% item.title |html %] >+ [% item.title %] > [% FOREACH subtitl IN item.subtitle %] > [% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] >- [% subtitl.subfield |html %] >+ [% subtitl.subfield %] > [% END %] > </a> > </td> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt >index c4413a7..fbabe1e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt >@@ -21,7 +21,7 @@ > </head> > <body id="opac_maintenance" class="opac"> > [% IF ( opacheader ) %] >- [% opacheader %] >+ [% opacheader.raw %] > [% END %] > <div class="container-fluid"> > <div class="row-fluid"> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt >index 108b9bf..f445c80 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt >@@ -21,7 +21,7 @@ > <div id="views"> > <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]">Normal view</a></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber %]">MARC view</a></span> <span class="view current-view"><span id="ISBDview">ISBD view</span></span></div> > >- <div id="isbdcontents">[% ISBD %]</div> >+ <div id="isbdcontents">[% ISBD.raw %]</div> > > </div> <!-- / #catalogue_detail_biblio --> > </div> <!-- / #usermarcdetail --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt >index 1f0680e..23734b9 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt >@@ -37,7 +37,7 @@ > <tr><th colspan="2">[% tab0X.tag %]</th></tr> > [% FOREACH subfiel IN tab0X.subfield %] > <tr> >- <td>[% subfiel.marc_lib %]</td> >+ <td>[% subfiel.marc_lib.raw %]</td> > <td>[% subfiel.marc_value %]</td> > </tr> > [% END %] >@@ -46,7 +46,7 @@ > <tr><th colspan="2">[% tab1X.tag %]</th></tr> > [% FOREACH subfiel IN tab1X.subfield %] > <tr> >- <td >[% subfiel.marc_lib %]</td> >+ <td >[% subfiel.marc_lib.raw %]</td> > <td >[% subfiel.marc_value %]</td> > </tr> > [% END %] >@@ -56,7 +56,7 @@ > <tr><th colspan="2">[% tab2X.tag %]</th></tr> > [% FOREACH subfiel IN tab2X.subfield %] > <tr> >- <td>[% subfiel.marc_lib %]</td> >+ <td>[% subfiel.marc_lib.raw %]</td> > <td>[% subfiel.marc_value %]</td> > </tr> > [% END %] >@@ -66,7 +66,7 @@ > <tr><th colspan="2">[% tab3X.tag %]</th></tr> > [% FOREACH subfiel IN tab3X.subfield %] > <tr> >- <td>[% subfiel.marc_lib %]</td> >+ <td>[% subfiel.marc_lib.raw %]</td> > <td>[% subfiel.marc_value %]</td> > </tr> > [% END %] >@@ -76,7 +76,7 @@ > <tr><th colspan="2" >[% tab4X.tag %]</th></tr> > [% FOREACH subfiel IN tab4X.subfield %] > <tr> >- <td>[% subfiel.marc_lib %]</td> >+ <td>[% subfiel.marc_lib.raw %]</td> > <td>[% subfiel.marc_value %]</td> > </tr> > [% END %] >@@ -86,7 +86,7 @@ > <tr><th colspan="2">[% tab5X.tag %]</th></tr> > [% FOREACH subfiel IN tab5X.subfield %] > <tr> >- <td>[% subfiel.marc_lib %]</td> >+ <td>[% subfiel.marc_lib.raw %]</td> > <td>[% subfiel.marc_value %]</td> > </tr> > [% END %] >@@ -96,7 +96,7 @@ > <tr><th colspan="2">[% tab6X.tag %]</th></tr> > [% FOREACH subfiel IN tab6X.subfield %] > <tr> >- <td>[% subfiel.marc_lib %]</td> >+ <td>[% subfiel.marc_lib.raw %]</td> > <td>[% subfiel.marc_value %]</td> > </tr> > [% END %] >@@ -106,7 +106,7 @@ > <tr><th colspan="2">[% tab7X.tag %]</th></tr> > [% FOREACH subfiel IN tab7X.subfield %] > <tr> >- <td>[% subfiel.marc_lib %]</td> >+ <td>[% subfiel.marc_lib.raw %]</td> > <td>[% subfiel.marc_value %]</td> > </tr> > [% END %] >@@ -116,7 +116,7 @@ > <tr><th colspan="2">[% tab8X.tag %]</th></tr> > [% FOREACH subfiel IN tab8X.subfield %] > <tr> >- <td>[% subfiel.marc_lib %]</td> >+ <td>[% subfiel.marc_lib.raw %]</td> > <td>[% subfiel.marc_value %]</td> > </tr> > [% END %] >@@ -126,7 +126,7 @@ > <tr><th colspan="2">[% tab9X.tag %]</th></tr> > [% FOREACH subfiel IN tab9X.subfield %] > <tr> >- <td>[% subfiel.marc_lib %]</td> >+ <td>[% subfiel.marc_lib.raw %]</td> > <td>[% subfiel.marc_value %]</td> > </tr> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt >index 164c750..b39e7d5 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt >@@ -12,13 +12,13 @@ > [% IF ( authorized ) %] > [% UNLESS ( newshelf ) %] > [% IF ( multiple ) %] >- <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 %] >@@ -30,17 +30,17 @@ > <label for="shelfnumber">Add to list:</label> <select name="shelfnumber" id="shelfnumber"> > [% 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 %] > </select> >@@ -87,7 +87,7 @@ > </select> > </fieldset> > [% FOREACH biblio IN biblios %] >- <input type="hidden" name="biblionumber" value="[% biblio.biblionumber | html%]" /> >+ <input type="hidden" name="biblionumber" value="[% biblio.biblionumber%]" /> > [% END %] > <fieldset class="action"> > <input type="hidden" name="sortfield" value="title" /> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >index 7aded0b..6de7978 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >@@ -49,7 +49,7 @@ > <p><b>[% Tag0X.tag %]</b></p> > <ul> > [% FOREACH subfiel IN Tag0X.subfield %] >- <li><b>[% subfiel.marc_lib %]:</b> >+ <li><b>[% subfiel.marc_lib.raw %]:</b> > [% IF subfiel.isurl %]<a href="[% subfiel.marc_value %]">[% subfiel.marc_value %]</a> > [% ELSE %][% subfiel.marc_value %][% END %]</li> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >index 6d941bf..e7f9304 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >@@ -154,7 +154,7 @@ > <input type="hidden" name="koha_login_context" value="opac" /> > <fieldset class="brief"> > [% 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 %] > <label for="userid">Login</label> > <input type="text" size="25" id="userid" name="userid" /> >@@ -169,7 +169,7 @@ > [% END %] > <div id="nologininstructions"> > [% IF Koha.Preference('NoLoginInstructions') %] >- [% Koha.Preference('NoLoginInstructions') %] >+ [% Koha.Preference('NoLoginInstructions').raw %] > [% ELSE %] > <h5>Don't have a password yet?</h5> > <p>If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >index e6d5e24..59c22fb 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >@@ -1,6 +1,31 @@ > [% USE Koha %] > [% PROCESS 'opac-authorities.inc' %] > [% PROCESS 'authorities-search-results.inc' %] >+[% BLOCK pagination %] >+ <div class="pagination"> >+ <ul> >+ [% IF ( displayprev ) %] >+ <li> >+ <a href="opac-authorities-home.pl?startfrom=[% startfromprev %]&[% FOREACH searchdat IN searchdata %][% searchdat.term %]=[% searchdat.val |url %]&[% END %]resultsperpage=[% resultsperpage %]&type=opac&op=do_search&authtypecode=[% authtypecode %]&orderby=[% orderby %]"> >+ « >+ </a> >+ </li> >+ [% END %] >+ [% FOREACH number IN numbers %] >+ [% IF ( number.highlight ) %] >+ <li class="active"><a href="#">[% number.number %]</a></li> >+ [% ELSE %] >+ <li><a href="opac-authorities-home.pl?startfrom=[% number.startfrom %]&[% FOREACH searchdat IN number.searchdata %][% searchdat.term %]=[% searchdat.val |url %]&[% END %]resultsperpage=[% resultsperpage %]&type=opac&op=do_search&authtypecode=[% authtypecode %]&orderby=[% orderby %]">[% number.number %]</a></li> >+ [% END %] >+ [% END %] >+ [% IF ( displaynext ) %] >+ <li> >+ <a href="opac-authorities-home.pl?startfrom=[% startfromnext %]&[% FOREACH searchdat IN searchdata %][% searchdat.term %]=[% searchdat.val |url %]&[% END %]&resultsperpage=[% resultsperpage %]&type=opac&op=do_search&authtypecode=[% authtypecode %]&orderby=[% orderby %]">»</a> >+ </li> >+ [% END %] >+ </ul> >+ </div> <!-- / #pages --> >+[% END %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › [% IF ( total ) %]Authority search result[% ELSE %]No results found[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -32,7 +57,7 @@ > <h1>Authority search results</h1> > > [% IF total %] >- <div class="pages">[% pagination_bar %]</div> >+ <div class="pages">[% pagination_bar.raw %]</div> > [% END %] > <div id="results"> > [% IF ( total ) %] >@@ -75,7 +100,7 @@ > </table> > </div> <!-- / .searchresults --> > >- <div class="pages">[% pagination_bar %]</div> >+ <div class="pages">[% pagination_bar.raw %]</div> > > [% END # / IF total %] > </div> <!-- / #userauthsearchresults --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt >index fa7e496..3975522 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt >@@ -66,14 +66,14 @@ > [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] > <h3> > [% IF ( print_basket ) %] >- [% BIBLIO_RESULT.title |html %] >- [% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield |html %] [% END %][% END %] >- [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author |html %][% END %] >+ [% BIBLIO_RESULT.title %] >+ [% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield %] [% END %][% END %] >+ [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %] > [% ELSE %] > <input type="checkbox" class="cb" value="[% BIBLIO_RESULT.biblionumber %]" name="bib[% BIBLIO_RESULT.biblionumber %]" id="bib[% BIBLIO_RESULT.biblionumber %]" onclick="selRecord(value,checked)" /> >- [% BIBLIO_RESULT.title |html %] >- [% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield |html %] [% END %][% END %] >- [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author |html %][% END %] >+ [% BIBLIO_RESULT.title %] >+ [% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield %] [% END %][% END %] >+ [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author %][% END %] > [% END # / IF print_basket %] > </h3> > <!-- COinS / Openurl --> >@@ -263,7 +263,7 @@ > </td> > [% END %] > <td> >- <a href="#" onclick="openBiblio('[% BIBLIO_RESULT.dest %]',[% BIBLIO_RESULT.biblionumber %])">[% BIBLIO_RESULT.title |html %][% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %][% subtitl.subfield |html %][% END %][% END %]</a> >+ <a href="#" onclick="openBiblio('[% BIBLIO_RESULT.dest %]',[% BIBLIO_RESULT.biblionumber %])">[% BIBLIO_RESULT.title %][% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %][% subtitl.subfield %][% END %][% END %]</a> > <!-- COinS / Openurl --> > <span class="Z3988" title="ctx_ver=Z39.88-2004&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&rft.au=[% BIBLIO_RESULT.author %]&rft.btitle=[% BIBLIO_RESULT.title |url %]&rft.date=[% BIBLIO_RESULT.publicationyear %]&rft.tpages=[% BIBLIO_RESULT.item('size') %]&rft.isbn=[% BIBLIO_RESULT.isbn |url %]&rft.aucorp=&rft.place=[% BIBLIO_RESULT.place %]&rft.pub=[% BIBLIO_RESULT.publisher |url %]&rft.edition=[% BIBLIO_RESULT.edition %]&rft.series=[% BIBLIO_RESULT.series %]&rft.genre="></span> > [% IF ( TagsInputEnabled && loggedinusername ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt >index be4776c..89d05d3 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt >@@ -19,7 +19,7 @@ > <p>You are not authorized to view this record.</p> > [% IF ( OpacSuppressionMessage ) %] > <div id="opacsuppressionmessage"> >- [% OpacSuppressionMessage %] >+ [% OpacSuppressionMessage.raw %] > </div> > [% END %] > </div> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt >index 635f8d8..ec6f92e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt >@@ -32,7 +32,7 @@ > <ul> > [% FOREACH HIERARCHY_LOO IN HIERARCHY_LOOP %] > <li> >- <a href="opac-browser.pl?level=[% HIERARCHY_LOO.level %]&filter=[% HIERARCHY_LOO.classification |uri %]">[% HIERARCHY_LOO.description |html %]</a> >+ <a href="opac-browser.pl?level=[% HIERARCHY_LOO.level %]&filter=[% HIERARCHY_LOO.classification |uri %]">[% HIERARCHY_LOO.description %]</a> > </li> > <li style="list-style-type: none;"> > [% END %] >@@ -43,9 +43,9 @@ > <td> > <p> > [% IF ( LEVEL_LOO.endnode ) %] >- <a href="opac-search.pl?q=Dewey-classification:[% LEVEL_LOO.classification |uri %]">[% LEVEL_LOO.description |html %]</a> >+ <a href="opac-search.pl?q=Dewey-classification:[% LEVEL_LOO.classification |uri %]">[% LEVEL_LOO.description %]</a> > [% ELSE %] >- <a href="opac-browser.pl?level=[% LEVEL_LOO.level %]&filter=[% LEVEL_LOO.classification |uri %]">[% LEVEL_LOO.description |html %]</a> >+ <a href="opac-browser.pl?level=[% LEVEL_LOO.level %]&filter=[% LEVEL_LOO.classification |uri %]">[% LEVEL_LOO.description %]</a> > [% END %] > </p> > <p style="font-size:0.75em"><i>([% LEVEL_LOO.number %] biblios)</i></p> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >index e4fb61f..00293c2 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >@@ -25,7 +25,7 @@ > [% SET protocol = "http://" %] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Details for: [% title |html %][% FOREACH subtitl IN subtitle %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] [% subtitl.subfield |html %][% END %]</title> >+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Details for: [% title %][% FOREACH subtitl IN subtitle %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] [% subtitl.subfield %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( bidi ) %] > [% BLOCK cssinclude %]<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left.css" />[% END %] >@@ -41,7 +41,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="#">Details for: [% title |html %][% FOREACH subtitl IN subtitle %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] [% subtitl.subfield |html %][% END %]</a></li> >+ <li><a href="#">Details for: [% title %][% FOREACH subtitl IN subtitle %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] [% subtitl.subfield %][% END %]</a></li> > </ul> > > <div class="container-fluid"> >@@ -89,12 +89,12 @@ > [% IF ( BakerTaylorEnabled && bt_id ) %] > [% IF BakerTaylorBookstoreURL %] > [% IF ( OPACURLOpenInNewWindow ) %] >- <a href="https://[% BakerTaylorBookstoreURL |html %][% bt_id %]" target="_blank" rel="noreferrer"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |html %][% bt_id %]" /></a> >+ <a href="https://[% BakerTaylorBookstoreURL %][% bt_id %]" target="_blank" rel="noreferrer"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL %][% bt_id %]" /></a> > [% ELSE %] >- <a href="https://[% BakerTaylorBookstoreURL |html %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |html %][% bt_id %]" /></a> >+ <a href="https://[% BakerTaylorBookstoreURL %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL %][% bt_id %]" /></a> > [% END %] > [% ELSE %] >- <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |html %][% bt_id %]" /> >+ <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL %][% bt_id %]" /> > [% END %] > [% END %] > </div><!-- / #bookcover --> >@@ -110,10 +110,10 @@ > [% IF ( ISBD ) %]<span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber %]">ISBD view</a></span>[% END %] > </div> > [% IF ( OPACXSLTDetailsDisplay ) %] >- [% XSLTBloc %] >+ [% XSLTBloc.raw %] > [% ELSE %] >- <h1 class="title">[% title |html %][% IF ( subtitle ) %] <span class="subtitle">[% FOREACH subtitl IN subtitle %][% subtitl.subfield |html %] [% END %]</span>[% END %]</h1> >- [% IF ( author ) %]<h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% author |url %]">[% author |html %]</a></h5>[% END %] >+ <h1 class="title">[% title %][% IF ( subtitle ) %] <span class="subtitle">[% FOREACH subtitl IN subtitle %][% subtitl.subfield %] [% END %]</span>[% END %]</h1> >+ [% IF ( author ) %]<h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% author |url %]">[% author %]</a></h5>[% END %] > > <span class="results_summary">[% UNLESS ( item_level_itypes ) %] > [ >@@ -214,7 +214,7 @@ > [% IF ( publishercode ) %] > <span class="results_summary publisher"><span class="label">Published by :</span> > <a href="/cgi-bin/koha/opac-search.pl?q=pb:[% publishercode |url %] "> >- [% publishercode |html %] >+ [% publishercode %] > </a> [% IF ( place ) %]([% place %])[% END %] [% IF ( publicationyear ) %], [% publicationyear %][% END %] > </span> > [% END %] >@@ -393,7 +393,7 @@ > <span class="label">Tags from this library:</span> > <ul id="tagslist"> > [% FOREACH TagLoo IN TagLoop %] >- <li><a href="/cgi-bin/koha/opac-search.pl?tag=[% TagLoo.term |url %]&q=[% TagLoo.term |url %]">[% TagLoo.term |html %]</a> <span class="weight">([% TagLoo.weight_total %])</span> >+ <li><a href="/cgi-bin/koha/opac-search.pl?tag=[% TagLoo.term |url %]&q=[% TagLoo.term |url %]">[% TagLoo.term %]</a> <span class="weight">([% TagLoo.weight_total %])</span> > [% IF ( loop.last ) %][% ELSE %], [% END %] > </li> > [% END %] >@@ -504,7 +504,7 @@ > [% IF ( BakerTaylorContentURL ) %] > <span class="results_summary"> > <span class="label">Enhanced content: </span> >- [% IF ( OPACURLOpenInNewWindow ) %]<a href="[% BakerTaylorContentURL |html %]" target="_blank" rel="noreferrer">Content Cafe</a>[% ELSE %]<a href="[% BakerTaylorContentURL |html %]">Content Cafe</a>[% END %] >+ [% IF ( OPACURLOpenInNewWindow ) %]<a href="[% BakerTaylorContentURL %]" target="_blank" rel="noreferrer">Content Cafe</a>[% ELSE %]<a href="[% BakerTaylorContentURL %]">Content Cafe</a>[% END %] > </span> > [% END # / IF BakerTaylorContentURL %] > >@@ -895,7 +895,7 @@ > <small>[% review.datereviewed | $KohaDates %]</small> > <p> > [% FILTER html_break %] >- [% review.review |html %] >+ [% review.review %] > [% END %] > <a href="#" onclick="Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=[% review.biblionumber %]&reviewid=[% review.reviewid %]');">Edit</a> > </p> >@@ -924,7 +924,7 @@ > [% END # / IF ShowReviewer != "none"%] > <p> > [% FILTER html_break %] >- [% review.review |html %] >+ [% review.review %] > [% END %] > </p> > </div> <!-- / .commentline --> >@@ -973,11 +973,11 @@ > [% UNLESS ( item_level_itypes ) %] > <td>[% XISBN.description %]</td> > [% END %] >- <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% XISBN.biblionumber %]">[% XISBN.title |html %]</a> >- [% IF ( XISBN.author ) %] by [% XISBN.author |html %][% END %] >+ <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% XISBN.biblionumber %]">[% XISBN.title %]</a> >+ [% IF ( XISBN.author ) %] by [% XISBN.author %][% END %] > [% IF ( XISBN.copyrightdate ) %] ©[% XISBN.copyrightdate %][% END %] > [% IF ( XISBN.publishercode ) %] >- <p>[% XISBN.publishercode |html %] >+ <p>[% XISBN.publishercode %] > [% IF ( XISBN.place ) %]([% XISBN.place %])[% END %] > [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear %][% END %] > [% IF ( XISBN.pages ) %][% XISBN.pages %] [% XISBN.illus %] [% XISBN.size %][% END %] >@@ -1067,7 +1067,7 @@ > <ul class="pg_menu clearfix"> > <li class="left_results"> > [% IF ( previousBiblionumber ) %] >- <a href="opac-detail.pl?biblionumber=[% previousBiblionumber %][% IF ( query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]" title="See: [% IF ( previousTitle ) %][% previousTitle |html %][% ELSE %]previous biblio[% END %]">« Previous</a> >+ <a href="opac-detail.pl?biblionumber=[% previousBiblionumber %][% IF ( query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]" title="See: [% IF ( previousTitle ) %][% previousTitle %][% ELSE %]previous biblio[% END %]">« Previous</a> > [% ELSE %] > <span>Previous</span> > [% END %] >@@ -1076,7 +1076,7 @@ > <li class="back_results"><a href="opac-search.pl?[% busc %]" title="Back to the results search list">Back to results</a></li> > <li class="right_results"> > [% IF ( nextBiblionumber ) %] >- <a href="opac-detail.pl?biblionumber=[% nextBiblionumber %][% IF ( query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]" title="See: [% IF ( nextTitle ) %][% nextTitle |html %][% ELSE %]next biblio[% END %]">Next »</a> >+ <a href="opac-detail.pl?biblionumber=[% nextBiblionumber %][% IF ( query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]" title="See: [% IF ( nextTitle ) %][% nextTitle %][% ELSE %]next biblio[% END %]">Next »</a> > [% ELSE %] > <span>Next</span> > [% END %] >@@ -1355,8 +1355,8 @@ > [% FOREACH listResult IN listResults %] > arrPagination[[% listResult.index %]] = { > url:"[% listResult.url %][% IF ( listResult.url && query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]", >- title:"[% listResult.title|remove('\n')|html %]", >- author:"[% listResult.author|html %]", >+ title:"[% listResult.title|remove('\n') %]", >+ author:"[% listResult.author %]", > biblionumber:[% listResult.biblionumber %] > }; > [% END %] >@@ -1467,7 +1467,7 @@ > "aaSorting": [[ default_order_index, 'asc' ]] > })); > >- [% IF ( query_desc ) %][% IF ( OpacHighlightedWords ) %]var query_desc = "[% query_desc |replace("'", "\'") |replace('\n', '\\n') |replace('\r', '\\r') |html %]"; >+ [% IF ( query_desc ) %][% IF ( OpacHighlightedWords ) %]var query_desc = "[% query_desc |replace("'", "\'") |replace('\n', '\\n') |replace('\r', '\\r') %]"; > q_array = query_desc.split(" "); > q_array = q_array.filter(function(n){ return n }); // Remove empty strings > highlightOn(); >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt >index f7eebd8..8e00cf3 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt >@@ -22,7 +22,7 @@ > [% END %] > </select> > <fieldset class="action"> >- <input type="hidden" name="bib_list" value="[% bib_list | html %]" /> >+ <input type="hidden" name="bib_list" value="[% bib_list %]" /> > <input type="submit" name="save" value="Go" /> > <a class="cancel close" href="#">Cancel</a> > </fieldset> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt >index 7824f31..6a30d33 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt >@@ -1,7 +1,7 @@ > [% USE Koha %] > [% IF ( fullpage ) %] > [% INCLUDE 'doc-head-open.inc' %] >- <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Download list [% shelf.shelfname | html %]</title>[% INCLUDE 'doc-head-close.inc' %] >+ <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Download list [% shelf.shelfname %]</title>[% INCLUDE 'doc-head-close.inc' %] > [% BLOCK cssinclude %][% END %] > </head> > [% INCLUDE 'bodytag.inc' bodyid='opac-downloadlist' %] >@@ -20,7 +20,7 @@ > [% END %] > <span class="divider">›</span> > </li> >- <li>Download list <i>[% shelf.shelfname | html %]</i></li> >+ <li>Download list <i>[% shelf.shelfname %]</i></li> > </ul> > <div class="container-fluid"> > <div class="row-fluid"> >@@ -47,7 +47,7 @@ > <p>Your download should begin automatically.</p> > </div> > [% ELSE %] >- <h1>Download list <i>[% shelf.shelfname | html %]</i></h1> >+ <h1>Download list <i>[% shelf.shelfname %]</i></h1> > <form method="post" action="/cgi-bin/koha/opac-downloadshelf.pl"> > <fieldset> > <select name="format" id="dlformat" required="required"> >@@ -57,16 +57,16 @@ > <option value="isbd">ISBD</option> > <option value="iso2709">MARC</option> > [% FOREACH csv_profile IN csv_profiles %] >- <option value="[% csv_profile.export_format_id |html %]">CSV - [% csv_profile.profile |html %]</option> >+ <option value="[% csv_profile.export_format_id %]">CSV - [% csv_profile.profile %]</option> > [% END %] > </select> > <span class="required">Required</span> > </fieldset> > > <fieldset class="action"> >- <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" /> >+ <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber %]" /> > <input type="submit" name="save" class="btn" value="Go" /> >- <a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | html %]" class="cancel close" data-dismiss="modal">Cancel</a> >+ <a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber %]" class="cancel close" data-dismiss="modal">Cancel</a> > </fieldset> > </form> > [% IF ( modal ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt >index 5985b93..a9222a8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Images for: [% biblio.title |html %]</title> >+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Images for: [% biblio.title %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% BLOCK cssinclude %] > <style type="text/css"> >@@ -120,7 +120,7 @@ > //<![CDATA[ > $(document).ready(function(){ > $("#largeCoverImg").attr("src","[% interface %]/[% theme %]/images/loading.gif"); >- showCover([% imagenumber | html %]); >+ showCover([% imagenumber %]); > }); > > function showCover(img) { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >index e1ce18c..155b5bf 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >@@ -44,7 +44,7 @@ > [% FOREACH koha_new IN koha_news %] > <div class="newsitem"> > <a name="newsitem[% koha_new.idnew %]"></a><h4 class="newsheader">[% koha_new.title %]</h4> >- <div class="newsbody">[% koha_new.content %]</div> >+ <div class="newsbody">[% koha_new.content.raw %]</div> > <div class="newsfooter">(published on [% koha_new.newdate %][% IF ( (newsdisp == 'opac' || newsdisp == 'both') && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title %] </span>[% koha_new.author_firstname %] [% koha_new.author_surname %][% END %])</div> > </div> > [% END %] >@@ -65,7 +65,7 @@ > </div> > [% END %] > >- [% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock %]</div>[% END %] >+ [% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock.raw %]</div>[% END %] > </div> <!-- / .span 7/9 --> > > [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %] >@@ -92,7 +92,7 @@ > [% END %] > [% IF Koha.Preference( 'NoLoginInstructions' ) %] > <div id="nologininstructions-main"> >- [% Koha.Preference( 'NoLoginInstructions' ) %] >+ [% Koha.Preference( 'NoLoginInstructions' ).raw %] > </div> > [% END %] > </form> >@@ -102,7 +102,7 @@ > [% END # /opacuserlogin %] > [% IF ( OpacNavRight ) %] > <div id="opacnavright"> >- [% OpacNavRight %] >+ [% OpacNavRight.raw %] > </div> > [% END # /OpacNavRight %] > </div> <!-- / .span3 --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >index 53401b9..7222baf 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >@@ -177,9 +177,9 @@ > <select id="borrower_branchcode" name="borrower_branchcode"> > [% FOREACH l IN libraries %] > [% IF l.branchcode == borrower.branchcode %] >- <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname %]</option> >+ <option value="[% l.branchcode %]" selected="selected">[% l.branchname %]</option> > [% ELSE %] >- <option value="[% l.branchcode | html %]">[% l.branchname %]</option> >+ <option value="[% l.branchcode %]">[% l.branchname %]</option> > [% END %] > [% END %] > </select> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-mymessages.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-mymessages.tt >index 53550af..ae5e1ca 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-mymessages.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-mymessages.tt >@@ -13,11 +13,11 @@ > <webMaster></webMaster> > [% FOREACH message_lis IN message_list %] > <item> >- <title>[% message_lis.subject |html %]</title> >- <link>[% message_lis.title |html %]</link> >- <description>[% message_lis.content |html %]</description> >- <pubDate>[% message_lis.time_queued |html %]</pubDate> >- <guid>[% message_lis.title |html %]</guid> >+ <title>[% message_lis.subject %]</title> >+ <link>[% message_lis.title %]</link> >+ <description>[% message_lis.content %]</description> >+ <pubDate>[% message_lis.time_queued %]</pubDate> >+ <guid>[% message_lis.title %]</guid> > </item> > [% END %] > </channel> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt >index aa18011..b66f9f1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt >@@ -7,9 +7,9 @@ > <description></description> > [% FOREACH newsitem IN koha_news %] > <item> >- <title>[% newsitem.title |html %]</title> >- <description>[% newsitem.content |html %]</description> >- <guid>[% OPACBaseURL %]/cgi-bin/koha/opac-main.pl#newsitem[% newsitem.idnew |html %]</guid> >+ <title>[% newsitem.title %]</title> >+ <description>[% newsitem.content.raw %]</description> >+ <guid>[% OPACBaseURL %]/cgi-bin/koha/opac-main.pl#newsitem[% newsitem.idnew %]</guid> > </item> > [% END %] > </channel> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >index 09f1a72..d23481e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >@@ -2,10 +2,10 @@ > [% USE Koha %] > [% IF ( opensearchdescription ) %] > <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> >- <ShortName>[% LibraryName |html %] Search</ShortName> >- <Description>Search the [% LibraryName |html %]</Description> >- <Tags>koha opac [% LibraryName |html %]</Tags> >- <Contact>[% KohaAdminEmailAddress |html %]</Contact> >+ <ShortName>[% LibraryName %] Search</ShortName> >+ <Description>Search the [% LibraryName %]</Description> >+ <Tags>koha opac [% LibraryName %]</Tags> >+ <Contact>[% KohaAdminEmailAddress %]</Contact> > <Url type="application/rss+xml" > template="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?q={searchTerms}&pw={startPage?}&format=rss2"/> > </OpenSearchDescription> >@@ -18,23 +18,23 @@ > xmlns:dc="http://purl.org/dc/elements/1.1/" > xmlns:atom="http://www.w3.org/2005/Atom"> > <channel> >- <title><![CDATA[[% LibraryName |html %] Search [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc |html %]'[% END %]]]></title> >- <link>[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&format=rss2</link> >- <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&sort_by=[% sort_by |html %]&format=rss2"/> >- <description><![CDATA[ Search results [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc |html %]'[% END %] at [% LibraryName |html %]]]></description> >+ <title><![CDATA[[% LibraryName %] Search [% IF ( query_desc ) %]for '[% query_desc %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc %]'[% END %]]]></title> >+ <link>[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]&format=rss2</link> >+ <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]&sort_by=[% sort_by %]&format=rss2"/> >+ <description><![CDATA[ Search results [% IF ( query_desc ) %]for '[% query_desc %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc %]'[% END %] at [% LibraryName %]]]></description> > <opensearch:totalResults>[% total %]</opensearch:totalResults> > <opensearch:startIndex>[% offset %]</opensearch:startIndex> > [% IF ( results_per_page ) %] >- <opensearch:itemsPerPage>[% results_per_page |html%]</opensearch:itemsPerPage> >+ <opensearch:itemsPerPage>[% results_per_page%]</opensearch:itemsPerPage> > [% ELSE %] > <opensearch:itemsPerPage>20</opensearch:itemsPerPage> > [% END %] > [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] >- <atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi |html %][% SEARCH_RESULT.limit_cgi |html %]&sort_by=[% SEARCH_RESULT.sort_by |html %]&format=opensearchdescription"/> >+ <atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi %][% SEARCH_RESULT.limit_cgi %]&sort_by=[% SEARCH_RESULT.sort_by %]&format=opensearchdescription"/> > <opensearch:Query role="request" searchTerms="[% SEARCH_RESULT.query_desc |url %][% SEARCH_RESULT.limit_desc |url %]" startPage="[% SEARCH_RESULT.page %]" /> > <item> >- <title>[% SEARCH_RESULT.title |html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield |html %][% END %]</title> >- <dc:identifier>ISBN [% SEARCH_RESULT.isbn |html %]</dc:identifier> >+ <title>[% SEARCH_RESULT.title %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield %][% END %]</title> >+ <dc:identifier>ISBN [% SEARCH_RESULT.isbn %]</dc:identifier> > <link>[% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %][% OPACBaseURL %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% ELSE %][% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %][% OPACBaseURL %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% ELSE %][% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% END %][% END %]</link> > <description><![CDATA[ > [% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]<img src="https://images-na.ssl-images-amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn %].01.TZZZZZZZ.jpg" alt="" />[% END %][% END %] >@@ -44,14 +44,14 @@ > [% END %][% END %][% END %] > > [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] >-[% IF ( BakerTaylorEnabled ) %][% IF bt_id %]<a href="https://[% BakerTaylorBookstoreURL |html %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |html %][% bt_id %]" /></a>[% END %][% END %] >- <p>[% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author |html %]. [% END %] >- [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place |html %] [% END %][% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode |html %][% END %][% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear |html %] >- [% ELSE %][% IF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate |html %][% END %][% END %] >- [% IF ( SEARCH_RESULT.pages ) %]. [% SEARCH_RESULT.pages |html %][% END %] >- [% IF ( SEARCH_RESULT.notes ) %], [% SEARCH_RESULT.notes |html %][% END %] >- [% IF ( SEARCH_RESULT.size ) %] [% SEARCH_RESULT.size |html %]. [% END %] >- [% IF ( SEARCH_RESULT.isbn ) %] [% SEARCH_RESULT.isbn |html %][% END %] >+[% IF ( BakerTaylorEnabled ) %][% IF bt_id %]<a href="https://[% BakerTaylorBookstoreURL %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL %][% bt_id %]" /></a>[% END %][% END %] >+ <p>[% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author %]. [% END %] >+ [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place %] [% END %][% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode %][% END %][% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear %] >+ [% ELSE %][% IF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate %][% END %][% END %] >+ [% IF ( SEARCH_RESULT.pages ) %]. [% SEARCH_RESULT.pages %][% END %] >+ [% IF ( SEARCH_RESULT.notes ) %], [% SEARCH_RESULT.notes %][% END %] >+ [% IF ( SEARCH_RESULT.size ) %] [% SEARCH_RESULT.size %]. [% END %] >+ [% IF ( SEARCH_RESULT.isbn ) %] [% SEARCH_RESULT.isbn %][% END %] > </p> > [% IF Koha.Preference( 'RequestOnOpac' ) == 1 %] > <p><a href="[% OPACBaseURL %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold on <i>[% SEARCH_RESULT.title %]</i></a></p> >@@ -67,12 +67,12 @@ > [% IF ( atom ) %] > <feed xmlns="http://www.w3.org/2005/Atom" > xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"> >- <id>[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&format=atom</id> >- <title>[% LibraryName |html %] Search [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc |html %]'[% END %]</title> >- <link href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&format=rss2"/> >+ <id>[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]&format=atom</id> >+ <title>[% LibraryName %] Search [% IF ( query_desc ) %]for '[% query_desc %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc %]'[% END %]</title> >+ <link href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]&format=rss2"/> > <updated>[% timestamp %]</updated> > <author> >- <name>[% LibraryName |html %]</name> >+ <name>[% LibraryName %]</name> > </author> > <!-- <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id> --> > <opensearch:totalResults>[% total %]</opensearch:totalResults> >@@ -82,7 +82,7 @@ > [% ELSE %] > <opensearch:itemsPerPage>20</opensearch:itemsPerPage> > [% END %] >- <opensearch:Query role="request" searchTerms="[% query_desc |html %] [% limit_desc |html %]" startPage="[% page |html %]" /> >+ <opensearch:Query role="request" searchTerms="[% query_desc %] [% limit_desc %]" startPage="[% page %]" /> > <link rel="alternate" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=[% page %]&format=atom" type="application/atom+xml"/> > <link rel="self" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]&format=atom" type="application/atom+xml"/> > <link rel="first" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=1&format=atom" type="application/atom+xml"/> >@@ -93,7 +93,7 @@ > > [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] > <entry> >- <title>[% SEARCH_RESULT.title |html %]</title> >+ <title>[% SEARCH_RESULT.title %]</title> > <link href="[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]"/> > <!-- <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id> --> > <updated>[% SEARCH_RESULT.timestamp %]</updated> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >index 5f5a836..0acd934 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › OverDrive search for '[% q | html %]'</title> >+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › OverDrive search for '[% q %]'</title> > [% INCLUDE 'doc-head-close.inc' %] > [% BLOCK cssinclude %] > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/jquery.rating.css" /> >@@ -17,7 +17,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="#">OverDrive search for '[% q | html %]'</a></li> >+ <li><a href="#">OverDrive search for '[% q %]'</a></li> > </ul> > > <div class="container-fluid"> >@@ -29,7 +29,7 @@ > </div> > <div class="span10"> > <div id="overdrive-results-content" class="maincontent searchresults"> >- <h1>OverDrive search for '[% q | html %]'</h1> >+ <h1>OverDrive search for '[% q %]'</h1> > <div id="breadcrumbs"> > <p></p> > </div> >@@ -60,7 +60,7 @@ > <script type="text/javascript" src="[% interface %]/[% theme %]/js/overdrive.js"></script> > <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.rating.js"></script> > <script type="text/javascript"> >-var querystring = "[% q |replace( "'", "\'" ) |replace( '\n', '\\n' ) |replace( '\r', '\\r' ) |html %]"; >+var querystring = "[% q |replace( "'", "\'" ) |replace( '\n', '\\n' ) |replace( '\r', '\\r' ) %]"; > var results_per_page = [% OPACnumSearchResults %]; > > function fetch_availability( prod, $tr ) { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >index c4a7419..7c73fdd 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >@@ -105,7 +105,7 @@ > [% IF BakerTaylorEnabled %] > [% bt_id = ( issue.normalized_upc || issue.normalized_isbn ) %] > [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL |html %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |html %][% bt_id %]" /></a> >+ <a href="https://[% BakerTaylorBookstoreURL %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL %][% bt_id %]" /></a> > [% ELSE %] > <span class="no-image">No cover image available</span> > [% END %] >@@ -121,11 +121,11 @@ > </td> > <td> > [% IF issue.BiblioDefaultViewmarc %] >- <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title |html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield %][% END %][% END %]</a> >+ <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield %][% END %][% END %]</a> > [% ELSIF issue.BiblioDefaultViewisbd %] >- <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title |html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield %][% END %][% END %]</a> >+ <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield %][% END %][% END %]</a> > [% ELSE %] >- <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title |html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield %][% END %][% END %]</a> >+ <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield %][% END %][% END %]</a> > [% END %] > <span class="item-details">[% issue.author %]</span> > </td> >@@ -150,7 +150,7 @@ > [% END %] > </td> > [% IF OPACMySummaryHTML %] >- <td>[% issue.MySummaryHTML %]</td> >+ <td>[% issue.MySummaryHTML.raw %]</td> > [% END %] > </tr> > [% END # / FOREACH issue %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt >index 7ce46b7..d69685f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt >@@ -55,7 +55,7 @@ > <p id="patron-instructions">For your convenience, the login box on this page has been pre-filled with this data. Please log in[% IF OpacPasswordChange %] and change your password[% END %].</p> > [% END %] > >- <div id="PatronSelfRegistrationAdditionalInstructions">[% PatronSelfRegistrationAdditionalInstructions %]</div> >+ <div id="PatronSelfRegistrationAdditionalInstructions">[% PatronSelfRegistrationAdditionalInstructions.raw %]</div> > </div> > > </div> <!-- / .span7/9 --> >@@ -94,7 +94,7 @@ > [% END # /opacuserlogin %] > [% IF ( OpacNavRight ) %] > <div id="opacnavright"> >- [% OpacNavRight %] >+ [% OpacNavRight.raw %] > </div> > [% END # /OpacNavRight %] > </div> <!-- / .span3 --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >index c0dd300..0e496d7 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >@@ -152,7 +152,7 @@ > [% END # / bibitemloo.holdable %] > > <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% bibitemloo.biblionumber %]"> >- [% bibitemloo.title |html %] >+ [% bibitemloo.title %] > [% IF ( bibitemloo.subtitle ) %] > [% FOREACH subtitl IN bibitemloo.subtitle %] > [% subtitl.subfield %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt >index fbb63a2..4b84ba3 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt >@@ -38,7 +38,7 @@ > [% IF Koha.Preference('RestrictedPageTitle') %] > <h1>[% Koha.Preference('RestrictedPageTitle') %]</h1> > [% END %] >- [% Koha.Preference('RestrictedPageContent') %] >+ [% Koha.Preference('RestrictedPageContent').raw %] > </div> > </div> <!-- / .span10 --> > </div> <!-- / .row-fluid --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt >index 8595f9a..66be780 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt >@@ -2,14 +2,14 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › > [% IF ( searchdesc ) %] >- Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %] >+ 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' %] > [% BLOCK cssinclude %][% END %] > <link rel="alternate" type="application/rss+xml" title="Koha - RSS" >-href="/cgi-bin/koha/opac-rss.pl?[% query_cgi %][% limit_cgi |html %]" /> >+href="/cgi-bin/koha/opac-rss.pl?[% query_cgi %][% limit_cgi %]" /> > > </head> > [% INCLUDE 'bodytag.inc' bodyid='results-grouped' %] >@@ -20,7 +20,7 @@ href="/cgi-bin/koha/opac-rss.pl?[% query_cgi %][% limit_cgi |html %]" /> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> > <li> > [% IF ( searchdesc ) %] >- <a href="#">Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]</a> >+ <a href="#">Results of search [% IF ( query_desc ) %]for '[% query_desc %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc %]'[% END %]</a> > [% ELSE %] > <a href="#">You did not specify any search criteria.</a> > [% END %] >@@ -104,7 +104,7 @@ href="/cgi-bin/koha/opac-rss.pl?[% query_cgi %][% limit_cgi |html %]" /> > [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] > <tr> > <td> >- <a href="/cgi-bin/koha/opac-search.pl?q=[% SEARCH_RESULT.scan_use |url %]"[% SEARCH_RESULT.title |url %]"">[% SEARCH_RESULT.title |html %]</a> >+ <a href="/cgi-bin/koha/opac-search.pl?q=[% SEARCH_RESULT.scan_use |url %]"[% SEARCH_RESULT.title |url %]"">[% SEARCH_RESULT.title %]</a> > </td> > <td> > [% FOREACH subtitl IN SEARCH_RESULT.subtitle %] >@@ -122,10 +122,10 @@ href="/cgi-bin/koha/opac-rss.pl?[% query_cgi %][% limit_cgi |html %]" /> > <form action="/cgi-bin/koha/opac-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 %] > >@@ -288,7 +288,7 @@ $(document).ready(function(){ > }); > $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">Clear all</a>"); > $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">Select all</a>"); >- $("span.addto").html("<label for=\"addto\">Add to: </label><select name=\"addto\" id=\"addto\"><option value=\"\"></option>[% IF Koha.Preference( 'opacbookbag' ) == 1 %]<option value=\"addtocart\">Cart</option>[% END %][% IF Koha.Preference( 'virtualshelves' ) == 1 %][% IF ( loggedinusername ) %]<optgroup label=\"Lists:\">[% IF ( barshelves ) %][% FOREACH barshelvesloo IN barshelvesloop %][% IF ( category == 1 ) %]<option id=\"s[% barshelvesloo.shelfnumber %]\" value=\"addtolist\">[% barshelvesloo.shelfname | html %]</option>[% END %][% END %][% END %]<option value=\"newlist\">[ New list ]</option></optgroup>[% ELSE %]<option value=\"newlist\">List</option>[% END %][% END %]</select> <input type=\"submit\" class=\"submit\" value=\"Save\" />"); >+ $("span.addto").html("<label for=\"addto\">Add to: </label><select name=\"addto\" id=\"addto\"><option value=\"\"></option>[% IF Koha.Preference( 'opacbookbag' ) == 1 %]<option value=\"addtocart\">Cart</option>[% END %][% IF Koha.Preference( 'virtualshelves' ) == 1 %][% IF ( loggedinusername ) %]<optgroup label=\"Lists:\">[% IF ( barshelves ) %][% FOREACH barshelvesloo IN barshelvesloop %][% IF ( category == 1 ) %]<option id=\"s[% barshelvesloo.shelfnumber %]\" value=\"addtolist\">[% barshelvesloo.shelfname %]</option>[% END %][% END %][% END %]<option value=\"newlist\">[ New list ]</option></optgroup>[% ELSE %]<option value=\"newlist\">List</option>[% END %][% END %]</select> <input type=\"submit\" class=\"submit\" value=\"Save\" />"); > $("#addto").change(function(){ > cartList(); > }); >@@ -323,7 +323,7 @@ $(document).ready(function(){ > return false; > }); > [% IF ( query_desc ) %] >- var query_desc = "[% query_desc |replace("'", "\'") |replace('\n', '\\n') |replace('\r', '\\r') |html %]"; >+ var query_desc = "[% query_desc |replace("'", "\'") |replace('\n', '\\n') |replace('\r', '\\r') %]"; > q_array = query_desc.split(" "); > // ensure that we don't have "" at the end of the array, which can > // break the highlighter >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >index 2d85671..b14fe08 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -5,7 +5,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › > [% IF ( searchdesc ) %] >- Results of search [% IF ( query_desc ) %]for '[% query_desc | html%]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %] >+ 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> >@@ -16,7 +16,7 @@ > [% END %] > [% END %] > >-<link rel="alternate" type="application/rss+xml" title="[% LibraryName |html %] Search RSS feed" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |uri %]&count=[% countrss |uri %]&sort_by=acqdate_dsc&format=rss2" /> >+<link rel="alternate" type="application/rss+xml" title="[% LibraryName %] Search RSS feed" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |uri %]&count=[% countrss |uri %]&sort_by=acqdate_dsc&format=rss2" /> > </head> > > [% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %] >@@ -27,7 +27,7 @@ > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> > <li> > [% IF ( searchdesc ) %] >- <a href="#">Results of search [% IF ( query_desc ) %]for '[% query_desc | html%]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]</a> >+ <a href="#">Results of search [% IF ( query_desc ) %]for '[% query_desc%]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc %]'[% END %]</a> > [% ELSE %] > <a href="#">You did not specify any search criteria</a> > [% END %] >@@ -53,7 +53,7 @@ > [% END %] > [% IF ( OPACNoResultsFound ) %] > <div id="noresultsfound"> >- [% OPACNoResultsFound %] >+ [% OPACNoResultsFound.raw %] > </div> > [% END %] > </div> <!-- / .span12 --> >@@ -77,7 +77,7 @@ > > [% IF ( searchdesc ) %] > <p id="numresults"> >- [% IF ( total ) %]<strong>Your search returned [% total |html %] results.</strong> >+ [% IF ( total ) %]<strong>Your search returned [% total %] results.</strong> > [% IF ( related ) %] > (related searches: > [% FOREACH relate IN related %] >@@ -85,7 +85,7 @@ > [% END %] > ). > [% END %] >- <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |html | url %]&count=[% countrss |html %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink noprint"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> >+ <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |html | url %]&count=[% countrss %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink noprint"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> > [% END # / IF total %] > </p> > [% END # / IF searchdesc %] >@@ -128,10 +128,10 @@ > <form action="/cgi-bin/koha/opac-search.pl" method="get" name="bookbag_form" id="bookbag_form" class="checkboxed"> > [% 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 # IF /searchdesc %] > >@@ -275,7 +275,7 @@ > [% IF ( BakerTaylorEnabled && !BakerTaylorBookstoreURL ) %] > [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] > [% IF ( bt_id ) %] >- <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |html %][% bt_id %]" /> >+ <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL %][% bt_id %]" /> > [% ELSE %] > <span class="no-image">No cover image available</span> > [% END %] >@@ -285,8 +285,8 @@ > [% IF ( BakerTaylorEnabled && BakerTaylorBookstoreURL ) %] > [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] > [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL |html %][% bt_id %]"> >- <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |html %][% bt_id %]" /> >+ <a href="https://[% BakerTaylorBookstoreURL %][% bt_id %]"> >+ <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL %][% bt_id %]" /> > </a> > [% ELSE %] > <span class="no-image">No cover image available</span> >@@ -310,7 +310,7 @@ > [% END %] > > [% IF ( OPACXSLTResultsDisplay ) %] >- [% SEARCH_RESULT.XSLTResultsRecord %] >+ [% SEARCH_RESULT.XSLTResultsRecord.raw %] > [% ELSE %] > [% IF ( BiblioDefaultViewmarc ) %] > <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]" title="View details for this title"> >@@ -323,13 +323,13 @@ > [% END %] > > [% IF ( SEARCH_RESULT.title ) %] >- [% SEARCH_RESULT.title |html %] >+ [% SEARCH_RESULT.title %] > [% ELSE %] > No title > [% END %] > > [% FOREACH subtitl IN SEARCH_RESULT.subtitle %] >- , [% subtitl.subfield|html %] >+ , [% subtitl.subfield %] > [% END %]</a> > > [% IF ( SEARCH_RESULT.author ) %] >@@ -341,7 +341,7 @@ > <span class="results_summary publisher"> > <span class="label">Publication:</span> > [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place %] [% END %] >- [% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode|html %][% END %] >+ [% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode %][% END %] > [% IF ( SEARCH_RESULT.publicationyear ) %] > [% SEARCH_RESULT.publicationyear %] > [% ELSE %] >@@ -350,7 +350,7 @@ > [% END %] > [% END %] > [% IF ( SEARCH_RESULT.pages ) %]. [% SEARCH_RESULT.pages %][% END %] >- [% IF ( SEARCH_RESULT.notes ) %], [% SEARCH_RESULT.notes|html %][% END %] >+ [% IF ( SEARCH_RESULT.notes ) %], [% SEARCH_RESULT.notes %][% END %] > [% IF ( SEARCH_RESULT.size ) %] [% SEARCH_RESULT.size %][% END %] > [% IF ( SEARCH_RESULT.timestamp ) %] <i>(modified on [% SEARCH_RESULT.timestamp %])</i>[% END %] > </span> >@@ -761,7 +761,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 %] >@@ -773,7 +773,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 %] >@@ -871,8 +871,8 @@ $(document).ready(function(){ > [% END %] > > [% IF ( query_desc ) %] >- var query_desc = "[% query_desc |replace("'", "\'") |replace('\n', '\\n') |replace('\r', '\\r') |html %]"; >- var querystring = "[% querystring |replace("'", "\'") |replace('\n', '\\n') |replace('\r', '\\r') |html %]"; >+ var query_desc = "[% query_desc |replace("'", "\'") |replace('\n', '\\n') |replace('\r', '\\r') %]"; >+ var querystring = "[% querystring |replace("'", "\'") |replace('\n', '\\n') |replace('\r', '\\r') %]"; > [% IF ( OpacHighlightedWords ) %] > q_array = query_desc.split(" "); > // ensure that we don't have "" at the end of the array, which can >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt >index 7e537b6..ac72d10 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Comments on [% title |html %]</title> >+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Comments on [% title %]</title> > <style type="text/css"> > #custom-doc { width:37.08em;*width:36.16em;min-width:485px; margin:1em auto; text-align:left; } > </style> >@@ -42,11 +42,11 @@ > </div> > [% END # / ERRORs %] > >- <h1>Comments on <i>[% title |html %] [% subtitle %]</i></h1> >- [% IF ( author ) %]<h3>[% author |html %]</h3>[% END %] >+ <h1>Comments on <i>[% title %] [% subtitle %]</i></h1> >+ [% IF ( author ) %]<h3>[% author %]</h3>[% END %] > <form id="reviewf" action="/cgi-bin/koha/opac-review.pl[% IF ( cgi_debug ) %]?debug=1[% END %]" method="post"> >- <input type="hidden" name="biblionumber" value="[% biblionumber | html%]" /> >- [% IF ( reviewid ) %]<input type="hidden" name="reviewid" value="[% reviewid | html%]" />[% END %] >+ <input type="hidden" name="biblionumber" value="[% biblionumber%]" /> >+ [% IF ( reviewid ) %]<input type="hidden" name="reviewid" value="[% reviewid%]" />[% END %] > <fieldset> > <textarea id="review" name="review" cols="60" rows="8">[% review %]</textarea> > </fieldset> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >index d8d6c57..fa04930 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >@@ -68,7 +68,7 @@ > <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="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&[% s.query_cgi |html %]&count=[% countrss |html %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >+ <td><a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&[% s.query_cgi %]&count=[% countrss %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi %]">[% s.query_desc %]</a></td> > <td>[% s.total %]</td> > </tr> > [% END %] >@@ -108,7 +108,7 @@ > <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="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&[% s.query_cgi |html %]&count=[% countrss |html %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >+ <td><a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&[% s.query_cgi %]&count=[% countrss %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi %]">[% s.query_desc %]</a></td> > <td>[% s.total %]</td> > </tr> > [% END %] >@@ -153,7 +153,7 @@ > <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/opac-authorities-home.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >+ <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi %]">[% s.query_desc %]</a></td> > <td>[% s.total %]</td> > </tr> > [% END %] >@@ -190,7 +190,7 @@ > <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/opac-authorities-home.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >+ <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi %]">[% s.query_desc %]</a></td> > <td>[% s.total %]</td> > </tr> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt >index 47d03f1..5e5ca97 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt >@@ -10,7 +10,7 @@ Your cart > [% FILTER html2text %] > <p>Hi,</p> > >- <p>[% firstname %] [% surname %] sent you a cart from our online catalog.</p> >+ <p>[% firstname.raw %] [% surname.raw %] sent you a cart from our online catalog.</p> > > <p>Please note that the attached file is a MARC bibliographic records file > which can be imported into personal bibliographic software like EndNote, >@@ -23,26 +23,26 @@ Your cart > [% FILTER html2text %] > > [% IF comment %] >- <p>[% comment %]</p> >+ <p>[% comment.raw %]</p> > <hr/> > [% END %] > <ol> > [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] > <li> > <span> >- [% BIBLIO_RESULT.title %] >- [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %] >+ [% BIBLIO_RESULT.title.raw %] >+ [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle.raw %][% END %] > </span> > > <p> > [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] >- <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %] >+ <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author.raw %][% END %] > > [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %] >- [% IF ( BIBLIO_RESULT.author ) %]; [% END %] >+ [% IF ( BIBLIO_RESULT.author.raw ) %]; [% END %] > [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %] > [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %] >- [% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %] >+ [% MARCAUTHOR_SUBFIELDS_LOO.separator.raw %][% MARCAUTHOR_SUBFIELDS_LOO.value.raw %] > [% END %] > [% UNLESS ( loop.last ) %];[% END %] > [% END %] >@@ -52,76 +52,76 @@ Your cart > > [% IF ( BIBLIO_RESULT.ISBN ) %] > <span> >- ISBN: [% BIBLIO_RESULT.ISBN %] >+ ISBN: [% BIBLIO_RESULT.ISBN.raw %] > </span><br/> > [% END %] > > [% IF BIBLIO_RESULT.publishercode %] > <span> >- Published by: [% BIBLIO_RESULT.publishercode %] >+ Published by: [% BIBLIO_RESULT.publishercode.raw %] > [% IF ( BIBLIO_RESULT.publicationyear ) %] >- in [% BIBLIO_RESULT.publicationyear %] >+ in [% BIBLIO_RESULT.publicationyear.raw %] > [% END %] > [% IF ( BIBLIO_RESULT.pages ) %] >- , [% BIBLIO_RESULT.pages %] >+ , [% BIBLIO_RESULT.pages.raw %] > [% END %] > [% IF BIBLIO_RESULT.item('size') %] >- , [% BIBLIO_RESULT.item('size') %] >+ , [% BIBLIO_RESULT.item('size').raw %] > [% END %] > </span><br/> > [% END %] > > [% IF BIBLIO_RESULT.collection %] > <span> >- Collection: [% BIBLIO_RESULT.seriestitle %] >+ Collection: [% BIBLIO_RESULT.seriestitle.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.subject ) %] > <span> >- Subject: [% BIBLIO_RESULT.subject %] >+ Subject: [% BIBLIO_RESULT.subject.raw %] > <span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.copyrightdate ) %] > <span> >- Copyright year: [% BIBLIO_RESULT.copyrightdate %] >+ Copyright year: [% BIBLIO_RESULT.copyrightdate.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.notes ) %] > <span> >- Notes : [% BIBLIO_RESULT.notes %] >+ Notes : [% BIBLIO_RESULT.notes.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.unititle ) %] > <span> >- Unified title: [% BIBLIO_RESULT.unititle %] >+ Unified title: [% BIBLIO_RESULT.unititle.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.serial ) %] > <span> >- Serial: [% BIBLIO_RESULT.serial %] >+ Serial: [% BIBLIO_RESULT.serial.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.dewey ) %] > <span> >- Dewey: [% BIBLIO_RESULT.dewey %] >+ Dewey: [% BIBLIO_RESULT.dewey.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.classification ) %] > <span> >- Classification: [% BIBLIO_RESULT.classification %] >+ Classification: [% BIBLIO_RESULT.classification.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.lccn ) %] > <span> >- LCCN: [% BIBLIO_RESULT.lccn %] >+ LCCN: [% BIBLIO_RESULT.lccn.raw %] > </span><br/> > [% END %] > [% IF ( BIBLIO_RESULT.url ) %] >@@ -134,17 +134,17 @@ Your cart > [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %] > [% IF ( OPACBaseURL ) %] > <p> >- In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %] >+ In online catalog: [% OPACBaseURL.raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %] > </p> > [% END %] > [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %] > <p>Items: > <ul> > [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]<li> >- [% ITEM_RESULT.branchname %] >- [% ITEM_RESULT.location %] >- [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %] >- [% ITEM_RESULT.barcode %] >+ [% ITEM_RESULT.branchname.raw %] >+ [% ITEM_RESULT.location.raw %] >+ [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber.raw %])[% END %] >+ [% ITEM_RESULT.barcode.raw %] > </li>[% END %] > </ul> > </p> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt >index fed5013..30986f6 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt >@@ -14,7 +14,7 @@ > [% IF ( SENT ) %] > <h1>Message sent</h1> > <div class="dialog dialog-success"> >- <p>The cart was sent to: [% email_add | html %]</p> >+ <p>The cart was sent to: [% email_add %]</p> > </div> > <p><a class="focus close" href="#">Close window</a></p> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt >index 4c7f5d4..62a4306 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt >@@ -1,5 +1,5 @@ > <SUBJECT> >-Your list : [% shelfname %] >+Your list : [% shelfname.raw %] > <END_SUBJECT> > > [% USE HtmlToText %] >@@ -8,8 +8,8 @@ Your list : [% shelfname %] > [% FILTER html2text %] > <p>Hi,</p> > >- <p>[% firstname %] [% surname %] sent you from our online catalog, the >- virtual shelf called : [% shelfname %].</p> >+ <p>[% firstname.raw %] [% surname.raw %] sent you from our online catalog, the >+ virtual shelf called : [% shelfname.raw %].</p> > > <p>Please note that the attached file is a MARC bibliographic records file > which can be imported into personal bibliographic software like EndNote, >@@ -23,30 +23,30 @@ Your list : [% shelfname %] > [% FILTER html2text %] > > [% IF comment %] >- <p>[% comment %]</p> >+ <p>[% comment.raw %]</p> > <hr/> > [% END %] > <ol> > [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] > <li> > <span> >- [% BIBLIO_RESULT.title %] >+ [% BIBLIO_RESULT.title.raw %] > [% IF ( BIBLIO_RESULT.subtitle.size ) %] > [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %] >- [% subtitle.subfield %] >+ [% subtitle.subfield.raw %] > [% END %] > [% END %] > </span> > > <p> > [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] >- <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %] >+ <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author.raw %][% END %] > > [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %] > [% IF ( BIBLIO_RESULT.author ) %]; [% END %] > [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %] > [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %] >- [% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %] >+ [% MARCAUTHOR_SUBFIELDS_LOO.separator.raw %][% MARCAUTHOR_SUBFIELDS_LOO.value.raw %] > [% END %] > [% UNLESS ( loop.last ) %];[% END %] > [% END %] >@@ -57,7 +57,7 @@ Your list : [% shelfname %] > [% IF ( BIBLIO_RESULT.ISBN ) %] > <span> > ISBN: [% FOREACH isbn IN BIBLIO_RESULT.ISBN %] >- [% isbn %] >+ [% isbn.raw %] > [% UNLESS ( loop.last ) %]; [% END %] > [% END %] > </span><br/> >@@ -65,12 +65,12 @@ Your list : [% shelfname %] > > [% IF BIBLIO_RESULT.publishercode %] > <span> >- Published by: [% BIBLIO_RESULT.publishercode %] >+ Published by: [% BIBLIO_RESULT.publishercode.raw %] > [% IF ( BIBLIO_RESULT.publicationyear ) %] >- in [% BIBLIO_RESULT.publicationyear %] >+ in [% BIBLIO_RESULT.publicationyear.raw %] > [% END %] > [% IF ( BIBLIO_RESULT.pages ) %] >- , [% BIBLIO_RESULT.pages %] >+ , [% BIBLIO_RESULT.pages.raw %] > [% END %] > [% IF BIBLIO_RESULT.item('size') %] > , [% BIBLIO_RESULT.item('size') %] >@@ -80,55 +80,55 @@ Your list : [% shelfname %] > > [% IF BIBLIO_RESULT.collection %] > <span> >- Collection: [% BIBLIO_RESULT.seriestitle %] >+ Collection: [% BIBLIO_RESULT.seriestitle.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.subject ) %] > <span> >- Subject: [% BIBLIO_RESULT.subject %] >+ Subject: [% BIBLIO_RESULT.subject.raw %] > <span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.copyrightdate ) %] > <span> >- Copyright year: [% BIBLIO_RESULT.copyrightdate %] >+ Copyright year: [% BIBLIO_RESULT.copyrightdate.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.notes ) %] > <span> >- Notes : [% BIBLIO_RESULT.notes %] >+ Notes : [% BIBLIO_RESULT.notes.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.unititle ) %] > <span> >- Unified title: [% BIBLIO_RESULT.unititle %] >+ Unified title: [% BIBLIO_RESULT.unititle.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.serial ) %] > <span> >- Serial: [% BIBLIO_RESULT.serial %] >+ Serial: [% BIBLIO_RESULT.serial.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.dewey ) %] > <span> >- Dewey: [% BIBLIO_RESULT.dewey %] >+ Dewey: [% BIBLIO_RESULT.dewey.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.classification ) %] > <span> >- Classification: [% BIBLIO_RESULT.classification %] >+ Classification: [% BIBLIO_RESULT.classification.raw %] > </span><br/> > [% END %] > > [% IF ( BIBLIO_RESULT.lccn ) %] > <span> >- LCCN: [% BIBLIO_RESULT.lccn %] >+ LCCN: [% BIBLIO_RESULT.lccn.raw %] > </span><br/> > [% END %] > [% IF ( BIBLIO_RESULT.url ) %] >@@ -140,17 +140,17 @@ Your list : [% shelfname %] > > [% IF ( OPACBaseURL ) %] > <p> >- In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %] >+ In online catalog: [% OPACBaseURL.raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %] > </p> > [% END %] > [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %] > <p>Items: > <ul> > [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]<li> >- [% ITEM_RESULT.branchname %] >- [% ITEM_RESULT.location %] >- [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %] >- [% ITEM_RESULT.barcode %] >+ [% ITEM_RESULT.branchname.raw %] >+ [% ITEM_RESULT.location.raw %] >+ [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber.raw %])[% END %] >+ [% ITEM_RESULT.barcode.raw %] > </li>[% END %] > </ul> > </p> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt >index c5e9fe8..06a9c06 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt >@@ -13,7 +13,7 @@ > [% IF ( SENT ) %] > <h1>Message sent</h1> > <div class="alert alert-success"> >- <p>The list was sent to: [% email | html %]</p> >+ <p>The list was sent to: [% email %]</p> > </div> > <p><a class="focus close" href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelfid %]">Back to lists</a></p> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >index 4517ffc..a702b74 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >@@ -30,10 +30,10 @@ > <h2>Issues for a subscription</h2> > <div id="views"> > <span class="view"> >- <a id="Normalview" href="opac-detail.pl?biblionumber=[% biblionumber | html %]" class="button">Normal view</a> >+ <a id="Normalview" href="opac-detail.pl?biblionumber=[% biblionumber %]" class="button">Normal view</a> > </span> > <span class="view"><span id="Briefhistory">Brief history</span></span> >- <span class="view"><a id="Fullhistory" href="opac-serial-issues.pl?selectview=full&biblionumber=[% biblionumber | html%]" class="button">Full history</a></span> >+ <span class="view"><a id="Fullhistory" href="opac-serial-issues.pl?selectview=full&biblionumber=[% biblionumber%]" class="button">Full history</a></span> > </div> > <form method="post" name="f"> > [% FOREACH subscription_LOO IN subscription_LOOP %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt >index 8ac96db..8a9de13 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt >@@ -32,7 +32,7 @@ > <div id="shareshelf" class="maincontent"> > > [% IF errcode %] >- [% IF errcode==1 && op %]<div class="alert">The operation [% op | html %] is not supported.</div>[% END %] >+ [% IF errcode==1 && op %]<div class="alert">The operation [% op %] is not supported.</div>[% END %] > [% IF errcode==1 && !op %]<div class="alert">No operation parameter has been passed.</div>[% END %] > [% IF errcode==2 %]<div class="alert">Invalid shelf number.</div>[% END %] > [% IF errcode==3 %]<div class="alert">The feature of sharing lists is not in use in this library.</div>[% END %] >@@ -50,7 +50,7 @@ > <ol> > <input type="hidden" name="op" value="conf_invite"/> > <input type="hidden" name="shelfnumber" value="[% shelfnumber %]"/> >- <li><label for="name">List name:</label> [% shelfname | html %]</li> >+ <li><label for="name">List name:</label> [% shelfname %]</li> > <li> > <label for="invite_address">Email address:</label> > <input id="invite_address" name="invite_address" size="40" /> >@@ -67,7 +67,7 @@ > [% ELSIF op=='conf_invite' %] > <div id="conf_invite"> > [% IF approvedaddress %] >- <p>An invitation to share list <i>[% shelfname | html %]</i> will be sent shortly to [% approvedaddress %].</p> >+ <p>An invitation to share list <i>[% shelfname %]</i> will be sent shortly to [% approvedaddress %].</p> > [% END %] > [% IF failaddress %] > <p>Something went wrong while processing the following addresses. Please check them. These are: [% failaddress %]</p> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves-rss.tt >index 5e01834..6a46354 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves-rss.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves-rss.tt >@@ -3,16 +3,16 @@ > <rss version="2.0"> > > <channel> >- <title>[% shelf.shelfname | html %]</title> >+ <title>[% shelf.shelfname %]</title> > <link>[% OPACBaseURL %]/cgi-bin/koha/opac-shelves.pl?rss=1&viewshelf=[% shelf.shelfnumber %]</link> >- <description>RSS feed for public list [% shelf.shelfname | html %]</description> >+ <description>RSS feed for public list [% shelf.shelfname %]</description> > > [% FOREACH i IN itemsloop %] > <item> > <title> >- [% i.title | html %] >+ [% i.title %] > [% IF i.author %] >- by [% i.author | html %] >+ by [% i.author %] > [% END %] > </title> > <link>[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber %]</link> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >index 0e20fcf..80fabbd 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >@@ -5,7 +5,7 @@ > [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsInputOnList') ) %] > > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › [% IF op == 'view' %]Contents of [% shelf.shelfname |html %][% ELSE %]Your lists[% END %]</title>[% INCLUDE 'doc-head-close.inc' %] >+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › [% IF op == 'view' %]Contents of [% shelf.shelfname %][% ELSE %]Your lists[% END %]</title>[% INCLUDE 'doc-head-close.inc' %] > [% BLOCK cssinclude %][% END %] > </head> > [% IF ( loggedinusername ) %][% INCLUDE 'bodytag.inc' bodyid='opac-userlists' bodyclass='scrollto' %][% ELSE %][% INCLUDE 'bodytag.inc' bodyid='opac-lists' bodyclass='scrollto' %][% END %] >@@ -66,7 +66,7 @@ > [% END %] > > [% IF op == 'view' %] >- <li><span class="divider">›</span> Contents of <i>[% shelf.shelfname | html %]</i></li> >+ <li><span class="divider">›</span> Contents of <i>[% shelf.shelfname %]</i></li> > [% END %] > > [% IF op == 'add_form' %] >@@ -74,7 +74,7 @@ > [% END %] > > [% IF op == 'edit_form' %] >- <li><span class="divider">›</span> Edit list <i>[% shelf.shelfname | html %]</i></li> >+ <li><span class="divider">›</span> Edit list <i>[% shelf.shelfname %]</i></li> > [% END %] > > </ul> <!-- / .breadcrumb --> >@@ -155,20 +155,20 @@ > > [% IF shelf AND op == 'view' %] > <h3> >- [% shelf.shelfname |html %] >+ [% shelf.shelfname %] > <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-shelves.pl?rss=1&op=view&shelfnumber=[% shelf.shelfnumber %]" class="rss-list-link noprint"> > <img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this list" title="Subscribe to this list" border="0" class="rsssearchicon"/> > </a> > </h3> > >- [% IF ( itemsloop ) %] >- <div id="toolbar" class="toolbar clearfix"> >- <div class="list-actions"> >+ [% IF ( itemsloop ) %] >+ <div id="toolbar" class="toolbar clearfix"> >+ <div class="list-actions"> > <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?op=add_form">New list</a> <span class="sep">|</span> >- <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfnumber=[% shelf.shelfnumber | html %]" class="download" data-toggle="modal" data-target="#modalWin">Download list</a> >+ <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfnumber=[% shelf.shelfnumber %]" class="download" data-toggle="modal" data-target="#modalWin">Download list</a> > > [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] >- <span class="sendlist"><a href="/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelf.shelfnumber | html %]" class="send" onclick="open('/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelf.shelfnumber | html %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send list</a></span> >+ <span class="sendlist"><a href="/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelf.shelfnumber %]" class="send" onclick="open('/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelf.shelfnumber %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send list</a></span> > [% END %] > > <a class="print-small" target="_blank" href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber %]&sortfield=[% sortfield %]&direction=[% direction |uri %]&print=1">Print list</a> >@@ -179,7 +179,7 @@ > <input type="hidden" name="op" value="edit_form" /> > <input type="hidden" name="referer" value="view" /> > <input type='hidden' name='category' value='[% category %]' /> >- <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" /> >+ <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber %]" /> > <input type="submit" class="editshelf" value="Edit list" /> > </form> > >@@ -187,18 +187,18 @@ > <input type="hidden" name="op" value="delete" /> > <input type="hidden" name="referer" value="list" /> > <input type='hidden' name='category' value='[% category %]' /> >- <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" /> >+ <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber %]" /> > <input type="submit" class="deleteshelf" value="Delete list" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);"/> > </form> > [% IF category == PRIVATE && Koha.Preference('OpacAllowSharingPrivateLists') %] >- <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% shelf.shelfnumber | html %]" class="">Share list</a> >+ <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% shelf.shelfnumber %]" class="">Share list</a> > [% END %] > [% ELSIF category == PRIVATE # not manageshelf and private means shared %] > <form action="/cgi-bin/koha/opac-shelves.pl" method="post" class="form-inline"> > <input type="hidden" name="op" value="remove_share" /> > <input type="hidden" name="referer" value="list" /> > <input type='hidden' name='category' value='[% category %]' /> >- <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" /> >+ <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber %]" /> > <input type="submit" class="deleteshelf" onclick="return confirmDelete(MSG_CONFIRM_REMOVE_SHARE);" value="Remove share" /> > </form> > [% END %] >@@ -206,7 +206,7 @@ > > <form action="/cgi-bin/koha/opac-shelves.pl" id="sorting-form" class="form-inline sort_by pull-right"> > <input type="hidden" name="op" value="view" /> >- <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" /> >+ <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber %]" /> > > <label for="sortfield">Sort by: </label> > <select name="sortfield" id="sortfield" class="resort" onchange="$('#sorting-form').submit()"> >@@ -283,7 +283,7 @@ > <form action="/cgi-bin/koha/opac-shelves.pl" method="post" id="myform" name="myform" class="checkboxed"> > [% IF can_manage_shelf %] > <input type="hidden" name="op" value="remove_biblios" /> >- <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" /> >+ <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber %]" /> > [% END %] > <div class="searchresults"> > <table id="listcontents" class="table"> >@@ -342,14 +342,14 @@ > [% IF ( BakerTaylorEnabled ) %] > [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) %] > [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL |html %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |html %][% bt_id %]" /></a> >+ <a href="https://[% BakerTaylorBookstoreURL %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL %][% bt_id %]" /></a> > [% ELSE %] > <span class="no-image">No cover image available</span> > [% END %] > [% END %] > </div> > [% IF ( itemsloo.XSLTBloc ) %] >- [% itemsloo.XSLTBloc %] >+ [% itemsloo.XSLTBloc.raw %] > [% ELSE %] > > [% IF ( itemsloo.BiblioDefaultViewmarc ) %] >@@ -363,13 +363,13 @@ > [% END %] > > [% IF ( itemsloo.title ) %] >- [% itemsloo.title |html %] >+ [% itemsloo.title %] > [% ELSE %] > No title > [% END %] > > [% FOREACH subtitl IN itemsloo.subtitle %] >- [% subtitl.subfield|html %] >+ [% subtitl.subfield %] > [% END %] > </a> > >@@ -385,7 +385,7 @@ > [% itemsloo.place %] > [% END %] > [% IF ( itemsloo.publishercode ) %] >- [% itemsloo.publishercode|html %] >+ [% itemsloo.publishercode %] > [% END %] > [% IF ( itemsloo.publicationyear ) %] > [% itemsloo.publicationyear %] >@@ -395,7 +395,7 @@ > [% END %] > [% END %] > [% IF ( itemsloo.pages ) %]. [% itemsloo.pages %][% END %] >- [% IF ( itemsloo.notes ) %], [% itemsloo.notes|html %][% END %] >+ [% IF ( itemsloo.notes ) %], [% itemsloo.notes %][% END %] > [% IF ( itemsloo.item('size') ) %] [% itemsloo.item('size') %][% END %] > </span> > <span class="results_summary"> >@@ -488,7 +488,7 @@ > </div><!-- / .searchresults --> > > [% IF ( pagination_bar ) %] >- <div class="pages">[% pagination_bar %]</div> >+ <div class="pages">[% pagination_bar.raw %]</div> > [% END %] > > [% ELSE %] >@@ -501,13 +501,13 @@ > <input type="hidden" name="op" value="edit_form" /> > <input type="hidden" name="referer" value="view" /> > <input type="hidden" name="category" value="category" /> >- <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" /> >+ <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber %]" /> > <input type="submit" class="editshelf" value="Edit list" /> > </form> > > <form method="post" action="/cgi-bin/koha/opac-shelves.pl" class="form-inline"> > <input type="hidden" name="op" value="delete" /> >- <input type="hidden" name="shelfnumber" value="[% shelfnumber | html %]"/> >+ <input type="hidden" name="shelfnumber" value="[% shelfnumber %]"/> > <input type="hidden" name="category" value="category" /> > <input type="submit" class="deleteshelf" value="Delete list" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);"/> > </form> >@@ -522,11 +522,10 @@ > [% END %] > </div> > [% END # / IF itemsloop %] >- [% END %] >- >+ [% END %] > [% IF itemsloop && can_remove_biblios %] > <input type="hidden" name="op" value="remove_biblios" /> >- <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" /> >+ <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber %]" /> > <input type="hidden" name="modifyshelfcontents" value="1" /> > <input type="submit" value="Remove selected items" id="remove-selected" class="btn btn-danger"/> > </form> >@@ -534,7 +533,7 @@ > <form method="post" action="opac-shelves.pl"> > <input type="hidden" name="op" value="delete" /> > <input type="hidden" name="referer" value="list" /> >- <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]"/> >+ <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber %]"/> > <input type="submit" class="btn btn-danger" value="Delete this list" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST)" /> > </form> > [% END %] >@@ -547,16 +546,16 @@ > <legend>Create a new list</legend> > <input type="hidden" name="op" value="add" /> > [% ELSE %] >- <legend>Editing <em>[% shelf.shelfname |html %]</em></legend> >+ <legend>Editing <em>[% shelf.shelfname %]</em></legend> > <input type="hidden" name="op" value="edit" /> >- <input type="hidden" name="referer" value="[% referer | html %]" /> >- <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" /> >+ <input type="hidden" name="referer" value="[% referer %]" /> >+ <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber %]" /> > [% END %] > <input type="hidden" name="owner" id="owner" value="[% loggedinusernumber %]" /> > <ol> > <li> > <label class="required" for="shelfname">List name: </label> >- <input type="text" id="shelfname" name="shelfname" maxlength="255" value="[% shelf.shelfname |html %]" /></li> >+ <input type="text" id="shelfname" name="shelfname" maxlength="255" value="[% shelf.shelfname %]" /></li> > <li> > <label for="sortfield" >Sort this list by: </label> > <select name="sortfield" id="sortfield"> >@@ -666,7 +665,7 @@ > [% FOREACH s IN shelves %] > [% SET contents = s.get_contents %] > <tr> >- <td><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber %]">[% s.shelfname |html %]</a></td> >+ <td><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber %]">[% s.shelfname %]</a></td> > <td>[% IF contents.count %][% contents.count %] [% IF contents.count == 1 %]item[% ELSE %]items[% END %][% ELSE %]Empty[% END %]</td> > <td> > [% IF s.category == PRIVATE %] >@@ -678,7 +677,7 @@ > <td> > [% IF s.can_be_managed( loggedinusernumber ) %] > <form action="/cgi-bin/koha/opac-shelves.pl" method="get" class="form-inline"> >- <input type="hidden" name="shelfnumber" value="[% s.shelfnumber |html %]" /> >+ <input type="hidden" name="shelfnumber" value="[% s.shelfnumber %]" /> > <input type="hidden" name="category" value="[% s.category %]" /> > <input type="hidden" name="op" value="edit_form" /> > <input type="hidden" name="referer" value="list" /> >@@ -690,19 +689,19 @@ > <input type="hidden" name="op" value="delete" /> > <input type="hidden" name="referer" value="list" /> > <input type='hidden' name='category' value='[% category %]' /> >- <input type="hidden" name="shelfnumber" value="[% s.shelfnumber | html %]" /> >+ <input type="hidden" name="shelfnumber" value="[% s.shelfnumber %]" /> > <input type="submit" class="deleteshelf" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);" value="Delete" /> > </form> > [% END %] > [% IF s.category == PRIVATE AND s.can_be_managed( loggedinusernumber ) AND Koha.Preference('OpacAllowSharingPrivateLists') %] >- <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% s.shelfnumber |html %]" class="">Share</a> >+ <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% s.shelfnumber %]" class="">Share</a> > [% END %] > [% IF s.is_shared_with( loggedinusernumber ) %] > <form action="opac-shelves.pl" method="post" class="form-inline"> > <input type="hidden" name="op" value="remove_share" /> > <input type="hidden" name="referer" value="list" /> > <input type='hidden' name='category' value='[% category %]' /> >- <input type="hidden" name="shelfnumber" value="[% s.shelfnumber | html %]" /> >+ <input type="hidden" name="shelfnumber" value="[% s.shelfnumber %]" /> > <input type="submit" class="deleteshelf" onclick="return confirmDelete(MSG_CONFIRM_REMOVE_SHARE);" value="Remove share" /> > </form> > [% END %] >@@ -711,7 +710,7 @@ > [% END %] > </tbody> > </table> >- <div class="pages">[% pagination_bar %]</div> >+ <div class="pages">[% pagination_bar.raw %]</div> > [% ELSE %] > [% IF category == PUBLIC %] > <p>No public lists.</p> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt >index fddf531..528bf5a 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt >@@ -8,7 +8,7 @@ > <lastBuildDate>[% timestamp %]</lastBuildDate> > [% FOREACH review IN reviews %] > <item> >- <title>New comment on [% review.title |html %] [% FOREACH subtitl IN review.subtitle %], [% subtitl.subfield |html %][% END %]</title> >+ <title>New comment on [% review.title %] [% FOREACH subtitl IN review.subtitle %], [% subtitl.subfield %][% END %]</title> > <link>[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber %]#comments</link> > <description><![CDATA[ > [% IF ( OPACAmazonCoverImages ) %][% IF ( review.normalized_isbn ) %]<img src="https://images-na.ssl-images-amazon.com/images/P/[% review.normalized_isbn %].01.TZZZZZZZ.jpg" alt="" />[% END %][% END %] >@@ -19,15 +19,15 @@ > [% END %][% END %][% END %][% END %] > > [% bt_id = ( review.normalized_upc || review.normalized_isbn ) %] >-[% IF ( BakerTaylorEnabled && bt_id ) %]<a href="https://[% BakerTaylorBookstoreURL |html %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |html %][% bt_id %]" /></a>[% END %] >- [% IF ( review.author ) %]<p>By [% review.author |html %].</p> [% END %] >- <p>[% IF ( review.place ) %][% review.place |html %] [% END %][% IF ( review.publishercode ) %][% review.publishercode |html %][% END %][% IF ( review.publicationyear ) %] [% review.publicationyear |html %] >- [% ELSE %][% IF ( review.copyrightdate ) %] [% review.copyrightdate |html %][% END %][% END %] >- [% IF ( review.pages ) %]. [% review.pages |html %][% END %] >- [% IF ( review.notes ) %], [% review.notes |html %][% END %] >- [% IF ( review.size ) %] [% review.size |html %]. [% END %] >- [% IF ( review.isbn ) %] [% review.isbn |html %][% END %] </p> >-<p>[% IF ( review.borrowernumber && ShowReviewer ) %][% review.firstname %] [% review.surname %] commented[% ELSE %]Comment[% END %] on [% review.datereviewed | $KohaDates %]: [% review.review |html %]</p> >+[% IF ( BakerTaylorEnabled && bt_id ) %]<a href="https://[% BakerTaylorBookstoreURL %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL %][% bt_id %]" /></a>[% END %] >+ [% IF ( review.author ) %]<p>By [% review.author %].</p> [% END %] >+ <p>[% IF ( review.place ) %][% review.place %] [% END %][% IF ( review.publishercode ) %][% review.publishercode %][% END %][% IF ( review.publicationyear ) %] [% review.publicationyear %] >+ [% ELSE %][% IF ( review.copyrightdate ) %] [% review.copyrightdate %][% END %][% END %] >+ [% IF ( review.pages ) %]. [% review.pages %][% END %] >+ [% IF ( review.notes ) %], [% review.notes %][% END %] >+ [% IF ( review.size ) %] [% review.size %]. [% END %] >+ [% IF ( review.isbn ) %] [% review.isbn %][% END %] </p> >+<p>[% IF ( review.borrowernumber && ShowReviewer ) %][% review.firstname %] [% review.surname %] commented[% ELSE %]Comment[% END %] on [% review.datereviewed | $KohaDates %]: [% review.review %]</p> > ]]></description> > <guid>[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber %]&reviewid=[% review.reviewid %]</guid> > <pubDate>[% review.timestamp %]</pubDate> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >index 507c118..411161c 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >@@ -45,7 +45,7 @@ > [% END %] > [% END %] > [% IF ( review.title ) %][% review.title %][% ELSE %]No title[% END %] >- [% FOREACH subtitl IN review.subtitle %] [% subtitl.subfield |html %][% END %] >+ [% FOREACH subtitl IN review.subtitle %] [% subtitl.subfield %][% END %] > </a> > [% IF ( review.author ) %] > by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% review.author |url %]" title="Search for works by this author" class="author">[% review.author %]</a> >@@ -84,7 +84,7 @@ > <img class="avatar" src="[% review.avatarurl %]" height="40" width="40" alt="" /> > [% END %] > [% FILTER html_break %] >- [% review.review |html %] >+ [% review.review %] > [% END %] > <span style="font-size:87%;font-color:#CCC;">Added [% review.datereviewed | $KohaDates %] [% IF ( review.your_comment ) %] by <strong>you</strong>[% ELSE %] > [% IF ( review.borrowernumber && ShowReviewer != "none" ) %] by >@@ -140,7 +140,7 @@ > [% bt_id = ( review.normalized_upc || review.normalized_isbn ) %] > [% IF ( BakerTaylorEnabled ) %] > [% IF ( bt_id ) %] >- <a href="https://[% review.BakerTaylorBookstoreURL |html %][% bt_id %]"><img alt="See Baker & Taylor" src="[% review.BakerTaylorImageURL |html %][% bt_id %]" /></a> >+ <a href="https://[% review.BakerTaylorBookstoreURL %][% bt_id %]"><img alt="See Baker & Taylor" src="[% review.BakerTaylorImageURL %][% bt_id %]" /></a> > [% ELSE %] > <span class="no-image">No cover image available</span> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >index fa9da1f..fc6e0fd 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >@@ -127,7 +127,7 @@ > <form action="/cgi-bin/koha/opac-suggestions.pl" class="form-inline" method="get"> > <fieldset> > <label for="title">Search for:</label> >- <input type="text" name="title" id="title" value="[% title |html %]" /> >+ <input type="text" name="title" id="title" value="[% title %]" /> > [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) == 1 %] > [% IF loggedinusername %] > <label for="suggested_by_anyone">Suggested by:</label> >@@ -190,12 +190,12 @@ > </td> > [% END %] > <td> >- <p><strong>[% suggestions_loo.title |html %]</strong></p> >- <p>[% IF ( suggestions_loo.author ) %][% suggestions_loo.author |html %],[% END %] >- [% IF ( suggestions_loo.copyrightdate ) %] - [% suggestions_loo.copyrightdate |html %],[% END %] >- [% IF ( suggestions_loo.publishercode ) %] - [% suggestions_loo.publishercode |html %][% END %] >- [% IF ( suggestions_loo.place ) %]([% suggestions_loo.place |html %])[% END %] >- [% IF ( suggestions_loo.collectiontitle ) %] , [% suggestions_loo.collectiontitle |html %][% END %] >+ <p><strong>[% suggestions_loo.title %]</strong></p> >+ <p>[% IF ( suggestions_loo.author ) %][% suggestions_loo.author %],[% END %] >+ [% IF ( suggestions_loo.copyrightdate ) %] - [% suggestions_loo.copyrightdate %],[% END %] >+ [% IF ( suggestions_loo.publishercode ) %] - [% suggestions_loo.publishercode %][% END %] >+ [% IF ( suggestions_loo.place ) %]([% suggestions_loo.place %])[% END %] >+ [% IF ( suggestions_loo.collectiontitle ) %] , [% suggestions_loo.collectiontitle %][% END %] > [% IF ( suggestions_loo.itemtype ) %] - [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 1 ) %][% END %] > </p> > </td> >@@ -205,7 +205,7 @@ > <td> > [% IF ( suggestions_loo.note ) %] > <span class="tdlabel">Note: </span> >- [% suggestions_loo.note |html %] >+ [% suggestions_loo.note %] > [% END %] > </td> > [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) == 1 %] >@@ -235,7 +235,7 @@ > [% ELSIF ( suggestions_loo.REJECTED ) %]Suggestion declined > [% ELSIF ( suggestions_loo.AVAILABLE ) %]Available in the library > [% ELSE %] [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS, 1 ) %] [% END %] >- [% IF ( suggestions_loo.reason ) %]([% suggestions_loo.reason |html %])[% END %] >+ [% IF ( suggestions_loo.reason ) %]([% suggestions_loo.reason %])[% END %] > </td> > </tr> > [% END # / FOREACH suggestions_loo %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >index 052acd6..3abc7f2 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >@@ -97,7 +97,7 @@ > <div id="tagcloud"> > [% FOREACH TAGLOO IN TAGLOOP %] > <span class="tag tagweight[% TAGLOO.stratum %]" id="tag[% loop.count %]" style="display:inline;"> >- <a href="/cgi-bin/koha/opac-search.pl?tag=[% TAGLOO.term |url %]&q=[% TAGLOO.term |url %]">[% TAGLOO.term |html %]</a> >+ <a href="/cgi-bin/koha/opac-search.pl?tag=[% TAGLOO.term |url %]&q=[% TAGLOO.term |url %]">[% TAGLOO.term %]</a> > <span class="tagweight">[% TAGLOO.weight_total %]</span> > </span> > [% END %] >@@ -123,22 +123,21 @@ > <td class="tagterm"> > <span class="tdlabel">Tag:</span> > [% IF MY_TAG.approved == 1 %] >- <a href="/cgi-bin/koha/opac-search.pl?tag=[% MY_TAG.term |url %]&q=[% MY_TAG.term |url %]">[% MY_TAG.term |html %]</a> >+ <a href="/cgi-bin/koha/opac-search.pl?tag=[% MY_TAG.term |url %]&q=[% MY_TAG.term |url %]">[% MY_TAG.term %]</a> > [% ELSE %] >- [% MY_TAG.term |html %] (not approved) >+ [% MY_TAG.term %] (not approved) > [% END %] > </td> >- > <td> > [% IF ( MY_TAG.XSLTBloc ) %] >- [% MY_TAG.XSLTBloc %] >+ [% MY_TAG.XSLTBloc.raw %] > [% ELSE %] > <span class="tdlabel">Title:</span> > <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% MY_TAG.biblionumber %]"> >- [% MY_TAG.title |html %] >+ [% MY_TAG.title %] > [% IF ( MY_TAG.subtitle ) %] > [% FOREACH subtitle IN MY_TAG.subtitle %] >- [% subtitle.subfield |html %] >+ [% subtitle.subfield %] > [% END %] > [% END %] > </a> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt >index f3194b2..92975db 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt >@@ -41,7 +41,7 @@ > </fieldset> > > [% FOREACH LOO IN LOOP %] >- <a href="/cgi-bin/koha/opac-search.pl?idx=su&q="[% LOO.entry |html %]"" style="font-size:[% LOO.weight %]px;">[% LOO.entry %]</a> >+ <a href="/cgi-bin/koha/opac-search.pl?idx=su&q="[% LOO.entry %]"" style="font-size:[% LOO.weight %]px;">[% LOO.entry %]</a> > [% END %] > [% ELSE %] > <p>Note: This feature only available to French catalogs where ISBD subjects have been populated, and an index built by separate script.</p> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >index 09fa0e3..17cf924 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >@@ -45,7 +45,7 @@ > [% Branches.GetName( branch ) %] > [% END %] > [% IF ( timeLimit != 999 ) %] >- in the past [% timeLimit |html %] months >+ in the past [% timeLimitFinite %] months > [% ELSE %] of all time[% END %] > </caption> > <thead> >@@ -59,7 +59,7 @@ > <tbody> > [% FOREACH result IN results %] > <tr> >- <td><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% result.biblionumber %]">[% result.title |html %]</a><p>[% result.author %] >+ <td><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% result.biblionumber %]">[% result.title %]</a><p>[% result.author %] > [% IF ( result.publishercode ) %]- [% result.publishercode %][% END %] > [% IF ( result.place ) %][% result.place %][% END %] > [% IF ( result.publicationyear ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index ef24771..b58bffc 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -99,7 +99,7 @@ Using this account is not recommended because some parts of Koha will not functi > </li> > [% ELSE %] > <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen. >- [% IF ( BORROWER_INFO.debarredcomment ) %] Comment: <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment %]"</span>[% END %] >+ [% IF ( BORROWER_INFO.debarredcomment ) %] Comment: <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment.raw %]"</span>[% END %] > [% IF ( BORROWER_INFO.userdebarreddate ) %] End date: <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %] > <em>Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library.</em> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a></li> > [% END %] >@@ -120,8 +120,7 @@ Using this account is not recommended because some parts of Koha will not functi > </div> > [% END # / IF patron_flagged %] > >- [% SET OPACMySummaryNote = Koha.Preference('OPACMySummaryNote') %] >- [% IF OPACMySummaryNote %][% OPACMySummaryNote %][% END %] >+ [% IF OPACMySummaryNote %][% Koha.Preference('OPACMySummaryNote').raw %][% END %] > > <div id="opac-user-views" class="toptabs"> > <ul> >@@ -191,7 +190,7 @@ Using this account is not recommended because some parts of Koha will not functi > [% IF ( BakerTaylorEnabled ) %] > [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) %] > [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL |html %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |html %][% bt_id %]" /></a> >+ <a href="https://[% BakerTaylorBookstoreURL %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL %][% bt_id %]" /></a> > [% ELSE %] > <span class="no-image">No cover image available</span><!-- BakerTaylor needs normalized_upc or normalized_isbn! --> > [% END %] >@@ -208,7 +207,7 @@ Using this account is not recommended because some parts of Koha will not functi > </td>[% END # / IF JacketImages %] > > <td class="title"> >- <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %]</a> >+ <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %]</a> > [% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron %][% END %] > <span class="item-details">[% ISSUE.author %]</span> > </td> >@@ -281,7 +280,7 @@ Using this account is not recommended because some parts of Koha will not functi > </td> > [% END %] > [% IF ( OPACMySummaryHTML ) %] >- <td class="links">[% ISSUE.MySummaryHTML %]</td> >+ <td class="links">[% ISSUE.MySummaryHTML.raw %]</td> > [% END %] > </tr> > [% END # /FOREACH ISSUES %] >@@ -445,7 +444,7 @@ Using this account is not recommended because some parts of Koha will not functi > [% IF ( BakerTaylorEnabled ) %] > [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) %] > [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL |html %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |html %][% bt_id %]" /></a> >+ <a href="https://[% BakerTaylorBookstoreURL %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL %][% bt_id %]" /></a> > [% ELSE %] > <span class="no-image">No cover image available</span><!-- BakerTaylor needs normalized_upc or normalized_isbn! --> > [% END %] >@@ -462,7 +461,7 @@ Using this account is not recommended because some parts of Koha will not functi > [% END # /IF jacketcell %] > > <td> >- <a class="title" href="/cgi-bin/koha/opac-detail.pl?bib=[% OVERDUE.biblionumber %]">[% OVERDUE.title |html %] [% FOREACH subtitl IN OVERDUE.subtitle %] [% subtitl.subfield %][% END %] >+ <a class="title" href="/cgi-bin/koha/opac-detail.pl?bib=[% OVERDUE.biblionumber %]">[% OVERDUE.title %] [% FOREACH subtitl IN OVERDUE.subtitle %] [% subtitl.subfield %][% END %] > </a> > <span class="item-details">[% OVERDUE.author %]</span></td> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >index 3bf2f15..c41e6dc 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >@@ -7,8 +7,8 @@ > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min.css" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui.css" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sco.css" /> >-[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %] >-[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %] >+[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS.raw %]</style>[% END %] >+[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS.raw %]</style>[% END %] > <!--[if lt IE 9]> > <script src="[% interface %]/[% theme %]/lib/respond.min.js"></script> > <![endif]--> >@@ -28,7 +28,7 @@ > > [% IF ( SelfCheckHelpMessage ) %] > <div id="selfcheckhelpmessage"> >-[% SelfCheckHelpMessage %] >+[% SelfCheckHelpMessage.raw %] > </div> > [% END %] > >@@ -61,5 +61,5 @@ The Submit button only needs to be clicked if you enter the barcode manually.</p > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >-[% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS %]</script>[% END %] >+[% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS.raw %]</script>[% END %] > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >index d97c5f1..496d1b2 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >@@ -9,8 +9,8 @@ > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min.css" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui.css" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sco.css" /> >-[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %] >-[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %] >+[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS.raw %]</style>[% END %] >+[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS.raw %]</style>[% END %] > <!--[if lt IE 9]> > <script src="[% interface %]/[% theme %]/lib/respond.min.js"></script> > <![endif]--> >@@ -38,7 +38,7 @@ > <h3>Item cannot be checked out.</h3> > <p>Sorry, this item cannot be checked out at this station.</p> > [% IF ( title ) %] >- <p>Title: <em>[% title |html %]</em> </p> >+ <p>Title: <em>[% title %]</em> </p> > [% END %] > > <p> >@@ -233,9 +233,9 @@ > <td>[% ISSUE.issuedate %]</td> > <td> > [% UNLESS ( noitemlinks ) %] >- <a href="/cgi-bin/koha/opac-detail.pl?bib=[% ISSUE. biblionumber %]">[% ISSUE.title |html %]</a> >+ <a href="/cgi-bin/koha/opac-detail.pl?bib=[% ISSUE. biblionumber %]">[% ISSUE.title %]</a> > [% ELSE %] >- <strong>[% ISSUE.title |html %]</strong> >+ <strong>[% ISSUE.title %]</strong> > [% END %] > <span class="item-details">[% ISSUE.author %]</span> > ([% ISSUE.barcode %]) >@@ -309,7 +309,7 @@ > [% END # / IF authbylogin %] > > [% 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 %] > <input type="hidden" name="op" value="login" /> > </fieldset> >@@ -415,5 +415,5 @@ > //]]> > </script> > >- [% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS %]</script>[% END %] >+ [% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS.raw %]</script>[% END %] > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt >index 3e62d0e..212f3e4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt >@@ -34,7 +34,7 @@ > <div> > <span class="suggestionlabel">Did you mean:</span> > [% FOREACH suggestion IN suggestions %] >- <span class="searchsuggestion"><a href="/cgi-bin/koha/opac-search.pl?q=[% suggestion.search |uri %]">[% suggestion.label |html %]</a></span> >+ <span class="searchsuggestion"><a href="/cgi-bin/koha/opac-search.pl?q=[% suggestion.search |uri %]">[% suggestion.label %]</a></span> > [% END %] > </div> > [% ELSE %] >-- >2.9.3
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