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

Temp commit.

Browse source 
It's not done, need to work more later.
This commit is contained in:
James Moon 2011-04-25 10:11:12 -07:00
parent 7a40161e7e
commit bf34170f29
4 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/controllers/PlaylistController.php
View file

@ -173,6 +173,7 @@ class PlaylistController extends Zend_Controller_Action
$this->view->html = $this->view->render('playlist/update.phtml');
$this->view->name = $pl->getName();
$this->view->length = $pl->getLength();
$this->view->pl_id = $pl->getid();
unset($this->view->pl);
return;
@ -218,8 +219,11 @@ class PlaylistController extends Zend_Controller_Action
$this->view->html = $this->view->render('playlist/update.phtml');
$this->view->name = $pl->getName();
$this->view->length = $pl->getLength();
$this->view->pl_id = $pl->getid();
unset($this->view->pl);
return;
}
public function setCueAction()

2
airtime_mvc/application/models/Playlist.php
View file

@ -371,7 +371,7 @@ class Playlist {
->computeLength();
if(is_null($res))
return '00:00:00.000000';
return '00:00:00';
return $res;
}

3
airtime_mvc/public/js/airtime/library/library.js
View file

@ -94,6 +94,9 @@ function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
}
$(nRow).attr("id", type+'_'+id);
// insert id on lenth field
$('td:eq(4)', nRow).attr("id", "length");
$('td:eq(5) img', nRow).qtip({

8
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -258,6 +258,10 @@ function setSPLContent(json) {
$(".spl_fade_control").click(openFadeEditor);
//$(".spl_playlength").click(openCueEditor);
$(".spl_cue").click(openCueEditor);
//Update length on library list
$("#pl_"+json.pl_id).children("#length").empty().append(json.length);
//var pos = dt.fnGetPosition($("#pl_"+json.pl_id));
return false;
}
@ -360,6 +364,10 @@ function createPlaylistMetaForm(json) {
$.post(url, data, function(json){
openDiffSPL(json);
})
//redraw the library list
dt = $("#library_display").dataTable();
dt.fnDraw();
});
$("#side_playlist")