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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Yuchen Wang 2011-10-17 14:25:07 -04:00
commit 3e441dc72f
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/models/StoredFile.php
View file

@ -443,7 +443,7 @@ class Application_Model_StoredFile {
$serverName = $_SERVER['SERVER_NAME'];
$serverPort = $_SERVER['SERVER_PORT'];
return constructGetFileUrl($serverName, $serverPort);
return $this->constructGetFileUrl($serverName, $serverPort);
}
/**
@ -456,7 +456,7 @@ class Application_Model_StoredFile {
$serverName = $CC_CONFIG['baseUrl'];
$serverPort = $CC_CONFIG['basePort'];
return constructGetFileUrl($serverName, $serverPort);
return $this->constructGetFileUrl($serverName, $serverPort);
}
private function constructGetFileUrl($p_serverName, $p_serverPort){

2
airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
View file

@ -42,7 +42,7 @@ $(document).ready(function(){
?>
});
</script>
<div class="jp-logo"><img id="logo-img" onload='resizeToMaxHeight(this, 67);' src="<?php echo $this->logo ?>" /></div>
<div class="jp-logo"><img id="logo-img" onload='resizeToMaxHeight(this, 40);' src="<?php echo $this->logo ?>" /></div>
<div class="jp-stream">
<div class="jp-stream-text">Select stream:</div>