diff --git a/marietje/marietje/static/css/custom.css b/marietje/marietje/static/css/custom.css index f97451c..d727cd5 100644 --- a/marietje/marietje/static/css/custom.css +++ b/marietje/marietje/static/css/custom.css @@ -21,3 +21,12 @@ footer { text-align: center; } + +.marietjequeue { + color: #777777;" +} + +.marietjequeuestart { + border-top: 4px double #777777; + color: #777777;" +} \ No newline at end of file diff --git a/marietje/marietje/static/js/queue.js b/marietje/marietje/static/js/queue.js index 5916676..a0eaefa 100644 --- a/marietje/marietje/static/js/queue.js +++ b/marietje/marietje/static/js/queue.js @@ -196,7 +196,8 @@ function renderQueue(playNextAt, now) var canDeletePrevious = false; $.each(queue, function (id, song) { var requestedBy = song.requested_by; - var requestCurr = requestedBy != 'Marietje'; + var reqMarietje = requestedBy != 'Marietje'; + var startMarietje = false //checks if id is the last item and returns false if the next song is Marietje, while the current song is not. if(id === queue.length-1){ @@ -208,20 +209,28 @@ function renderQueue(playNextAt, now) if(id === 0){ var requestPrev = false } else { - var requestPrev = !((queue[id-1].requested_by !== 'Marietje') && (requestedBy === 'Marietje')) var prevItem = queue[id-1].id + if(queue[id-1].requested_by !== 'Marietje'){ + var requestPrev = false + if (requestedBy == 'Marietje'){ + var startMarietje = true + } else { + var requestPrev = true + } + } else {var requestPrev = true} } - + var canDelete = song.can_move_down || canMoveSongs; - var canMoveUp = canMoveSongs && requestPrev || canDeletePrevious && requestCurr && requestPrev; - var canMoveDown = canMoveSongs && requestNext || canDelete && requestCurr && requestNext; + var canMoveUp = canMoveSongs && requestPrev || canDeletePrevious && reqMarietje && requestPrev; + var canMoveDown = canMoveSongs && requestNext || canDelete && reqMarietje && requestNext; var artist = song.song.artist.trim() === '' ? '?' : song.song.artist; var title = song.song.title.trim() === '' ? '?' : song.song.title; - + var marietjeclass = reqMarietje ? '' : ' class="marietjequeue"'; + var marietjestartclass = startMarietje ? ' class="marietjequeuestart"' : ''; showTime = showTimeToPlay ? (timeToPlay < 0 ? '' : timeToPlay.secondsToMMSS()) : (playNextAt < now ? '' : playNextAt.timestampToHHMMSS()) - $('.queuebody:last-child').append('' + artist + $('.queuebody:last-child').append('' + '' + artist + '' + title + '' + requestedBy + '' + showTime + '' + '