Merge Pull Request #139 into develop

master
Eugene E. Kashpureff Jr 8 years ago
commit 139755d4be
  1. 1
      libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
  2. 1
      libresonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp
  3. 3
      libresonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp
  4. 1
      libresonic-main/src/main/webapp/WEB-INF/jsp/home.jsp
  5. 1
      libresonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp

@ -481,6 +481,7 @@
<c:param name="coverArtSize" value="${model.coverArtSizeMedium}"/> <c:param name="coverArtSize" value="${model.coverArtSizeMedium}"/>
<c:param name="showLink" value="true"/> <c:param name="showLink" value="true"/>
<c:param name="appearAfter" value="${loopStatus.count * 30}"/> <c:param name="appearAfter" value="${loopStatus.count * 30}"/>
<c:param name="hideOverflow" value="true"/>
</c:import> </c:import>
</div> </div>
</c:forEach> </c:forEach>

@ -273,6 +273,7 @@
<c:param name="coverArtSize" value="${model.coverArtSizeMedium}"/> <c:param name="coverArtSize" value="${model.coverArtSizeMedium}"/>
<c:param name="showLink" value="true"/> <c:param name="showLink" value="true"/>
<c:param name="appearAfter" value="${loopStatus.count * 30}"/> <c:param name="appearAfter" value="${loopStatus.count * 30}"/>
<c:param name="hideOverflow" value="true"/>
</c:import> </c:import>
</div> </div>
</c:if> </c:if>

@ -15,6 +15,7 @@ PARAMETERS
showZoom: Whether to display a link for zooming the cover art. showZoom: Whether to display a link for zooming the cover art.
showChange: Whether to display a link for changing 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. 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:choose>
<c:when test="${empty param.coverArtSize}"> <c:when test="${empty param.coverArtSize}">
@ -32,7 +33,7 @@ PARAMETERS
<str:randomString count="5" type="alphabet" var="playId"/> <str:randomString count="5" type="alphabet" var="playId"/>
<div class="coverart dropshadow"> <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:if test="${not empty param.albumId}">
<c:url value="main.view" var="targetUrl"> <c:url value="main.view" var="targetUrl">

@ -111,6 +111,7 @@
<c:param name="coverArtSize" value="${model.coverArtSize}"/> <c:param name="coverArtSize" value="${model.coverArtSize}"/>
<c:param name="showLink" value="true"/> <c:param name="showLink" value="true"/>
<c:param name="appearAfter" value="${loopStatus.count * 30}"/> <c:param name="appearAfter" value="${loopStatus.count * 30}"/>
<c:param name="hideOverflow" value="true"/>
</c:import> </c:import>
<c:if test="${not empty album.rating}"> <c:if test="${not empty album.rating}">

@ -73,6 +73,7 @@
<c:param name="coverArtSize" value="${model.coverArtSize}"/> <c:param name="coverArtSize" value="${model.coverArtSize}"/>
<c:param name="showLink" value="true"/> <c:param name="showLink" value="true"/>
<c:param name="appearAfter" value="${loopStatus.count * 30}"/> <c:param name="appearAfter" value="${loopStatus.count * 30}"/>
<c:param name="hideOverflow" value="true"/>
</c:import> </c:import>
</div> </div>
</c:forEach> </c:forEach>

Loading…
Cancel
Save