From a7ef526387963dd0285a43aac69f3e983795cd5c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 29 Oct 2018 16:16:17 -0300 Subject: [PATCH] Bug 21526: Use the 'url' filter when needed Content-Type: text/plain; charset=utf-8 Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy --- .../en/includes/authorities-search-results.inc | 4 ++-- .../intranet-tmpl/prog/en/includes/facets.inc | 6 +++--- .../prog/en/modules/acqui/addorderiso2709.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- .../prog/en/modules/acqui/basketgroup.tt | 8 ++++---- .../prog/en/modules/acqui/cancelorder.tt | 2 +- .../prog/en/modules/acqui/modordernotes.tt | 2 +- .../prog/en/modules/acqui/supplier.tt | 2 +- .../prog/en/modules/acqui/uncertainprice.tt | 2 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 8 ++++---- .../prog/en/modules/admin/aqcontract.tt | 6 +++--- .../en/modules/admin/auth_subfields_structure.tt | 2 +- .../prog/en/modules/admin/auth_tag_structure.tt | 6 +++--- .../prog/en/modules/admin/branches.tt | 2 +- .../prog/en/modules/admin/classsources.tt | 12 +++++------ .../prog/en/modules/admin/marctagstructure.tt | 2 +- .../prog/en/modules/admin/matching-rules.tt | 6 +++--- .../prog/en/modules/admin/patron-attr-types.tt | 6 +++--- .../prog/en/modules/admin/printers.tt | 2 +- .../prog/en/modules/admin/systempreferences.tt | 6 +++--- .../prog/en/modules/admin/usage_statistics.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 6 +++--- .../prog/en/modules/batch/print-notices.tt | 2 +- .../prog/en/modules/catalogue/MARCdetail.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 10 ++++----- .../prog/en/modules/catalogue/results.tt | 2 +- .../prog/en/modules/cataloguing/additem.tt | 2 +- .../prog/en/modules/circ/printslip.tt | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 2 +- .../en/modules/course_reserves/course-details.tt | 4 ++-- .../prog/en/modules/ill/ill-requests.tt | 8 ++++---- .../en/modules/reports/guided_reports_start.tt | 2 +- .../en/modules/serials/subscription-batchedit.tt | 2 +- .../prog/en/modules/serials/subscription-detail.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 2 +- .../prog/en/modules/tools/batchMod-del.tt | 6 +++--- .../prog/en/modules/tools/batchMod-edit.tt | 4 ++-- .../prog/en/modules/tools/manage-marc-import.tt | 10 ++++----- .../en/includes/authorities-search-results.inc | 2 +- .../bootstrap/en/includes/doc-head-close.inc | 6 +++--- .../opac-tmpl/bootstrap/en/includes/masthead.inc | 2 +- .../bootstrap/en/includes/opac-facets.inc | 6 +++--- .../bootstrap/en/modules/opac-auth-MARCdetail.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 10 ++++----- .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 6 +++--- .../bootstrap/en/modules/opac-course-details.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 20 +++++++++--------- .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +- .../bootstrap/en/modules/opac-news-rss.tt | 2 +- .../bootstrap/en/modules/opac-opensearch.tt | 24 +++++++++++----------- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 8 ++++---- .../bootstrap/en/modules/opac-search-history.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- .../bootstrap/en/modules/opac-showreviews-rss.tt | 2 +- .../bootstrap/en/modules/opac-showreviews.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/sci/sci-main.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/sco/help.tt | 2 +- .../bootstrap/en/modules/sco/printslip.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 2 +- misc/cronjobs/rss/lastAcquired-1.0.tt | 2 +- misc/cronjobs/rss/lastAcquired-2.0.tt | 2 +- 62 files changed, 143 insertions(+), 143 deletions(-) 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 06d6621..3832d3c 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 @@ -10,7 +10,7 @@ [% IF marcflavour == 'UNIMARC' %] [% IF authid %] - [% link = BLOCK %][% heading | html %][% END %] + [% link = BLOCK %][% heading | html %][% END %] [% ELSE %] [% link = BLOCK %][% heading | html %][% END %] [% END %] @@ -28,7 +28,7 @@ [% IF ( linkType=='seealso' ) %] [% IF ( authid ) %] - [% heading | html %] + [% heading | html %] [% ELSE %] [% heading | html %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc index b050848..204d11a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ -33,10 +33,10 @@ [% IF facet.active %] [% SET local_url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %] [% facet.facet_label_value | html %] - [x] + [x] [% ELSE %] [% SET local_url = url _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %] - [% facet.facet_label_value | html %] + [% facet.facet_label_value | html %] [% IF ( displayFacetCount ) %] ([% facet.facet_count | html %]) [% END %] @@ -45,7 +45,7 @@ [% END %] [% IF ( facets_loo.expandable ) %]
  • - Show more + Show more
    • [% 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 f3e2822..54a7011 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -413,7 +413,7 @@ [% batch_lis.staged_date | $KohaDates with_hours => 1 | html %] [% batch_lis.num_records | html %] - Add orders + Add orders [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 243ac8e..2443cf7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -2,7 +2,7 @@ [% USE Asset %] [% BLOCK csv_export %]
    - Export as CSV + Export as CSV
    [% END %] 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 4bb82de..41b17a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt @@ -34,7 +34,7 @@
    - Cancel + Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index 7cc6bf1..c6db192 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -264,7 +264,7 @@

    Phone: [% phone | html %]

    Fax: [% fax | html %]

    [% IF ( url ) %] -

    Website: [% url | html %]

    +

    Website: [% url | html %]

    [% END %] [% IF ( accountnumber ) %]

    Account number: [% accountnumber | html %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index 425176e..82c067e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -33,7 +33,7 @@ [% bookselleraddress2 | html %] [% bookselleraddress3 | html %] [% bookselleraddress4 | html %] - [% booksellerurl | html %] + [% booksellerurl | html %]

    Phone: [% booksellerphone | html %] / Fax: 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 98a2e03..498486c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -10,7 +10,7 @@

    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 c9935fb..d6c38ec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt @@ -13,7 +13,7 @@ [% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% Asset.css("css/print.css") | $raw %] [% IF ( Koha.Preference('SlipCSS') ) %] 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 1ba62df..94a58ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -28,7 +28,7 @@

    Holds awaiting pickup for your library on: [% show_date | $KohaDates %] [% IF ( all_branches_link ) %] - + View all libraries [% END %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt index f798473..c34d14e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -156,9 +156,9 @@ [% IF (cr.item.uri) %] - Item URI + Item URI [% ELSIF (cr.biblioitem.url) %] - Record URL + Record URL [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index 931cef5..0ec9ec1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -409,7 +409,7 @@
    - Cancel + Cancel
    [% ELSE %] @@ -417,7 +417,7 @@ Interlibrary loan request details

    No partners have been defined yet. Please create appropriate patron records (by default ILLLIBS category).

    Be sure to provide email addresses for these patrons.

    -

    Cancel

    +

    Cancel

    [% END %] @@ -535,7 +535,7 @@
    Patron: [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %] - + [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
    @@ -631,7 +631,7 @@ [% FOREACH comment IN request.illcomments %]
    Comment by: - + [% comment.patron.firstname _ " " _ comment.patron.surname _ " [" _ comment.patron.cardnumber _ "]" | html %] [% comment.timestamp | $KohaDates with_hours => 1 %]

    [% comment.comment | html %]

    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 ab18d68..6c551b0 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 @@ -234,7 +234,7 @@ canned reports and writing custom SQL reports.

    [% IF (savedreport.public) %] - [% OPACBaseURL | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | html %] + [% OPACBaseURL | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | html %] [% ELSE %] [% Koha.Preference('staffClientBaseURL') | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | html %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt index aa81f21..5876983 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt @@ -155,7 +155,7 @@
    - Cancel + Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index f37f5e4..1c15bd3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -84,7 +84,7 @@ [% IF ( OPACBaseURL ) %]
  • OPAC view: - Open in new window. + Open in new window.
    • [% END %] [% IF ( branchcode ) %]
  • Library: [% Branches.GetName( branchcode ) | html %]
    • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index add1048..ba9a0c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -405,7 +405,7 @@ -
    [% IF ( suggestionid ) %] Cancel[% ELSE %] Cancel[% END %] +
    [% IF ( suggestionid ) %] Cancel[% ELSE %] Cancel[% END %]
    [% END %] 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 0579328..64721ce 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 @@ -118,7 +118,7 @@ @@ -164,7 +164,7 @@ [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%] Return to the record [% ELSIF src %] - Return to where you were + Return to where you were [% ELSE %] Return to batch item deletion [% END %] @@ -199,7 +199,7 @@ [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%] Return to the record [% ELSIF src %] - Return to where you were + Return to where you were [% ELSE %] Return to batch item deletion [% END %] 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 89679d7..07a916d 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 @@ -79,7 +79,7 @@ $(document).ready(function(){ [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] Return to the record [% ELSIF src %] - Return to where you were + Return to where you were [% ELSE %] Return to batch item modification [% END %] @@ -318,7 +318,7 @@ $(document).ready(function(){ [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] Return to the record [% ELSIF src %] - Return to where you were + Return to where you were [% ELSE %] Return to batch item modification [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt index dd0671f..f3b7a02 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt @@ -21,7 +21,7 @@ @@ -286,7 +286,7 @@ [% FOREACH batch_lis IN batch_list %] [% batch_lis.import_batch_id | html %] - [% batch_lis.file_name | html %] + [% batch_lis.file_name | html %] [% batch_lis.comments | html %] [% IF ( batch_lis.record_type == 'auth' ) %]Authority[% ELSE %]Bibliographic[% END %] @@ -308,7 +308,7 @@ [% batch_lis.upload_timestamp | html %] [% batch_lis.num_records | html %] - [% batch_lis.num_items | html %][% IF ( batch_lis.num_items ) %] (Create label batch)[% END %] + [% batch_lis.num_items | html %][% IF ( batch_lis.num_items ) %] (Create label batch)[% END %] [% IF ( batch_lis.can_clean ) %]
    @@ -333,7 +333,7 @@ [% IF ( page.current_page ) %] [% page.page_number | html %] [% ELSE %] - [% page.page_number | html %] + [% page.page_number | html %] [% END %] [% END %] 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 a309e01..5cf2e60 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 @@ -22,7 +22,7 @@ [% IF ( linkType=='seealso' ) %] [% IF ( authid ) %] - [% heading | html %] + [% heading | html %] [% ELSE %] [% heading | html %] [% END %] 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 22160e9..ad2217e 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 @@ -19,13 +19,13 @@ [% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %] [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %] - + [% ELSE %] [% Asset.css("css/" _ opaclayoutstylesheet) | $raw %] [% END %] [% IF ( OpacAdditionalStylesheet ) %] [% IF (OpacAdditionalStylesheet.match('^https?:|^\/')) %] - + [% ELSE %] [% END %] @@ -44,7 +44,7 @@ [% END %] [% END %] - + [% PROCESS cssinclude %] - + [% IF Branches.all.size == 1 %] [% IF branchcode %] RSS feed for [% Branches.GetName( branchcode ) | html %] library news. 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 64a4a47..d3935e6 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 @@ -2,7 +2,7 @@ - + News from [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]the library[% END %] [% OPACBaseURL | html %]/cgi-bin/koha/opac-main.pl 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 2e50ae9..7abdee6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt @@ -23,7 +23,7 @@ <![CDATA[[% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]]]> [% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&format=rss2 - + [% total | html %] [% offset | html %] @@ -33,7 +33,7 @@ 20 [% END %] [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] -