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

6 years ago · b73ab9c45e
parent 78ee5bd1da ac1c887698
commit b73ab9c45e
5 changed files with 1 additions and 6 deletions
--- a/airsonic-main/src/main/resources/org/airsonic/player/theme/subStandard.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/theme/subStandard.properties
@ -41,11 +41,10 @@ removeImage = icons/subStandard/remove.png
 searchImage = icons/subStandard/search.png
 settingsImage = icons/subStandard/settings.png
 shareFacebookImage = icons/subStandard/facebook.png
-shareGooglePlusImage = icons/subStandard/googleplus.png
 shareTwitterImage = icons/subStandard/twitter.png
 starredImage = icons/subStandard/starred.png
 statusImage = icons/subStandard/status.png
 upImage = icons/subStandard/up.png
 uploadImage = icons/subStandard/upload.png
 volumeImage = icons/subStandard/now_playing.png
-wapImage = icons/subStandard/phone.png
+wapImage = icons/subStandard/phone.png
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/createShare.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/createShare.jsp
@ -3,7 +3,6 @@
 <html>
 <head>
    <%@ include file="head.jsp" %>
-    <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
 </head>
 <body class="mainframe bgcolor1">

@ -22,9 +21,6 @@
    <a href="http://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>
 </p>
-<p>
-    <g:plusone size="small" annotation="none" href="${model.playUrl}"></g:plusone>&nbsp;<fmt:message key="share.googleplus"/>
-</p>
 <p>
    <fmt:message key="share.link">
        <fmt:param>${model.playUrl}</fmt:param>
--- a/airsonic-main/src/main/webapp/icons/default_dark/share_googleplus.png
+++ b/airsonic-main/src/main/webapp/icons/default_dark/share_googleplus.png
--- a/airsonic-main/src/main/webapp/icons/default_light/share_googleplus.png
+++ b/airsonic-main/src/main/webapp/icons/default_light/share_googleplus.png
--- a/airsonic-main/src/main/webapp/icons/subStandard/googleplus.png
+++ b/airsonic-main/src/main/webapp/icons/subStandard/googleplus.png