From 53f7e584e3246fbffb76ad279b42c363029357fc Mon Sep 17 00:00:00 2001 From: Fridolin Somers <fridolin.somers@biblibre.com> Date: Mon, 26 Oct 2015 08:44:17 +0100 Subject: [PATCH] Bug 15059 - Line break in html attribute In some templates, there is a line break inside href attribute. This generates an attribute with a lot of spaces %20. Test plan : - at intranet (same at OPAC) - perform a search on one word with a sort order (anything but relevance) - click on "Next" at the bottom of the page - look at link "Show more" in facets => Without patch the URL contains a lot of spaces => With patch the URL is correct - at intranet go to ciculation module - click on "Overdues with fines" - look at links "Phone", "Notice" and "Considered lost" => Without patch the URL contains a lot of spaces => With patch the URL is correct --- koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc | 3 +-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt | 9 +++------ koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc | 3 +-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc index 157366e..d7d2741 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ -42,8 +42,7 @@ [% END %] [% IF ( facets_loo.expandable ) %] <li class="showmore"> - <a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi %][% limit_cgi |url %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %][% IF ( offset ) %] - &offset=[% offset |url %][% END %]&expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a> + <a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi %][% limit_cgi |url %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %][% IF ( offset ) %]&offset=[% offset |url %][% END %]&expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a> </li> [% END %] </ul></li> 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 dd2d7e6..ff3424d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt @@ -77,11 +77,9 @@ Mail [% END %] | - <a href="branchoverdues.pl?action=add&borrowernumber=[% overduesloo.borrowernumber %]&itemnumber=[% overduesloo.itemnumber %]&method=phone&location=[% overduesloo.location %]&overduelevel=[% overduesloo.overdueLevel %]&notifyId=[% overduesloo.notify_id %] - ">Phone</a> + <a href="branchoverdues.pl?action=add&borrowernumber=[% overduesloo.borrowernumber %]&itemnumber=[% overduesloo.itemnumber %]&method=phone&location=[% overduesloo.location %]&overduelevel=[% overduesloo.overdueLevel %]&notifyId=[% overduesloo.notify_id %]">Phone</a> | - <a href="branchoverdues.pl?action=add&borrowernumber=[% overduesloo.borrowernumber %]&itemnumber=[% overduesloo.itemnumber %]&method=letter&location=[% overduesloo.location %]&overduelevel=[% overduesloo.overdueLevel %] - &notifyId=[% overduesloo.notify_id %]">Notice</a> + <a href="branchoverdues.pl?action=add&borrowernumber=[% overduesloo.borrowernumber %]&itemnumber=[% overduesloo.itemnumber %]&method=letter&location=[% overduesloo.location %]&overduelevel=[% overduesloo.overdueLevel %]&notifyId=[% overduesloo.notify_id %]">Notice</a> [% END %] [% IF ( overduesloo.overdue2 ) %] @@ -89,8 +87,7 @@ [% END %] [% IF ( overduesloo.overdue3 ) %] - <a href="branchoverdues.pl?action=add&borrowernumber=[% overduesloo.borrowernumber %]&itemnumber=[% overduesloo.itemnumber %]&method=lost&location=[% overduesloo.location %]&overduelevel=[% overduesloo.overdueLevel %] - &notifyId=[% overduesloo.notify_id %]">Considered lost</a> + <a href="branchoverdues.pl?action=add&borrowernumber=[% overduesloo.borrowernumber %]&itemnumber=[% overduesloo.itemnumber %]&method=lost&location=[% overduesloo.location %]&overduelevel=[% overduesloo.overdueLevel %]&notifyId=[% overduesloo.notify_id %]">Considered lost</a> [% END %] </td> 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 958d571..48d996c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc @@ -51,8 +51,7 @@ [% END %] [% IF ( facets_loo.expandable ) %] <li class="showmore"> - <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi |url %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %][% IF ( offset ) %] - &offset=[% offset |url %][% END %]&expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a> + <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi |url %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %][% IF ( offset ) %]&offset=[% offset |url %][% END %]&expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a> </li> [% END %] </ul> -- 2.1.0