From dd9e978c2c4ba140af5d4586fc9ec3589f356e75 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 19 Jul 2018 18:24:10 -0300 Subject: [PATCH] Bug 13618: Fix BLOCKs perl -p -i -e 's/BLOCK \| html/BLOCK/g' **/*.inc **/*.tt Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens --- koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/serials/serials-search.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc index 450197f597..3943c0ab6f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ -25,7 +25,7 @@
    [% SET url = "/cgi-bin/koha/catalogue/search.pl?" _ query_cgi _ limit_cgi %] [% IF ( sort_by ) %] - [% url = BLOCK | html %][% url | html %][% "&sort_by=" _ sort_by |url %][% END %] + [% url = BLOCK %][% url | html %][% "&sort_by=" _ sort_by |url %][% END %] [% END %] [% FOREACH facet IN facets_loo.facets %] [% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetByCode('CCODE',facet.facet_label_value,0) || facet.facet_label_value %][% END %] 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 f3021db4aa..a2ac542406 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -327,7 +327,7 @@ [% IF loop_receive.cannot_cancel or ( order.basket.effective_create_items == "receiving" and loop_receive.holds > 0 ) %] [% IF loop_receive.cannot_cancel %] - [% span_title = BLOCK | html %] + [% span_title = BLOCK %] Cannot cancel receipt of this order line because it was created from a partial receipt of order line no. [% order.parent_ordernumber | html %], which is @@ -337,7 +337,7 @@ [% ELSE %] [%# FIXME Here we block the cancellation if holds exist. Actually it could be possible if items will be exist after the deletion %] [%# Some additional checks should be added in the pl file %] - [% span_title = BLOCK | html %] + [% span_title = BLOCK %] Cannot cancel receipt of this order line because at least one reservation exists on the records. [% END %] [% END %] 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 91cb45b21e..9039415c31 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 @@ -20,11 +20,11 @@ [% url_params = [] | html %] [% FOREACH param IN CGI.params.pairs %] - [% escaped_value = BLOCK | html %][% param.value | uri %][% END %] + [% escaped_value = BLOCK %][% param.value | uri %][% END %] [% url_params.push(param.key _ '=' _ escaped_value) | html %] [% END %] [% SET referrer = '/cgi-bin/koha/serials/serials-search.pl?' %] -[% referrer = BLOCK | html %][% referrer | url %][% url_params.join("&") |uri %][% END %] +[% referrer = BLOCK %][% referrer | url %][% url_params.join("&") |uri %][% END %] [% SET edit_action_link = '/cgi-bin/koha/serials/subscription-batchedit.pl?referrer=' _ referrer %] [% BLOCK subscriptions_table %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt index 5fc7b80047..b72639de5b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -68,7 +68,7 @@

    You searched for [% searchfield | html %]

    [% END %] [% IF ( letter && !independant_branch) %] - [% select_for_copy = BLOCK | html %] + [% select_for_copy = BLOCK %] 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 34d4d97dfa..e71e9de1e6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -480,7 +480,7 @@ [% IF ( OpacStarRatings == 'all' ) %]
    [% SET rating_avg = SEARCH_RESULT.ratings.get_avg_rating() %] - [% rating_avg_int = BLOCK | html %][% rating_avg | format("%.0f") %][% END %] + [% rating_avg_int = BLOCK %][% rating_avg | format("%.0f") %][% END %] [% FOREACH i IN [ 1 2 3 4 5 ] %] [% IF rating_avg_int == i %] -- 2.39.5