andpp/mopidy-musicbox-webclient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New icons for 'PLAY' and 'PLAY_ALL' action.

Browse Source
This commit is contained in:
jcass 2016-05-05 07:04:40 +02:00
parent 295b4831c0
commit 30ac2a5065
7 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -87,6 +87,8 @@ v2.3.0 (UNRELEASED)
(Addresses: `#184 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/184>`_).
- Optimized rendering of large lists of tracks to make UI more responsive.
- Added 'Folder' FontAwesome icon on the Browse pane for browsing the filesystem.
- New icons for 'PLAY' and 'PLAY_ALL' actions. In general, icons with an empty background will perform an action only
on the selected track, while icons with a filled background will apply the action to all tracks in the list.
**Fixes**

9
mopidy_musicbox_webclient/static/css/webclient.css
View File

@ -300,6 +300,11 @@
line-height: 100%;
}
.moreBtn i {
color: #ddd;
text-size: initial;
}
.backnav {
background-color: #ccc !important;
}
@ -395,11 +400,11 @@
}
.ui-icon-playAll:after {
content: '\f050';
content: '\f144';
}
.ui-icon-play:after {
content: '\f04b';
content: '\f01d';
}
.ui-icon-playNext:after {

6
mopidy_musicbox_webclient/static/index.html
View File

@ -115,12 +115,12 @@
<div data-role="popup" data-transition="none" data-theme="b" id="popupTracks">
<div data-role="collapsible-set">
<ul data-role="listview" data-icon="false" id="popupTracksLv">
<li data-icon="playAll" data-iconshadow="false">
<a href="#" onclick="return controls.playTracks(PLAY_ALL, mopidy);">Play All</a>
</li>
<li data-icon="play">
<a href="#" onclick="return controls.playTracks(PLAY_NOW, mopidy);">Play <span class="popupTrackName"></span></a>
</li>
<li data-icon="playAll" data-iconshadow="false">
<a href="#" onclick="return controls.playTracks(PLAY_ALL, mopidy);">Play All</a>
</li>
<li data-icon="playNext" class="addqueue">
<a href="#" onclick="return controls.playTracks(PLAY_NEXT, mopidy);">Play Track Next</a>
</li>

4
mopidy_musicbox_webclient/static/js/controls.js vendored
View File

@ -117,9 +117,9 @@
switch (parseInt(action)) {
case PLAY_ALL:
return 'fa fa-fast-forward'
return 'fa fa-play-circle'
case PLAY_NOW:
return 'fa fa-play'
return 'fa fa-play-circle-o'
case PLAY_NEXT:
return 'fa fa-level-down'
case ADD_THIS_BOTTOM:

2
mopidy_musicbox_webclient/static/js/functionsvars.js
View File

@ -216,7 +216,7 @@ function renderSongLi (previousTrack, track, nextTrack, uri, tlid, target, curre
html +=
'<li class="song albumli" id="' + getjQueryID(target, track.uri) + '" tlid="' + tlid + '">' +
'<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + track.uri + tlidParameter + '\');">' +
'<i class="fa fa-ellipsis-v"></i></a>' +
'<i class="fa fa-play-circle"></i></a>' +
'<a href="#" onclick="' + onClick + '"><h1><i class="' + getMediaClass(track.uri) + '"></i> ' + track.name + '</h1>'
if (listLength === 1 || (!hasSameAlbum(previousTrack, track) && !hasSameAlbum(track, nextTrack))) {

2
mopidy_musicbox_webclient/static/mb.appcache
View File

@ -1,6 +1,6 @@
CACHE MANIFEST
# 2016-04-27:v1
# 2016-05-05:v1
NETWORK:
*

8
tests/js/test_controls.js
View File

@ -217,8 +217,8 @@ describe('controls', function () {
describe('#getIconForAction()', function () {
it('should return correct FontAwesome class for each tracklist action', function () {
assert.equal(controls.getIconForAction(PLAY_ALL), 'fa fa-fast-forward')
assert.equal(controls.getIconForAction(PLAY_NOW), 'fa fa-play')
assert.equal(controls.getIconForAction(PLAY_ALL), 'fa fa-play-circle')
assert.equal(controls.getIconForAction(PLAY_NOW), 'fa fa-play-circle-o')
assert.equal(controls.getIconForAction(PLAY_NEXT), 'fa fa-level-down')
assert.equal(controls.getIconForAction(ADD_THIS_BOTTOM), 'fa fa-plus-square-o')
assert.equal(controls.getIconForAction(ADD_ALL_BOTTOM), 'fa fa-plus-square')
@ -229,11 +229,11 @@ describe('controls', function () {
})
it('should handle action identifier strings in addition to integers', function () {
assert.equal(controls.getIconForAction('0'), 'fa fa-play')
assert.equal(controls.getIconForAction('0'), 'fa fa-play-circle-o')
})
it('should use default tracklist action if no parameter is provided', function () {
assert.equal(controls.getIconForAction(), 'fa fa-fast-forward')
assert.equal(controls.getIconForAction(), 'fa fa-play-circle')
})
})