From 43aebfbe9f18c9770b2e48732decff1baa85c8db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Thomas?= <fx.thomas@gmail.com>
Date: Sat, 12 Nov 2016 16:29:50 +0100
Subject: [PATCH] Fix cover art overflow issues

Cover art images whose height is larger than their width overflow their
containing div and are superposed with the name of the album, and
sometimes other albums below.
---
 libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp  | 1 +
 libresonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp | 1 +
 libresonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp   | 3 ++-
 libresonic-main/src/main/webapp/WEB-INF/jsp/home.jsp       | 1 +
 libresonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp    | 3 ++-
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
index 19fd2f79..429275b5 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
@@ -481,6 +481,7 @@
                     <c:param name="coverArtSize" value="${model.coverArtSizeMedium}"/>
                     <c:param name="showLink" value="true"/>
                     <c:param name="appearAfter" value="${loopStatus.count * 30}"/>
+                    <c:param name="hideOverflow" value="true"/>
                 </c:import>
             </div>
         </c:forEach>
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp
index c7290c15..f843dac0 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp
@@ -273,6 +273,7 @@
                             <c:param name="coverArtSize" value="${model.coverArtSizeMedium}"/>
                             <c:param name="showLink" value="true"/>
                             <c:param name="appearAfter" value="${loopStatus.count * 30}"/>
+                            <c:param name="hideOverflow" value="true"/>
                         </c:import>
                     </div>
                 </c:if>
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp
index c4242ecd..8d9eee77 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp
@@ -15,6 +15,7 @@ PARAMETERS
   showZoom: Whether to display a link for zooming the cover art.
   showChange: Whether to display a link for changing the cover art.
   appearAfter: Fade in after this many milliseconds, or nil if no fading in should happen.
+  hideOverflow: Hide cover art overflow when height is greater than width
 --%>
 <c:choose>
     <c:when test="${empty param.coverArtSize}">
@@ -32,7 +33,7 @@ PARAMETERS
 <str:randomString count="5" type="alphabet" var="playId"/>
 
 <div class="coverart dropshadow">
-    <div style="width:${size};max-width:${size};height:${size};max-height:${size};cursor:pointer" title="${param.caption1}" id="${divId}">
+    <div style="width:${size};max-width:${size};height:${size};max-height:${size};cursor:pointer;<c:if test="${param.hideOverflow}">overflow:hidden</c:if>;" title="${param.caption1}" id="${divId}">
 
         <c:if test="${not empty param.albumId}">
             <c:url value="main.view" var="targetUrl">
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/home.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/home.jsp
index 3ed409b2..38040f27 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/home.jsp
@@ -111,6 +111,7 @@
             <c:param name="coverArtSize" value="${model.coverArtSize}"/>
             <c:param name="showLink" value="true"/>
             <c:param name="appearAfter" value="${loopStatus.count * 30}"/>
+            <c:param name="hideOverflow" value="true"/>
         </c:import>
 
         <c:if test="${not empty album.rating}">
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp
index 216ef2bf..6bc964ff 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp
@@ -73,6 +73,7 @@
                 <c:param name="coverArtSize" value="${model.coverArtSize}"/>
                 <c:param name="showLink" value="true"/>
                 <c:param name="appearAfter" value="${loopStatus.count * 30}"/>
+                <c:param name="hideOverflow" value="true"/>
             </c:import>
         </div>
     </c:forEach>
@@ -178,4 +179,4 @@
     </table>
 </c:if>
 
-</body></html>
\ No newline at end of file
+</body></html>