Merge branch 'master' of dev.sourcefabric.org:campcaster

This commit is contained in:
Naomi 2011-01-21 13:25:34 -05:00
commit 7bdfd60ea9
5 changed files with 63 additions and 68 deletions

View file

@ -3,7 +3,7 @@
<div>Volume</div>
</div>
<div id='col1' style='float:left; width: 30%; height: 100%;'>
<div id='col1' style='float:left; width: 25%; height: 100%;'>
<div>Show: <span id='show'></span></div>
<div>Playlist: <span id='playlist'></span></div>
<div>Host: <span id='host'></span></div>
@ -15,7 +15,8 @@
<div>Upcoming: <span id='next'></span></div>
</div>
<div id='list0' style='float:left; width: 30%; height: 100%;'></div>
<div>Start: <span id='start'></span> End: <span id='end'></span></div>
<div id='progressbar'></div>
<div id='list0' style='float:left; width: 35%; height: 100%;'></div>
<div>Start: <span id='start'></span></div>
<div>End: <span id='end'></span></div>
<div><span id='progressbar'></span> <span id='songposition'></span> | <span id='songlength'></span></div>
</div>