mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lots of music improvements, might break some things though

This commit is contained in:
Jan-Christoph Borchardt 2011-09-25 00:02:50 +02:00
parent 700ac75565
commit 368412a730
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/media/css/music.css
View File

@ -9,7 +9,8 @@ div.jp-progress { position:absolute; overflow:hidden; top:.5em; left:8em; width:
div.jp-seek-bar { background:#eee; width:0; height:100%; cursor:pointer; } div.jp-seek-bar { background:#eee; width:0; height:100%; cursor:pointer; }
div.jp-play-bar { background:#ccc; width:0; height:100%; } div.jp-play-bar { background:#ccc; width:0; height:100%; }
div.jp-seeking-bg { background:url("../img/pbar-ani.gif"); } div.jp-seeking-bg { background:url("../img/pbar-ani.gif"); }
div.jp-current-time,div.jp-duration { position:absolute; font-size:.64em; font-style:oblique; top:1em; left:13.5em; width:22em; } div.jp-current-time,div.jp-duration { position:absolute; font-size:.64em; font-style:oblique; top:1em; left:13.5em; }
div.jp-duration { left:33em; }
div.jp-duration { text-align:right; } div.jp-duration { text-align:right; }
a.jp-mute,a.jp-unmute { left:24em; } a.jp-mute,a.jp-unmute { left:24em; }
@ -27,14 +28,9 @@ div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; }
#collection li { padding-right:10px; } #collection li { padding-right:10px; }
#searchresults input.play, #searchresults input.add { float:left; height:1em; width:1em; } #searchresults input.play, #searchresults input.add { float:left; height:1em; width:1em; }
#collection tr.collapsed td.album, #collection tr.collapsed td.title { color:#ddd; } #collection tr.collapsed td.album, #collection tr.collapsed td.title { color:#ddd; }
a.expander { } a.expander { float:right; padding:0 1em; }
tr.active { background-color:#eee; } tr.active td { background-color:#eee; font-weight:bold; }
tr.artist, tr.artist td { tr td { border-top:1px solid #eee; height:2.2em; }
border-top: 1px solid lightgrey; tr .artist img { vertical-align:middle; }
} tr.album td.artist { padding-left:1em; }
tr.album td.artist { tr.song td.artist { padding-left:2em; }
padding-left: 20px;
}
tr.song td.artist {
padding-left: 40px;
}

12
apps/media/js/collection.js
View File

@ -219,10 +219,7 @@ Collection={
addButtons:function(parent,data){ addButtons:function(parent,data){
buttons = parent.find('.buttons'); buttons = parent.find('.buttons');
if(buttons.find('.add').length<=0) { if(buttons.find('.add').length<=0) {
buttons.append('<img class="add" src="'+OC.imagePath('core','actions/play-add')+'"/>'); buttons.prepend('<img class="add action" src="'+OC.imagePath('core','actions/play-add')+'" title="Add to playlist" />');
}
if(buttons.find('.play').length<=0) {
buttons.append('<img class="play" src="'+OC.imagePath('core','actions/play')+'"/>');
} }
buttons.find('.add').unbind('click'); buttons.find('.add').unbind('click');
buttons.find('.add').click(function(event){ buttons.find('.add').click(function(event){
@ -230,13 +227,6 @@ Collection={
PlayList.add(data,true); PlayList.add(data,true);
PlayList.render(); PlayList.render();
}); });
buttons.find('.play').unbind('click');
buttons.find('.play').click(function(event){
event.preventDefault();
PlayList.add(data);
PlayList.play(0,0);
PlayList.render();
});
}, },
find:function(artistName,albumName,songName){ find:function(artistName,albumName,songName){
if(songName){ if(songName){