From 20c2405f2076b0692b692aca349902f6d15eec17 Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Fri, 30 Sep 2011 14:46:09 -0400
Subject: [PATCH] CC-2907: Stream player window gets a 404 when clicked 	from
 "Stream settings" page

-fixed
---
 airtime_mvc/application/Bootstrap.php               | 2 +-
 airtime_mvc/public/js/airtime/dashboard/playlist.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index f0e9b98e9..f3bf8f561 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -66,7 +66,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         $view->headScript()->appendFile($baseUrl.'/js/libs/jquery.stickyPanel.js','text/javascript');
         $view->headScript()->appendFile($baseUrl.'/js/qtip/jquery.qtip2.min.js','text/javascript');
         $view->headScript()->appendFile($baseUrl.'/js/jplayer/jquery.jplayer.min.js');
-
+        $view->headScript()->appendScript("var baseUrl='$baseUrl/'");
 
         //scripts for now playing bar
         $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/helperfunctions.js','text/javascript');
diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js
index cfaad17ac..70203ef81 100644
--- a/airtime_mvc/public/js/airtime/dashboard/playlist.js
+++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js
@@ -262,7 +262,7 @@ function init() {
     
     $('#on-air-info').click(function() {
         if (stream_window == null || stream_window.closed)
-            stream_window=window.open("/Dashboard/stream-player", 'name', 'width=400,height=216');
+            stream_window=window.open(baseUrl+"Dashboard/stream-player", 'name', 'width=400,height=216');
         stream_window.focus();
         return false;
     });