MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge Pull Request #139 into develop

Browse Source
This commit is contained in:
Eugene E. Kashpureff Jr
2016-11-19 03:12:34 +00:00
parent 7832e5083e 43aebfbe9f
commit 139755d4be
5 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
+1
View File
@@ -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>
libresonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp
+1
View File
@@ -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>
libresonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp
+2 -1
View File
@@ -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">
libresonic-main/src/main/webapp/WEB-INF/jsp/home.jsp
+1
View File
@@ -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}">
libresonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp
+1
View File
@@ -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>