From ea703579202f81157e82de3a7da204345989183e Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Mon, 14 Jan 2013 17:08:47 -0500
Subject: [PATCH 1/2] - remove logging

---
 airtime_mvc/application/Bootstrap.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 81564d135..dab304fd1 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -23,7 +23,6 @@ require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php';
 date_default_timezone_set('UTC');
 require_once (APPLICATION_PATH."/logging/Logging.php");
 Logging::setLogPath('/var/log/airtime/zendphp.log');
-Logging::info($CC_CONFIG);
 date_default_timezone_set(Application_Model_Preference::GetTimezone());
 
 Config::setAirtimeVersion();

From e22a573d8aab49aa0b09d65f7244bd9683177fcc Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Mon, 14 Jan 2013 17:15:53 -0500
Subject: [PATCH 2/2] CC-2184: Hardcoded CSS path should be relative path
 instead

-missed some paths
---
 airtime_mvc/public/js/airtime/dashboard/dashboard.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
index 18599fcfb..3b2cad458 100644
--- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js
+++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
@@ -398,7 +398,7 @@ function setSwitchListener(ele){
     var sourcename = $(ele).attr('id');
     var status_span = $(ele).find("span");
     var status = status_span.html();
-    $.get(baseUrl+"/Dashboard/switch-source/format/json/sourcename/"+sourcename+"/status/"+status, function(data){
+    $.get(baseUrl+"Dashboard/switch-source/format/json/sourcename/"+sourcename+"/status/"+status, function(data){
         if(data.error){
             alert(data.error);
         }else{
@@ -415,7 +415,7 @@ function setSwitchListener(ele){
 function kickSource(ele){
     var sourcename = $(ele).attr('id');
     
-    $.get(baseUrl+"/Dashboard/disconnect-source/format/json/sourcename/"+sourcename, function(data){
+    $.get(baseUrl+"Dashboard/disconnect-source/format/json/sourcename/"+sourcename, function(data){
         if(data.error){
             alert(data.error);
         }
@@ -435,7 +435,7 @@ function init() {
     
     $('.listen-control-button').click(function() {
         if (stream_window == null || stream_window.closed)
-            stream_window=window.open(baseUrl+"/Dashboard/stream-player", 'name', 'width=400,height=158');
+            stream_window=window.open(baseUrl+"Dashboard/stream-player", 'name', 'width=400,height=158');
         stream_window.focus();
         return false;
     });
@@ -460,7 +460,7 @@ $(document).ready(function() {
     
     $('#current-user').live('click', function() {
         $.ajax({
-            url: baseUrl+'/user/edit-user/format/json'
+            url: baseUrl+'user/edit-user/format/json'
         });
     });