yetangitu/Jamstash
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add Artist to now playing display

Browse source
This commit is contained in:
Carey Metcalfe 2017-10-17 09:12:22 -04:00
parent 63a6188d46
commit 3e66e6258c
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/common/model-service.js
View file

@ -94,7 +94,7 @@ angular.module('jamstash.model', ['jamstash.utils'])
var url, title, artist, track, rating, starred, contenttype, suffix, description; var url, title, artist, track, rating, starred, contenttype, suffix, description;
var specs = '', coverartthumb = '', coverartfull = ''; var specs = '', coverartthumb = '', coverartfull = '';
if (typeof song.coverArt != 'undefined') { if (typeof song.coverArt != 'undefined') {
coverartthumb = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&size=30&id=' + song.coverArt; coverartthumb = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&size=45&id=' + song.coverArt;
coverartfull = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&id=' + song.coverArt; coverartfull = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&id=' + song.coverArt;
} else { } else {
coverartthumb = 'images/albumdefault_60.jpg'; coverartthumb = 'images/albumdefault_60.jpg';

3
app/player/player.html
View file

@ -18,11 +18,12 @@
<div id="songdetails"> <div id="songdetails">
<div id="coverart"> <div id="coverart">
<a ng-click="fancyboxOpenImage(getPlayingSong().coverartfull)"> <a ng-click="fancyboxOpenImage(getPlayingSong().coverartfull)">
<img ng-src="{{getPlayingSong().coverartthumb}}" src="images/albumdefault_60.jpg" height="30" width="30" /> <img ng-src="{{getPlayingSong().coverartthumb}}" src="images/albumdefault_60.jpg" height="45" width="45" />
</a> </a>
</div> </div>
<ul> <ul>
<li class="song" id="{{getPlayingSong().id}}" ng-bind-html="getPlayingSong().name" title="{{getPlayingSong().specs}}"></li> <li class="song" id="{{getPlayingSong().id}}" ng-bind-html="getPlayingSong().name" title="{{getPlayingSong().specs}}"></li>
<li class="artist" ng-bind-html="getPlayingSong().artist"></li>
<li class="album" ng-bind-html="getPlayingSong().album"></li> <li class="album" ng-bind-html="getPlayingSong().album"></li>
</ul> </ul>
<div id="songdetails_controls"> <div id="songdetails_controls">

18
app/styles/Style.css
View file

@ -1218,7 +1218,7 @@ ul.songlist li:hover
.audiojs .audiojs
{ {
width: auto; width: auto;
height: 45px; height: 60px;
margin: 0 10px 0 0; margin: 0 10px 0 0;
background: none; background: none;
font-family: inherit; font-family: inherit;
@ -1233,7 +1233,7 @@ ul.songlist li:hover
.audiojs .scrubber .audiojs .scrubber
{ {
height: 4px; height: 4px;
margin: 20px 5px 0px 5px; margin: 25px 5px 0px 5px;
float: none; float: none;
width: auto; width: auto;
position: relative; position: relative;
@ -1285,8 +1285,9 @@ ul.songlist li:hover
} }
.playeractions .playeractions
{ {
margin: 12px 9px 7px 20px; height: 25px;
width: 85px; margin: 18px 9px 18px 20px;
width: 85px;
} }
#playermiddle #playermiddle
{ {
@ -1296,8 +1297,8 @@ ul.songlist li:hover
#preview { display: none; } #preview { display: none; }
#coverart #coverart
{ {
width: 30px; width: 45px;
height: 30px; height: 45px;
overflow: hidden; overflow: hidden;
margin: 1px 8px 0 1px; margin: 1px 8px 0 1px;
float: left; float: left;
@ -1354,6 +1355,11 @@ ul.songlist li:hover
line-height: 14px; line-height: 14px;
margin: 0 0 2px 0; margin: 0 0 2px 0;
} }
#songdetails li.artist
{
font-size: 11px;
line-height: 14px;
}
#songdetails li.album #songdetails li.album
{ {
font-size: 11px; font-size: 11px;