From 929e29182b4704ddca1c07a37b9d3dc9c33b41c7 Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Tue, 4 Oct 2011 17:18:36 -0400
Subject: [PATCH] CC-2908: Add "Live Stream" title to live stream popup window

-custom logo
---
 .../controllers/DashboardController.php       |  7 ++++
 .../scripts/dashboard/stream-player.phtml     |  4 +-
 .../views/scripts/form/register-dialog.phtml  |  4 +-
 .../views/scripts/form/support-setting.phtml  |  4 +-
 .../js/airtime/dashboard/helperfunctions.js   | 38 +++++++++++++++++++
 .../public/js/airtime/nowplaying/register.js  | 30 +++++++--------
 .../js/airtime/preferences/support-setting.js | 25 ------------
 .../js/jplayer/skin/jplayer.blue.monday.css   | 17 +++++++--
 8 files changed, 79 insertions(+), 50 deletions(-)

diff --git a/airtime_mvc/application/controllers/DashboardController.php b/airtime_mvc/application/controllers/DashboardController.php
index f51597ad9..8b918137d 100644
--- a/airtime_mvc/application/controllers/DashboardController.php
+++ b/airtime_mvc/application/controllers/DashboardController.php
@@ -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()
diff --git a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
index 12976ef57..21e9d9a30 100644
--- a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
@@ -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) {
diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
index f74715250..acb461be5 100644
--- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
@@ -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>
\ No newline at end of file
+</div>
diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml
index 9eb9af547..9794f8159 100644
--- a/airtime_mvc/application/views/scripts/form/support-setting.phtml
+++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml
@@ -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>
\ No newline at end of file
+</fieldset>
diff --git a/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js b/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
index e1abb3f2d..510c43fee 100644
--- a/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
+++ b/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
@@ -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");
+    }
+}
diff --git a/airtime_mvc/public/js/airtime/nowplaying/register.js b/airtime_mvc/public/js/airtime/nowplaying/register.js
index 084e933d0..fe1e3b38f 100644
--- a/airtime_mvc/public/js/airtime/nowplaying/register.js
+++ b/airtime_mvc/public/js/airtime/nowplaying/register.js
@@ -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" );
-    }	
-}
\ No newline at end of file
+        img.css("width", newWidth);
+    }else if( width == height && width > targetWidth){
+        img.css("height", targetHeight+"px");
+        img.css("width", targetWidth+"px" );
+    }
+}
diff --git a/airtime_mvc/public/js/airtime/preferences/support-setting.js b/airtime_mvc/public/js/airtime/preferences/support-setting.js
index acd3fe671..d26c39cf8 100644
--- a/airtime_mvc/public/js/airtime/preferences/support-setting.js
+++ b/airtime_mvc/public/js/airtime/preferences/support-setting.js
@@ -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");
 
diff --git a/airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css b/airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css
index 3c880aa63..1ef4fc2fe 100644
--- a/airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css
+++ b/airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css
@@ -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;