From d6616004a61c7d3e1c2d6bc417766b8476c049b6 Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Wed, 18 May 2011 18:37:13 -0400
Subject: [PATCH] CC-2283: Now playing bar only shows the first word of the
 show name

-fixed
---
 airtime_mvc/application/models/Nowplaying.php               | 6 +++---
 .../public/js/airtime/nowplaying/nowplayingdatagrid.js      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/models/Nowplaying.php b/airtime_mvc/application/models/Nowplaying.php
index 3c93295e2..5b646497d 100644
--- a/airtime_mvc/application/models/Nowplaying.php
+++ b/airtime_mvc/application/models/Nowplaying.php
@@ -4,7 +4,7 @@ class Application_Model_Nowplaying
 {
 
 	public static function CreateHeaderRow($p_showName, $p_showStart, $p_showEnd){
-		return array("h", $p_showName, $p_showStart, $p_showEnd, "", "", "", "", "", "", "");
+		return array("h", "", $p_showStart, $p_showEnd, $p_showName, "", "", "", "", "", "");
 	}
 
 	public static function CreateDatatableRows($p_dbRows){
@@ -30,11 +30,11 @@ class Application_Model_Nowplaying
 	}
 	
 	public static function CreateGapRow($p_gapTime){
-		return array("g", $p_gapTime, "", "", "", "", "", "", "", "", "");
+		return array("g", "", "", "", $p_gapTime, "", "", "", "", "", "");
 	}
 	
 	public static function CreateRecordingRow($p_showInstance){
-		return array("r", $p_showInstance->getName(), "", "", "", "", "", "", "", "", "");
+		return array("r", "", "", "", $p_showInstance->getName(), "", "", "", "", "", "");
 	}
 
 	public static function GetDataGridData($viewType, $dateString){
diff --git a/airtime_mvc/public/js/airtime/nowplaying/nowplayingdatagrid.js b/airtime_mvc/public/js/airtime/nowplaying/nowplayingdatagrid.js
index 737fdbb8c..b086424a9 100644
--- a/airtime_mvc/public/js/airtime/nowplaying/nowplayingdatagrid.js
+++ b/airtime_mvc/public/js/airtime/nowplaying/nowplayingdatagrid.js
@@ -155,7 +155,7 @@ function createDataGrid(){
                 if ( sType.indexOf("h") != -1 ){
 					//show header row found 
 					
-                    var showName = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[1];
+                    var showName = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[4];
                     var startTime = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[2];
                     var endTime = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[3];
 
@@ -169,7 +169,7 @@ function createDataGrid(){
                 } else if ( sType.indexOf("g") != -1 ){
 					//gap row found
 					
-                    var gapTime = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[1];
+                    var gapTime = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[4];
                     
                     var nGroup = document.createElement('tr');
                     var nCell = document.createElement('td');
@@ -181,7 +181,7 @@ function createDataGrid(){
                 } else if ( sType.indexOf("r") != -1 ){
 					//gap row found
 					
-                    var showName = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[1];
+                    var showName = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[4];
                     
                     var nGroup = document.createElement('tr');
                     var nCell = document.createElement('td');