Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-2908: Add "Live Stream" title to live stream popup window 

-custom logo
This commit is contained in:
martin 2011-10-04 17:18:36 -04:00
parent 7dd14efe27
commit 929e29182b
8 changed files with 79 additions and 50 deletions
airtime_mvc
application
controllers
DashboardController.php
views/scripts
dashboard
stream-player.phtml
form
register-dialog.phtmlsupport-setting.phtml
public/js
airtime
dashboard
helperfunctions.js
nowplaying
register.js
preferences
support-setting.js
jplayer/skin
jplayer.blue.monday.css

7
airtime_mvc/application/controllers/DashboardController.php
View File

@ -19,6 +19,13 @@ class DashboardController extends Zend_Controller_Action
$baseUrl = $request->getBaseUrl();
$this->view->headLink()->appendStylesheet($baseUrl.'/js/jplayer/skin/jplayer.blue.monday.css');
$this->_helper->layout->setLayout('bare');
$logo = Application_Model_Preference::GetStationLogo();
if($logo){
$this->view->logo = "data:image/png;base64,$logo";
} else {
$this->view->logo = "$baseUrl/css/images/airtime_logo_jp.png";
}
}
public function helpAction()

4
airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
View File

@ -42,11 +42,11 @@ $(document).ready(function(){
?>
});
</script>
<div class="jp-logo"></div>
<div class="jp-logo"><img id="logo-img" onload='resizeToMaxHeight(this, 67);' src="<?php echo $this->logo ?>" /></div>
<div class="jp-stream">
<div class="jp-stream-text">Select stream:</div>
<form id="form1" method="post" action="">
<select id="combo-box">
<?php
foreach($ids as $id) {

4
airtime_mvc/application/views/scripts/form/register-dialog.phtml
View File

@ -140,7 +140,7 @@
<dd id="Logo-element">
<?php if($this->element->getView()->logoImg){?>
<div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
<div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
<?php }?>
<?php echo $this->element->getElement('Logo') ?>
@ -176,4 +176,4 @@
<?php }?>
</div>
</form>
</div>
</div>

4
airtime_mvc/application/views/scripts/form/support-setting.phtml
View File

@ -134,7 +134,7 @@
</dt>
<dd id="Logo-element" class="block-display clearfix">
<?php if($this->element->getView()->logoImg){?>
<div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
<div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
<?php }?>
<?php echo $this->element->getElement('Logo') ?>
@ -175,4 +175,4 @@
<a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;">Terms and Conditions</a>
<?php }?>
</div>
</fieldset>
</fieldset>

38
airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
View File

@ -222,3 +222,41 @@ function audioPreview(filename, elemID){
$('#'+elemID+' div.list-item-container a span').attr("class", "ui-icon ui-icon-pause");
}
function resizeImg(ele, targetWidth, targetHeight){
var img = $(ele);
var width = ele.width;
var height = ele.height;
// resize img proportionaly
if( width > height && width > targetWidth){
var ratio = targetWidth/width;
img.css("width", targetHeight+"px");
var newHeight = height * ratio;
img.css("height", newHeight+"px");
}else if( width < height && height > targetHeight){
var ratio = targetHeight/height;
img.css("height", targetHeight+"px");
var newWidth = width * ratio;
img.css("width", newWidth+"px");
}else if( width == height && width > targetWidth){
img.css("height", targetHeight+"px");
img.css("width", targetWidth+"px" );
}
}
function resizeToMaxHeight(ele, targetHeight){
var img = $(ele);
var width = ele.width;
var height = ele.height;
// resize img proportionaly
if( height > targetHeight){
var ratio = targetHeight/height;
img.css("height", targetHeight+"px");
var newWidth = width * ratio;
img.css("width", newWidth+"px");
}
}

30
airtime_mvc/public/js/airtime/nowplaying/register.js
View File

@ -102,27 +102,25 @@ $(document).ready(function(){
});
});
function resizeImg(ele){
function resizeImg(ele, targetWidth, targetHeight){
var img = $(ele);
var width = ele.width;
var height = ele.height;
// resize img proportionaly
if( width > height && width > 430){
var ratio = 430/width;
img.css("width", "430px");
if( width > height && width > targetWidth){
var ratio = targetWidth/width;
img.css("width", targetHeight+"px");
var newHeight = height * ratio;
img.css("height", newHeight );
}else if( width < height && height > 430){
var ratio = 430/height;
img.css("height", "430px");
img.css("height", newHeight);
}else if( width < height && height > targetHeight){
var ratio = targetHeight/height;
img.css("height", targetHeight+"px");
var newWidth = width * ratio;
img.css("width", newWidth );
}else if( width == height && width > 430){
img.css("height", "430px");
img.css("width", "430px" );
}
}
img.css("width", newWidth);
}else if( width == height && width > targetWidth){
img.css("height", targetHeight+"px");
img.css("width", targetWidth+"px" );
}
}

25
airtime_mvc/public/js/airtime/preferences/support-setting.js
View File

@ -10,31 +10,6 @@ function showErrorSections() {
}
}
function resizeImg(ele){
var img = $(ele);
var width = ele.width;
var height = ele.height;
// resize img proportionaly
if( width > height && width > 450){
var ratio = 450/width;
img.css("width", "450px");
var newHeight = height * ratio;
img.css("height", newHeight );
}else if( width < height && height > 450){
var ratio = 450/height;
img.css("height", "450px");
var newWidth = width * ratio;
img.css("width", newWidth );
}else if( width == height && width > 450){
img.css("height", "450px");
img.css("width", "450px" );
}
}
$(document).ready(function() {
var form = $("form");

17
airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css
View File

@ -38,14 +38,25 @@
text-shadow: 0px -1px 1px #000;
}
.jp-logo {
.jp-logo{
width:400px;
height: 67px;
background:#282828 url(../../../css/images/airtime_logo_jp.png) no-repeat 120px 14px;
/* background:#282828 url(../../../css/images/airtime_logo_jp.png) no-repeat 120px 14px;
background: url(../../../css/images/airtime_logo_jp.png) no-repeat 120px 14px, -moz-radial-gradient(200px 0px, circle cover, rgba(70,70,70,1) 0%, rgba(40,40,40,1) 90%);
background: url(../../../css/images/airtime_logo_jp.png) no-repeat 120px 14px, -webkit-radial-gradient(170px 20px, rgba(70,70,70,1) 0%,rgba(40,40,40,1) 70%);
background: url(../../../css/images/airtime_logo_jp.png) no-repeat 120px 14px, -webkit-radial-gradient(170px 20px, rgba(70,70,70,1) 0%,rgba(40,40,40,1) 70%); */
background:#282828 no-repeat 120px 14px;
background: no-repeat 120px 14px, -moz-radial-gradient(200px 0px, circle cover, rgba(70,70,70,1) 0%, rgba(40,40,40,1) 90%);
background: no-repeat 120px 14px, -webkit-radial-gradient(170px 20px, rgba(70,70,70,1) 0%,rgba(40,40,40,1) 70%);
display:block;
}
.jp-logo img{
display: block;
margin-left: auto;
margin-right: auto;
}
.jp-stream {
height: 27px;
display:block;