From 1160ef6fd5e85bc3a5e9d47b199ae34367b9b0d7 Mon Sep 17 00:00:00 2001 From: phette23 Date: Sun, 12 Jan 2020 11:32:53 +0100 Subject: [PATCH] Bug 17221: Remove orphan commas in shelf browser This patch adds more conditions to the shelf browser template such that the displayed text reads as a proper list no matter what combination of system preferences are utilized Sponsored-by: California College of the Arts Signed-off-by: Katrin Fischer Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson (cherry picked from commit 091133983b116e2b5a330223404187482e5d5e79) Signed-off-by: Lucas Gass --- koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc index 276c0d2d5c..71bb14ca56 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc @@ -3,8 +3,10 @@
[% IF ( starting_homebranch ) %]Browsing [% starting_homebranch | html %] Shelves[% END %] - [% IF ( starting_location ) %], Shelving location: [% starting_location | html %][% END %] - [% IF ( starting_ccode ) %], Collection code: [% starting_ccode | html %][% END %] + [% IF ( starting_homebranch && ( starting_location || starting_ccode ) ) %], [% END %] + [% IF ( starting_location ) %]Shelving location: [% starting_location | html %][% END %] + [% IF ( ( starting_homebranch || starting_location ) && starting_ccode ) %], [% END %] + [% IF ( starting_ccode ) %]Collection code: [% starting_ccode | html %][% END %] Close shelf browser
-- 2.39.5