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

airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties

@@ -3,6 +3,7 @@
 # Author: Sindre Mehus
 
 addImage = icons/default_dark/add.png
+addOverlayImage = icons/default_dark/add_overlay.png
 addNextImage = icons/default_dark/add_next.png
 androidImage = icons/default_dark/android.png
 backImage = icons/default_dark/back.png
@@ -54,7 +55,3 @@ viewAsListImage = icons/default_dark/view_as_list.png
 viewAsGridImage = icons/default_dark/view_as_grid.png
 volumeImage = icons/default_dark/volume.png
 errorImage = icons/default_dark/error.png
-
-
-
-

airsonic-main/src/main/resources/org/airsonic/player/theme/default_light.properties

@@ -3,6 +3,7 @@
 # Author: Sindre Mehus
 
 addImage = icons/default_light/add.png
+addOverlayImage = icons/default_light/add_overlay.png
 addNextImage = icons/default_light/add_next.png
 androidImage = icons/default_light/android.png
 backImage = icons/default_light/back.png
@@ -54,7 +55,3 @@ viewAsListImage = icons/default_light/view_as_list.png
 viewAsGridImage = icons/default_light/view_as_grid.png
 volumeImage = icons/default_light/volume.png
 errorImage = icons/default_light/error.png
-
-
-
-

airsonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp

@@ -31,6 +31,7 @@ PARAMETERS
 <str:randomString count="5" type="alphabet" var="divId"/>
 <str:randomString count="5" type="alphabet" var="imgId"/>
 <str:randomString count="5" type="alphabet" var="playId"/>
+<str:randomString count="5" type="alphabet" var="addId"/>
 
 <div class="coverart dropshadow">
     <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}">
@@ -74,6 +75,14 @@ PARAMETERS
             <img src="<spring:theme code="playOverlayImage"/>" id="${playId}"
                  style="position: relative; top: 8px; left: 8px; z-index: 2; display:none" >
         </div>
+
+        <c:if test="${not empty param.albumId}">
+          <div style="position: relative; width: 0; height: 0">
+              <img src="<spring:theme code="addOverlayImage"/>" id="${addId}"
+                   style="position: relative; top: 8px; left: 48px; z-index: 2; display:none" >
+          </div>
+        </c:if>
+
         <c:choose>
         <c:when test="${param.showLink}"><a href="${targetUrl}" title="${param.caption1}"></c:when>
         <c:when test="${param.showZoom}"><a href="${zoomCoverArtUrl}" rel="zoom" title="${param.caption1}"></c:when>
@@ -120,11 +129,13 @@ PARAMETERS
 
     $("#${divId}").mouseenter(function () {
         $("#${playId}").show();
+        $("#${addId}").show();
         $("#${imgId}").stop();
         $("#${imgId}").animate({opacity: 0.7}, 150);
     });
     $("#${divId}").mouseleave(function () {
         $("#${playId}").hide();
+        $("#${addId}").hide();
         $("#${imgId}").stop();
         $("#${imgId}").animate({opacity: 1.0}, 150);
     });
@@ -139,6 +150,9 @@ PARAMETERS
         top.playQueue.onPlayPodcastChannel(${param.podcastChannelId});
         </c:if>
     });
-
+    $("#${addId}").click(function () {
+        <c:if test="${not empty param.albumId}">
+        top.playQueue.onAdd(${param.albumId});
+        </c:if>
+    });
 </script>
-