From f9d5b7cd27d8fedf5d6a466f6ee8ec366cc1e080 Mon Sep 17 00:00:00 2001 From: Jonathan Druart 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ä Signed-off-by: Bernardo Gonzalez Kriegel 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ä Signed-off-by: Bernardo Gonzalez Kriegel 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ä Signed-off-by: Bernardo Gonzalez Kriegel Bug 13618: Remove html filters at the intranet Signed-off-by: Signed-off-by: Joonas Kylmälä Signed-off-by: Bernardo Gonzalez Kriegel Bug 13618: Specific places where we don't need to escape variables - intra Signed-off-by: Signed-off-by: Joonas Kylmälä Signed-off-by: Bernardo Gonzalez Kriegel Bug 13618: Specific for pagination_bar Signed-off-by: Signed-off-by: Joonas Kylmälä Signed-off-by: Bernardo Gonzalez Kriegel Bug 13618: Specific for the ISBD view Signed-off-by: Signed-off-by: Joonas Kylmälä Signed-off-by: Bernardo Gonzalez Kriegel 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ä Signed-off-by: Bernardo Gonzalez Kriegel Bug 13618: Specific for IntranetUser* and OPACUser* prefs Signed-off-by: Signed-off-by: Joonas Kylmälä Signed-off-by: Bernardo Gonzalez Kriegel Bug 13618: Specific for ColumnsSettings Signed-off-by: Signed-off-by: Joonas Kylmälä Signed-off-by: Bernardo Gonzalez Kriegel 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ä Signed-off-by: Bernardo Gonzalez Kriegel 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ä Signed-off-by: Bernardo Gonzalez Kriegel Bug 13618: Specific for Salutation on editing a patron Signed-off-by: Signed-off-by: Joonas Kylmälä Signed-off-by: Bernardo Gonzalez Kriegel Bug 13618: Specific for XSLTBloc Signed-off-by: Signed-off-by: Joonas Kylmälä Signed-off-by: Bernardo Gonzalez Kriegel 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ä Signed-off-by: Bernardo Gonzalez Kriegel Bug 13618: Fix for news Signed-off-by: Signed-off-by: Joonas Kylmälä Signed-off-by: Bernardo Gonzalez Kriegel Bug 13618: Fix last occurrences recently introduced to master Signed-off-by: Bernardo Gonzalez Kriegel Bug 13618: followup to remove tabs Signed-off-by: Bernardo Gonzalez Kriegel 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 Bug 13618: (follow-up) Specific for ColumnsSettings Signed-off-by: Bernardo Gonzalez Kriegel Bug 13618: (follow-up) add missing lines for opac-shelves Proposed patch to fix opac-shelves Signed-off-by: Jonathan Druart 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 @@
- + [+] 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) [% END %] - +
@@ -168,7 +168,7 @@ function finderjumpfull(page) [% END %] - +
  • @@ -193,7 +193,7 @@ function finderjumpfull(page) [% END %] - +
  • @@ -217,7 +217,7 @@ function finderjumpfull(page) [% END %] - +
  • 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' %] - BT: [% heading | html %] + BT: [% heading %] [% CASE 'narrower' %] - NT: [% heading | html %] + NT: [% heading %] [% CASE 'seefrom' %] - UF: [% heading | html %] + UF: [% heading %] [% CASE 'seealso' %] - RT: [% heading | html %] + RT: [% heading %] [% END %] [% ELSE %] [% IF ( linkType=='seealso' ) %] [% IF ( authid ) %] - [% heading | html %] + [% heading %] [% ELSE %] - [% heading | html %] + [% heading %] [% END %] [% ELSE %] - [% heading | html %] + [% heading %] [% END %] [% UNLESS ( type=='seefrom' || type=='seealso' ) %] @@ -42,7 +42,7 @@ [% CASE 'broader' %](Broader heading) [% CASE 'narrower' %](Narrower heading) [% CASE 'parent' %](Immediate parent body) - [% CASE %][% IF type %]([% type | html %]) + [% CASE %][% IF type %]([% type %]) [% END %] [% END %] @@ -50,7 +50,7 @@ [% END %] [% END %] [% BLOCK authresult %] - [% IF ( summary.label ) %][% summary.label | html %]:[% END %] + [% IF ( summary.label ) %][% summary.label %]:[% END %] [% IF summary.summary %]
    [% summary.summary %] @@ -59,7 +59,7 @@ [% UNLESS ( summary.summaryonly ) %]
    [% FOREACH authorize IN summary.authorized %] - [% authorize.heading | html %] + [% authorize.heading %] [% UNLESS loop.last %] | [% END %] [% END %]
    @@ -67,7 +67,7 @@ [% IF summary.notes %]
    [% FOREACH note IN summary.notes %] - [% note.note | html %] + [% note.note %] [% END %]
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc index 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 @@ [% END %] - + - + - + - + - +
    [% 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 %] - +
  • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc index 2992164..2ef952f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc @@ -1,7 +1,7 @@ [% IF ( PAGE_NUMBERS ) %]
    - [% IF ( previous_page_offset.defined ) %]<< Previous[% END %] - [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %][% IF ( PAGE_NUMBER.highlight ) %][% PAGE_NUMBER.pg %][% ELSE %] [% PAGE_NUMBER.pg %][% END %] + [% IF ( previous_page_offset.defined ) %]<< Previous[% END %] + [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %][% IF ( PAGE_NUMBER.highlight ) %][% PAGE_NUMBER.pg %][% ELSE %] [% PAGE_NUMBER.pg %][% END %] [% END %] - [% IF ( next_page_offset ) %]Next >>[% END %] + [% IF ( next_page_offset ) %]Next >>[% END %]
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/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 @@ - +
    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 @@ [% END %] - + [% IF (UNIMARC) %] - + [% END %] - + Advanced search 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 @@ \ No newline at end of file + 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 @@
    1. - +
    2. - +
    3. [% IF Koha.Preference( 'marcflavour' ) == "UNIMARC" %]
    4. - +
    5. [% END %]
    6. - +
    7. - +
    8. @@ -38,10 +38,10 @@
    [% IF (booksellerid) %] - + [% END %] [% IF (basketno) %] - + [% END %]
    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 @@ - - - - + + + + - - + + [% IF (is_psgi) %] - + [% END %] - + [% IF (errZebraConnection == 10000) %] [% ELSIF (errZebraConnection) %] @@ -888,7 +888,7 @@ [% FOREACH ro IN tabl.row2 %] - + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt index 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 @@ [% FOREACH var IN vars_loop %] [% FOREACH val IN var.values %] - + [% END %] [% END %] 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 %]
  • [% IF (iteminformatio.mandatory) %] - + [% ELSE %] - + [% 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' %] -Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %] +Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname %] ([% basketno %]) for [% name %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] @@ -167,7 +167,7 @@ [% INCLUDE 'acquisitions-search.inc' %] - +
    @@ -288,7 +288,7 @@

    The following records could not be deleted:

      [% FOREACH cannotdelbiblio IN cannotdelbiblios %] -
    • [% cannotdelbiblio.title |html %] by [% cannotdelbiblio.author %]: +
    • [% cannotdelbiblio.title %] by [% cannotdelbiblio.author %]:
        [% IF (cannotdelbiblio.itemcount) %]
      • [% cannotdelbiblio.itemcount %] item(s) attached.
      • [% END %] [% IF (cannotdelbiblio.subscriptions) %]
      • [% cannotdelbiblio.subscriptions %] subscription(s) attached.
      • [% END %] @@ -321,7 +321,7 @@ [% END %]
    [% END %] -

    [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]

    +

    [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname %] ([% basketno %]) for [% name %]

    [% IF ( basketno ) %]
    @@ -541,7 +541,7 @@

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

    [% IF ( books_loo.order_internalnote ) %] -

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

    +

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

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

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

    +

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

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

    [% 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 %] Deleted bibliographic record, can't find title [% END %] @@ -739,7 +739,7 @@

    -

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

    +

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

    [% IF ( CAN_user_acquisition_group_manage ) %]

    @@ -763,7 +763,7 @@

    -

    Are you sure you want to generate an EDIFACT order and close basket [% basketname|html %]?

    +

    Are you sure you want to generate an EDIFACT order and close basket [% basketname %]?

    [% IF CAN_user_acquisition_group_manage %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index 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' %] -Koha › Basket grouping for [% booksellername |html %] +Koha › Basket grouping for [% booksellername %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] @@ -129,9 +129,9 @@ function submitForm(form) {

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

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

    +

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

    [% ELSIF (name) %] -

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

    +

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

    [% ELSE %] -

    Add basket group for [% booksellername |html %]

    +

    Add basket group for [% booksellername %]

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

    Basket grouping for [% booksellername |html %]

    +

    Basket grouping for [% booksellername %]

      [% UNLESS ( listclosed) %]
    • Open
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/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 %]
        [% FOREACH seg IN segments %] -
      • [% seg | html %]
      • +
      • [% seg %]
      • [% END %]
      [% 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 @@ //
  • 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 @@
    -

    Files for invoice: [% invoicenumber | html %]

    +

    Files for invoice: [% invoicenumber %]

    Vendor: [% suppliername %]


    [% IF errors %] @@ -62,9 +62,9 @@
    [% FOREACH f IN files %] - - - + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 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 @@ [% FOREACH f IN files %] - - - + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index 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 ) %] - + [% IF ( letters ) %]

    - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt index 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 @@ - - + @@ -172,17 +172,17 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : - - - - - - - - - - - + + + + + + + + + + + [% FOREACH server IN servers %] 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 @@
    Server information
    Koha version: [% kohaVersion |html %]
    OS version ('uname -a'): [% osVersion |html %]
    Perl interpreter: [% perlPath |html %]
    Perl version: [% perlVersion |html %]
    Koha version: [% kohaVersion %]
    OS version ('uname -a'): [% osVersion %]
    Perl interpreter: [% perlPath %]
    Perl version: [% perlVersion %]
    Perl @INC: [% FOREACH perlIncPat IN perlIncPath %] - [% perlIncPat.perlinc |html %]
    + [% perlIncPat.perlinc %]
    [% END %]
    MySQL version: [% mysqlVersion |html %]
    Apache version: [% apacheVersion |html %]
    MySQL version: [% mysqlVersion %]
    Apache version: [% apacheVersion %]
    PSGI: [% psgi_server |html %]
    PSGI: [% psgi_server %]
    Memcached: - Servers: [% IF memcached_servers %][% memcached_servers | html %] + Servers: [% IF memcached_servers %][% memcached_servers %] [% ELSE %]undefined[% END %] | - Namespace: [% IF memcached_namespace %][% memcached_namespace | html %] + Namespace: [% IF memcached_namespace %][% memcached_namespace %] [% ELSE %]undefined[% END %] | Status: [% IF memcached_servers %] [% IF memcached_running and is_memcached_still_active %] @@ -78,7 +78,7 @@ [% END %]
    Zebra version: [% zebraVersion |html %]
    Zebra version: [% zebraVersion %]
    Error Zebra server seems not to be available. Is it started?
    [% ro.date %][% ro.desc|html %][% ro.desc %]
    - [% order.title |html %] + [% order.title %]
    [% order.author %]
    [% order.isbn %]
    [% order.name %]
    [% f.file_name | html %][% f.file_type | html %][% f.file_description | html %][% f.file_name %][% f.file_type %][% f.file_description %] [% f.date_uploaded | $KohaDates %]
    [% f.file_name | html %][% f.file_type | html %][% f.file_description | html %][% f.file_name %][% f.file_type %][% f.file_description %] [% f.date_uploaded | $KohaDates %] - [% lateorder.title |html %] + [% lateorder.title %] [% IF ( lateorder.author ) %]
    Author: [% lateorder.author %][% END %] [% IF ( lateorder.publisher ) %]
    Published by: [% lateorder.publisher %] @@ -221,10 +221,10 @@ $(document).ready(function() {

    Filter results:

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

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

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

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

    [% END %] [% END %]
      -
    1. days ago
    2. +
    3. days ago
    4. [% INCLUDE 'date-format.inc' %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt index f17d5c2..081e013 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt @@ -12,7 +12,7 @@ [% INCLUDE 'header.inc' %] - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt index 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 ) %] [% total %] results found -
      [% pagination_bar %]
      +
      [% pagination_bar.raw %]
      [% ELSE %]

      No results found

      @@ -74,7 +74,7 @@ [% FOREACH biblio IN resultsloop %]

    -

    [% biblio.title | html %] +

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

    [% IF ( biblio.isbn ) %] [% biblio.isbn %][% END %] [% IF ( biblio.pages ) %] - [% biblio.pages %][% END %] 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()

    1. [% IF ( biblionumber ) %] Title - [% title |html %] + [% title %] [% ELSE %] - + Required [% END %]
    2. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt index 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 %]
    [% sub.issn %][% IF (sub.title) %][% sub.title |html %][% ELSE %] + [% IF (sub.title) %][% sub.title %][% ELSE %] --- [% END %][% IF (sub.unititle) %], [% sub.unititle %][% END %]
    [% suggestions_loo.managedby %] -

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

    +

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

    [% IF ( suggestions_loo.copyrightdate ) %]© [% suggestions_loo.copyrightdate %] [% END %] [% IF ( suggestions_loo.volumedesc ) %]volume: [% suggestions_loo.volumedesc %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index 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 @@

    Catalog details -
    1. Title: [% title |html %]
    2. +
      1. Title: [% title %]
      2. Author: [% author %]
      3. Copyright: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 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 @@
    [% loop_order.ordernumber %] - [% loop_order.title |html %] + [% loop_order.title %] [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %] [% IF ( loop_order.isbn ) %] – [% loop_order.isbn %][% END %] [% IF ( loop_order.publishercode ) %]
    Publisher:[% loop_order.publishercode %][% END %] @@ -278,12 +278,12 @@ [% END %]
    [% IF ( loop_order.order_internalnote ) %] -

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

    +

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

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

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

    +

    Vendor note: [% loop_order.order_vendornote %]

    [% ELSE %] [Add vendor note] [% END %] @@ -414,7 +414,7 @@ 0 [% END %]
    [% order.title |html %] + [% order.title %] [% IF ( order.author ) %] / [% order.author %][% END %] [% IF ( order.isbn ) %] - [% order.isbn %][% END %] [% IF ( order.publishercode ) %]
    Publisher :[% order.publishercode %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt index 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": "[% 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%]", "dt_branch": - "[% data.branchname |html %]", + "[% data.branchname %]", "dt_category": - "[% data.category_description |html %] ([% data.category_type |html %])", + "[% data.category_description %] ([% data.category_type %])", "dt_action": [%- IF selection_type == 'select' -%] - "Select" + "Select" [%- ELSE -%] " Add" [%- 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 @@
    [% ordersloo.ordernumber %] - [% ordersloo.title |html %] + [% ordersloo.title %] [% IF ( ordersloo.author ) %] by [% ordersloo.author %][% END %] [% IF ( ordersloo.isbn ) %] – [% ordersloo.isbn %][% END %] [% IF ( ordersloo.publishercode ) %]
    Publisher :[% ordersloo.publishercode %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index 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' %] - +
    @@ -63,12 +63,12 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
      -
    1. -
    2. +
    3. +
    4. -
    5. -
    6. +
    7. +
    8. @@ -82,9 +82,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
    9. Clear search form
    - - - + + +

    Search targets

    @@ -113,14 +113,14 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :

    Search results

    You searched for: - [% IF ( title ) %]Title: [% title | html %] [% END %] - [% IF ( author ) %]Author: [% author | html %] [% END %] - [% IF ( isbn ) %]ISBN: [% isbn | html %] [% END %] - [% IF ( issn ) %]ISSN: [% issn | html %] [% END %] - [% IF ( lccall ) %]LC call number: [% lccall | html %] [% END %] - [% IF ( subject ) %]Subject heading: [% subject | html %] [% END %] - [% IF ( controlnumber ) %]Control no: [% controlnumber | html %] [% END %] - [% IF ( dewey ) %]Dewey: [% dewey | html %] [%END %] + [% IF ( title ) %]Title: [% title %] [% END %] + [% IF ( author ) %]Author: [% author %] [% END %] + [% IF ( isbn ) %]ISBN: [% isbn %] [% END %] + [% IF ( issn ) %]ISSN: [% issn %] [% END %] + [% IF ( lccall ) %]LC call number: [% lccall %] [% END %] + [% IF ( subject ) %]Subject heading: [% subject %] [% END %] + [% IF ( controlnumber ) %]Control no: [% controlnumber %] [% END %] + [% IF ( dewey ) %]Dewey: [% dewey %] [%END %]

    [% IF ( breeding_loop ) %] @@ -139,7 +139,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
    [% breeding_loo.server %] [% breeding_loo.title |html %][% breeding_loo.title %] [% breeding_loo.author %] [% breeding_loo.isbn %] [% breeding_loo.lccn %]
    - - + +
    - + - +
    @@ -258,14 +258,14 @@

    Data deleted

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

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

    +

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

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

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

    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 @@ [% END %] -
  • -
  • +
  • +
  • [% IF ( repeatable ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt index 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 @@
  • - + Required
  • @@ -169,8 +169,8 @@ Actions 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 %]
  • - + Required
  • @@ -217,8 +217,8 @@