From 6204409c5eac00514636cb7ab35a6b7c22a39624 Mon Sep 17 00:00:00 2001 From: jo Date: Tue, 27 Feb 2018 15:58:44 +0100 Subject: [PATCH 1/2] New add_album to play queue --- .../player/theme/default_dark.properties | 5 +---- .../player/theme/default_light.properties | 5 +---- .../src/main/webapp/WEB-INF/jsp/coverArt.jsp | 18 ++++++++++++++++-- .../webapp/icons/default_dark/add_overlay.png | Bin 0 -> 1352 bytes .../icons/default_dark/play_overlay.png | Bin 1336 -> 1303 bytes .../icons/default_light/add_overlay.png | Bin 0 -> 1352 bytes .../icons/default_light/play_overlay.png | Bin 1336 -> 1303 bytes 7 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 airsonic-main/src/main/webapp/icons/default_dark/add_overlay.png create mode 100644 airsonic-main/src/main/webapp/icons/default_light/add_overlay.png diff --git a/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties index 397c8824..933edbfb 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties +++ b/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 - - - - diff --git a/airsonic-main/src/main/resources/org/airsonic/player/theme/default_light.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/default_light.properties index 92ee2559..f53b954f 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/theme/default_light.properties +++ b/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 - - - - diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp index f6e83348..7616e135 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp @@ -31,6 +31,7 @@ PARAMETERS +
overflow:hidden;" title="${param.caption1}" id="${divId}"> @@ -74,6 +75,14 @@ PARAMETERS " id="${playId}" style="position: relative; top: 8px; left: 8px; z-index: 2; display:none" >
+ + +
+ " id="${addId}" + style="position: relative; top: 8px; left: 48px; z-index: 2; display:none" > +
+ + @@ -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}); }); - + $("#${addId}").click(function () { + + top.playQueue.onAdd(${param.albumId}); + + }); - diff --git a/airsonic-main/src/main/webapp/icons/default_dark/add_overlay.png b/airsonic-main/src/main/webapp/icons/default_dark/add_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..bb2187243c168bdc21b03f22fb07c134abb1dcbe GIT binary patch literal 1352 zcmV-O1-JT%P)B6Gs$=|F=7fccGSTaBu?HRO_N3lpMfi1yVUw zLP&wwTv~BK+_(^E5TL42)mv2*)iiD30ul!-ZuEj3kq9nTxr78zr9_BS)QXZQv73NR z1M#Li-svH6Ft&-Eq=^5tntl7;H*aR%n*~0wXeGu%2m!yy#SB|@H>D< zL?mkU$!ZL|9l!<7`In3_-`w2X{PX9}%~UGI0ieFVo^9H+NnO8wy@PX}5<=Vp5GA6q zYQC4vfDpnB;5*y4&tx(gD;|$$5{X3S!Gi~{%N!BGFpLe6NW>EkhdmyThe?vu4d8ns zdbwf%A;eD0vhHxsw_Lk+E#2MSoiL!#A$I2T`N4+|A6h3) zoOt%?)vKCj{VqA3PB|8f1w)|_lVy2tX(rwR5JI>u%X&OMKJIO4X?eQV;KdNVy}gaw zwr!hM6lG8Go+t&ll*{GX4jw%Cq*~gWnwqrc=4K55hK7c6!^6Y5ucbBGV zzYx*ag>k7U_;%a2&s@EFHC@Y^hr?k{G#cFzjYfBb!(mS~`(!dXfBpLPv~An%LWn>a z0DudbOvbu=`Et6Nv(>7rt1FewW;uZKZvhA)h;#nM?c29AwH~$A$TUqm9*<`^=f@VS z>QV;wGREo?iA3go1uv+lr{@J@%m-jkF~DbYb93{9gM(!i?*CSQfB$RKH0QCXGS#I zO2$J&L%Azgu8fzC8;0R5%z9v8AUiNHFk9){N!V%4-Z$Y zavdEVTZ#Z?FJ8PjSt(elhzNCcbt-^oz?&twuW6cU7{-QLoUBFr_wWBmRaFNTZcj@9 zk2vR3kw~O!NnNX2TU$Mx^GN`IECCRaV2u454u?Ies!GdxSc5c8lOmCbn=y8)aBnOQ z*6HzhpGL%jLd0bm-8NWHLFwoU_%m<9qk+?NU{> zi-^8?7l6yMtj7}*6Ll>uEhDqDvlWZeO67Dq<-WeY#;seorWHjA5z#+|cWYFp0RZP0f6W?9)104~nK7rPrt$#L(9j@zymjQGC;}lY+++>_2m&Zn&I}f6`+XvMyb_-uT>k+@^aYvZN>xAr0000< KMNUMnLSTaNfp6si literal 0 HcmV?d00001 diff --git a/airsonic-main/src/main/webapp/icons/default_dark/play_overlay.png b/airsonic-main/src/main/webapp/icons/default_dark/play_overlay.png index d1727811427b03ce7146ff0c37d3861a8d2a79ec..00a427aa35cefff3ad6d83bafa6b8832da9427d1 100644 GIT binary patch delta 1284 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 diff --git a/airsonic-main/src/main/webapp/icons/default_light/add_overlay.png b/airsonic-main/src/main/webapp/icons/default_light/add_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..bb2187243c168bdc21b03f22fb07c134abb1dcbe GIT binary patch literal 1352 zcmV-O1-JT%P)B6Gs$=|F=7fccGSTaBu?HRO_N3lpMfi1yVUw zLP&wwTv~BK+_(^E5TL42)mv2*)iiD30ul!-ZuEj3kq9nTxr78zr9_BS)QXZQv73NR z1M#Li-svH6Ft&-Eq=^5tntl7;H*aR%n*~0wXeGu%2m!yy#SB|@H>D< zL?mkU$!ZL|9l!<7`In3_-`w2X{PX9}%~UGI0ieFVo^9H+NnO8wy@PX}5<=Vp5GA6q zYQC4vfDpnB;5*y4&tx(gD;|$$5{X3S!Gi~{%N!BGFpLe6NW>EkhdmyThe?vu4d8ns zdbwf%A;eD0vhHxsw_Lk+E#2MSoiL!#A$I2T`N4+|A6h3) zoOt%?)vKCj{VqA3PB|8f1w)|_lVy2tX(rwR5JI>u%X&OMKJIO4X?eQV;KdNVy}gaw zwr!hM6lG8Go+t&ll*{GX4jw%Cq*~gWnwqrc=4K55hK7c6!^6Y5ucbBGV zzYx*ag>k7U_;%a2&s@EFHC@Y^hr?k{G#cFzjYfBb!(mS~`(!dXfBpLPv~An%LWn>a z0DudbOvbu=`Et6Nv(>7rt1FewW;uZKZvhA)h;#nM?c29AwH~$A$TUqm9*<`^=f@VS z>QV;wGREo?iA3go1uv+lr{@J@%m-jkF~DbYb93{9gM(!i?*CSQfB$RKH0QCXGS#I zO2$J&L%Azgu8fzC8;0R5%z9v8AUiNHFk9){N!V%4-Z$Y zavdEVTZ#Z?FJ8PjSt(elhzNCcbt-^oz?&twuW6cU7{-QLoUBFr_wWBmRaFNTZcj@9 zk2vR3kw~O!NnNX2TU$Mx^GN`IECCRaV2u454u?Ies!GdxSc5c8lOmCbn=y8)aBnOQ z*6HzhpGL%jLd0bm-8NWHLFwoU_%m<9qk+?NU{> zi-^8?7l6yMtj7}*6Ll>uEhDqDvlWZeO67Dq<-WeY#;seorWHjA5z#+|cWYFp0RZP0f6W?9)104~nK7rPrt$#L(9j@zymjQGC;}lY+++>_2m&Zn&I}f6`+XvMyb_-uT>k+@^aYvZN>xAr0000< KMNUMnLSTaNfp6si literal 0 HcmV?d00001 diff --git a/airsonic-main/src/main/webapp/icons/default_light/play_overlay.png b/airsonic-main/src/main/webapp/icons/default_light/play_overlay.png index d1727811427b03ce7146ff0c37d3861a8d2a79ec..00a427aa35cefff3ad6d83bafa6b8832da9427d1 100644 GIT binary patch delta 1284 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 From 30ffc9560b1cb7c75e585a02f53ad35609a66557 Mon Sep 17 00:00:00 2001 From: jo Date: Fri, 4 May 2018 01:45:00 +0200 Subject: [PATCH 2/2] Fix wrong case --- .../resources/org/airsonic/player/theme/default_dark.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties index 933edbfb..132a1517 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties @@ -3,7 +3,7 @@ # Author: Sindre Mehus addImage = icons/default_dark/add.png -AddOverlayImage = icons/default_dark/add_overlay.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