Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Naomi 2011-01-26 18:32:27 -05:00
commit 9e20e935ca
12 changed files with 195 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

9
application/views/scripts/nowplaying/livestream.phtml Normal file
View file

@ -0,0 +1,9 @@
<OBJECT ID="MediaPlayer1" CLASSID="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95" CODEBASE="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab# Version=5,1,52,701" STANDBY="Loading Microsoft Windows® Media Player components..." TYPE="application/x-oleobject" width="280" height="46">
<param name="fileName" value="http://localhost:8000/airtime.mp3">
<param name="animationatStart" value="true">
<param name="transparentatStart" value="true">
<param name="autoStart" value="true">
<param name="showControls" value="true">
<param name="Volume" value="100">
<embed type="application/x-mplayer2" pluginspage="http://www.microsoft.com/Windows/MediaPlayer/" src="http://localhost:8000/airtime.mp3" name="MediaPlayer1" width=280 height=46 autostart=1 showcontrols=1 volume=100>
</OBJECT>

4
application/views/scripts/partialviews/header.phtml
View file

@ -1,5 +1,5 @@
<div id='col0' style='float:left; width: 10%; height: 100%;'>
<div><a href="Schedule" onClick="return popup(this)">Listen</a></div>
<div><a href="Nowplaying/livestream" onClick="return popup(this)">Listen</a></div>
</div>
<div id='col1' style='float:left; width: 25%; height: 100%;'>
@ -30,7 +30,7 @@ function popup(mylink){
href=mylink;
else
href=mylink.href;
window.open(href, "player", 'width=400,height=200,scrollbars=yes');
window.open(href, "player", 'width=300,height=100,scrollbars=yes');
return false;
}
</script>