Merge remote-tracking branch 'airsonic/pr/952'

master
Andrew DeMaria 6 years ago
commit 1daa6cff6e
No known key found for this signature in database
GPG Key ID: 0A3F5E91F8364EDF
  1. 6
      airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
  2. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/allmusic.jsp
  3. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp
  4. 8
      airsonic-main/src/main/webapp/WEB-INF/jsp/createShare.jsp

@ -244,17 +244,17 @@
</c:if> </c:if>
<c:if test="${not empty model.artist and not empty model.album}"> <c:if test="${not empty model.artist and not empty model.album}">
<sub:url value="http://www.google.com/search" var="googleUrl" encoding="UTF-8"> <sub:url value="https://www.google.com/search" var="googleUrl" encoding="UTF-8">
<sub:param name="q" value="\"${model.artist}\" \"${model.album}\""/> <sub:param name="q" value="\"${model.artist}\" \"${model.album}\""/>
</sub:url> </sub:url>
<sub:url value="http://en.wikipedia.org/wiki/Special:Search" var="wikipediaUrl" encoding="UTF-8"> <sub:url value="https://en.wikipedia.org/wiki/Special:Search" var="wikipediaUrl" encoding="UTF-8">
<sub:param name="search" value="\"${model.album}\""/> <sub:param name="search" value="\"${model.album}\""/>
<sub:param name="go" value="Go"/> <sub:param name="go" value="Go"/>
</sub:url> </sub:url>
<sub:url value="allmusic.view" var="allmusicUrl"> <sub:url value="allmusic.view" var="allmusicUrl">
<sub:param name="album" value="${model.album}"/> <sub:param name="album" value="${model.album}"/>
</sub:url> </sub:url>
<sub:url value="http://www.last.fm/search" var="lastFmUrl" encoding="UTF-8"> <sub:url value="https://www.last.fm/search" var="lastFmUrl" encoding="UTF-8">
<sub:param name="q" value="\"${model.artist}\" \"${model.album}\""/> <sub:param name="q" value="\"${model.artist}\" \"${model.album}\""/>
<sub:param name="type" value="album"/> <sub:param name="type" value="album"/>
</sub:url> </sub:url>

@ -7,7 +7,7 @@
<body onload="document.allmusic.submit();" class="mainframe bgcolor1"> <body onload="document.allmusic.submit();" class="mainframe bgcolor1">
<h2><fmt:message key="allmusic.text"><fmt:param value="${album}"/></fmt:message></h2> <h2><fmt:message key="allmusic.text"><fmt:param value="${album}"/></fmt:message></h2>
<form name="allmusic" action="http://www.allmusic.com/search" method="POST" accept-charset="iso-8859-1"> <form name="allmusic" action="https://www.allmusic.com/search" method="POST" accept-charset="iso-8859-1">
<input type="hidden" name="search_term" value="${album}"/> <input type="hidden" name="search_term" value="${album}"/>
<input type="hidden" name="search_type" value="album"/> <input type="hidden" name="search_type" value="album"/>
</form> </form>

@ -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="http://last.fm/" target="_blank"><img src="<c:url value="/icons/lastfm.gif"/>"></a> <a href="https://last.fm/" target="_blank"><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>

@ -13,13 +13,13 @@
<fmt:message key="share.warning"/> <fmt:message key="share.warning"/>
<p> <p>
<a href="http://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"><img src="<spring:theme code="shareFacebookImage"/>" alt=""></a>&nbsp;
<a href="http://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"><fmt:message key="share.facebook"/></a>
</p> </p>
<p> <p>
<a href="http://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"><img src="<spring:theme code="shareTwitterImage"/>" alt=""></a>&nbsp;
<a href="http://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"><fmt:message key="share.twitter"/></a>
</p> </p>
<p> <p>
<fmt:message key="share.link"> <fmt:message key="share.link">

Loading…
Cancel
Save