Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-3394: Add play button to timeline table.

Browse source 
- added image information to row in ShowBuilder.php to enable audio preview of shows.
- moved around code so the audio preview functionaly is standalone
- fixed the firefox bug for issue CC-3429
This commit is contained in:
Daniel 2012-03-15 17:56:51 -04:00
parent f399c7adab
commit ae0d3c560c
11 changed files with 977 additions and 759 deletions
Download patch file Download diff file Expand all files Collapse all files

9
airtime_mvc/application/models/ShowBuilder.php
View file

@ -126,6 +126,7 @@ class Application_Model_ShowBuilder {
$row["duration"] = $showEndDT->format("U") - $showStartDT->format("U");
$row["title"] = $p_item["show_name"];
$row["instance"] = intval($p_item["si_id"]);
$row["image"] = '';
$this->contentDT = $showStartDT;
@ -156,10 +157,11 @@ class Application_Model_ShowBuilder {
$this->isCurrent($startsEpoch, min($endsEpoch, $showEndEpoch), $row);
$row["id"] = intval($p_item["sched_id"]);
$row["image"] = '<img src="/css/images/icon_audioclip.png">';
$row["instance"] = intval($p_item["si_id"]);
$row["starts"] = $schedStartDT->format("H:i:s");
$row["ends"] = $schedEndDT->format("H:i:s");
$formatter = new LengthFormatter($p_item['file_length']);
$row['runtime'] = $formatter->format();
@ -177,12 +179,14 @@ class Application_Model_ShowBuilder {
//show is empty or is a special kind of show (recording etc)
else if (intval($p_item["si_record"]) === 1) {
$row["record"] = true;
$row["image"] = '';
}
else {
$row["empty"] = true;
$row["id"] = 0 ;
$row["instance"] = intval($p_item["si_id"]);
$row["image"] = '';
}
return $row;
@ -201,7 +205,7 @@ class Application_Model_ShowBuilder {
$timeFilled = new TimeFilledFormatter($runtime);
$row["fRuntime"] = $timeFilled->format();
$row["image"] = '';
return $row;
}
@ -293,7 +297,6 @@ class Application_Model_ShowBuilder {
}
if (!$this->hasCurrent) {
}
return $display_items;