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

Merge pull request #188 from fxthomas/fix-shortcuts-and-coverart-overflow

Browse Source 
Fix shortcut help text and cover art overflow
This commit is contained in:
Eugene E. Kashpureff Jr
2016-12-23 13:21:14 -08:00
committed by GitHub
parent 3dd21c6465 cd348fe21e
commit ea592d7778
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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/more.jsp
+1 -1
View File
@@ -342,7 +342,7 @@
<td class="more-shortcut">m</td><td class="more-shortcut-descr"><fmt:message key="more.keyboard.sidebar"/></td> <td class="more-shortcut">m</td><td class="more-shortcut-descr"><fmt:message key="more.keyboard.sidebar"/></td>
</tr> </tr>
<tr> <tr>
<td class="more-shortcut">&#8593;</td><td class="more-shortcut-descr"><fmt:message key="more.keyboard.next"/></td> <td class="more-shortcut">&#8594;</td><td class="more-shortcut-descr"><fmt:message key="more.keyboard.next"/></td>
<td class="more-shortcut">g <fmt:message key="more.keyboard.then"/> o</td><td class="more-shortcut-descr"><fmt:message key="more.keyboard.podcasts"/></td> <td class="more-shortcut">g <fmt:message key="more.keyboard.then"/> o</td><td class="more-shortcut-descr"><fmt:message key="more.keyboard.podcasts"/></td>
<td class="more-shortcut">q</td><td class="more-shortcut-descr"><fmt:message key="more.keyboard.playqueue"/></td> <td class="more-shortcut">q</td><td class="more-shortcut-descr"><fmt:message key="more.keyboard.playqueue"/></td>
</tr> </tr>