diff --git a/README.md b/README.md index f772197f..8931c857 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,8 @@ The [Subsonic source code](https://github.com/airsonic/subsonic-svn) was release The cover zooming feature is provided by [jquery.fancyzoom](https://github.com/keegnotrub/jquery.fancyzoom), released under [MIT License](http://www.opensource.org/licenses/mit-license.php). +The icons are from the amazing [feather](https://feathericons.com/) project, +and are licensed under [MIT license](https://github.com/feathericons/feather/blob/master/LICENSE). Usage ----- 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 132a1517..bf8c9e6e 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 @@ -1,22 +1,23 @@ - # Icons used by dark themes. # Author: Sindre Mehus addImage = icons/default_dark/add.png -addOverlayImage = icons/default_dark/add_overlay.png addNextImage = icons/default_dark/add_next.png +addOverlayImage = icons/default_dark/add_overlay.png androidImage = icons/default_dark/android.png backImage = icons/default_dark/back.png castActiveImage = icons/default_dark/cast_active.png castIdleImage = icons/default_dark/cast_idle.png castPauseImage = icons/default_dark/cast_pause.png castPlayImage = icons/default_dark/cast_play.png +clearImage = icons/default_light/clear.svg clearRatingImage = icons/default_dark/remove.png currentImage = icons/default_dark/current.png donateImage = icons/default_dark/donate.png donateSmallImage = icons/default_dark/donate_small.png downImage = icons/default_dark/down.png downloadImage = icons/default_dark/download.png +errorImage = icons/default_dark/error.png forwardImage = icons/default_dark/forward.png helpImage = icons/default_dark/help.png helpPopupImage = icons/default_dark/help_small.png @@ -25,33 +26,37 @@ html5Image = icons/default_dark/html5.png keyboardImage = icons/default_dark/keyboard.png logImage = icons/default_dark/log.png logoImage = icons/default_dark/logo_light.png +logoutImage = icons/default_dark/logout.svg moreImage = icons/default_dark/more.png muteImage = icons/default_dark/mute.png nowPlayingImage = icons/default_dark/now_playing.png playImage = icons/default_dark/play.png -playlistImage = icons/default_dark/playlist.png playOverlayImage = icons/default_dark/play_overlay.png +playlistImage = icons/default_dark/playlist.png podcastImage = icons/default_dark/podcast.png podcastLargeImage = icons/default_dark/podcast_large.png randomImage = icons/default_dark/random.png -ratingOnImage = icons/default_dark/ratingOn.png -ratingOffImage = icons/default_dark/ratingOff.png ratingHalfImage = icons/default_dark/ratingHalf.png +ratingOffImage = icons/default_dark/ratingOff.png +ratingOnImage = icons/default_dark/ratingOn.png removeImage = icons/default_dark/remove.png +repeatOff = icons/default_light/repeat_off.svg +repeatOn = icons/default_light/repeat_on.svg scanningImage = icons/default_dark/spinner.gif searchImage = icons/default_dark/search.png settingsImage = icons/default_dark/settings.png -shareSmallImage = icons/default_dark/share_small.png -shareImage = icons/default_dark/share.png shareFacebookImage = icons/default_dark/share_facebook.png +shareImage = icons/default_dark/share.png +shareSmallImage = icons/default_dark/share_small.png shareTwitterImage = icons/default_dark/share_twitter.png shuffleImage = icons/default_dark/shuffle.png +sidebarImage = icons/default_dark/sidebar.svg starredImage = icons/default_dark/starred.png statusImage = icons/default_dark/status.png statusSmallImage = icons/default_dark/status_small.png +undoImage = icons/default_light/undo.svg upImage = icons/default_dark/up.png uploadImage = icons/default_dark/upload.png -viewAsListImage = icons/default_dark/view_as_list.png viewAsGridImage = icons/default_dark/view_as_grid.png +viewAsListImage = icons/default_dark/view_as_list.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 f53b954f..d42e4059 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 @@ -1,57 +1,62 @@ - # Icons used by light themes. # 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 -castActiveImage = icons/default_light/cast_active.png -castIdleImage = icons/default_light/cast_idle.png -castPauseImage = icons/default_light/cast_pause.png -castPlayImage = icons/default_light/cast_play.png -clearRatingImage = icons/default_light/remove.png -currentImage = icons/default_light/current.png -donateImage = icons/default_light/donate.png -donateSmallImage = icons/default_light/donate_small.png -downImage = icons/default_light/down.png -downloadImage = icons/default_light/download.png -forwardImage = icons/default_light/forward.png -helpImage = icons/default_light/help.png -helpPopupImage = icons/default_light/help_small.png -homeImage = icons/default_light/home.png +addImage = icons/default_light/add.svg +addNextImage = icons/default_light/add_next.svg +addOverlayImage = icons/default_light/add_overlay.svg +androidImage = icons/default_light/android.svg +backImage = icons/default_light/back.svg +castActiveImage = icons/default_light/cast_active.svg +castIdleImage = icons/default_light/cast_idle.svg +castPauseImage = icons/default_light/cast_pause.svg +castPlayImage = icons/default_light/play.svg +clearImage = icons/default_light/clear.svg +clearRatingImage = icons/default_light/remove.svg +currentImage = icons/default_light/current.svg +donateImage = icons/default_light/donate.svg +donateSmallImage = icons/default_light/donate.svg +downImage = icons/default_light/down.svg +downloadImage = icons/default_light/download.svg +errorImage = icons/default_light/error.svg +forwardImage = icons/default_light/forward.svg +helpImage = icons/default_light/help.svg +helpPopupImage = icons/default_light/help.svg +homeImage = icons/default_light/home.svg html5Image = icons/default_light/html5.png keyboardImage = icons/default_light/keyboard.png -logImage = icons/default_light/log.png +logImage = icons/default_light/log.svg logoImage = icons/default_light/logo.png -moreImage = icons/default_light/more.png -muteImage = icons/default_light/mute.png -nowPlayingImage = icons/default_light/now_playing.png -playImage = icons/default_light/play.png -playlistImage = icons/default_light/playlist.png -playOverlayImage = icons/default_light/play_overlay.png -podcastImage = icons/default_light/podcast.png -podcastLargeImage = icons/default_light/podcast_large.png -randomImage = icons/default_light/random.png -ratingOnImage = icons/default_light/ratingOn.png -ratingOffImage = icons/default_light/ratingOff.png +logoutImage = icons/default_light/logout.svg +moreImage = icons/default_light/more.svg +muteImage = icons/default_light/mute.svg +nowPlayingImage = icons/default_light/now_playing.svg +playImage = icons/default_light/play.svg +playOverlayImage = icons/default_light/play_overlay.svg +playlistImage = icons/default_light/playlist.svg +podcastImage = icons/default_light/podcast.svg +podcastLargeImage = icons/default_light/podcast.svg +randomImage = icons/default_dark/random.png ratingHalfImage = icons/default_light/ratingHalf.png -removeImage = icons/default_light/remove.png +ratingOffImage = icons/default_light/ratingOff.svg +ratingOnImage = icons/default_light/ratingOn.svg +removeImage = icons/default_light/remove.svg +repeatOff = icons/default_light/repeat_off.svg +repeatOn = icons/default_light/repeat_on.svg scanningImage = icons/default_light/spinner.gif -searchImage = icons/default_light/search.png -settingsImage = icons/default_light/settings.png -shareSmallImage = icons/default_light/share_small.png -shareImage = icons/default_light/share.png -shareFacebookImage = icons/default_light/share_facebook.png -shareTwitterImage = icons/default_light/share_twitter.png -shuffleImage = icons/default_light/shuffle.png -starredImage = icons/default_light/starred.png -statusImage = icons/default_light/status.png -statusSmallImage = icons/default_light/status_small.png -upImage = icons/default_light/up.png -uploadImage = icons/default_light/upload.png -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 +searchImage = icons/default_light/search.svg +settingsImage = icons/default_light/settings.svg +shareFacebookImage = icons/default_light/share_facebook.svg +shareImage = icons/default_light/share.svg +shareSmallImage = icons/default_light/share.svg +shareTwitterImage = icons/default_light/share_twitter.svg +shuffleImage = icons/default_light/shuffle.svg +sidebarImage = icons/default_light/sidebar.svg +starredImage = icons/default_light/starred.svg +statusImage = icons/default_light/status.svg +statusSmallImage = icons/default_light/status.svg +undoImage = icons/default_light/undo.svg +upImage = icons/default_light/up.svg +uploadImage = icons/default_light/upload.svg +viewAsGridImage = icons/default_light/view_as_grid.svg +viewAsListImage = icons/default_light/view_as_list.svg +volumeImage = icons/default_light/volume.svg diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp index 1f7e79d1..ac9eb872 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp @@ -164,7 +164,7 @@

" - onclick="toggleStar(${model.dir.id}, '#starImage'); return false;" style="cursor:pointer" alt=""> + onclick="toggleStar(${model.dir.id}, '#starImage'); return false;" style="cursor:pointer;height:18px;" alt=""> @@ -239,7 +239,7 @@ - " alt=""> + " style="height:18px;" alt=""> | diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp index 93326629..f3d036be 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp @@ -164,8 +164,8 @@

- " - onclick="toggleStar(${model.dir.id}, '#starImage'); return false;" style="cursor:pointer" alt=""> + " + onclick="toggleStar(${model.dir.id}, '#starImage'); return false;" style="cursor:pointer;height:18px;" alt=""> @@ -321,7 +321,7 @@ - " + " style="cursor:pointer" alt="" title=""> " alt="" title="" diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/createShare.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/createShare.jsp index 35271ac2..05848c5a 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/createShare.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/createShare.jsp @@ -7,7 +7,7 @@

- " alt=""> + " alt="" style="height:18px;">

diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp index fcc0c2e2..1df64f14 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp @@ -76,7 +76,11 @@ - " alt="">  + + " alt="Shuffle" style="height:16px;"> + + + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp index a393dd98..81da95b7 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp @@ -143,7 +143,7 @@

${fn:escapeXml(entry.key.index)}

- " alt=""> + " alt="" style="height:18px;"> diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/playButtons.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playButtons.jsp index 46351229..96770848 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playButtons.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playButtons.jsp @@ -18,11 +18,11 @@ PARAMETERS - " alt="" style="cursor:pointer" + " alt="" style="cursor:pointer;height:18px;" onclick="toggleStar(${param.id}, '#starImage${param.id}'); return false;"> - " alt="" style="cursor:pointer" + " alt="" style="cursor:pointer;height:18px;" onclick="toggleStar(${param.id}, '#starImage${param.id}'); return false;"> @@ -41,11 +41,11 @@ PARAMETERS title=""> - " alt="" style="cursor:pointer" + " alt="" style="cursor:pointer; height:18px;" onclick="${param.onPlay}; return false;" title=""> - " alt="" style="cursor:pointer" + " alt="" style="cursor:pointer; height:18px;" onclick="top.playQueue.onPlay(${param.id}); return false;" title=""> @@ -56,7 +56,7 @@ PARAMETERS " alt="" onclick="top.playQueue.onAdd(${param.id}); $().toastmessage('showSuccessToast', ''); return false;" - style="cursor:pointer" title=""> + style="cursor:pointer; height:18px;" title=""> @@ -64,7 +64,7 @@ PARAMETERS " alt="" onclick="top.playQueue.onAddNext(${param.id}); $().toastmessage('showSuccessToast', ''); return false;" - style="cursor:pointer" title=""> + style="cursor:pointer; height:18px;" title=""> diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp index 1783e6e8..560c1803 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp @@ -420,9 +420,11 @@ if (radioEnabled) { $("#toggleRepeat").html(""); } else if (repeatEnabled) { - $("#toggleRepeat").html(""); + $("#toggleRepeat").attr('src', ''); + $("#toggleRepeat").attr('alt', 'Repeat On'); } else { - $("#toggleRepeat").html(""); + $("#toggleRepeat").attr('src', ''); + $("#toggleRepeat").attr('alt', 'Repeat Off'); } } @@ -691,8 +693,8 @@ -
-