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

Merge remote-tracking branch 'origin/pr/994'

Browse Source
This commit is contained in:
Andrew DeMaria
2019-04-19 09:46:40 -06:00
parent 1bd70263bd 90cb02105e
commit 2030caa219
8 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
+4 -4
View File
@@ -259,13 +259,13 @@
<sub:param name="type" value="album"/> <sub:param name="type" value="album"/>
</sub:url> </sub:url>
<span class="header"><fmt:message key="top.search"/> <a target="_blank" href="${googleUrl}">Google</a></span> | <span class="header"><fmt:message key="top.search"/> <a target="_blank" href="${googleUrl}">Google</a></span> |
<span class="header"><a target="_blank" href="${wikipediaUrl}">Wikipedia</a></span> | <span class="header"><a target="_blank" rel="noopener noreferrer" href="${wikipediaUrl}">Wikipedia</a></span> |
<span class="header"><a target="_blank" href="${allmusicUrl}">allmusic</a></span> | <span class="header"><a target="_blank" rel="noopener noreferrer" href="${allmusicUrl}">allmusic</a></span> |
<span class="header"><a target="_blank" href="${lastFmUrl}">Last.fm</a></span> | <span class="header"><a target="_blank" rel="noopener noreferrer" href="${lastFmUrl}">Last.fm</a></span> |
<c:if test="${not empty model.musicBrainzReleaseId}"> <c:if test="${not empty model.musicBrainzReleaseId}">
<sub:url value="https://musicbrainz.org/release/${model.musicBrainzReleaseId}" var="musicBrainzUrl" encoding="UTF-8"> <sub:url value="https://musicbrainz.org/release/${model.musicBrainzReleaseId}" var="musicBrainzUrl" encoding="UTF-8">
</sub:url> </sub:url>
<span class="header"><a target="_blank" href="${musicBrainzUrl}">MusicBrainz</a></span> | <span class="header"><a target="_blank" rel="noopener noreferrer" href="${musicBrainzUrl}">MusicBrainz</a></span> |
</c:if> </c:if>
<span class="header"> <span class="header">
<fmt:message key="main.playcount"><fmt:param value="${model.dir.playCount}"/></fmt:message> <fmt:message key="main.playcount"><fmt:param value="${model.dir.playCount}"/></fmt:message>
airsonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp
+1 -1
View File
@@ -123,7 +123,7 @@
<div style="clear:both;"></div> <div style="clear:both;"></div>
<div id="images"></div> <div id="images"></div>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<a href="https://last.fm/" target="_blank"><img src="<c:url value="/icons/lastfm.gif"/>"></a> <a href="https://last.fm/" target="_blank" rel="noopener noreferrer"><img src="<c:url value="/icons/lastfm.gif"/>"></a>
<span class="detail" style="padding-left:1em"><fmt:message key="changecoverart.courtesy"/></span> <span class="detail" style="padding-left:1em"><fmt:message key="changecoverart.courtesy"/></span>
</div> </div>
airsonic-main/src/main/webapp/WEB-INF/jsp/createShare.jsp
+4 -4
View File
@@ -13,13 +13,13 @@
<fmt:message key="share.warning"/> <fmt:message key="share.warning"/>
<p> <p>
<a href="https://www.facebook.com/sharer.php?u=${model.playUrl}" target="_blank"><img src="<spring:theme code="shareFacebookImage"/>" alt=""></a>&nbsp; <a href="https://www.facebook.com/sharer.php?u=${model.playUrl}" target="_blank" rel="noopener noreferrer"><img src="<spring:theme code="shareFacebookImage"/>" alt=""></a>&nbsp;
<a href="https://www.facebook.com/sharer.php?u=${model.playUrl}" target="_blank"><fmt:message key="share.facebook"/></a> <a href="https://www.facebook.com/sharer.php?u=${model.playUrl}" target="_blank" rel="noopener noreferrer"><fmt:message key="share.facebook"/></a>
</p> </p>
<p> <p>
<a href="https://twitter.com/?status=Listening to ${model.playUrl}" target="_blank"><img src="<spring:theme code="shareTwitterImage"/>" alt=""></a>&nbsp; <a href="https://twitter.com/?status=Listening to ${model.playUrl}" target="_blank" rel="noopener noreferrer"><img src="<spring:theme code="shareTwitterImage"/>" alt=""></a>&nbsp;
<a href="https://twitter.com/?status=Listening to ${model.playUrl}" target="_blank"><fmt:message key="share.twitter"/></a> <a href="https://twitter.com/?status=Listening to ${model.playUrl}" target="_blank" rel="noopener noreferrer"><fmt:message key="share.twitter"/></a>
</p> </p>
<p> <p>
<fmt:message key="share.link"> <fmt:message key="share.link">
airsonic-main/src/main/webapp/WEB-INF/jsp/error.jsp
+1 -1
View File
@@ -18,7 +18,7 @@
<p> <p>
Airsonic encountered an internal error. You can report this error in the Airsonic encountered an internal error. You can report this error in the
<a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic Forum</a>. <a href="https://www.reddit.com/r/airsonic" target="_blank" rel="noopener noreferrer">Airsonic Forum</a>.
Please include the information below. Please include the information below.
</p> </p>
airsonic-main/src/main/webapp/WEB-INF/jsp/externalPlayer.jsp
+1
View File
@@ -47,6 +47,7 @@
</audio> </audio>
<div class="detail" style="text-align:center;">Streaming by <a href="https://airsonic.github.io/" <div class="detail" style="text-align:center;">Streaming by <a href="https://airsonic.github.io/"
rel="noopener noreferrer"
target="_blank"><b>Airsonic</b></a></div> target="_blank"><b>Airsonic</b></a></div>
</div> </div>
airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp
+2 -2
View File
@@ -41,8 +41,8 @@
<tr><td class="ruleTableHeader"><fmt:message key="help.license.title"/></td><td class="ruleTableCell"> <tr><td class="ruleTableHeader"><fmt:message key="help.license.title"/></td><td class="ruleTableCell">
<a href="http://www.gnu.org/copyleft/gpl.html" target="_blank"><img style="float:right;margin-left: 10px" alt="GPL 3.0" src="<c:url value="/icons/default_light/gpl.png"/>"></a> <a href="http://www.gnu.org/copyleft/gpl.html" target="_blank"><img style="float:right;margin-left: 10px" alt="GPL 3.0" src="<c:url value="/icons/default_light/gpl.png"/>"></a>
<fmt:message key="help.license.text"><fmt:param value="${model.brand}"/></fmt:message></td></tr> <fmt:message key="help.license.text"><fmt:param value="${model.brand}"/></fmt:message></td></tr>
<tr><td class="ruleTableHeader"><fmt:message key="help.homepage.title"/></td><td class="ruleTableCell"><a target="_blank" href="https://airsonic.github.io/">Airsonic website</a></td></tr> <tr><td class="ruleTableHeader"><fmt:message key="help.homepage.title"/></td><td class="ruleTableCell"><a target="_blank" href="https://airsonic.github.io/" rel="noopener nofererrer">Airsonic website</a></td></tr>
<tr><td class="ruleTableHeader"><fmt:message key="help.forum.title"/></td><td class="ruleTableCell"><a target="_blank" href="https://www.reddit.com/r/airsonic">Airsonic on Reddit</a></td></tr> <tr><td class="ruleTableHeader"><fmt:message key="help.forum.title"/></td><td class="ruleTableCell"><a target="_blank" href="https://www.reddit.com/r/airsonic" rel="noopener noreferrer">Airsonic on Reddit</a></td></tr>
<tr><td class="ruleTableHeader"><fmt:message key="help.contact.title"/></td><td class="ruleTableCell"><fmt:message key="help.contact.text"><fmt:param value="${model.brand}"/></fmt:message></td></tr> <tr><td class="ruleTableHeader"><fmt:message key="help.contact.title"/></td><td class="ruleTableCell"><fmt:message key="help.contact.text"><fmt:param value="${model.brand}"/></fmt:message></td></tr>
</table> </table>
airsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
+1 -1
View File
@@ -263,7 +263,7 @@
</form> </form>
</c:if> </c:if>
<a href="https://airsonic.github.io/docs/apps/" target="_blank"><img alt="Apps" src="<c:url value="/icons/default_light/apps.png"/>" style="float: right;margin-left: 3em; margin-right: 3em"/></a> <a href="https://airsonic.github.io/docs/apps/" target="_blank" rel="noopener noreferrer"><img alt="Apps" src="<c:url value="/icons/default_light/apps.png"/>" style="float: right;margin-left: 3em; margin-right: 3em"/></a>
<h2> <h2>
<img src="<spring:theme code="androidImage"/>" alt=""/> <img src="<spring:theme code="androidImage"/>" alt=""/>
airsonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp
+1 -1
View File
@@ -88,7 +88,7 @@
<p style="padding-top:0.75em"> <p style="padding-top:0.75em">
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em"> <input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
<a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>" style="margin-right:1.3em"></a> <a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>" style="margin-right:1.3em"></a>
<a href="https://airsonic.github.io/docs/transcode/" target="_blank"><fmt:message key="transcodingsettings.recommended"/></a> <a href="https://airsonic.github.io/docs/transcode/" target="_blank" rel="noopener noreferrer"><fmt:message key="transcodingsettings.recommended"/></a>
</p> </p>
</form> </form>