From b04b8d006172894e132a4c6d2be37498370d0f1a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sat, 28 Mar 2020 17:42:50 +0000 Subject: [PATCH] Bug 25007: (follow-up) Fix the way image check alters layout A question in the bug report asks: Why is is necessary to change the Bootstrap class to col-xs-12? The JavaScript which checks for the existence of an Amazon cover image is designed to remove the Amazon cover's container if there is none. Changing the class of cover image column is gone. However, the check is incorrect because it doesn't account for Local Covers. There might be both a 1 x 1 pixel Amazon image and a local cover image, so the layout shouldn't be changed unless there are no images present. To test, apply the patch and view the bibliographic details page of various titles including: - Amazon cover present, no local cover - No Amazon cover, local cover image present - Both Amazon and local cover image Signed-off-by: David Nind Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson (cherry picked from commit 05c4248721cfcbb9967b42e2bacf1a82eb845f1a) Signed-off-by: Lucas Gass --- .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index d440da692e..bd9e34e1ad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -779,14 +779,15 @@ h = this.height; if ((w == 1) || (h == 1)) { $("#amazon-bookcoverimg").remove(); - $("#catalogue_detail_biblio").attr("class","col-xs-12"); } else if ((this.complete != null) && (!this.complete)) { $("#amazon-bookcoverimg").remove(); - $("#catalogue_detail_biblio").attr("class","col-xs-12"); } } }); - if( $(this).find('img').length < 1 ) $(this).remove(); + if( $(this).find('img').length < 1 ){ + $(this).remove(); + $("#catalogue_detail_biblio").attr("class","col-xs-12"); + } }); $("#editions img").each(function(i){ if ((this.src.indexOf('images.amazon.com') >= 0) || (this.src.indexOf('g-images.amazon.com') >=0) || (this.src.indexOf('images-na.ssl-images-amazon.com'))) { -- 2.39.5