From 44dccf15ce02b2888a657f48348c7cfe71ec89ce Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Fri, 17 Feb 2012 15:53:10 +0100 Subject: [PATCH 01/21] CC-3335 : Timeline - Drag and drop usability improvements dragging and dropping multiple files is working. --- .../library/events/library_showbuilder.js | 15 ++++-- .../public/js/airtime/showbuilder/builder.js | 47 ++++++++++++------- 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index 58dc3d549..f48f70dd5 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -19,7 +19,16 @@ var AIRTIME = (function(AIRTIME){ mod.fnDrawCallback = function() { $('#library_display tr:not(:first)').draggable({ - helper: 'clone', + //helper: 'clone', + helper: function(){ + var selected = $('#library_display input:checked').parents('tr'); + if (selected.length === 0) { + selected = $(this); + } + var container = $('
').attr('id', 'draggingContainer'); + container.append(selected.clone()); + return container; + }, cursor: 'pointer', connectToSortable: '#show_builder_table' }); @@ -63,9 +72,7 @@ var AIRTIME = (function(AIRTIME){ } } - AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds, function(){ - oLibTT.fnSelectNone(); - }); + AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds); }; //[0] = button text diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 3e98d1af8..10796ab01 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -13,17 +13,15 @@ var AIRTIME = (function(AIRTIME){ } } - mod.fnAdd = function(aMediaIds, aSchedIds, callback) { + mod.fnAdd = function(aMediaIds, aSchedIds) { + var oLibTT = TableTools.fnGetInstance('library_display'); $.post("/showbuilder/schedule-add", {"format": "json", "mediaIds": aMediaIds, "schedIds": aSchedIds}, function(json){ checkError(json); oSchedTable.fnDraw(); - - if ($.isFunction(callback)) { - callback(); - } + oLibTT.fnSelectNone(); }); }; @@ -394,21 +392,26 @@ $(document).ready(function() { }); var sortableConf = (function(){ - var origRow, - oItemData, + var origTrs, + aItemData = [], oPrevData, fnAdd, fnMove, fnReceive, - fnUpdate; + fnUpdate, + i, + html; fnAdd = function() { var aMediaIds = [], - aSchedIds = []; + aSchedIds = [], + oLibTT = TableTools.fnGetInstance('library_display'); + for(i=0; i < aItemData.length; i++) { + aMediaIds.push({"id": aItemData[i].id, "type": aItemData[i].ftype}); + } aSchedIds.push({"id": oPrevData.id, "instance": oPrevData.instance, "timestamp": oPrevData.timestamp}); - aMediaIds.push({"id": oItemData.id, "type": oItemData.ftype}); - + AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds); }; @@ -416,28 +419,38 @@ $(document).ready(function() { var aSelect = [], aAfter = []; - aSelect.push({"id": oItemData.id, "instance": oItemData.instance, "timestamp": oItemData.timestamp}); + aSelect.push({"id": aItemData[0].id, "instance": aItemData[0].instance, "timestamp": aItemData[0].timestamp}); aAfter.push({"id": oPrevData.id, "instance": oPrevData.instance, "timestamp": oPrevData.timestamp}); AIRTIME.showbuilder.fnMove(aSelect, aAfter); }; fnReceive = function(event, ui) { - origRow = ui.item; + origTrs = ui.helper.find("tr"); + html = ui.helper.html(); }; fnUpdate = function(event, ui) { + aItemData = []; oPrevData = ui.item.prev().data("aData"); //item was dragged in - if (origRow !== undefined) { - oItemData = origRow.data("aData"); - origRow = undefined; + if (origTrs !== undefined) { + + $("#show_builder_table tr.ui-draggable") + .empty() + .after(html); + + origTrs.each(function(i, el){ + aItemData.push($("#"+$(el).attr("id")).data("aData")); + }); + + origTrs = undefined; fnAdd(); } //item was reordered. else { - oItemData = ui.item.data("aData"); + aItemData.push(ui.item.data("aData")); fnMove(); } }; From d335f5487344009e2af338d2e045d9c4e5201873 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 17 Feb 2012 18:01:53 -0500 Subject: [PATCH 02/21] CC-3075: Create airtime-test-soundcard and airtime-test-icecast utils -initial commit --- utils/airtime-test-soundcard.py | 53 ++++++++++++++++++++++ utils/airtime-test-stream.py | 80 +++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 utils/airtime-test-soundcard.py create mode 100644 utils/airtime-test-stream.py diff --git a/utils/airtime-test-soundcard.py b/utils/airtime-test-soundcard.py new file mode 100644 index 000000000..4978cebce --- /dev/null +++ b/utils/airtime-test-soundcard.py @@ -0,0 +1,53 @@ +import subprocess +import os +import pwd +import grp +import sys + +import getopt + +if os.geteuid() == 0: + print "Please run this program as non-root" + sys.exit(1) + +def printUsage(): + print "airtime-test-soundcard [-v] [-o alsa | ao | oss | portaudio | pulseaudio ]" + print " Where: " + print " -v verbose mode " + print " -o Linux Sound API " + + +optlist, args = getopt.getopt(sys.argv[1:], 'hvo:') +sound_api_types = set(["alsa", "ao", "oss", "portaudio", "pulseaudio"]) + +verbose = False +sound_api = "alsa" +for o, a in optlist: + if "-v" == o: + verbose = True + if "-o" == o: + if a.lower() in sound_api_types: + sound_api = a.lower() + else: + print "Unknown sound api type\n" + printUsage() + sys.exit(1) + if "-h" == o: + printUsage() + sys.exit(0) + +try: + print "Outputting to soundcard with '%s' sound API. You should be able to hear a monotonous tone. Press ctrl-c to quit." % sound_api + + command = "/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap 'output.%s(sine())'" % sound_api + + if not verbose: + command += " > /dev/null" + + #print command + rv = subprocess.call(command, shell=True) + +except KeyboardInterrupt, ki: + print "Exiting" +except Exception, e: + raise diff --git a/utils/airtime-test-stream.py b/utils/airtime-test-stream.py new file mode 100644 index 000000000..3c47b77ab --- /dev/null +++ b/utils/airtime-test-stream.py @@ -0,0 +1,80 @@ +import subprocess +import os +import pwd +import grp +import sys + +import getopt + +if os.geteuid() == 0: + print "Please run this program as non-root" + sys.exit(1) + +def printUsage(): + print "airtime-test-stream [-v] [-o icecast | shoutcast ] [-H hostname] [-P port] [-u username] [-p password] [-m mount]" + print " Where: " + print " -v verbose mode" + print " -o stream server type (default: icecast)" + print " -H hostname (default: localhost) " + print " -P port (default: 8000) " + print " -u port (default: source) " + print " -p password (default: hackme) " + print " -m mount (default: test) " + + +optlist, args = getopt.getopt(sys.argv[1:], 'hvo:H:P:u:p:') +stream_types = set(["shoutcast", "icecast"]) + +verbose = False +stream_type = "icecast" + +host = "localhost" +port = 8000 +user = "source" +password = "hackme" +mount = "test" + +for o, a in optlist: + if "-v" == o: + verbose = True + if "-o" == o: + if a.lower() in stream_types: + stream_type = a.lower() + else: + print "Unknown stream type\n" + printUsage() + sys.exit(1) + if "-h" == o: + printUsage() + sys.exit(0) + if "-H" == o: + host = a + if "-P" == o: + port = a + if "-u" == o: + user = a + if "-p" == o: + password = a + if "-m" == o: + mount = a + +try: + + url = "http://%s:%s/%s" % (host, port, mount) + print "Outputting to %s streaming server. You should be able to hear a monotonous tone on %s. Press ctrl-c to quit." % (stream_type, url) + + if stream_type == "icecast": + command = "liquidsoap 'output.icecast(%%vorbis, host = \"%s\", port = %s, user= \"%s\", password = \"%s\", mount=\"%s\", sine())'" % (host, port, user, password, mount) + else: + command = "liquidsoap 'output.shoutcast(%%mp3, host=\"%s\", port = %s, user= \"%s\", password = \"%s\", mount=\"%s\", sine())'" % (host, port, user, password, mount) + + if not verbose: + command += " > /dev/null" + + #print command + rv = subprocess.call(command, shell=True) + +except KeyboardInterrupt, ki: + print "Exiting" +except Exception, e: + raise From 17c3cdcfb28622091fcbf1b1d072f9cba3614d07 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Mon, 20 Feb 2012 11:41:44 +0100 Subject: [PATCH 03/21] CC-3174 : showbuilder fix ordering problem with track column. --- airtime_mvc/application/models/StoredFile.php | 18 ++++++-------- .../public/js/airtime/library/library.js | 24 +++++++++---------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 175c2b918..e1016baea 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -556,7 +556,7 @@ class Application_Model_StoredFile { * * @return string $runtime */ - private static function formatDuration($dt){ + private static function formatDuration($dt) { $hours = $dt->format("H"); $min = $dt->format("i"); @@ -569,7 +569,7 @@ class Application_Model_StoredFile { $hours = $p_interval->format("%h"); $mins = $p_interval->format("%i"); - if( $hours == 0) { + if ( $hours == 0) { $runtime = $p_interval->format("%i:%S"); } else { @@ -579,8 +579,7 @@ class Application_Model_StoredFile { return $runtime; } - public static function searchFilesForPlaylistBuilder($datatables) - { + public static function searchFilesForPlaylistBuilder($datatables) { global $CC_CONFIG; $displayData = array("track_title", "artist_name", "album_title", "genre", "length", "year", "utime", "mtime", "ftype", "track_number"); @@ -610,9 +609,6 @@ class Application_Model_StoredFile { } else if ($key === "mtime") { $plSelect .= $key.", "; $fileSelect .= $key.", "; - } else if ($key === "track_number") { - $plSelect .= "NULL AS ".$key.", "; - $fileSelect .= $key.", "; } else { $plSelect .= "NULL AS ".$key.", "; $fileSelect .= $key.", "; @@ -624,10 +620,10 @@ class Application_Model_StoredFile { UNION (".$fileSelect."id FROM ".$CC_CONFIG["filesTable"]." AS FILES WHERE file_exists = 'TRUE')) AS RESULTS"; - $results = Application_Model_StoredFile::searchFiles($fromTable, $datatables); + $results = Application_Model_StoredFile::searchFiles($fromTable, $datatables); - foreach($results['aaData'] as &$row){ + foreach ($results['aaData'] as &$row) { $row['id'] = intval($row['id']); @@ -649,7 +645,7 @@ class Application_Model_StoredFile { //TODO url like this to work on both playlist/showbuilder screens. //datatable stuff really needs to be pulled out and generalized within the project //access to zend view methods to access url helpers is needed. - if($type == "au") { + if ($type == "au") { $row['image'] = ''; } else { @@ -738,7 +734,7 @@ class Application_Model_StoredFile { } //display sql executed in airtime log for testing - //Logging::log($sql); + Logging::log($sql); $results = $CC_DBC->getAll($sql); diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 1be99f829..faee0bd35 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -300,18 +300,18 @@ function createDataTable(data) { }, "aoColumns": [ - /* Checkbox */ {"sTitle": "", "bSortable": false, "bSearchable": false, "mDataProp": "checkbox", "sWidth": "25px", "sClass": "library_checkbox"}, - /* Type */ {"sName": "ftype", "bSearchable": false, "mDataProp": "image", "sWidth": "25px", "sClass": "library_type"}, - /* Title */ {"sTitle": "Title", "sName": "track_title", "mDataProp": "track_title", "sClass": "library_title"}, - /* Creator */ {"sTitle": "Creator", "sName": "artist_name", "mDataProp": "artist_name", "sClass": "library_creator"}, - /* Album */ {"sTitle": "Album", "sName": "album_title", "mDataProp": "album_title", "sClass": "library_album"}, - /* Genre */ {"sTitle": "Genre", "sName": "genre", "mDataProp": "genre", "sClass": "library_genre"}, - /* Year */ {"sTitle": "Year", "sName": "year", "mDataProp": "year", "sClass": "library_year"}, - /* Length */ {"sTitle": "Length", "sName": "length", "mDataProp": "length", "sClass": "library_length"}, - /* Upload Time */ {"sTitle": "Uploaded", "sName": "utime", "mDataProp": "utime", "sClass": "library_upload_time"}, - /* Last Modified */ {"sTitle": "Last Modified", "sName": "mtime", "bVisible": false, "mDataProp": "mtime", "sClass": "library_modified_time"}, - /* Track Number */ {"sTitle": "Track", "sName": "track", "bSearchable": false, "bVisible": false, "mDataProp": "track_number", "sClass": "library_track"} - ], + /* Checkbox */ {"sTitle": "", "bSortable": false, "bSearchable": false, "mDataProp": "checkbox", "sWidth": "25px", "sClass": "library_checkbox"}, + /* Type */ {"sName": "ftype", "bSearchable": false, "mDataProp": "image", "sWidth": "25px", "sClass": "library_type"}, + /* Title */ {"sTitle": "Title", "sName": "track_title", "mDataProp": "track_title", "sClass": "library_title"}, + /* Creator */ {"sTitle": "Creator", "sName": "artist_name", "mDataProp": "artist_name", "sClass": "library_creator"}, + /* Album */ {"sTitle": "Album", "sName": "album_title", "mDataProp": "album_title", "sClass": "library_album"}, + /* Genre */ {"sTitle": "Genre", "sName": "genre", "mDataProp": "genre", "sClass": "library_genre"}, + /* Year */ {"sTitle": "Year", "sName": "year", "mDataProp": "year", "sClass": "library_year"}, + /* Length */ {"sTitle": "Length", "sName": "length", "mDataProp": "length", "sClass": "library_length"}, + /* Upload Time */ {"sTitle": "Uploaded", "sName": "utime", "mDataProp": "utime", "sClass": "library_upload_time"}, + /* Last Modified */ {"sTitle": "Last Modified", "sName": "mtime", "bVisible": false, "mDataProp": "mtime", "sClass": "library_modified_time"}, + /* Track Number */ {"sTitle": "Track", "sName": "track_number", "bSearchable": false, "bVisible": false, "mDataProp": "track_number", "sClass": "library_track"} + ], "aaSorting": [[2,'asc']], "sPaginationType": "full_numbers", "bJQueryUI": true, From c0f16fac3c9a184e7fae41424f608a4d24dad59b Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Mon, 20 Feb 2012 18:24:04 +0100 Subject: [PATCH 04/21] CC-3174 : showbuilder improving playlist functionality/error checking like the showbuilder. will send last modified ts to make sure user has a current copy of the open playlist. --- .../controllers/PlaylistController.php | 223 +++++----- airtime_mvc/application/models/Playlist.php | 315 ++++++------- airtime_mvc/public/js/airtime/library/spl.js | 416 ++++++++++-------- 3 files changed, 524 insertions(+), 430 deletions(-) diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index 64032d84a..65a9e38d8 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -30,6 +30,12 @@ class PlaylistController extends Zend_Controller_Action if (isset($this->pl_sess->id)) { $pl = new Application_Model_Playlist($this->pl_sess->id); + + $modified = $this->_getParam('modified', null); + if ($pl->getLastModified("U") !== $modified) { + $this->createFullResponse($pl); + throw new PlaylistOutDatedException("You are viewing an older version of {$pl->getName()}"); + } } return $pl; } @@ -51,6 +57,7 @@ class PlaylistController extends Zend_Controller_Action $this->view->name = $pl->getName(); $this->view->length = $pl->getLength(); $this->view->description = $pl->getDescription(); + $this->view->modified = $pl->getLastModified("U"); unset($this->view->pl); } @@ -68,10 +75,33 @@ class PlaylistController extends Zend_Controller_Action } } + private function playlistOutdated($pl, $e) + { + $this->view->error = $e->getMessage(); + } + + private function playlistNotFound() + { + $this->view->error = "Playlist not found"; + + Logging::log("Playlist not found"); + $this->changePlaylist(null); + $this->createFullResponse(null); + } + + private function playlistUnknownError($e) + { + $this->view->error = "Something went wrong."; + + Logging::log("{$e->getFile()}"); + Logging::log("{$e->getLine()}"); + Logging::log("{$e->getMessage()}"); + } + public function indexAction() { global $CC_CONFIG; - + $request = $this->getRequest(); $baseUrl = $request->getBaseUrl(); @@ -81,18 +111,16 @@ class PlaylistController extends Zend_Controller_Action $this->_helper->viewRenderer->setResponseSegment('spl'); try { - $pl = $this->getPlaylist(); - - if (isset($pl)) { - $this->view->pl = $pl; + if (isset($this->pl_sess->id)) { + $pl = new Application_Model_Playlist($this->pl_sess->id); + $this->view->pl = $pl; } } catch (PlaylistNotFoundException $e) { - Logging::log("Playlist not found"); - $this->changePlaylist(null); + $this->playlistNotFound(); } catch (Exception $e) { - Logging::log("{$e->getMessage()}"); + $this->playlistUnknownError($e); } } @@ -119,20 +147,15 @@ class PlaylistController extends Zend_Controller_Action } try { - $pl = $this->getPlaylist(); + $pl = new Application_Model_Playlist($id); + $this->createFullResponse($pl); } catch (PlaylistNotFoundException $e) { - Logging::log("Playlist {$id} not found"); - $this->changePlaylist(null); + $this->playlistNotFound(); } catch (Exception $e) { - Logging::log("{$e->getFile()}"); - Logging::log("{$e->getLine()}"); - Logging::log("{$e->getMessage()}"); - $this->changePlaylist(null); + $this->playlistUnknownError($e); } - - $this->createFullResponse($pl); } public function deleteAction() @@ -150,23 +173,18 @@ class PlaylistController extends Zend_Controller_Action } else { Logging::log("Not deleting currently active playlist"); + $pl = new Application_Model_Playlist($this->pl_sess->id); } Application_Model_Playlist::DeletePlaylists($ids); - $pl = $this->getPlaylist(); + $this->createFullResponse($pl); } - catch(PlaylistNotFoundException $e) { - Logging::log("Playlist not found"); - $this->changePlaylist(null); - $pl = null; + catch (PlaylistNotFoundException $e) { + $this->playlistNotFound(); } - catch(Exception $e) { - Logging::log("{$e->getFile()}"); - Logging::log("{$e->getLine()}"); - Logging::log("{$e->getMessage()}"); + catch (Exception $e) { + $this->playlistUnknownError($e); } - - $this->createFullResponse($pl); } public function addItemsAction() @@ -176,24 +194,20 @@ class PlaylistController extends Zend_Controller_Action $afterItem = $this->_getParam('afterItem', null); $addType = $this->_getParam('type', 'after'); - Logging::log("type is ".$addType); - try { $pl = $this->getPlaylist(); $pl->addAudioClips($ids, $afterItem, $addType); + $this->createUpdateResponse($pl); + } + catch (PlaylistOutDatedException $e) { + $this->playlistOutdated($pl, $e); } catch (PlaylistNotFoundException $e) { - Logging::log("Playlist not found"); - $this->changePlaylist(null); - $this->createFullResponse(null); + $this->playlistNotFound(); } catch (Exception $e) { - Logging::log("{$e->getFile()}"); - Logging::log("{$e->getLine()}"); - Logging::log("{$e->getMessage()}"); + $this->playlistUnknownError($e); } - - $this->createUpdateResponse($pl); } public function moveItemsAction() @@ -201,46 +215,44 @@ class PlaylistController extends Zend_Controller_Action $ids = $this->_getParam('ids'); $ids = (!is_array($ids)) ? array($ids) : $ids; $afterItem = $this->_getParam('afterItem', null); + $modified = $this->_getParam('modified'); try { $pl = $this->getPlaylist(); $pl->moveAudioClips($ids, $afterItem); + $this->createUpdateResponse($pl); + } + catch (PlaylistOutDatedException $e) { + $this->playlistOutdated($pl, $e); } catch (PlaylistNotFoundException $e) { - Logging::log("Playlist not found"); - $this->changePlaylist(null); - $this->createFullResponse(null); + $this->playlistNotFound(); } catch (Exception $e) { - Logging::log("{$e->getFile()}"); - Logging::log("{$e->getLine()}"); - Logging::log("{$e->getMessage()}"); + $this->playlistUnknownError($e); } - - $this->createUpdateResponse($pl); } public function deleteItemsAction() { $ids = $this->_getParam('ids'); $ids = (!is_array($ids)) ? array($ids) : $ids; + $modified = $this->_getParam('modified'); try { $pl = $this->getPlaylist(); $pl->delAudioClips($ids); + $this->createUpdateResponse($pl); + } + catch (PlaylistOutDatedException $e) { + $this->playlistOutdated($pl, $e); } catch (PlaylistNotFoundException $e) { - Logging::log("Playlist not found"); - $this->changePlaylist(null); - $this->createFullResponse(null); + $this->playlistNotFound(); } catch (Exception $e) { - Logging::log("{$e->getFile()}"); - Logging::log("{$e->getLine()}"); - Logging::log("{$e->getMessage()}"); + $this->playlistUnknownError($e); } - - $this->createUpdateResponse($pl); } public function setCueAction() @@ -253,21 +265,22 @@ class PlaylistController extends Zend_Controller_Action $pl = $this->getPlaylist(); $response = $pl->changeClipLength($id, $cueIn, $cueOut); - $this->view->response = $response; - - if(!isset($response["error"])) { + if (!isset($response["error"])) { + $this->view->response = $response; $this->createUpdateResponse($pl); } + else { + $this->view->cue_error = $response["error"]; + } + } + catch (PlaylistOutDatedException $e) { + $this->playlistOutdated($pl, $e); } catch (PlaylistNotFoundException $e) { - Logging::log("Playlist not found"); - $this->changePlaylist(null); - $this->createFullResponse(null); + $this->playlistNotFound(); } catch (Exception $e) { - Logging::log("{$e->getFile()}"); - Logging::log("{$e->getLine()}"); - Logging::log("{$e->getMessage()}"); + $this->playlistUnknownError($e); } } @@ -281,21 +294,22 @@ class PlaylistController extends Zend_Controller_Action $pl = $this->getPlaylist(); $response = $pl->changeFadeInfo($id, $fadeIn, $fadeOut); - $this->view->response = $response; - if (!isset($response["error"])) { $this->createUpdateResponse($pl); + $this->view->response = $response; + } + else { + $this->view->fade_error = $response["error"]; } } + catch (PlaylistOutDatedException $e) { + $this->playlistOutdated($pl, $e); + } catch (PlaylistNotFoundException $e) { - Logging::log("Playlist not found"); - $this->changePlaylist(null); - $this->createFullResponse(null); + $this->playlistNotFound(); } catch (Exception $e) { - Logging::log("{$e->getFile()}"); - Logging::log("{$e->getLine()}"); - Logging::log("{$e->getMessage()}"); + $this->playlistUnknownError($e); } } @@ -309,15 +323,14 @@ class PlaylistController extends Zend_Controller_Action $fades = $pl->getFadeInfo($pl->getSize()-1); $this->view->fadeOut = $fades[1]; } + catch (PlaylistOutDatedException $e) { + $this->playlistOutdated($pl, $e); + } catch (PlaylistNotFoundException $e) { - Logging::log("Playlist not found"); - $this->changePlaylist(null); - $this->createFullResponse(null); + $this->playlistNotFound(); } catch (Exception $e) { - Logging::log("{$e->getFile()}"); - Logging::log("{$e->getLine()}"); - Logging::log("{$e->getMessage()}"); + $this->playlistUnknownError($e); } } @@ -335,15 +348,14 @@ class PlaylistController extends Zend_Controller_Action $pl = $this->getPlaylist(); $pl->setPlaylistfades($fadeIn, $fadeOut); } + catch (PlaylistOutDatedException $e) { + $this->playlistOutdated($pl, $e); + } catch (PlaylistNotFoundException $e) { - Logging::log("Playlist not found"); - $this->changePlaylist(null); - $this->createFullResponse(null); + $this->playlistNotFound(); } catch (Exception $e) { - Logging::log("{$e->getFile()}"); - Logging::log("{$e->getLine()}"); - Logging::log("{$e->getMessage()}"); + $this->playlistUnknownError($e); } } @@ -351,33 +363,42 @@ class PlaylistController extends Zend_Controller_Action { $name = $this->_getParam('name', 'Unknown Playlist'); - $pl = $this->getPlaylist(); - if($pl === false){ - $this->view->playlist_error = true; - return false; + try { + $pl = $this->getPlaylist(); + $pl->setName($name); + $this->view->playlistName = $name; + $this->view->modified = $pl->getLastModified("U"); + } + catch (PlaylistOutDatedException $e) { + $this->playlistOutdated($pl, $e); + } + catch (PlaylistNotFoundException $e) { + $this->playlistNotFound(); + } + catch (Exception $e) { + $this->playlistUnknownError($e); } - $pl->setName($name); - - $this->view->playlistName = $name; } public function setPlaylistDescriptionAction() { - $description = $this->_getParam('description', false); - $pl = $this->getPlaylist(); - if($pl === false){ - $this->view->playlist_error = true; - return false; - } + $description = $this->_getParam('description', ""); - if($description != false) { + try { + $pl = $this->getPlaylist(); $pl->setDescription($description); + $this->view->description = $pl->getDescription(); + $this->view->modified = $pl->getLastModified("U"); } - else { - $description = $pl->getDescription(); + catch (PlaylistOutDatedException $e) { + $this->playlistOutdated($pl, $e); + } + catch (PlaylistNotFoundException $e) { + $this->playlistNotFound(); + } + catch (Exception $e) { + $this->playlistUnknownError($e); } - - $this->view->playlistDescription = $description; } } diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php index 441ed9a43..ee264df57 100644 --- a/airtime_mvc/application/models/Playlist.php +++ b/airtime_mvc/application/models/Playlist.php @@ -89,7 +89,7 @@ class Application_Model_Playlist { public function setName($p_newname) { $this->pl->setDbName($p_newname); - $this->pl->setDbMtime(new DateTime("now"), new DateTimeZone("UTC")); + $this->pl->setDbMtime(new DateTime("now", new DateTimeZone("UTC"))); $this->pl->save($this->con); } @@ -106,7 +106,7 @@ class Application_Model_Playlist { public function setDescription($p_description) { $this->pl->setDbDescription($p_description); - $this->pl->setDbMtime(new DateTime("now"), new DateTimeZone("UTC")); + $this->pl->setDbMtime(new DateTime("now", new DateTimeZone("UTC"))); $this->pl->save($this->con); } @@ -123,7 +123,7 @@ class Application_Model_Playlist { public function setCreator($p_id) { $this->pl->setDbCreatorId($p_id); - $this->pl->setDbMtime(new DateTime("now"), new DateTimeZone("UTC")); + $this->pl->setDbMtime(new DateTime("now", new DateTimeZone("UTC"))); $this->pl->save($this->con); } @@ -218,13 +218,18 @@ class Application_Model_Playlist { { $file = CcFilesQuery::create()->findPK($p_item, $this->con); - $entry = $this->plItem; - $entry["id"] = $file->getDbId(); - $entry["pos"] = $pos; - $entry["cliplength"] = $file->getDbLength(); - $entry["cueout"] = $file->getDbLength(); + if (isset($file) && $file->getDbFileExists()) { + $entry = $this->plItem; + $entry["id"] = $file->getDbId(); + $entry["pos"] = $pos; + $entry["cliplength"] = $file->getDbLength(); + $entry["cueout"] = $file->getDbLength(); - return $entry; + return $entry; + } + else { + throw new Exception("trying to add a file that does not exist."); + } } /* @@ -300,7 +305,7 @@ class Application_Model_Playlist { $pos = $pos + 1; } - $this->pl->setDbMtime(new DateTime("now"), new DateTimeZone("UTC")); + $this->pl->setDbMtime(new DateTime("now", new DateTimeZone("UTC"))); $this->pl->save($this->con); $this->con->commit(); @@ -383,7 +388,7 @@ class Application_Model_Playlist { $this->pl = CcPlaylistQuery::create()->findPK($this->id); - $this->pl->setDbMtime(new DateTime("now"), new DateTimeZone("UTC")); + $this->pl->setDbMtime(new DateTime("now", new DateTimeZone("UTC"))); $this->pl->save($this->con); } @@ -415,7 +420,7 @@ class Application_Model_Playlist { $contents[$i]->save($this->con); } - $this->pl->setDbMtime(new DateTime("now"), new DateTimeZone("UTC")); + $this->pl->setDbMtime(new DateTime("now", new DateTimeZone("UTC"))); $this->pl->save($this->con); $this->con->commit(); @@ -462,47 +467,52 @@ class Application_Model_Playlist { $fadeIn = $fadeIn?'00:00:'.$fadeIn:$fadeIn; $fadeOut = $fadeOut?'00:00:'.$fadeOut:$fadeOut; + $this->con->beginTransaction(); + $errArray= array(); - $con = Propel::getConnection(CcPlaylistPeer::DATABASE_NAME); - - $row = CcPlaylistcontentsQuery::create()->findPK($id); - - if (is_null($row)) { - $errArray["error"]="Playlist item does not exist."; - return $errArray; - } - - $clipLength = $row->getDbCliplength(); - - if(!is_null($fadeIn)) { - - $sql = "SELECT INTERVAL '{$fadeIn}' > INTERVAL '{$clipLength}'"; - $r = $con->query($sql); - if($r->fetchColumn(0)) { - //"Fade In can't be larger than overall playlength."; - $fadeIn = $clipLength; - } - $row->setDbFadein($fadeIn); - } - if(!is_null($fadeOut)){ - - $sql = "SELECT INTERVAL '{$fadeOut}' > INTERVAL '{$clipLength}'"; - $r = $con->query($sql); - if($r->fetchColumn(0)) { - //Fade Out can't be larger than overall playlength."; - $fadeOut = $clipLength; - } - $row->setDbFadeout($fadeOut); - } try { - $row->save(); + $row = CcPlaylistcontentsQuery::create()->findPK($id); + + if (is_null($row)) { + throw new Exception("Playlist item does not exist."); + } + + $clipLength = $row->getDbCliplength(); + + if (!is_null($fadeIn)) { + + $sql = "SELECT INTERVAL '{$fadeIn}' > INTERVAL '{$clipLength}'"; + $r = $this->con->query($sql); + if ($r->fetchColumn(0)) { + //"Fade In can't be larger than overall playlength."; + $fadeIn = $clipLength; + } + $row->setDbFadein($fadeIn); + } + if (!is_null($fadeOut)){ + + $sql = "SELECT INTERVAL '{$fadeOut}' > INTERVAL '{$clipLength}'"; + $r = $this->con->query($sql); + if ($r->fetchColumn(0)) { + //Fade Out can't be larger than overall playlength."; + $fadeOut = $clipLength; + } + $row->setDbFadeout($fadeOut); + } + + $row->save($this->con); + $this->pl->setDbMtime(new DateTime("now", new DateTimeZone("UTC"))); + $this->pl->save($this->con); + + $this->con->commit(); } catch (Exception $e) { - Logging::log($e->getMessage()); + $this->con->rollback(); + throw $e; } - return array("fadeIn"=>$fadeIn, "fadeOut"=>$fadeOut); + return array("fadeIn"=> $fadeIn, "fadeOut"=> $fadeOut); } public function setPlaylistfades($fadein, $fadeout) { @@ -512,7 +522,7 @@ class Application_Model_Playlist { $row = CcPlaylistcontentsQuery::create() ->filterByDbPlaylistId($this->id) ->filterByDbPosition(0) - ->findOne(); + ->findOne($this->con); $this->changeFadeInfo($row->getDbId(), $fadein, null); } @@ -521,7 +531,7 @@ class Application_Model_Playlist { $row = CcPlaylistcontentsQuery::create() ->filterByDbPlaylistId($this->id) ->filterByDbPosition($this->getSize()-1) - ->findOne(); + ->findOne($this->con); $this->changeFadeInfo($row->getDbId(), null, $fadeout); } @@ -540,126 +550,135 @@ class Application_Model_Playlist { */ public function changeClipLength($id, $cueIn, $cueOut) { + $this->con->beginTransaction(); + $errArray= array(); - $con = Propel::getConnection(CcPlaylistPeer::DATABASE_NAME); - if (is_null($cueIn) && is_null($cueOut)) { - $errArray["error"]="Cue in and cue out are null."; - return $errArray; - } - - $row = CcPlaylistcontentsQuery::create() - ->joinWith(CcFilesPeer::OM_CLASS) - ->filterByPrimaryKey($id) - ->findOne(); - - if (is_null($row)) { - $errArray["error"]="Playlist item does not exist!."; - return $errArray; - } - - $oldCueIn = $row->getDBCuein(); - $oldCueOut = $row->getDbCueout(); - $fadeIn = $row->getDbFadein(); - $fadeOut = $row->getDbFadeout(); - - $file = $row->getCcFiles(); - $origLength = $file->getDbLength(); - - - if(!is_null($cueIn) && !is_null($cueOut)){ - - if($cueOut === ""){ - $cueOut = $origLength; - } - - $sql = "SELECT INTERVAL '{$cueIn}' > INTERVAL '{$cueOut}'"; - $r = $con->query($sql); - if($r->fetchColumn(0)) { - $errArray["error"]= "Can't set cue in to be larger than cue out."; + try { + if (is_null($cueIn) && is_null($cueOut)) { + $errArray["error"] = "Cue in and cue out are null."; return $errArray; } - $sql = "SELECT INTERVAL '{$cueOut}' > INTERVAL '{$origLength}'"; - $r = $con->query($sql); - if($r->fetchColumn(0)){ - $errArray["error"] = "Can't set cue out to be greater than file length."; - return $errArray; + $row = CcPlaylistcontentsQuery::create() + ->joinWith(CcFilesPeer::OM_CLASS) + ->filterByPrimaryKey($id) + ->findOne($this->con); + + if (is_null($row)) { + throw new Exception("Playlist item does not exist."); } - $sql = "SELECT INTERVAL '{$cueOut}' - INTERVAL '{$cueIn}'"; - $r = $con->query($sql); - $cliplength = $r->fetchColumn(0); + $oldCueIn = $row->getDBCuein(); + $oldCueOut = $row->getDbCueout(); + $fadeIn = $row->getDbFadein(); + $fadeOut = $row->getDbFadeout(); - $row->setDbCuein($cueIn); - $row->setDbCueout($cueOut); - $row->setDBCliplength($cliplength); + $file = $row->getCcFiles($this->con); + $origLength = $file->getDbLength(); - } - else if(!is_null($cueIn)) { + if (!is_null($cueIn) && !is_null($cueOut)){ - $sql = "SELECT INTERVAL '{$cueIn}' > INTERVAL '{$oldCueOut}'"; - $r = $con->query($sql); - if($r->fetchColumn(0)) { - $errArray["error"] = "Can't set cue in to be larger than cue out."; - return $errArray; + if ($cueOut === ""){ + $cueOut = $origLength; + } + + $sql = "SELECT INTERVAL '{$cueIn}' > INTERVAL '{$cueOut}'"; + $r = $this->con->query($sql); + if ($r->fetchColumn(0)) { + $errArray["error"] = "Can't set cue in to be larger than cue out."; + return $errArray; + } + + $sql = "SELECT INTERVAL '{$cueOut}' > INTERVAL '{$origLength}'"; + $r = $this->con->query($sql); + if ($r->fetchColumn(0)){ + $errArray["error"] = "Can't set cue out to be greater than file length."; + return $errArray; + } + + $sql = "SELECT INTERVAL '{$cueOut}' - INTERVAL '{$cueIn}'"; + $r = $this->con->query($sql); + $cliplength = $r->fetchColumn(0); + + $row->setDbCuein($cueIn); + $row->setDbCueout($cueOut); + $row->setDBCliplength($cliplength); + + } + else if (!is_null($cueIn)) { + + $sql = "SELECT INTERVAL '{$cueIn}' > INTERVAL '{$oldCueOut}'"; + $r = $this->con->query($sql); + if ($r->fetchColumn(0)) { + $errArray["error"] = "Can't set cue in to be larger than cue out."; + return $errArray; + } + + $sql = "SELECT INTERVAL '{$oldCueOut}' - INTERVAL '{$cueIn}'"; + $r = $this->con->query($sql); + $cliplength = $r->fetchColumn(0); + + $row->setDbCuein($cueIn); + $row->setDBCliplength($cliplength); + } + else if (!is_null($cueOut)) { + + if ($cueOut === ""){ + $cueOut = $origLength; + } + + $sql = "SELECT INTERVAL '{$cueOut}' < INTERVAL '{$oldCueIn}'"; + $r = $this->con->query($sql); + if ($r->fetchColumn(0)) { + $errArray["error"] = "Can't set cue out to be smaller than cue in."; + return $errArray; + } + + $sql = "SELECT INTERVAL '{$cueOut}' > INTERVAL '{$origLength}'"; + $r = $this->con->query($sql); + if ($r->fetchColumn(0)){ + $errArray["error"] = "Can't set cue out to be greater than file length."; + return $errArray; + } + + $sql = "SELECT INTERVAL '{$cueOut}' - INTERVAL '{$oldCueIn}'"; + $r = $this->con->query($sql); + $cliplength = $r->fetchColumn(0); + + $row->setDbCueout($cueOut); + $row->setDBCliplength($cliplength); } - $sql = "SELECT INTERVAL '{$oldCueOut}' - INTERVAL '{$cueIn}'"; - $r = $con->query($sql); - $cliplength = $r->fetchColumn(0); + $cliplength = $row->getDbCliplength(); - $row->setDbCuein($cueIn); - $row->setDBCliplength($cliplength); - } - else if(!is_null($cueOut)) { - - if($cueOut === ""){ - $cueOut = $origLength; + $sql = "SELECT INTERVAL '{$fadeIn}' > INTERVAL '{$cliplength}'"; + $r = $this->con->query($sql); + if ($r->fetchColumn(0)){ + $fadeIn = $cliplength; + $row->setDbFadein($fadeIn); } - $sql = "SELECT INTERVAL '{$cueOut}' < INTERVAL '{$oldCueIn}'"; - $r = $con->query($sql); - if($r->fetchColumn(0)) { - $errArray["error"] ="Can't set cue out to be smaller than cue in."; - return $errArray; + $sql = "SELECT INTERVAL '{$fadeOut}' > INTERVAL '{$cliplength}'"; + $r = $this->con->query($sql); + if ($r->fetchColumn(0)){ + $fadeOut = $cliplength; + $row->setDbFadein($fadeOut); } - $sql = "SELECT INTERVAL '{$cueOut}' > INTERVAL '{$origLength}'"; - $r = $con->query($sql); - if($r->fetchColumn(0)){ - $errArray["error"] ="Can't set cue out to be greater than file length."; - return $errArray; - } + $row->save($this->con); + $this->pl->setDbMtime(new DateTime("now", new DateTimeZone("UTC"))); + $this->pl->save($this->con); - $sql = "SELECT INTERVAL '{$cueOut}' - INTERVAL '{$oldCueIn}'"; - $r = $con->query($sql); - $cliplength = $r->fetchColumn(0); - - $row->setDbCueout($cueOut); - $row->setDBCliplength($cliplength); + $this->con->commit(); + } + catch (Exception $e) { + $this->con->rollback(); + throw $e; } - $cliplength = $row->getDbCliplength(); - - $sql = "SELECT INTERVAL '{$fadeIn}' > INTERVAL '{$cliplength}'"; - $r = $con->query($sql); - if($r->fetchColumn(0)){ - $fadeIn = $cliplength; - $row->setDbFadein($fadeIn); - } - - $sql = "SELECT INTERVAL '{$fadeOut}' > INTERVAL '{$cliplength}'"; - $r = $con->query($sql); - if($r->fetchColumn(0)){ - $fadeOut = $cliplength; - $row->setDbFadein($fadeOut); - } - - $row->save(); - - return array("cliplength"=>$cliplength, "cueIn"=>$cueIn, "cueOut"=>$cueOut, "length"=>$this->getLength(), - "fadeIn"=>$fadeIn, "fadeOut"=>$fadeOut); + return array("cliplength"=> $cliplength, "cueIn"=> $cueIn, "cueOut"=> $cueOut, "length"=> $this->getLength(), + "fadeIn"=> $fadeIn, "fadeOut"=> $fadeOut); } public function getAllPLMetaData() diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index b58a2d87e..5977712dc 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -19,6 +19,10 @@ var AIRTIME = (function(AIRTIME){ return regExpr.test(fade); } + function playlistError(json) { + alert(json.error); + openPlaylist(json); + } function stopAudioPreview() { // stop any preview playing @@ -51,130 +55,151 @@ var AIRTIME = (function(AIRTIME){ function changeCueIn(event) { event.stopPropagation(); - var id, url, cueIn, li, unqid; + var span = $(this), + id = span.parent().attr("id").split("_").pop(), + url = "/Playlist/set-cue", + cueIn = $.trim(span.text()), + li = span.parents("li"), + unqid = li.attr("unqid"), + lastMod = getModified(); - span = $(this); - id = span.parent().attr("id").split("_").pop(); - url = "/Playlist/set-cue"; - cueIn = $.trim(span.text()); - li = span.parent().parent().parent().parent(); - unqid = li.attr("unqid"); - - if(!isTimeValid(cueIn)){ + if (!isTimeValid(cueIn)){ showError(span, "please put in a time '00:00:00 (.000000)'"); return; } - $.post(url, {format: "json", cueIn: cueIn, id: id, type: event.type}, function(json){ + $.post(url, + {format: "json", cueIn: cueIn, id: id, modified: lastMod}, + function(json){ - if(json.response !== undefined && json.response.error) { - showError(span, json.response.error); - return; - } - - setPlaylistContent(json); - - li = $('#side_playlist li[unqid='+unqid+']'); - li.find(".cue-edit").toggle(); - highlightActive(li); - highlightActive(li.find('.spl_cue')); - }); + if (json.error !== undefined){ + playlistError(json); + return; + } + if (json.cue_error !== undefined) { + showError(span, json.cue_error); + return; + } + + setPlaylistContent(json); + + li = $('#side_playlist li[unqid='+unqid+']'); + li.find(".cue-edit").toggle(); + highlightActive(li); + highlightActive(li.find('.spl_cue')); + }); } function changeCueOut(event) { event.stopPropagation(); - var id, url, cueOut, li, unqid; + var span = $(this), + id = span.parent().attr("id").split("_").pop(), + url = "/Playlist/set-cue", + cueOut = $.trim(span.text()), + li = span.parents("li"), + unqid = li.attr("unqid"), + lastMod = getModified(); - span = $(this); - id = span.parent().attr("id").split("_").pop(); - url = "/Playlist/set-cue"; - cueOut = $.trim(span.text()); - li = span.parent().parent().parent().parent(); - unqid = li.attr("unqid"); - - if(!isTimeValid(cueOut)){ + if (!isTimeValid(cueOut)){ showError(span, "please put in a time '00:00:00 (.000000)'"); return; } - $.post(url, {format: "json", cueOut: cueOut, id: id}, function(json){ + $.post(url, + {format: "json", cueOut: cueOut, id: id, modified: lastMod}, + function(json){ - if(json.response !== undefined && json.response.error) { - showError(span, json.response.error); - return; - } - - setPlaylistContent(json); - - li = $('#side_playlist li[unqid='+unqid+']'); - li.find(".cue-edit").toggle(); - highlightActive(li); - highlightActive(li.find('.spl_cue')); - }); + if (json.error !== undefined){ + playlistError(json); + return; + } + if (json.cue_error !== undefined) { + showError(span, json.cue_error); + return; + } + + setPlaylistContent(json); + + li = $('#side_playlist li[unqid='+unqid+']'); + li.find(".cue-edit").toggle(); + highlightActive(li); + highlightActive(li.find('.spl_cue')); + }); } function changeFadeIn(event) { event.stopPropagation(); - var id, url, fadeIn, li, unqid; + var span = $(this), + id = span.parent().attr("id").split("_").pop(), + url = "/Playlist/set-fade", + fadeIn = $.trim(span.text()), + li = span.parents("li"), + unqid = li.attr("unqid"), + lastMod = getModified(); - span = $(this); - id = span.parent().attr("id").split("_").pop(); - url = "/Playlist/set-fade"; - fadeIn = $.trim(span.text()); - li = span.parent().parent().parent().parent(); - unqid = li.attr("unqid"); - - if(!isFadeValid(fadeIn)){ + if (!isFadeValid(fadeIn)){ showError(span, "please put in a time in seconds '00 (.000000)'"); return; } - $.post(url, {format: "json", fadeIn: fadeIn, id: id}, function(json){ + $.post(url, + {format: "json", fadeIn: fadeIn, id: id, modified: lastMod}, + function(json){ - if(json.response !== undefined && json.response.error) { - showError(span, json.response.error); - return; - } - - setPlaylistContent(json); - - li = $('#side_playlist li[unqid='+unqid+']'); - li.find('.crossfade').toggle(); - highlightActive(li.find('.spl_fade_control')); - }); + if (json.error !== undefined){ + playlistError(json); + return; + } + if (json.fade_error !== undefined) { + showError(span, json.fade_error); + return; + } + + setPlaylistContent(json); + + li = $('#side_playlist li[unqid='+unqid+']'); + li.find('.crossfade').toggle(); + highlightActive(li.find('.spl_fade_control')); + }); } function changeFadeOut(event) { event.stopPropagation(); - var id, url, fadeOut, li, unqid; + var span = $(this), + id = span.parent().attr("id").split("_").pop(), + url = "/Playlist/set-fade", + fadeOut = $.trim(span.text()), + li = span.parents("li"), + unqid = li.attr("unqid"), + lastMod = getModified(); - span = $(this); - id = span.parent().attr("id").split("_").pop(); - url = "/Playlist/set-fade"; - fadeOut = $.trim(span.text()); - li = span.parent().parent().parent().parent(); - unqid = li.attr("unqid"); - - if(!isFadeValid(fadeOut)){ + if (!isFadeValid(fadeOut)){ showError(span, "please put in a time in seconds '00 (.000000)'"); return; } - $.post(url, {format: "json", fadeOut: fadeOut, id: id}, function(json){ - if(json.response !== undefined && json.response.error) { - showError(span, json.response.error); - return; - } - - setPlaylistContent(json); - - li = $('#side_playlist li[unqid='+unqid+']'); - li.find('.crossfade').toggle(); - highlightActive(li.find('.spl_fade_control')); - }); + $.post(url, + {format: "json", fadeOut: fadeOut, id: id, modified: lastMod}, + function(json){ + + if (json.error !== undefined){ + playlistError(json); + return; + } + if (json.fade_error !== undefined) { + showError(span, json.fade_error); + return; + } + + setPlaylistContent(json); + + li = $('#side_playlist li[unqid='+unqid+']'); + li.find('.crossfade').toggle(); + highlightActive(li.find('.spl_fade_control')); + }); } function submitOnEnter(event) { @@ -221,27 +246,33 @@ var AIRTIME = (function(AIRTIME){ } function editName() { - var nameElement = $(this); - var playlistName = nameElement.text(); + var nameElement = $(this), + playlistName = nameElement.text(), + lastMod = getModified(); $("#playlist_name_input") .removeClass('element_hidden') .val(playlistName) .keydown(function(event){ - if(event.keyCode === 13) { + if (event.keyCode === 13) { event.preventDefault(); - var input = $(this); - var url; - url = '/Playlist/set-playlist-name'; + var input = $(this), + url = '/Playlist/set-playlist-name'; - $.post(url, {format: "json", name: input.val()}, function(json){ - if(json.playlist_error == true){ - alertPlaylistErrorAndReload(); - } - input.addClass('element_hidden'); - nameElement.text(json.playlistName); - redrawLib(); - }); + $.post(url, + {format: "json", name: input.val(), modified: lastMod}, + function(json){ + + if (json.error !== undefined) { + playlistError(json); + } + else { + setModified(json.modified); + input.addClass('element_hidden'); + nameElement.text(json.playlistName); + redrawLib(); + } + }); } }) .focus(); @@ -269,7 +300,9 @@ var AIRTIME = (function(AIRTIME){ $('#spl_sortable') .empty() .append(json.html); - + + setModified(json.modified); + redrawLib(); } @@ -281,6 +314,10 @@ var AIRTIME = (function(AIRTIME){ return parseInt($("#pl_lastMod").val(), 10); } + function setModified(modified) { + $("#pl_lastMod").val(modified); + } + function openPlaylist(json) { $("#side_playlist") @@ -335,9 +372,11 @@ var AIRTIME = (function(AIRTIME){ function setUpPlaylist(playlist) { var playlist = $("#side_playlist"), - sortableConf; + sortableConf, + cachedDescription; - playlist.find("#spl_crossfade").on("click", function(){ + playlist.find("#spl_crossfade").on("click", function() { + var lastMod = getModified(); if ($(this).hasClass("ui-state-active")) { $(this).removeClass("ui-state-active"); @@ -348,19 +387,23 @@ var AIRTIME = (function(AIRTIME){ var url = '/Playlist/get-playlist-fades'; - $.get(url, {format: "json"}, function(json){ - if(json.playlist_error == true){ - alertPlaylistErrorAndReload(); - } - playlist.find("#spl_fade_in_main").find("span") - .empty() - .append(json.fadeIn); - playlist.find("#spl_fade_out_main").find("span") - .empty() - .append(json.fadeOut); - - playlist.find("#crossfade_main").show(); - }); + $.get(url, + {format: "json", modified: lastMod}, + function(json){ + if (json.error !== undefined){ + playlistError(json); + } + else { + playlist.find("#spl_fade_in_main").find("span") + .empty() + .append(json.fadeIn); + playlist.find("#spl_fade_out_main").find("span") + .empty() + .append(json.fadeOut); + + playlist.find("#crossfade_main").show(); + } + }); } }); @@ -369,7 +412,8 @@ var AIRTIME = (function(AIRTIME){ playlist.find("#fieldset-metadate_change > legend").on("click", function(){ var descriptionElement = $(this).parent(); - if(descriptionElement.hasClass("closed")) { + if (descriptionElement.hasClass("closed")) { + cachedDescription = playlist.find("#fieldset-metadate_change textarea").val(); descriptionElement.removeClass("closed"); } else { @@ -380,77 +424,71 @@ var AIRTIME = (function(AIRTIME){ playlist.find("#description_save").on("click", function(){ var textarea = playlist.find("#fieldset-metadate_change textarea"), description = textarea.val(), - url; + url, + lastMod = getModified();; url = '/Playlist/set-playlist-description'; - $.post(url, {format: "json", description: description}, function(json){ - if(json.playlist_error == true){ - alertPlaylistErrorAndReload(); - } - else{ - textarea.val(json.playlistDescription); - } - - playlist.find("#fieldset-metadate_change").addClass("closed"); - redrawLib(); - }); + $.post(url, + {format: "json", description: description, modified: lastMod}, + function(json){ + if (json.error !== undefined){ + playlistError(json); + } + else{ + setModified(json.modified); + textarea.val(json.description); + playlist.find("#fieldset-metadate_change").addClass("closed"); + redrawLib(); + } + }); }); playlist.find("#description_cancel").on("click", function(){ - var textarea = playlist.find("#fieldset-metadate_change textarea"), - url; + var textarea = playlist.find("#fieldset-metadate_change textarea"); - url = '/Playlist/set-playlist-description'; - - $.post(url, {format: "json"}, function(json){ - if(json.playlist_error == true){ - alertPlaylistErrorAndReload(); - } - else{ - textarea.val(json.playlistDescription); - } - - playlist.find("#fieldset-metadate_change").addClass("closed"); - }); + textarea.val(cachedDescription); + playlist.find("#fieldset-metadate_change").addClass("closed"); }); playlist.find("#spl_fade_in_main span:first").on("blur", function(event){ event.stopPropagation(); - var url, fadeIn, span; - span = $(this); - url = "/Playlist/set-playlist-fades"; - fadeIn = $.trim(span.text()); - - if(!isFadeValid(fadeIn)){ + var url = "/Playlist/set-playlist-fades", + span = $(this), + fadeIn = $.trim(span.text()), + lastMod = getModified(); + + if (!isFadeValid(fadeIn)){ showError(span, "please put in a time in seconds '00 (.000000)'"); return; } - $.post(url, {format: "json", fadeIn: fadeIn}, function(json){ - - hideError(span); - }); + $.post(url, + {format: "json", fadeIn: fadeIn, modified: lastMod}, + function(json){ + hideError(span); + }); }); playlist.find("#spl_fade_out_main span:last").on("blur", function(event){ event.stopPropagation(); - var url, fadeOut, span; - - span = $(this); - url = "/Playlist/set-playlist-fades"; - fadeOut = $.trim(span.text()); + var url = "/Playlist/set-playlist-fades", + span = $(this), + fadeOut = $.trim(span.text()), + lastMod = getModified(); if(!isFadeValid(fadeOut)){ showError(span, "please put in a time in seconds '00 (.000000)'"); return; } - $.post(url, {format: "json", fadeOut: fadeOut}, function(json){ - hideError(span); - }); + $.post(url, + {format: "json", fadeOut: fadeOut, modified: lastMod}, + function(json){ + hideError(span); + }); }); playlist.find("#spl_fade_in_main span:first, #spl_fade_out_main span:first") @@ -501,7 +539,7 @@ var AIRTIME = (function(AIRTIME){ return { items: 'li', - placeholder: "placeholder lib-placeholder ui-state-highlight", + placeholder: "placeholder ui-state-highlight", forcePlaceholderSize: true, handle: 'div.list-item-container', start: function(event, ui) { @@ -518,30 +556,28 @@ var AIRTIME = (function(AIRTIME){ } mod.fnNew = function() { - var url; + var url = '/Playlist/new'; stopAudioPreview(); - url = '/Playlist/new'; - - $.post(url, {format: "json"}, function(json){ - openPlaylist(json); - redrawLib(); - }); + + $.post(url, + {format: "json"}, + function(json){ + openPlaylist(json); + redrawLib(); + }); }; mod.fnEdit = function(id) { - var url; + var url = '/Playlist/edit';; stopAudioPreview(); - url = '/Playlist/edit'; - $.post(url, {format: "json", id: id}, function(json){ openPlaylist(json); - //redrawLib(); - }); + }); }; mod.fnDelete = function(plid) { @@ -557,33 +593,51 @@ var AIRTIME = (function(AIRTIME){ function(json){ openPlaylist(json); redrawLib(); - }); + }); }; mod.fnAddItems = function(aItems, iAfter, sAddType) { + var lastMod = getModified(); $.post("/playlist/add-items", - {format: "json", "ids": aItems, "afterItem": iAfter, "type": sAddType}, + {format: "json", "ids": aItems, "afterItem": iAfter, "type": sAddType, "modified": lastMod}, function(json){ - setPlaylistContent(json); + if (json.error !== undefined) { + playlistError(json); + } + else { + setPlaylistContent(json); + } }); }; mod.fnMoveItems = function(aIds, iAfter) { + var lastMod = getModified(); $.post("/playlist/move-items", - {format: "json", "ids": aIds, "afterItem": iAfter}, + {format: "json", "ids": aIds, "afterItem": iAfter, "modified": lastMod}, function(json){ - setPlaylistContent(json); + if (json.error !== undefined) { + playlistError(json); + } + else { + setPlaylistContent(json); + } }); }; mod.fnDeleteItems = function(aItems) { + var lastMod = getModified(); $.post("/playlist/delete-items", - {format: "json", "ids": aItems}, + {format: "json", "ids": aItems, "modified": lastMod}, function(json){ - setPlaylistContent(json); + if (json.error !== undefined) { + playlistError(json); + } + else { + setPlaylistContent(json); + } }); }; From 378d3d3ef4dc53562ca1d78b7db6db46ea6b79ee Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Mon, 20 Feb 2012 20:44:35 +0100 Subject: [PATCH 05/21] CC-3174 : showbuilder group drag and drop for playlist. --- .../library/events/library_playlistbuilder.js | 23 ++++++--------- .../library/events/library_showbuilder.js | 1 - airtime_mvc/public/js/airtime/library/spl.js | 28 +++++++++++++------ 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js index 33c6adc4b..aa8bb6316 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -19,20 +19,15 @@ var AIRTIME = (function(AIRTIME){ mod.fnDrawCallback = function() { $('#library_display tr[id ^= "au"]').draggable({ - helper: 'clone', - /* customize the helper on dragging to look like a pl item - * - helper: function(ev) { - var data, li; - - data = $(ev.currentTarget).data("aData"); - - li = $("
  • "); - li.append(data.track_title); - - return li; - }, - */ + helper: function(){ + var selected = $('#library_display input:checked').parents('tr[id^="au"]'); + if (selected.length === 0) { + selected = $(this); + } + var container = $('
    ').attr('id', 'draggingContainer'); + container.append(selected.clone()); + return container; + }, cursor: 'pointer', connectToSortable: '#spl_sortable' }); diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index f48f70dd5..5b49b3118 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -19,7 +19,6 @@ var AIRTIME = (function(AIRTIME){ mod.fnDrawCallback = function() { $('#library_display tr:not(:first)').draggable({ - //helper: 'clone', helper: function(){ var selected = $('#library_display input:checked').parents('tr'); if (selected.length === 0) { diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 5977712dc..267e77921 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -500,17 +500,19 @@ var AIRTIME = (function(AIRTIME){ }); sortableConf = (function(){ - var origRow, + var origTrs, + html, fnReceive, fnUpdate; fnReceive = function(event, ui) { - origRow = ui.item; + origTrs = ui.helper.find('tr[id^="au"]'); + html = ui.helper.html(); }; fnUpdate = function(event, ui) { var prev, - aItem = [], + aItems = [], iAfter, sAddType; @@ -525,15 +527,23 @@ var AIRTIME = (function(AIRTIME){ } //item was dragged in from library datatable - if (origRow !== undefined) { - aItem.push(origRow.data("aData").id); - origRow = undefined; - AIRTIME.playlist.fnAddItems(aItem, iAfter, sAddType); + if (origTrs !== undefined) { + + playlist.find("tr.ui-draggable") + .after(html) + .empty(); + + origTrs.each(function(i, el){ + aItems.push($("#"+$(el).attr("id")).data("aData").id); + }); + + origTrs = undefined; + AIRTIME.playlist.fnAddItems(aItems, iAfter, sAddType); } //item was reordered. else { - aItem.push(parseInt(ui.item.attr("id").split("_").pop(), 10)); - AIRTIME.playlist.fnMoveItems(aItem, iAfter); + aItems.push(parseInt(ui.item.attr("id").split("_").pop(), 10)); + AIRTIME.playlist.fnMoveItems(aItems, iAfter); } }; From 9b5a0fc5650592bca84a70fffba3158c0e1e6dad Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 21 Feb 2012 17:31:54 +0100 Subject: [PATCH 06/21] CC-3174 : showbuilder working on trying to save/load state serialized into the db for datatables. --- .../application/controllers/ApiController.php | 110 +++++------- .../controllers/LibraryController.php | 12 +- .../controllers/PreferenceController.php | 34 +++- airtime_mvc/public/css/showbuilder.css | 9 +- .../public/js/airtime/library/library.js | 167 ++++++++++-------- .../public/js/airtime/showbuilder/builder.js | 4 +- .../plugin/dataTables.ColReorder.js | 100 ++++------- .../js/datatables/plugin/dataTables.ColVis.js | 6 +- 8 files changed, 211 insertions(+), 231 deletions(-) mode change 100644 => 100755 airtime_mvc/public/js/datatables/plugin/dataTables.ColReorder.js mode change 100644 => 100755 airtime_mvc/public/js/datatables/plugin/dataTables.ColVis.js diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 4026d7460..f9628a78a 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -24,7 +24,6 @@ class ApiController extends Zend_Controller_Action ->addActionContext('status', 'json') ->addActionContext('register-component', 'json') ->addActionContext('update-liquidsoap-status', 'json') - ->addActionContext('library-init', 'json') ->addActionContext('live-chat', 'json') ->addActionContext('update-file-system-mount', 'json') ->addActionContext('handle-watched-dir-missing', 'json') @@ -64,7 +63,7 @@ class ApiController extends Zend_Controller_Action $jsonStr = json_encode(array("version"=>Application_Model_Preference::GetAirtimeVersion())); echo $jsonStr; } - + /** * Sets up and send init values used in the Calendar. * This is only being used by schedule.js at the moment. @@ -72,16 +71,16 @@ class ApiController extends Zend_Controller_Action public function calendarInitAction(){ $this->view->layout()->disableLayout(); $this->_helper->viewRenderer->setNoRender(true); - + if(is_null(Zend_Auth::getInstance()->getStorage()->read())) { header('HTTP/1.0 401 Unauthorized'); print 'You are not allowed to access this resource.'; return; } - + $this->view->calendarInit = array( - "timestamp" => time(), - "timezoneOffset" => date("Z"), + "timestamp" => time(), + "timezoneOffset" => date("Z"), "timeScale" => Application_Model_Preference::GetCalendarTimeScale(), "timeInterval" => Application_Model_Preference::GetCalendarTimeInterval(), "weekStartDay" => Application_Model_Preference::GetWeekStartDay() @@ -178,9 +177,9 @@ class ApiController extends Zend_Controller_Action * Retrieve the currently playing show as well as upcoming shows. * Number of shows returned and the time interval in which to * get the next shows can be configured as GET parameters. - * + * * TODO: in the future, make interval length a parameter instead of hardcode to 48 - * + * * Possible parameters: * type - Can have values of "endofday" or "interval". If set to "endofday", * the function will retrieve shows from now to end of day. @@ -199,19 +198,19 @@ class ApiController extends Zend_Controller_Action $date = new Application_Model_DateHelper; $utcTimeNow = $date->getUtcTimestamp(); $utcTimeEnd = ""; // if empty, GetNextShows will use interval instead of end of day - + $request = $this->getRequest(); $type = $request->getParam('type'); if($type == "endofday") { // make GetNextShows use end of day $utcTimeEnd = Application_Model_DateHelper::GetDayEndTimestampInUtc(); } - + $limit = $request->getParam('limit'); if($limit == "" || !is_numeric($limit)) { $limit = "5"; } - + $result = array("env"=>APPLICATION_ENV, "schedulerTime"=>gmdate("Y-m-d H:i:s"), "currentShow"=>Application_Model_Show::GetCurrentShow($utcTimeNow), @@ -219,7 +218,7 @@ class ApiController extends Zend_Controller_Action "timezone"=> date("T"), "timezoneOffset"=> date("Z"), "AIRTIME_API_VERSION"=>AIRTIME_API_VERSION); //used by caller to determine if the airtime they are running or widgets in use is out of date. - + //Convert from UTC to localtime for user. Application_Model_Show::ConvertToLocalTimeZone($result["currentShow"], array("starts", "ends", "start_timestamp", "end_timestamp")); Application_Model_Show::ConvertToLocalTimeZone($result["nextShow"], array("starts", "ends", "start_timestamp", "end_timestamp")); @@ -233,7 +232,7 @@ class ApiController extends Zend_Controller_Action exit; } } - + public function weekInfoAction() { if (Application_Model_Preference::GetAllow3rdPartyApi()){ @@ -244,7 +243,7 @@ class ApiController extends Zend_Controller_Action $date = new Application_Model_DateHelper; $dayStart = $date->getWeekStartDate(); $utcDayStart = Application_Model_DateHelper::ConvertToUtcDateTimeString($dayStart); - + $dow = array("sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"); $result = array(); @@ -252,9 +251,9 @@ class ApiController extends Zend_Controller_Action $utcDayEnd = Application_Model_DateHelper::GetDayEndTimestamp($utcDayStart); $shows = Application_Model_Show::GetNextShows($utcDayStart, "0", $utcDayEnd); $utcDayStart = $utcDayEnd; - + Application_Model_Show::ConvertToLocalTimeZone($shows, array("starts", "ends", "start_timestamp", "end_timestamp")); - + $result[$dow[$i]] = $shows; } $result['AIRTIME_API_VERSION'] = AIRTIME_API_VERSION; //used by caller to determine if the airtime they are running or widgets in use is out of date. @@ -373,8 +372,8 @@ class ApiController extends Zend_Controller_Action $now = new DateTime($today_timestamp); $end_timestamp = $now->add(new DateInterval("PT2H")); $end_timestamp = $end_timestamp->format("Y-m-d H:i:s"); - - $this->view->shows = Application_Model_Show::getShows(Application_Model_DateHelper::ConvertToUtcDateTime($today_timestamp, date_default_timezone_get()), + + $this->view->shows = Application_Model_Show::getShows(Application_Model_DateHelper::ConvertToUtcDateTime($today_timestamp, date_default_timezone_get()), Application_Model_DateHelper::ConvertToUtcDateTime($end_timestamp, date_default_timezone_get()), $excludeInstance=NULL, $onlyRecord=TRUE); @@ -405,7 +404,7 @@ class ApiController extends Zend_Controller_Action $upload_dir = ini_get("upload_tmp_dir"); $tempFilePath = Application_Model_StoredFile::uploadFile($upload_dir); $tempFileName = basename($tempFilePath); - + $fileName = isset($_REQUEST["name"]) ? $_REQUEST["name"] : ''; $result = Application_Model_StoredFile::copyFileToStor($upload_dir, $fileName, $tempFileName); if (isset($result)){ @@ -456,19 +455,19 @@ class ApiController extends Zend_Controller_Action } if (isset($show_name)) { - + $show_name = str_replace(" ", "-", $show_name); - + //2011-12-09-19-28-00-ofirrr-256kbps $filename = $file->getName(); - + //replace the showname in the filepath incase it has been edited since the show started recording //(some old bug) $filename_parts = explode("-", $filename); $new_name = array_slice($filename_parts, 0, 6); $new_name[] = $show_name; $new_name[] = $filename_parts[count($filename_parts)-1]; - + $tmpTitle = implode("-", $new_name); } else { @@ -533,7 +532,7 @@ class ApiController extends Zend_Controller_Action } $this->view->stor = Application_Model_MusicDir::getStorDir()->getDirectory(); - + $watchedDirs = Application_Model_MusicDir::getWatchedDirs(); $watchedDirsPath = array(); foreach($watchedDirs as $wd){ @@ -573,7 +572,7 @@ class ApiController extends Zend_Controller_Action $filepath = str_replace("//", "/", $filepath); $file = Application_Model_StoredFile::RecallByFilepath($filepath); - + if (is_null($file)) { $file = Application_Model_StoredFile::Insert($md); } @@ -737,10 +736,10 @@ class ApiController extends Zend_Controller_Action $this->view->msg = Application_Model_MusicDir::setStorDir($path); } - + public function getStreamSettingAction() { global $CC_CONFIG; - + $request = $this->getRequest(); $api_key = $request->getParam('api_key'); if (!in_array($api_key, $CC_CONFIG["apiKey"])) @@ -752,10 +751,10 @@ class ApiController extends Zend_Controller_Action $this->view->msg = Application_Model_StreamSetting::getStreamSetting(); } - + public function statusAction() { global $CC_CONFIG; - + $request = $this->getRequest(); $api_key = $request->getParam('api_key'); $getDiskInfo = $request->getParam('diskinfo') == "true"; @@ -767,7 +766,7 @@ class ApiController extends Zend_Controller_Action exit; } */ - + $status = array( "platform"=>Application_Model_Systemstatus::GetPlatformInfo(), "airtime_version"=>Application_Model_Preference::GetAirtimeVersion(), @@ -779,11 +778,11 @@ class ApiController extends Zend_Controller_Action "media_monitor"=>Application_Model_Systemstatus::GetMediaMonitorStatus() ) ); - + if ($getDiskInfo){ $status["partitions"] = Application_Model_Systemstatus::GetDiskInfo(); } - + $this->view->status = $status; } @@ -796,40 +795,21 @@ class ApiController extends Zend_Controller_Action Application_Model_ServiceRegister::Register($component, $remoteAddr); } - + public function updateLiquidsoapStatusAction(){ $request = $this->getRequest(); - + $msg = $request->getParam('msg'); $stream_id = $request->getParam('stream_id'); $boot_time = $request->getParam('boot_time'); - + Application_Model_StreamSetting::setLiquidsoapError($stream_id, $msg, $boot_time); } - - /** - * Sets up and send init values used in the Library. - * This is being used by library.js - */ - public function libraryInitAction(){ - $this->view->layout()->disableLayout(); - $this->_helper->viewRenderer->setNoRender(true); - - if(is_null(Zend_Auth::getInstance()->getStorage()->read())) { - header('HTTP/1.0 401 Unauthorized'); - print 'You are not allowed to access this resource.'; - return; - } - - $this->view->libraryInit = array( - "numEntries"=>Application_Model_Preference::GetLibraryNumEntries() - ); - } - + // handles addition/deletion of mount point which watched dirs reside public function updateFileSystemMountAction(){ global $CC_CONFIG; - + $request = $this->getRequest(); $api_key = $request->getParam('api_key'); if (!in_array($api_key, $CC_CONFIG["apiKey"])) @@ -842,16 +822,16 @@ class ApiController extends Zend_Controller_Action $params = $request->getParams(); $added_list = empty($params['added_dir'])?array():explode(',',$params['added_dir']); $removed_list = empty($params['removed_dir'])?array():explode(',',$params['removed_dir']); - + // get all watched dirs $watched_dirs = Application_Model_MusicDir::getWatchedDirs(null,null); - + foreach( $added_list as $ad){ foreach( $watched_dirs as $dir ){ $dirPath = $dir->getDirectory(); - + $ad .= '/'; - + // if mount path itself was watched if($dirPath == $ad){ Application_Model_MusicDir::addWatchedDir($dirPath, false); @@ -884,7 +864,7 @@ class ApiController extends Zend_Controller_Action // is new mount point within the watched dir? // pyinotify doesn't notify anyhing in this case, so we walk through all files within // this watched dir in DB and mark them deleted. - // In case of h) of use cases, due to pyinotify behaviour of noticing mounted dir, we need to + // In case of h) of use cases, due to pyinotify behaviour of noticing mounted dir, we need to // compare agaisnt all files in cc_files table else if(substr($rd, 0, strlen($dirPath)) === $dirPath ){ $watchDir = Application_Model_MusicDir::getDirByPath($rd); @@ -903,13 +883,13 @@ class ApiController extends Zend_Controller_Action } } } - + } - + // handles case where watched dir is missing public function handleWatchedDirMissingAction(){ global $CC_CONFIG; - + $request = $this->getRequest(); $api_key = $request->getParam('api_key'); if (!in_array($api_key, $CC_CONFIG["apiKey"])) @@ -918,7 +898,7 @@ class ApiController extends Zend_Controller_Action print 'You are not allowed to access this resource.'; exit; } - + $dir = base64_decode($request->getParam('dir')); Application_Model_MusicDir::removeWatchedDir($dir, false); } diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 1b2f9dfe4..1418b0f0f 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -47,7 +47,7 @@ class LibraryController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorderResize.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.TableTools.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); @@ -282,14 +282,4 @@ class LibraryController extends Zend_Controller_Action $this->view->error_msg = $file->getSoundCloudErrorMsg(); } } - - /** - * Stores the number of entries user chose to show in the Library - * to the pref db - */ - public function setNumEntriesAction() { - $request = $this->getRequest(); - $numEntries = $request->getParam('numEntries'); - Application_Model_Preference::SetLibraryNumEntries($numEntries); - } } diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index b297700b0..ee93539cd 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -14,13 +14,15 @@ class PreferenceController extends Zend_Controller_Action ->addActionContext('is-import-in-progress', 'json') ->addActionContext('change-stream-setting', 'json') ->addActionContext('get-liquidsoap-status', 'json') + ->addActionContext('get-library-datatable', 'json') + ->addActionContext('set-library-datatable', 'json') ->initContext(); } public function indexAction() { global $CC_CONFIG; - + $request = $this->getRequest(); $baseUrl = $request->getBaseUrl(); @@ -59,7 +61,7 @@ class PreferenceController extends Zend_Controller_Action public function supportSettingAction() { global $CC_CONFIG; - + $request = $this->getRequest(); $baseUrl = $request->getBaseUrl(); @@ -119,7 +121,7 @@ class PreferenceController extends Zend_Controller_Action public function directoryConfigAction() { global $CC_CONFIG; - + if(Application_Model_Preference::GetPlanLevel() == 'disabled'){ $request = $this->getRequest(); $baseUrl = $request->getBaseUrl(); @@ -136,7 +138,7 @@ class PreferenceController extends Zend_Controller_Action public function streamSettingAction() { global $CC_CONFIG; - + $request = $this->getRequest(); $baseUrl = $request->getBaseUrl(); @@ -206,10 +208,10 @@ class PreferenceController extends Zend_Controller_Action $values['output_sound_device'] = $form->getValue('output_sound_device'); } - + $values['icecast_vorbis_metadata'] = $form->getValue('icecast_vorbis_metadata'); $values['output_sound_device_type'] = $form->getValue('output_sound_device_type'); - $values['streamFormat'] = $form->getValue('streamFormat'); + $values['streamFormat'] = $form->getValue('streamFormat'); } if(!$error){ @@ -331,6 +333,26 @@ class PreferenceController extends Zend_Controller_Action } die(json_encode($out)); } + + public function setLibraryDatatableAction() { + + $request = $this->getRequest(); + $settings = $request->getParam("settings"); + + $data = serialize($settings); + Logging::log("library datatable"); + Logging::log($data); + + Application_Model_Preference::SetValue("library_datatable", $data, true); + + } + + public function getLibraryDatatableAction() { + + $data = Application_Model_Preference::GetValue("library_datatable", true); + + $this->view->settings = unserialize($data); + } } diff --git a/airtime_mvc/public/css/showbuilder.css b/airtime_mvc/public/css/showbuilder.css index 9a443518c..9bc163de2 100644 --- a/airtime_mvc/public/css/showbuilder.css +++ b/airtime_mvc/public/css/showbuilder.css @@ -2,4 +2,11 @@ #show_builder input.input_text { width:100px; -} \ No newline at end of file +} + +#show_builder span.ui-icon-triangle-1-e { + float: left; + position: relative; + left: -20px; + top: 15px; +} diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index faee0bd35..3f1a24f17 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -211,76 +211,51 @@ function addQtipToSCIcons(){ }); } -function fnCreatedRow( nRow, aData, iDataIndex ) { - - //call the context menu so we can prevent the event from propagating. - $(nRow).find('td:not(.library_checkbox):not(.library_type)').click(function(e){ - - $(this).contextMenu(); - - return false; - }); - - //add a tool tip to appear when the user clicks on the type icon. - $(nRow.children[1]).qtip({ - content: { - text: "Loading...", - title: { - text: aData.track_title - }, - ajax: { - url: "/Library/get-file-meta-data", - type: "get", - data: ({format: "html", id : aData.id, type: aData.ftype}), - success: function(data, status) { - this.set('content.text', data); - } - } - }, - position: { - my: 'left center', - at: 'right center', // Position the tooltip above the link - viewport: $(window), // Keep the tooltip on-screen at all times - effect: false // Disable positioning animation - }, - style: { - classes: "ui-tooltip-dark" - }, - show: { - event: 'click', - solo: true // Only show one tooltip at a time - }, - hide: 'mouseout' - - }).click(function(event) { - event.preventDefault(); - event.stopPropagation(); - }); -} - -/** - * Updates pref db when user changes the # of entries to show - */ -function saveNumEntriesSetting() { - $('select[name=library_display_length]').change(function() { - var url = '/Library/set-num-entries/format/json'; - $.post(url, {numEntries: $(this).val()}); - }); -} - -/** - * Use user preference for number of entries to show - */ -function getNumEntriesPreference(data) { - return parseInt(data.libraryInit.numEntries, 10); -} - -function createDataTable(data) { - var oTable; +$(document).ready(function() { + var oTable; + + $('.tabs').tabs(); oTable = $('#library_display').dataTable( { "bProcessing": true, "bServerSide": true, + + "bStateSave": true, + "fnStateSave": function (oSettings, oData) { + + $.ajax({ + url: "/preference/set-library-datatable", + type: "POST", + data: {settings : oData, format: "json"}, + dataType: "json", + success: function(){ + var x; + }, + error: function (jqXHR, textStatus, errorThrown) { + var x; + } + }); + }, + "fnStateLoad": function (oSettings) { + var o; + + $.ajax({ + url: "/preference/get-library-datatable", + type: "GET", + data: {format: "json"}, + dataType: "json", + async: false, + success: function(json){ + o = json.settings; + }, + error: function (jqXHR, textStatus, errorThrown) { + var x; + } + }); + + return o; + }, + "sAjaxSource": "/Library/contents", "fnServerData": function ( sSource, aoData, testCallback ) { aoData.push( { name: "format", value: "json"} ); @@ -293,7 +268,52 @@ function createDataTable(data) { } ); }, "fnRowCallback": AIRTIME.library.events.fnRowCallback, - "fnCreatedRow": fnCreatedRow, + "fnCreatedRow": function( nRow, aData, iDataIndex ) { + + //call the context menu so we can prevent the event from propagating. + $(nRow).find('td:not(.library_checkbox):not(.library_type)').click(function(e){ + + $(this).contextMenu(); + + return false; + }); + + //add a tool tip to appear when the user clicks on the type icon. + $(nRow.children[1]).qtip({ + content: { + text: "Loading...", + title: { + text: aData.track_title + }, + ajax: { + url: "/Library/get-file-meta-data", + type: "get", + data: ({format: "html", id : aData.id, type: aData.ftype}), + success: function(data, status) { + this.set('content.text', data); + } + } + }, + position: { + my: 'left center', + at: 'right center', // Position the tooltip above the link + viewport: $(window), // Keep the tooltip on-screen at all times + effect: false // Disable positioning animation + }, + style: { + classes: "ui-tooltip-dark" + }, + show: { + event: 'click', + solo: true // Only show one tooltip at a time + }, + hide: 'mouseout' + + }).click(function(event) { + event.preventDefault(); + event.stopPropagation(); + }); + }, "fnDrawCallback": AIRTIME.library.events.fnDrawCallback, "fnHeaderCallback": function(nHead) { $(nHead).find("input[type=checkbox]").attr("checked", false); @@ -319,8 +339,7 @@ function createDataTable(data) { "oLanguage": { "sSearch": "" }, - "iDisplayLength": getNumEntriesPreference(data), - + // R = ColReorder, C = ColVis, T = TableTools "sDom": 'Rlfr<"H"T<"library_toolbar"C>>t<"F"ip>', @@ -353,8 +372,7 @@ function createDataTable(data) { "buttonText": "Show/Hide Columns", "sAlign": "right", "aiExclude": [0, 1], - "sSize": "css", - "bShowAll": true + "sSize": "css" }, "oColReorder": { @@ -377,13 +395,6 @@ function createDataTable(data) { oTT.fnSelectNone(); } }); -} - -$(document).ready(function() { - $('.tabs').tabs(); - - $.ajax({url: "/Api/library-init/format/json", dataType:"json", success:createDataTable, - error:function(jqXHR, textStatus, errorThrown){}}); checkImportStatus(); setInterval( checkImportStatus, 5000 ); diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 10796ab01..205d8db78 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -205,7 +205,7 @@ $(document).ready(function() { if (aData.header === true) { cl = 'sb-header'; - sSeparatorHTML = ''+aData.title+''+aData.starts+''+aData.ends+''; + sSeparatorHTML = ''+aData.title+''+aData.starts+''+aData.ends+''; fnPrepareSeparatorRow(sSeparatorHTML, cl, 0); } else if (aData.footer === true) { @@ -230,7 +230,7 @@ $(document).ready(function() { node = nRow.children[0]; if (aData.checkbox === true) { - node.innerHTML = ''; + node.innerHTML = ''; } else { node.innerHTML = ''; diff --git a/airtime_mvc/public/js/datatables/plugin/dataTables.ColReorder.js b/airtime_mvc/public/js/datatables/plugin/dataTables.ColReorder.js old mode 100644 new mode 100755 index 95c39fcec..7c7b728a2 --- a/airtime_mvc/public/js/datatables/plugin/dataTables.ColReorder.js +++ b/airtime_mvc/public/js/datatables/plugin/dataTables.ColReorder.js @@ -1,6 +1,6 @@ /* * File: ColReorder.js - * Version: 1.0.4 + * Version: 1.0.5 * CVS: $Id$ * Description: Controls for column visiblity in DataTables * Author: Allan Jardine (www.sprymedia.co.uk) @@ -163,7 +163,11 @@ $.fn.dataTableExt.oApi.fnColReorder = function ( oSettings, iFrom, iTo ) /* Data column sorting (the column which the sort for a given column should take place on) */ for ( i=0, iLen=iCols ; i Date: Wed, 22 Feb 2012 00:02:35 +0100 Subject: [PATCH 07/21] CC-3174 : showbuilder datatables state restore needs real booleans not strings. --- .../controllers/LibraryController.php | 2 +- .../public/js/airtime/library/library.js | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 1418b0f0f..295b95d91 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -47,7 +47,7 @@ class LibraryController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorderResize.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.TableTools.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 3f1a24f17..9604d2e43 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -221,6 +221,10 @@ $(document).ready(function() { "bServerSide": true, "bStateSave": true, + + "fnStateSaveParams": function (oSettings, oData) { + oData.oSearch.sSearch = ""; + }, "fnStateSave": function (oSettings, oData) { $.ajax({ @@ -228,9 +232,7 @@ $(document).ready(function() { type: "POST", data: {settings : oData, format: "json"}, dataType: "json", - success: function(){ - var x; - }, + success: function(){}, error: function (jqXHR, textStatus, errorThrown) { var x; } @@ -255,16 +257,26 @@ $(document).ready(function() { return o; }, + "fnStateLoadParams": function (oSettings, oData) { + var i, + length, + a = oData.abVisCols; + + //datatables needs boolean type to work properly. + for (i = 0, length = oData.abVisCols.length; i < length; i++) { + a[i] = (a[i] === "true") ? true : false; + } + }, "sAjaxSource": "/Library/contents", - "fnServerData": function ( sSource, aoData, testCallback ) { + "fnServerData": function ( sSource, aoData, fnCallback ) { aoData.push( { name: "format", value: "json"} ); $.ajax( { "dataType": 'json', "type": "GET", "url": sSource, "data": aoData, - "success": testCallback + "success": fnCallback } ); }, "fnRowCallback": AIRTIME.library.events.fnRowCallback, From 09af403cf53cc4554ea1e42bf158b398700c6495 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 21 Feb 2012 21:38:25 -0500 Subject: [PATCH 08/21] CC-3075: Create airtime-test-soundcard and airtime-test-icecast utils -Done --- install_minimal/include/airtime-copy-files.sh | 2 + .../include/airtime-remove-files.sh | 2 + utils/airtime-test-soundcard | 33 ++++++++++++ utils/airtime-test-soundcard.py | 54 ++++++++++++++++--- utils/airtime-test-stream | 33 ++++++++++++ utils/airtime-test-stream.py | 48 +++++++++++++++-- 6 files changed, 159 insertions(+), 13 deletions(-) create mode 100755 utils/airtime-test-soundcard create mode 100755 utils/airtime-test-stream diff --git a/install_minimal/include/airtime-copy-files.sh b/install_minimal/include/airtime-copy-files.sh index 5eab4a4ef..9a8520566 100755 --- a/install_minimal/include/airtime-copy-files.sh +++ b/install_minimal/include/airtime-copy-files.sh @@ -77,6 +77,8 @@ ln -sf /usr/lib/airtime/utils/airtime-import/airtime-import /usr/bin/airtime-imp ln -sf /usr/lib/airtime/utils/airtime-update-db-settings /usr/bin/airtime-update-db-settings ln -sf /usr/lib/airtime/utils/airtime-check-system /usr/bin/airtime-check-system ln -sf /usr/lib/airtime/utils/airtime-log /usr/bin/airtime-log +ln -sf /usr/lib/airtime/utils/airtime-test-soundcard /usr/bin/airtime-test-soundcard +ln -sf /usr/lib/airtime/utils/airtime-test-stream /usr/bin/airtime-test-stream if [ "$web" = "t" ]; then echo "* Creating /usr/share/airtime" diff --git a/install_minimal/include/airtime-remove-files.sh b/install_minimal/include/airtime-remove-files.sh index b7c6c54b8..330f2b0c7 100755 --- a/install_minimal/include/airtime-remove-files.sh +++ b/install_minimal/include/airtime-remove-files.sh @@ -46,6 +46,8 @@ rm -f /usr/bin/airtime-import rm -f /usr/bin/airtime-update-db-settings rm -f /usr/bin/airtime-check-system rm -f /usr/bin/airtime-log +rm -f /usr/bin/airtime-test-soundcard +rm -f /usr/bin/airtime-test-stream rm -rf /usr/lib/airtime rm -rf /usr/share/airtime diff --git a/utils/airtime-test-soundcard b/utils/airtime-test-soundcard new file mode 100755 index 000000000..018697724 --- /dev/null +++ b/utils/airtime-test-soundcard @@ -0,0 +1,33 @@ +#!/bin/bash +#------------------------------------------------------------------------------- +# Copyright (c) 2011 Sourcefabric O.P.S. +# +# This file is part of the Airtime project. +# http://airtime.sourcefabric.org/ +# +# Airtime is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# Airtime is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Airtime; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +#------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- +# This script send data to data collection server +# +# Absolute path to this script +SCRIPT=`readlink -f $0` +# Absolute directory this script is in +SCRIPTPATH=`dirname $SCRIPT` + +cd $SCRIPTPATH + +python airtime-test-soundcard.py "$@" || exit 1 diff --git a/utils/airtime-test-soundcard.py b/utils/airtime-test-soundcard.py index 4978cebce..5d1ce95c9 100644 --- a/utils/airtime-test-soundcard.py +++ b/utils/airtime-test-soundcard.py @@ -6,18 +6,44 @@ import sys import getopt +""" +we need to run the program as non-root because Liquidsoap refuses to run as root. +It is possible to run change the effective user id (seteuid) before calling Liquidsoap +but this introduces other problems (fake root user is not part of audio group after calling seteuid) +""" if os.geteuid() == 0: print "Please run this program as non-root" sys.exit(1) def printUsage(): - print "airtime-test-soundcard [-v] [-o alsa | ao | oss | portaudio | pulseaudio ]" + print "airtime-test-soundcard [-v] [-o alsa | ao | oss | portaudio | pulseaudio ] [-h]" print " Where: " - print " -v verbose mode " - print " -o Linux Sound API " + print " -v verbose mode" + print " -o Linux Sound API (default: alsa)" + print " -h show help menu " + +def find_liquidsoap_binary(): + """ + Starting with Airtime 2.0, we don't know the exact location of the Liquidsoap + binary because it may have been installed through a debian package. Let's find + the location of this binary. + """ + + rv = subprocess.call("which liquidsoap > /dev/null", shell=True) + if rv == 0: + return "liquidsoap" + else: + if os.path.exists("/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap"): + return "/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap" + return None -optlist, args = getopt.getopt(sys.argv[1:], 'hvo:') +try: + optlist, args = getopt.getopt(sys.argv[1:], 'hvo:') +except getopt.GetoptError, g: + printUsage() + sys.exit(1) + sound_api_types = set(["alsa", "ao", "oss", "portaudio", "pulseaudio"]) verbose = False @@ -32,14 +58,20 @@ for o, a in optlist: print "Unknown sound api type\n" printUsage() sys.exit(1) - if "-h" == o: + if "-h" == o and len(optlist) == 1: printUsage() sys.exit(0) try: - print "Outputting to soundcard with '%s' sound API. You should be able to hear a monotonous tone. Press ctrl-c to quit." % sound_api + print "Sound API: %s" % sound_api + print "Outputting to soundcard. You should be able to hear a monotonous tone. Press ctrl-c to quit." - command = "/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap 'output.%s(sine())'" % sound_api + liquidsoap_exe = find_liquidsoap_binary() + + if liquidsoap_exe is None: + raise Exception("Liquidsoap not found!") + + command = "%s 'output.%s(sine())'" % (liquidsoap_exe, sound_api) if not verbose: command += " > /dev/null" @@ -47,7 +79,13 @@ try: #print command rv = subprocess.call(command, shell=True) + #if we reach this point, it means that our subprocess exited without the user + #doing a keyboard interrupt. This means there was a problem outputting to the + #soundcard. Print appropriate message. + print "There was an error using the selected sound API. Please select a different API " + \ + "and run this program again. Use the -h option for help" + except KeyboardInterrupt, ki: - print "Exiting" + print "\nExiting" except Exception, e: raise diff --git a/utils/airtime-test-stream b/utils/airtime-test-stream new file mode 100755 index 000000000..4c49fe27c --- /dev/null +++ b/utils/airtime-test-stream @@ -0,0 +1,33 @@ +#!/bin/bash +#------------------------------------------------------------------------------- +# Copyright (c) 2011 Sourcefabric O.P.S. +# +# This file is part of the Airtime project. +# http://airtime.sourcefabric.org/ +# +# Airtime is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# Airtime is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Airtime; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +#------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- +# This script send data to data collection server +# +# Absolute path to this script +SCRIPT=`readlink -f $0` +# Absolute directory this script is in +SCRIPTPATH=`dirname $SCRIPT` + +cd $SCRIPTPATH + +python airtime-test-stream.py "$@" || exit 1 diff --git a/utils/airtime-test-stream.py b/utils/airtime-test-stream.py index 3c47b77ab..2f349c592 100644 --- a/utils/airtime-test-stream.py +++ b/utils/airtime-test-stream.py @@ -6,6 +6,11 @@ import sys import getopt +""" +we need to run the program as non-root because Liquidsoap refuses to run as root. +It is possible to run change the effective user id (seteuid) before calling Liquidsoap +but this introduces other problems (fake root user is not part of audio group after calling seteuid) +""" if os.geteuid() == 0: print "Please run this program as non-root" sys.exit(1) @@ -20,7 +25,22 @@ def printUsage(): print " -u port (default: source) " print " -p password (default: hackme) " print " -m mount (default: test) " + +def find_liquidsoap_binary(): + """ + Starting with Airtime 2.0, we don't know the exact location of the Liquidsoap + binary because it may have been installed through a debian package. Let's find + the location of this binary. + """ + + rv = subprocess.call("which liquidsoap > /dev/null", shell=True) + if rv == 0: + return "liquidsoap" + else: + if os.path.exists("/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap"): + return "/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap" + return None optlist, args = getopt.getopt(sys.argv[1:], 'hvo:H:P:u:p:') stream_types = set(["shoutcast", "icecast"]) @@ -60,21 +80,39 @@ for o, a in optlist: try: + print "Protocol: %s " % stream_type + print "Host: %s" % host + print "Port: %s" % port + print "User: %s" % user + print "Password: %s" % password + print "Mount: %s\n" % mount + url = "http://%s:%s/%s" % (host, port, mount) - print "Outputting to %s streaming server. You should be able to hear a monotonous tone on %s. Press ctrl-c to quit." % (stream_type, url) + print "Outputting to %s streaming server. You should be able to hear a monotonous tone on '%s'. Press ctrl-c to quit." % (stream_type, url) + + liquidsoap_exe = find_liquidsoap_binary() + + if liquidsoap_exe is None: + raise Exception("Liquidsoap not found!") if stream_type == "icecast": - command = "liquidsoap 'output.icecast(%%vorbis, host = \"%s\", port = %s, user= \"%s\", password = \"%s\", mount=\"%s\", sine())'" % (host, port, user, password, mount) + command = "%s 'output.icecast(%%vorbis, host = \"%s\", port = %s, user= \"%s\", password = \"%s\", mount=\"%s\", sine())'" % (liquidsoap_exe, host, port, user, password, mount) else: - command = "liquidsoap 'output.shoutcast(%%mp3, host=\"%s\", port = %s, user= \"%s\", password = \"%s\", mount=\"%s\", sine())'" % (host, port, user, password, mount) + command = "%s 'output.shoutcast(%%mp3, host=\"%s\", port = %s, user= \"%s\", password = \"%s\", mount=\"%s\", sine())'" % (liquidsoap_exe, host, port, user, password, mount) if not verbose: - command += " > /dev/null" + command += " 2>/dev/null | grep \"failed\"" #print command rv = subprocess.call(command, shell=True) + #if we reach this point, it means that our subprocess exited without the user + #doing a keyboard interrupt. This means there was a problem outputting to the + #stream server. Print appropriate message. + print "There was an error with your stream configuration. Please review your configuration " + \ + "and run this program again. Use the -h option for help" + except KeyboardInterrupt, ki: - print "Exiting" + print "\nExiting" except Exception, e: raise From 5703508beb3411ab9627115c726588cecebfb095 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Wed, 22 Feb 2012 11:43:37 +0100 Subject: [PATCH 09/21] CC-3174 : showbuilder col reorder resize isn't new enough to work with the new save/load callbacks. switched to just the col reorder plugin written by Allan( datatables author) --- .../controllers/LibraryController.php | 2 +- .../library/events/library_playlistbuilder.js | 10 ++-------- .../library/events/library_showbuilder.js | 10 ++-------- airtime_mvc/public/js/airtime/library/library.js | 16 +++++++++++++--- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 295b95d91..1418b0f0f 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -47,7 +47,7 @@ class LibraryController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorderResize.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.TableTools.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js index aa8bb6316..b6c007485 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -41,11 +41,6 @@ var AIRTIME = (function(AIRTIME){ fnResetCol, fnAddSelectedItems; - fnResetCol = function () { - ColReorder.fnReset( oLibTable ); - return false; - }; - fnAddSelectedItems = function() { var oLibTT = TableTools.fnGetInstance('library_display'), aData = oLibTT.fnGetSelectedData(), @@ -68,9 +63,8 @@ var AIRTIME = (function(AIRTIME){ //[1] = id //[2] = enabled //[3] = click event - aButtons = [["Reset Order", "library_order_reset", true, fnResetCol], - ["Delete", "library_group_delete", true, AIRTIME.library.fnDeleteSelectedItems], - ["Add", "library_group_add", true, fnAddSelectedItems]]; + aButtons = [["Delete", "library_group_delete", true, AIRTIME.library.fnDeleteSelectedItems], + ["Add", "library_group_add", true, fnAddSelectedItems]]; addToolBarButtonsLibrary(aButtons); }; diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index 5b49b3118..b4588dc34 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -39,11 +39,6 @@ var AIRTIME = (function(AIRTIME){ fnResetCol, fnAddSelectedItems, - fnResetCol = function () { - ColReorder.fnReset( oLibTable ); - return false; - }; - fnAddSelectedItems = function() { var oLibTT = TableTools.fnGetInstance('library_display'), oSchedTT = TableTools.fnGetInstance('show_builder_table'), @@ -78,9 +73,8 @@ var AIRTIME = (function(AIRTIME){ //[1] = id //[2] = enabled //[3] = click event - aButtons = [["Reset Order", "library_order_reset", true, fnResetCol], - ["Delete", "library_group_delete", true, AIRTIME.library.fnDeleteSelectedItems], - ["Add", "library_group_add", true, fnAddSelectedItems]]; + aButtons = [["Delete", "library_group_delete", true, AIRTIME.library.fnDeleteSelectedItems], + ["Add", "library_group_add", true, fnAddSelectedItems]]; addToolBarButtonsLibrary(aButtons); }; diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 9604d2e43..556780747 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -223,7 +223,9 @@ $(document).ready(function() { "bStateSave": true, "fnStateSaveParams": function (oSettings, oData) { - oData.oSearch.sSearch = ""; + //remove oData components we don't want to save. + delete oData.oSearch; + delete oData.aoSearchCols; }, "fnStateSave": function (oSettings, oData) { @@ -262,10 +264,18 @@ $(document).ready(function() { length, a = oData.abVisCols; - //datatables needs boolean type to work properly. - for (i = 0, length = oData.abVisCols.length; i < length; i++) { + //putting serialized data back into the correct js type to make + //sure everything works properly. + for (i = 0, length = a.length; i < length; i++) { a[i] = (a[i] === "true") ? true : false; } + + a = oData.ColReorder; + for (i = 0, length = a.length; i < length; i++) { + a[i] = parseInt(a[i], 10); + } + + oData.iCreate = parseInt(oData.iCreate, 10); }, "sAjaxSource": "/Library/contents", From 2aae318a5ab522ad06b544ff757feaf5fe1033f6 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Wed, 22 Feb 2012 12:42:24 +0100 Subject: [PATCH 10/21] CC-3174 : showbuilder remembering state for the timeline datatable. --- .../controllers/PreferenceController.php | 20 +++++-- .../public/js/airtime/showbuilder/builder.js | 57 +++++++++++++++++++ 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index ee93539cd..800947f31 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -16,6 +16,8 @@ class PreferenceController extends Zend_Controller_Action ->addActionContext('get-liquidsoap-status', 'json') ->addActionContext('get-library-datatable', 'json') ->addActionContext('set-library-datatable', 'json') + ->addActionContext('get-timeline-datatable', 'json') + ->addActionContext('set-timeline-datatable', 'json') ->initContext(); } @@ -340,17 +342,27 @@ class PreferenceController extends Zend_Controller_Action $settings = $request->getParam("settings"); $data = serialize($settings); - Logging::log("library datatable"); - Logging::log($data); - Application_Model_Preference::SetValue("library_datatable", $data, true); - } public function getLibraryDatatableAction() { $data = Application_Model_Preference::GetValue("library_datatable", true); + $this->view->settings = unserialize($data); + } + public function setTimelineDatatableAction() { + + $request = $this->getRequest(); + $settings = $request->getParam("settings"); + + $data = serialize($settings); + Application_Model_Preference::SetValue("timeline_datatable", $data, true); + } + + public function getTimelineDatatableAction() { + + $data = Application_Model_Preference::GetValue("timeline_datatable", true); $this->view->settings = unserialize($data); } } diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 205d8db78..15dd971b4 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -282,6 +282,63 @@ $(document).ready(function() { "bServerSide": true, "bInfo": false, "bAutoWidth": false, + + "bStateSave": true, + "fnStateSaveParams": function (oSettings, oData) { + //remove oData components we don't want to save. + delete oData.oSearch; + delete oData.aoSearchCols; + }, + "fnStateSave": function (oSettings, oData) { + + $.ajax({ + url: "/preference/set-timeline-datatable", + type: "POST", + data: {settings : oData, format: "json"}, + dataType: "json", + success: function(){}, + error: function (jqXHR, textStatus, errorThrown) { + var x; + } + }); + }, + "fnStateLoad": function (oSettings) { + var o; + + $.ajax({ + url: "/preference/get-timeline-datatable", + type: "GET", + data: {format: "json"}, + dataType: "json", + async: false, + success: function(json){ + o = json.settings; + }, + error: function (jqXHR, textStatus, errorThrown) { + var x; + } + }); + + return o; + }, + "fnStateLoadParams": function (oSettings, oData) { + var i, + length, + a = oData.abVisCols; + + //putting serialized data back into the correct js type to make + //sure everything works properly. + for (i = 0, length = a.length; i < length; i++) { + a[i] = (a[i] === "true") ? true : false; + } + + a = oData.ColReorder; + for (i = 0, length = a.length; i < length; i++) { + a[i] = parseInt(a[i], 10); + } + + oData.iCreate = parseInt(oData.iCreate, 10); + }, "fnServerData": fnServerData, "fnRowCallback": fnShowBuilderRowCallback, From 0ba3049528a1a68814a0525e97e1d6d2b4acbee5 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Wed, 22 Feb 2012 13:19:49 +0100 Subject: [PATCH 11/21] CC-3174 : showbuilder removing old scheduling method code to avoid confusion. --- .../controllers/ScheduleController.php | 95 -------- airtime_mvc/application/models/StoredFile.php | 12 +- .../schedule/find-playlists-partial.phtml | 11 - .../schedule/find-playlists.ajax.phtml | 8 - .../scripts/schedule/find-playlists.phtml | 8 - .../schedule/schedule-show-dialog.phtml | 34 --- .../scripts/schedule/scheduled-content.phtml | 26 --- .../public/js/airtime/library/library.js | 28 +-- .../public/js/airtime/schedule/schedule.js | 208 ++---------------- 9 files changed, 30 insertions(+), 400 deletions(-) delete mode 100644 airtime_mvc/application/views/scripts/schedule/find-playlists-partial.phtml delete mode 100644 airtime_mvc/application/views/scripts/schedule/find-playlists.ajax.phtml delete mode 100644 airtime_mvc/application/views/scripts/schedule/find-playlists.phtml delete mode 100644 airtime_mvc/application/views/scripts/schedule/schedule-show-dialog.phtml delete mode 100644 airtime_mvc/application/views/scripts/schedule/scheduled-content.phtml diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index e0b326e55..86678e8ba 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -15,12 +15,9 @@ class ScheduleController extends Zend_Controller_Action ->addActionContext('move-show', 'json') ->addActionContext('resize-show', 'json') ->addActionContext('delete-show', 'json') - ->addActionContext('schedule-show', 'json') - ->addActionContext('schedule-show-dialog', 'json') ->addActionContext('show-content-dialog', 'json') ->addActionContext('clear-show', 'json') ->addActionContext('get-current-playlist', 'json') - ->addActionContext('find-playlists', 'json') ->addActionContext('remove-group', 'json') ->addActionContext('edit-show', 'json') ->addActionContext('add-show', 'json') @@ -43,8 +40,6 @@ class ScheduleController extends Zend_Controller_Action $baseUrl = $request->getBaseUrl(); $this->view->headScript()->appendFile($baseUrl.'/js/contextmenu/jquery.contextMenu.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); //full-calendar-functions.js requires this variable, so that datePicker widget can be offset to server time instead of client time $this->view->headScript()->appendScript("var timezoneOffset = ".date("Z")."; //in seconds"); @@ -264,37 +259,6 @@ class ScheduleController extends Zend_Controller_Action $this->view->items = $menu; } - public function scheduleShowAction() - { - $showInstanceId = $this->sched_sess->showInstanceId; - $search = $this->_getParam('search', null); - $plId = $this->_getParam('plId'); - - if($search == "") { - $search = null; - } - - $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new Application_Model_User($userInfo->id); - try{ - $show = new Application_Model_ShowInstance($showInstanceId); - }catch(Exception $e){ - $this->view->show_error = true; - return false; - } - - if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER, UTYPE_HOST),$show->getShowId())) { - $show->scheduleShow(array($plId)); - } - - $this->view->showContent = $show->getShowContent(); - $this->view->timeFilled = $show->getTimeScheduled(); - $this->view->percentFilled = $show->getPercentScheduled(); - - $this->view->chosen = $this->view->render('schedule/scheduled-content.phtml'); - unset($this->view->showContent); - } - public function clearShowAction() { $showInstanceId = $this->_getParam('id'); @@ -336,27 +300,6 @@ class ScheduleController extends Zend_Controller_Action $this->view->entries = $range; } - public function findPlaylistsAction() - { - $post = $this->getRequest()->getPost(); - try{ - $show = new Application_Model_ShowInstance($this->sched_sess->showInstanceId); - }catch(Exception $e){ - $this->view->show_error = true; - return false; - } - - $playlists = $show->searchPlaylistsForShow($post); - foreach( $playlists['aaData'] as &$data){ - // calling two functions to format time to 1 decimal place - $sec = Application_Model_Playlist::playlistTimeToSeconds($data['length']); - $data['length'] = Application_Model_Playlist::secondsToPlaylistTime($sec); - } - - //for datatables - die(json_encode($playlists)); - } - public function removeGroupAction() { $showInstanceId = $this->sched_sess->showInstanceId; @@ -383,44 +326,6 @@ class ScheduleController extends Zend_Controller_Action unset($this->view->showContent); } - public function scheduleShowDialogAction() - { - $showInstanceId = $this->_getParam('id'); - $this->sched_sess->showInstanceId = $showInstanceId; - - try{ - $show = new Application_Model_ShowInstance($showInstanceId); - }catch(Exception $e){ - $this->view->show_error = true; - return false; - } - - $start_timestamp = $show->getShowInstanceStart(); - $end_timestamp = $show->getShowInstanceEnd(); - - $dateInfo_s = getDate(strtotime(Application_Model_DateHelper::ConvertToLocalDateTimeString($start_timestamp))); - $dateInfo_e = getDate(strtotime(Application_Model_DateHelper::ConvertToLocalDateTimeString($end_timestamp))); - - $this->view->showContent = $show->getShowContent(); - $this->view->timeFilled = $show->getTimeScheduled(); - $this->view->showName = $show->getName(); - $this->view->showLength = $show->getShowLength(); - $this->view->percentFilled = $show->getPercentScheduled(); - - $this->view->s_wday = $dateInfo_s['weekday']; - $this->view->s_month = $dateInfo_s['month']; - $this->view->s_day = $dateInfo_s['mday']; - $this->view->e_wday = $dateInfo_e['weekday']; - $this->view->e_month = $dateInfo_e['month']; - $this->view->e_day = $dateInfo_e['mday']; - $this->view->startTime = sprintf("%02d:%02d", $dateInfo_s['hours'], $dateInfo_s['minutes']); - $this->view->endTime = sprintf("%02d:%02d", $dateInfo_e['hours'], $dateInfo_e['minutes']); - - $this->view->chosen = $this->view->render('schedule/scheduled-content.phtml'); - $this->view->dialog = $this->view->render('schedule/schedule-show-dialog.phtml'); - unset($this->view->showContent); - } - public function showContentDialogAction() { $showInstanceId = $this->_getParam('id'); diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index e1016baea..85452efd3 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -582,7 +582,8 @@ class Application_Model_StoredFile { public static function searchFilesForPlaylistBuilder($datatables) { global $CC_CONFIG; - $displayData = array("track_title", "artist_name", "album_title", "genre", "length", "year", "utime", "mtime", "ftype", "track_number"); + $displayData = array("track_title", "artist_name", "album_title", "genre", "length", + "year", "utime", "mtime", "ftype", "track_number"); $plSelect = "SELECT "; $fileSelect = "SELECT "; @@ -656,15 +657,6 @@ class Application_Model_StoredFile { return $results; } - public static function searchPlaylistsForSchedule($datatables) - { - $fromTable = "cc_playlist AS pl LEFT JOIN cc_playlisttimes AS plt USING(id) LEFT JOIN cc_subjs AS sub ON pl.editedby = sub.id"; - //$datatables["optWhere"][] = "INTERVAL '{$time_remaining}' > INTERVAL '00:00:00'"; - $datatables["optWhere"][] = "plt.length > INTERVAL '00:00:00'"; - - return Application_Model_StoredFile::searchFiles($fromTable, $datatables); - } - public static function searchFiles($fromTable, $data) { global $CC_CONFIG, $CC_DBC; diff --git a/airtime_mvc/application/views/scripts/schedule/find-playlists-partial.phtml b/airtime_mvc/application/views/scripts/schedule/find-playlists-partial.phtml deleted file mode 100644 index 6f79a662c..000000000 --- a/airtime_mvc/application/views/scripts/schedule/find-playlists-partial.phtml +++ /dev/null @@ -1,11 +0,0 @@ -
  • - name ?> - length ?> -
    - Creator: creator ?> - state === "edited") : ?> - Editing: login ?> - -
    -
    description ?>
    -
    • diff --git a/airtime_mvc/application/views/scripts/schedule/find-playlists.ajax.phtml b/airtime_mvc/application/views/scripts/schedule/find-playlists.ajax.phtml deleted file mode 100644 index 185ce5f98..000000000 --- a/airtime_mvc/application/views/scripts/schedule/find-playlists.ajax.phtml +++ /dev/null @@ -1,8 +0,0 @@ -playlists) > 0) { - echo $this->partialLoop('schedule/find-playlists-partial.phtml', $this->playlists); - } - else { - echo "No Playlists Fit Duration"; - } -?> diff --git a/airtime_mvc/application/views/scripts/schedule/find-playlists.phtml b/airtime_mvc/application/views/scripts/schedule/find-playlists.phtml deleted file mode 100644 index 185ce5f98..000000000 --- a/airtime_mvc/application/views/scripts/schedule/find-playlists.phtml +++ /dev/null @@ -1,8 +0,0 @@ -playlists) > 0) { - echo $this->partialLoop('schedule/find-playlists-partial.phtml', $this->playlists); - } - else { - echo "No Playlists Fit Duration"; - } -?> diff --git a/airtime_mvc/application/views/scripts/schedule/schedule-show-dialog.phtml b/airtime_mvc/application/views/scripts/schedule/schedule-show-dialog.phtml deleted file mode 100644 index 2085d67e9..000000000 --- a/airtime_mvc/application/views/scripts/schedule/schedule-show-dialog.phtml +++ /dev/null @@ -1,34 +0,0 @@ -
    -

    - showName; ?>: s_wday." ".$this->s_month." ".$this->s_day." ".$this->startTime. - " - ".$this->e_wday." ".$this->e_month." ".$this->e_day." ".$this->endTime; ?> -

    -
    -
    - - - - - - - - - - - - -
    IdDescriptionTitleCreatorLengthEditing
    -
    - -
    -

    Items In This Show:

    -
      -
      - timeFilled; ?> -
      - showLength; ?> -
      - -
      -
      -
      diff --git a/airtime_mvc/application/views/scripts/schedule/scheduled-content.phtml b/airtime_mvc/application/views/scripts/schedule/scheduled-content.phtml deleted file mode 100644 index c58492027..000000000 --- a/airtime_mvc/application/views/scripts/schedule/scheduled-content.phtml +++ /dev/null @@ -1,26 +0,0 @@ -showContent) > 0) : ?> - showContent as $pl) : ?> -
    • " > -

      - - -
      -
      -
      -

      - -
      • - - -
    • Nothing Scheduled
      • - - diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 556780747..3098277d5 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -217,6 +217,21 @@ $(document).ready(function() { $('.tabs').tabs(); oTable = $('#library_display').dataTable( { + + "aoColumns": [ + /* Checkbox */ {"sTitle": "", "bSortable": false, "bSearchable": false, "mDataProp": "checkbox", "sWidth": "25px", "sClass": "library_checkbox"}, + /* Type */ {"sName": "ftype", "bSearchable": false, "mDataProp": "image", "sWidth": "25px", "sClass": "library_type"}, + /* Title */ {"sTitle": "Title", "sName": "track_title", "mDataProp": "track_title", "sClass": "library_title"}, + /* Creator */ {"sTitle": "Creator", "sName": "artist_name", "mDataProp": "artist_name", "sClass": "library_creator"}, + /* Album */ {"sTitle": "Album", "sName": "album_title", "mDataProp": "album_title", "sClass": "library_album"}, + /* Genre */ {"sTitle": "Genre", "sName": "genre", "mDataProp": "genre", "sClass": "library_genre"}, + /* Year */ {"sTitle": "Year", "sName": "year", "mDataProp": "year", "sClass": "library_year"}, + /* Length */ {"sTitle": "Length", "sName": "length", "mDataProp": "length", "sClass": "library_length"}, + /* Upload Time */ {"sTitle": "Uploaded", "sName": "utime", "mDataProp": "utime", "sClass": "library_upload_time"}, + /* Last Modified */ {"sTitle": "Last Modified", "sName": "mtime", "bVisible": false, "mDataProp": "mtime", "sClass": "library_modified_time"}, + /* Track Number */ {"sTitle": "Track", "sName": "track_number", "bSearchable": false, "bVisible": false, "mDataProp": "track_number", "sClass": "library_track"} + ], + "bProcessing": true, "bServerSide": true, @@ -341,19 +356,6 @@ $(document).ready(function() { $(nHead).find("input[type=checkbox]").attr("checked", false); }, - "aoColumns": [ - /* Checkbox */ {"sTitle": "", "bSortable": false, "bSearchable": false, "mDataProp": "checkbox", "sWidth": "25px", "sClass": "library_checkbox"}, - /* Type */ {"sName": "ftype", "bSearchable": false, "mDataProp": "image", "sWidth": "25px", "sClass": "library_type"}, - /* Title */ {"sTitle": "Title", "sName": "track_title", "mDataProp": "track_title", "sClass": "library_title"}, - /* Creator */ {"sTitle": "Creator", "sName": "artist_name", "mDataProp": "artist_name", "sClass": "library_creator"}, - /* Album */ {"sTitle": "Album", "sName": "album_title", "mDataProp": "album_title", "sClass": "library_album"}, - /* Genre */ {"sTitle": "Genre", "sName": "genre", "mDataProp": "genre", "sClass": "library_genre"}, - /* Year */ {"sTitle": "Year", "sName": "year", "mDataProp": "year", "sClass": "library_year"}, - /* Length */ {"sTitle": "Length", "sName": "length", "mDataProp": "length", "sClass": "library_length"}, - /* Upload Time */ {"sTitle": "Uploaded", "sName": "utime", "mDataProp": "utime", "sClass": "library_upload_time"}, - /* Last Modified */ {"sTitle": "Last Modified", "sName": "mtime", "bVisible": false, "mDataProp": "mtime", "sClass": "library_modified_time"}, - /* Track Number */ {"sTitle": "Track", "sName": "track_number", "bSearchable": false, "bVisible": false, "mDataProp": "track_number", "sClass": "library_track"} - ], "aaSorting": [[2,'asc']], "sPaginationType": "full_numbers", "bJQueryUI": true, diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js index b80147442..8cd072b2c 100644 --- a/airtime_mvc/public/js/airtime/schedule/schedule.js +++ b/airtime_mvc/public/js/airtime/schedule/schedule.js @@ -26,155 +26,8 @@ function checkShowLength(json) { } } - -function setScheduleDialogHtml(json) { - var dt; - - dt = $('#schedule_playlists').dataTable(); - dt.fnDraw(); - - $("#schedule_playlist_chosen") - .empty() - .append(json.chosen); - - $("#show_time_filled").empty().append(json.timeFilled); - $("#show_progressbar").progressbar( "value" , json.percentFilled ); - - checkShowLength(json); -} - -function setScheduleDialogEvents(dialog) { - - dialog.find(".ui-icon-triangle-1-e").click(function(){ - var span = $(this); - - if(span.hasClass("ui-icon-triangle-1-s")) { - span - .removeClass("ui-icon-triangle-1-s") - .addClass("ui-icon ui-icon-triangle-1-e"); - - $(this).parent().parent().find(".group_list").hide(); - } - else if(span.hasClass("ui-icon-triangle-1-e")) { - span - .removeClass("ui-icon-triangle-1-e") - .addClass("ui-icon ui-icon-triangle-1-s"); - - $(this).parent().parent().find(".group_list").show(); - } - }); - - dialog.find(".ui-icon-close").click(function(){ - var groupId, url; - - groupId = $(this).parent().parent().attr("id").split("_").pop(); - url = '/Schedule/remove-group'; - - $.post(url, - {format: "json", groupId: groupId}, - function(json){ - if(json.show_error == true){ - alertShowErrorAndReload(); - } - var dialog = $("#schedule_playlist_dialog"); - - setScheduleDialogHtml(json); - setScheduleDialogEvents(dialog); - }); - }); -} - -function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { - var id = "pl_" + aData['id']; - - $(nRow).attr("id", id); - - return nRow; -} - -function addDtPlaylistEvents() { - - $('#schedule_playlists tbody tr') - .draggable({ - helper: 'clone' - }); -} - -function dtDrawCallback() { - addDtPlaylistEvents(); -} - -function makeScheduleDialog(dialog, json) { - if(json.show_error == true){ - alertShowErrorAndReload(); - } - dialog.find('#schedule_playlists').dataTable( { - "bProcessing": true, - "bServerSide": true, - "sAjaxSource": "/Schedule/find-playlists/format/json", - "fnServerData": function ( sSource, aoData, fnCallback ) { - $.ajax( { - "dataType": 'json', - "type": "POST", - "url": sSource, - "data": aoData, - "success": fnCallback - } ); - }, - "fnRowCallback": dtRowCallback, - "fnDrawCallback": dtDrawCallback, - "aoColumns": [ - /* Id */ {"sTitle": "ID", "sName": "pl.id", "bSearchable": false, "bVisible": false, "mDataProp": "id"}, - /* Description */ {"sTitle": "Description", "sName": "pl.description", "bSearchable": false, "bVisible": false, "mDataProp": "description"}, - /* Name */ {"sTitle": "Title", "sName": "pl.name", "mDataProp": "name"}, - /* Creator */ {"sTitle": "Creator", "sName": "pl.creator", "mDataProp": "creator"}, - /* Length */ {"sTitle": "Length", "sName": "plt.length", "mDataProp": "length"}, - /* Editing */ {"sTitle": "Editing", "sName": "sub.login", "mDataProp": "login"} - ], - "aaSorting": [[2,'asc']], - "sPaginationType": "full_numbers", - "bJQueryUI": true, - "bAutoWidth": false - }); - - //classes added for Vladimir's styles.css - dialog.find("#schedule_playlists_length select").addClass('input_select'); - dialog.find("#schedule_playlists_filter input").addClass('input_text auto-search'); - - dialog.find("#schedule_playlist_chosen") - .append(json.chosen) - .droppable({ - drop: function(event, ui) { - var pl_id, url, search; - - search = $("#schedule_playlist_search").val(); - pl_id = $(ui.helper).attr("id").split("_").pop(); - - url = '/Schedule/schedule-show/format/json'; - - $.post(url, - {plId: pl_id, search: search}, - function(json){ - if(json.show_error == true){ - alertShowErrorAndReload(); - } - var dialog = $("#schedule_playlist_dialog"); - - setScheduleDialogHtml(json); - setScheduleDialogEvents(dialog); - }); - } - }); - - dialog.find("#show_progressbar").progressbar({ - value: json.percentFilled - }); - - setScheduleDialogEvents(dialog); -} - function confirmCancelShow(show_instance_id){ - if(confirm('Erase current show and stop playback?')){ + if (confirm('Erase current show and stop playback?')){ var url = "/Schedule/cancel-current-show/id/"+show_instance_id; $.ajax({ url: url, @@ -184,7 +37,7 @@ function confirmCancelShow(show_instance_id){ } function confirmCancelRecordedShow(show_instance_id){ - if(confirm('Erase current show and stop recording?')){ + if (confirm('Erase current show and stop recording?')){ var url = "/Schedule/cancel-current-show/id/"+show_instance_id; $.ajax({ url: url, @@ -214,45 +67,42 @@ function uploadToSoundCloud(show_instance_id){ } } -function buildContentDialog(json){ - if(json.show_error == true){ +function buildContentDialog (json){ + var dialog = $(json.dialog), + viewportwidth, + viewportheight, + height, + width; + + if (json.show_error == true){ alertShowErrorAndReload(); } - var dialog = $(json.dialog); - + dialog.find("#show_progressbar").progressbar({ value: json.percentFilled }); - var viewportwidth; - var viewportheight; - // the more standards compliant browsers (mozilla/netscape/opera/IE7) use // window.innerWidth and window.innerHeight - if (typeof window.innerWidth != 'undefined') { viewportwidth = window.innerWidth, viewportheight = window.innerHeight; } - // IE6 in standards compliant mode (i.e. with a valid doctype as the first // line in the document) - else if (typeof document.documentElement != 'undefined' && typeof document.documentElement.clientWidth != 'undefined' && document.documentElement.clientWidth != 0) { viewportwidth = document.documentElement.clientWidth; viewportheight = document.documentElement.clientHeight; } - // older versions of IE - else { viewportwidth = document.getElementsByTagName('body')[0].clientWidth; viewportheight = document.getElementsByTagName('body')[0].clientHeight; } - var height = viewportheight * 2/3; - var width = viewportwidth * 4/5; + height = viewportheight * 2/3; + width = viewportwidth * 4/5; dialog.dialog({ autoOpen: false, @@ -269,37 +119,6 @@ function buildContentDialog(json){ dialog.dialog('open'); } -function buildScheduleDialog(json){ - var dialog; - if(json.show_error == true){ - alertShowErrorAndReload(); - } - if(json.error) { - alert(json.error); - return; - } - - dialog = $(json.dialog); - makeScheduleDialog(dialog, json); - - dialog.dialog({ - autoOpen: false, - title: 'Schedule Media', - width: 1100, - height: 550, - modal: true, - close: closeDialog, - buttons: {"Ok": function() { - dialog.remove(); - $("#schedule_calendar").fullCalendar( 'refetchEvents' ); - }} - }); - - dialog.dialog('open'); - checkShowLength(json); -} - - /** * Use user preference for time scale; defaults to month if preference was never set */ @@ -412,7 +231,6 @@ $(document).ready(function() { //define a content callback. if (oItems.content !== undefined) { - //delete a single instance callback = function() { $.get(oItems.content.url, {format: "json", id: data.id}, function(json){ buildContentDialog(json); From 2ac4940fd5a1a036cf1cabe9a2c94bf83ed2155b Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Wed, 22 Feb 2012 15:57:21 +0100 Subject: [PATCH 12/21] CC-3339 : showbuilder column names --- airtime_mvc/public/js/airtime/showbuilder/builder.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 15dd971b4..de6ff8327 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -267,9 +267,9 @@ $(document).ready(function() { oTable = tableDiv.dataTable( { "aoColumns": [ /* checkbox */ {"mDataProp": "checkbox", "sTitle": "", "sWidth": "15px"}, - /* starts */{"mDataProp": "starts", "sTitle": "Airtime"}, - /* ends */{"mDataProp": "ends", "sTitle": "Off Air"}, - /* runtime */{"mDataProp": "runtime", "sTitle": "Runtime"}, + /* starts */{"mDataProp": "starts", "sTitle": "Start"}, + /* ends */{"mDataProp": "ends", "sTitle": "End"}, + /* runtime */{"mDataProp": "runtime", "sTitle": "Duration"}, /* title */{"mDataProp": "title", "sTitle": "Title"}, /* creator */{"mDataProp": "creator", "sTitle": "Creator"}, /* album */{"mDataProp": "album", "sTitle": "Album"} From d4c7b832c9bd085e5d5b6ec8c0b823869ca887c5 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Wed, 22 Feb 2012 18:38:33 +0100 Subject: [PATCH 13/21] CC-3174 : showbuilder fixing up library table to include all interesting columns if a user would like to choose to see them. query is done with propel. --- .../controllers/PreferenceController.php | 8 +- airtime_mvc/application/models/StoredFile.php | 149 +++++++++++------- airtime_mvc/application/models/User.php | 3 +- .../public/js/airtime/library/library.js | 43 +++-- 4 files changed, 124 insertions(+), 79 deletions(-) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 800947f31..ebc78224b 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -348,7 +348,9 @@ class PreferenceController extends Zend_Controller_Action public function getLibraryDatatableAction() { $data = Application_Model_Preference::GetValue("library_datatable", true); - $this->view->settings = unserialize($data); + if ($data != "") { + $this->view->settings = unserialize($data); + } } public function setTimelineDatatableAction() { @@ -363,7 +365,9 @@ class PreferenceController extends Zend_Controller_Action public function getTimelineDatatableAction() { $data = Application_Model_Preference::GetValue("timeline_datatable", true); - $this->view->settings = unserialize($data); + if ($data != "") { + $this->view->settings = unserialize($data); + } } } diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 85452efd3..03b92973f 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -582,46 +582,60 @@ class Application_Model_StoredFile { public static function searchFilesForPlaylistBuilder($datatables) { global $CC_CONFIG; - $displayData = array("track_title", "artist_name", "album_title", "genre", "length", - "year", "utime", "mtime", "ftype", "track_number"); + $displayColumns = array("id", "track_title", "artist_name", "album_title", "genre", "length", + "year", "utime", "mtime", "ftype", "track_number", "mood", "bpm", "composer", "info_url", + "bit_rate", "sample_rate", "isrc_number", "encoded_by", "label", "copyright", "mime", "language" + ); - $plSelect = "SELECT "; - $fileSelect = "SELECT "; - foreach ($displayData as $key) { + $plSelect = array(); + $fileSelect = array(); + foreach ($displayColumns as $key) { - if ($key === "track_title") { - $plSelect .= "name AS ".$key.", "; - $fileSelect .= $key.", "; + if ($key === "id") { + $plSelect[] = "PL.id AS ".$key; + $fileSelect[] = $key; + } else if ($key === "track_title") { + $plSelect[] = "name AS ".$key; + $fileSelect[] = $key; } else if ($key === "ftype") { - $plSelect .= "'playlist' AS ".$key.", "; - $fileSelect .= $key.", "; + $plSelect[] = "'playlist' AS ".$key; + $fileSelect[] = $key; } else if ($key === "artist_name") { - $plSelect .= "login AS ".$key.", "; - $fileSelect .= $key.", "; + $plSelect[] = "login AS ".$key; + $fileSelect[] = $key; } else if ($key === "length") { - $plSelect .= $key.", "; - $fileSelect .= $key."::interval, "; + $plSelect[] = $key; + $fileSelect[] = $key."::interval"; } else if ($key === "year") { - $plSelect .= "CAST(utime AS varchar) AS ".$key.", "; - $fileSelect .= $key.", "; + $plSelect[] = "CAST(utime AS varchar) AS ".$key; + $fileSelect[] = $key; } else if ($key === "utime") { - $plSelect .= $key.", "; - $fileSelect .= $key.", "; + $plSelect[] = $key; + $fileSelect[] = $key; } else if ($key === "mtime") { - $plSelect .= $key.", "; - $fileSelect .= $key.", "; + $plSelect[] = $key; + $fileSelect[] = $key; } else { - $plSelect .= "NULL AS ".$key.", "; - $fileSelect .= $key.", "; + $plSelect[] = "NULL AS ".$key; + $fileSelect[] = $key; } } - $fromTable = " ((".$plSelect."PL.id - FROM cc_playlist AS PL LEFT JOIN cc_subjs AS sub ON (sub.id = PL.creator_id)) - UNION - (".$fileSelect."id FROM ".$CC_CONFIG["filesTable"]." AS FILES WHERE file_exists = 'TRUE')) AS RESULTS"; + $plSelect = "SELECT ". join(",", $plSelect); + $fileSelect = "SELECT ". join(",", $fileSelect); - $results = Application_Model_StoredFile::searchFiles($fromTable, $datatables); + $fromTable = " (({$plSelect} FROM cc_playlist AS PL + LEFT JOIN cc_subjs AS sub ON (sub.id = PL.creator_id)) + UNION + ({$fileSelect} FROM ".$CC_CONFIG["filesTable"]." AS FILES WHERE file_exists = 'TRUE')) AS RESULTS"; + + //TODO see Allan's reply about iDataSort working for serverside processing. + //hack to sort on ftype when image "type" col selected for sorting. + if ($datatables["iSortCol_0"] == 1) { + $datatables["iSortCol_0"] = 2; + } + + $results = Application_Model_StoredFile::searchFiles($displayColumns, $fromTable, $datatables); foreach ($results['aaData'] as &$row) { @@ -657,46 +671,45 @@ class Application_Model_StoredFile { return $results; } - public static function searchFiles($fromTable, $data) + public static function searchFiles($displayColumns, $fromTable, $data) { - global $CC_CONFIG, $CC_DBC; + $con = Propel::getConnection(CcFilesPeer::DATABASE_NAME); + $where = array(); - $columnsDisplayed = explode(",", $data["sColumns"]); + /* + $columnsDisplayed = array(); + for ($i = 0; $i < $data["iColumns"]; $i++) { + if (in_array($data["mDataProp_".$i], $displayColumns)) { + $columnsDisplayed[] = $data["mDataProp_".$i]; + } + } + */ - if($data["sSearch"] !== "") + if ($data["sSearch"] !== "") { $searchTerms = explode(" ", $data["sSearch"]); + } $selectorCount = "SELECT COUNT(*)"; - foreach( $columnsDisplayed as $key=>$col){ - if($col == ''){ - unset($columnsDisplayed[$key]); - } - } - //$selectorRows = "SELECT " . join(',', $columnsDisplayed ); - $selectorRows = "SELECT * "; + //$selectorRows = "SELECT ". join(",", $displayColumns); + $selectorRows = "SELECT *"; $sql = $selectorCount." FROM ".$fromTable; - $totalRows = $CC_DBC->getOne($sql); + $sqlTotalRows = $sql; - // Where clause - if(isset($data["optWhere"])) { - $where[] = join(" AND ", $data["optWhere"]); - } - - if(isset($searchTerms)) { + if (isset($searchTerms)) { $searchCols = array(); - for($i=0; $i<$data["iColumns"]; $i++) { - if($data["bSearchable_".$i] == "true") { - $searchCols[] = $columnsDisplayed[$i]; + for ($i = 0; $i < $data["iColumns"]; $i++) { + if ($data["bSearchable_".$i] == "true") { + $searchCols[] = $data["mDataProp_{$i}"]; } } $outerCond = array(); - foreach($searchTerms as $term) { + foreach ($searchTerms as $term) { $innerCond = array(); - foreach($searchCols as $col) { + foreach ($searchCols as $col) { $escapedTerm = pg_escape_string($term); $innerCond[] = "{$col}::text ILIKE '%{$escapedTerm}%'"; } @@ -708,32 +721,48 @@ class Application_Model_StoredFile { // Order By clause $orderby = array(); - for($i=0; $i<$data["iSortingCols"]; $i++){ - $orderby[] = $columnsDisplayed[$data["iSortCol_".$i]]." ".$data["sSortDir_".$i]; + for ($i = 0; $i < $data["iSortingCols"]; $i++){ + $num = $data["iSortCol_".$i]; + $orderby[] = $data["mDataProp_{$num}"]." ".$data["sSortDir_".$i]; } $orderby[] = "id"; $orderby = join("," , $orderby); // End Order By clause - if(isset($where)) { + if (count($where) > 0) { $where = join(" AND ", $where); $sql = $selectorCount." FROM ".$fromTable." WHERE ".$where; - $totalDisplayRows = $CC_DBC->getOne($sql); + $sqlTotalDisplayRows = $sql; + $sql = $selectorRows." FROM ".$fromTable." WHERE ".$where." ORDER BY ".$orderby." OFFSET ".$data["iDisplayStart"]." LIMIT ".$data["iDisplayLength"]; } else { $sql = $selectorRows." FROM ".$fromTable." ORDER BY ".$orderby." OFFSET ".$data["iDisplayStart"]." LIMIT ".$data["iDisplayLength"]; } + try { + $r = $con->query($sqlTotalRows); + $totalRows = $r->fetchColumn(0); + + if (isset($sqlTotalDisplayRows)) { + $r = $con->query($sqlTotalDisplayRows); + $totalDisplayRows = $r->fetchColumn(0); + } + else { + $totalDisplayRows = $totalRows; + } + + $r = $con->query($sql); + $r->setFetchMode(PDO::FETCH_ASSOC); + $results = $r->fetchAll(); + } + catch (Exception $e) { + Logging::log($e->getMessage()); + } + //display sql executed in airtime log for testing Logging::log($sql); - $results = $CC_DBC->getAll($sql); - - if(!isset($totalDisplayRows)) { - $totalDisplayRows = $totalRows; - } - return array("sEcho" => intval($data["sEcho"]), "iTotalDisplayRecords" => $totalDisplayRows, "iTotalRecords" => $totalRows, "aaData" => $results); } diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php index 3e94e61ae..f06a3c918 100644 --- a/airtime_mvc/application/models/User.php +++ b/airtime_mvc/application/models/User.php @@ -240,6 +240,7 @@ class Application_Model_User { public static function getUsersDataTablesInfo($datatables_post) { + $displayColumns = array("id", "login", "first_name", "last_name", "type"); $fromTable = "cc_subjs"; // get current user @@ -250,7 +251,7 @@ class Application_Model_User { $username = $auth->getIdentity()->login; } - $res = Application_Model_StoredFile::searchFiles($fromTable, $datatables_post); + $res = Application_Model_StoredFile::searchFiles($displayColumns, $fromTable, $datatables_post); // mark record which is for the current user foreach($res['aaData'] as &$record){ diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 3098277d5..d03803214 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -219,24 +219,36 @@ $(document).ready(function() { oTable = $('#library_display').dataTable( { "aoColumns": [ - /* Checkbox */ {"sTitle": "", "bSortable": false, "bSearchable": false, "mDataProp": "checkbox", "sWidth": "25px", "sClass": "library_checkbox"}, - /* Type */ {"sName": "ftype", "bSearchable": false, "mDataProp": "image", "sWidth": "25px", "sClass": "library_type"}, - /* Title */ {"sTitle": "Title", "sName": "track_title", "mDataProp": "track_title", "sClass": "library_title"}, - /* Creator */ {"sTitle": "Creator", "sName": "artist_name", "mDataProp": "artist_name", "sClass": "library_creator"}, - /* Album */ {"sTitle": "Album", "sName": "album_title", "mDataProp": "album_title", "sClass": "library_album"}, - /* Genre */ {"sTitle": "Genre", "sName": "genre", "mDataProp": "genre", "sClass": "library_genre"}, - /* Year */ {"sTitle": "Year", "sName": "year", "mDataProp": "year", "sClass": "library_year"}, - /* Length */ {"sTitle": "Length", "sName": "length", "mDataProp": "length", "sClass": "library_length"}, - /* Upload Time */ {"sTitle": "Uploaded", "sName": "utime", "mDataProp": "utime", "sClass": "library_upload_time"}, - /* Last Modified */ {"sTitle": "Last Modified", "sName": "mtime", "bVisible": false, "mDataProp": "mtime", "sClass": "library_modified_time"}, - /* Track Number */ {"sTitle": "Track", "sName": "track_number", "bSearchable": false, "bVisible": false, "mDataProp": "track_number", "sClass": "library_track"} + /* Checkbox */ {"sTitle": "", "mDataProp": "checkbox", "bSortable": false, "bSearchable": false, "sWidth": "25px", "sClass": "library_checkbox"}, + /* Type */ {"sTitle": "", "mDataProp": "image", "bSearchable": false, "sWidth": "25px", "sClass": "library_type", "iDataSort": 2}, + /* ftype */ {"sTitle": "", "mDataProp": "ftype", "bSearchable": false, "bVisible": false}, + /* Title */ {"sTitle": "Title", "mDataProp": "track_title", "sClass": "library_title"}, + /* Creator */ {"sTitle": "Creator", "mDataProp": "artist_name", "sClass": "library_creator"}, + /* Album */ {"sTitle": "Album", "mDataProp": "album_title", "sClass": "library_album"}, + /* Genre */ {"sTitle": "Genre", "mDataProp": "genre", "sClass": "library_genre"}, + /* Year */ {"sTitle": "Year", "mDataProp": "year", "sClass": "library_year"}, + /* Length */ {"sTitle": "Length", "mDataProp": "length", "sClass": "library_length"}, + /* Upload Time */ {"sTitle": "Uploaded", "mDataProp": "utime", "sClass": "library_upload_time"}, + /* Last Modified */ {"sTitle": "Last Modified", "mDataProp": "mtime", "bVisible": false, "sClass": "library_modified_time"}, + /* Track Number */ {"sTitle": "Track", "mDataProp": "track_number", "bSearchable": false, "bVisible": false, "sClass": "library_track"}, + /* Mood */ {"sTitle": "Mood", "mDataProp": "mood", "bSearchable": false, "bVisible": false, "sClass": "library_mood"}, + /* BPM */ {"sTitle": "BPM", "mDataProp": "bpm", "bSearchable": false, "bVisible": false, "sClass": "library_bpm"}, + /* Composer */ {"sTitle": "Composer", "mDataProp": "composer", "bSearchable": false, "bVisible": false, "sClass": "library_composer"}, + /* Website */ {"sTitle": "Website", "mDataProp": "info_url", "bSearchable": false, "bVisible": false, "sClass": "library_url"}, + /* Bit Rate */ {"sTitle": "Bit Rate", "mDataProp": "bit_rate", "bSearchable": false, "bVisible": false, "sClass": "library_bitrate"}, + /* Sameple Rate */ {"sTitle": "Sample Rate", "mDataProp": "sample_rate", "bSearchable": false, "bVisible": false, "sClass": "library_sr"}, + /* ISRC Number */ {"sTitle": "ISRC", "mDataProp": "isrc_number", "bSearchable": false, "bVisible": false, "sClass": "library_isrc"}, + /* Encoded */ {"sTitle": "Encoded", "mDataProp": "encoded_by", "bSearchable": false, "bVisible": false, "sClass": "library_encoded"}, + /* Label */ {"sTitle": "Label", "mDataProp": "label", "bSearchable": false, "bVisible": false, "sClass": "library_label"}, + /* Copyright */ {"sTitle": "Copyright", "mDataProp": "copyright", "bSearchable": false, "bVisible": false, "sClass": "library_copyright"}, + /* Mime */ {"sTitle": "Mime", "mDataProp": "mime", "bSearchable": false, "bVisible": false, "sClass": "library_mime"}, + /* Language */ {"sTitle": "Language", "mDataProp": "language", "bSearchable": false, "bVisible": false, "sClass": "library_language"} ], "bProcessing": true, "bServerSide": true, "bStateSave": true, - "fnStateSaveParams": function (oSettings, oData) { //remove oData components we don't want to save. delete oData.oSearch; @@ -356,7 +368,7 @@ $(document).ready(function() { $(nHead).find("input[type=checkbox]").attr("checked", false); }, - "aaSorting": [[2,'asc']], + "aaSorting": [[3, 'asc']], "sPaginationType": "full_numbers", "bJQueryUI": true, "bAutoWidth": false, @@ -395,13 +407,12 @@ $(document).ready(function() { "oColVis": { "buttonText": "Show/Hide Columns", "sAlign": "right", - "aiExclude": [0, 1], + "aiExclude": [0, 1, 2], "sSize": "css" }, "oColReorder": { - "iFixedColumns": 2, - "aiOrder": [ 0,1,2,3,4,5,6,7,8,9,10 ] + "iFixedColumns": 2 } }); From bb4991429434df3b8868216dc69e1cbf20a65e6c Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Wed, 22 Feb 2012 21:09:24 +0100 Subject: [PATCH 14/21] CC-3174 : showbuilder bug fixed in datatables - thanks Allan! --- airtime_mvc/application/models/StoredFile.php | 5 - .../js/datatables/js/jquery.dataTables.js | 134 ++++++++------- .../js/datatables/js/jquery.dataTables.min.js | 153 ------------------ 3 files changed, 72 insertions(+), 220 deletions(-) delete mode 100644 airtime_mvc/public/js/datatables/js/jquery.dataTables.min.js diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 03b92973f..3c28c5558 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -629,11 +629,6 @@ class Application_Model_StoredFile { UNION ({$fileSelect} FROM ".$CC_CONFIG["filesTable"]." AS FILES WHERE file_exists = 'TRUE')) AS RESULTS"; - //TODO see Allan's reply about iDataSort working for serverside processing. - //hack to sort on ftype when image "type" col selected for sorting. - if ($datatables["iSortCol_0"] == 1) { - $datatables["iSortCol_0"] = 2; - } $results = Application_Model_StoredFile::searchFiles($displayColumns, $fromTable, $datatables); diff --git a/airtime_mvc/public/js/datatables/js/jquery.dataTables.js b/airtime_mvc/public/js/datatables/js/jquery.dataTables.js index 35b8d1b57..1ef8973c9 100644 --- a/airtime_mvc/public/js/datatables/js/jquery.dataTables.js +++ b/airtime_mvc/public/js/datatables/js/jquery.dataTables.js @@ -1,7 +1,7 @@ /** * @summary DataTables * @description Paginate, search and sort HTML tables - * @version 1.9.0 + * @version 1.9.1.dev * @file jquery.dataTables.js * @author Allan Jardine (www.sprymedia.co.uk) * @contact www.sprymedia.co.uk/contact @@ -1272,6 +1272,7 @@ var aPreDraw = _fnCallbackFire( oSettings, 'aoPreDrawCallback', 'preDraw', [oSettings] ); if ( $.inArray( false, aPreDraw ) !== -1 ) { + _fnProcessingDisplay( oSettings, false ); return; } @@ -1787,8 +1788,8 @@ function _fnAjaxParameters( oSettings ) { var iColumns = oSettings.aoColumns.length; - var aoData = [], mDataProp; - var i; + var aoData = [], mDataProp, aaSort, aDataSort; + var i, j; aoData.push( { "name": "sEcho", "value": oSettings.iDraw } ); aoData.push( { "name": "iColumns", "value": iColumns } ); @@ -1819,20 +1820,24 @@ /* Sorting */ if ( oSettings.oFeatures.bSort !== false ) { - var iFixed = oSettings.aaSortingFixed !== null ? oSettings.aaSortingFixed.length : 0; - var iUser = oSettings.aaSorting.length; - aoData.push( { "name": "iSortingCols", "value": iFixed+iUser } ); - for ( i=0 ; i 0 ) - { - o.nTable.removeChild( nTheadSize[0] ); - } - - var nTfootSize; - if ( o.nTFoot !== null ) - { - /* Remove the old minimised footer element in the cloned header */ - nTfootSize = o.nTable.getElementsByTagName('tfoot'); - if ( nTfootSize.length > 0 ) - { - o.nTable.removeChild( nTfootSize[0] ); - } - } + $(o.nTable).children('thead, tfoot').remove(); /* Clone the current header and footer elements and then place it into the inner table */ nTheadSize = o.nTHead.cloneNode(true); @@ -3127,7 +3123,7 @@ if ( ie67 && ($('tbody', nScrollBody).height() > nScrollBody.offsetHeight || $(nScrollBody).css('overflow-y') == "scroll") ) { - o.nTable.style.width = _fnStringToCss( $(o.nTable).outerWidth()-o.oScroll.iBarWidth ); + o.nTable.style.width = _fnStringToCss( $(o.nTable).outerWidth() - o.oScroll.iBarWidth); } } else @@ -3304,12 +3300,21 @@ var iOuterWidth = $(o.nTable).outerWidth(); nScrollHeadTable.style.width = _fnStringToCss( iOuterWidth ); nScrollHeadInner.style.width = _fnStringToCss( iOuterWidth ); + + // Figure out if there are scrollbar present - if so then we need a the header and footer to + // provide a bit more space to allow "overflow" scrolling (i.e. past the scrollbar) + var bScrolling = $(o.nTable).height() > nScrollBody.clientHeight || $(nScrollBody).css('overflow-y') == "scroll"; + nScrollHeadInner.style.paddingRight = bScrolling ? o.oScroll.iBarWidth+"px" : "0px"; if ( o.nTFoot !== null ) { - nScrollFootInner.style.width = _fnStringToCss( o.nTable.offsetWidth ); - nScrollFootTable.style.width = _fnStringToCss( o.nTable.offsetWidth ); + nScrollFootTable.style.width = _fnStringToCss( iOuterWidth ); + nScrollFootInner.style.width = _fnStringToCss( iOuterWidth ); + nScrollFootInner.style.paddingRight = bScrolling ? o.oScroll.iBarWidth+"px" : "0px"; } + + /* Adjust the position of the header incase we loose the y-scrollbar */ + $(nScrollBody).scroll(); /* If sorting or filtering has occurred, jump the scrolling back to the top */ if ( o.bSorted || o.bFiltered ) @@ -3777,14 +3782,9 @@ if ( !oSettings.oFeatures.bServerSide && (oSettings.aaSorting.length !== 0 || oSettings.aaSortingFixed !== null) ) { - if ( oSettings.aaSortingFixed !== null ) - { - aaSort = oSettings.aaSortingFixed.concat( oSettings.aaSorting ); - } - else - { - aaSort = oSettings.aaSorting.slice(); - } + aaSort = ( oSettings.aaSortingFixed !== null ) ? + oSettings.aaSortingFixed.concat( oSettings.aaSorting ) : + oSettings.aaSorting.slice(); /* If there is a sorting data type, and a fuction belonging to it, then we need to * get the data from the developer's function and apply it for this column @@ -3797,9 +3797,16 @@ if ( DataTable.ext.afnSortData[sDataType] ) { var aData = DataTable.ext.afnSortData[sDataType]( oSettings, iColumn, iVisColumn ); - for ( j=0, jLen=aoData.length ; jstring - read an object property from the data source. Note that you can * use Javascript dotted notation to read deep properties/arrays from the * data source. - *
    • null - the sDafaultContent option will use used for the cell (empty - * string by default. This can be useful on generated columns such as - * edit / delete action columns.
      • + *
    • null - the sDefaultContent option will be used for the cell (null + * by default, so you will need to specify the default content you want - + * typically an empty string). This can be useful on generated columns such + * as edit / delete action columns.
      • *
    • function - the function given will be executed whenever DataTables * needs to set or get the data for a cell in the column. The function * takes three parameters: @@ -11335,7 +11343,9 @@ */ "string-pre": function ( a ) { - if ( typeof a != 'string' ) { a = ''; } + if ( typeof a != 'string' ) { + a = (a !== null && a.toString) ? a.toString() : ''; + } return a.toLowerCase(); }, diff --git a/airtime_mvc/public/js/datatables/js/jquery.dataTables.min.js b/airtime_mvc/public/js/datatables/js/jquery.dataTables.min.js deleted file mode 100644 index bbbddb5b0..000000000 --- a/airtime_mvc/public/js/datatables/js/jquery.dataTables.min.js +++ /dev/null @@ -1,153 +0,0 @@ -/* - * File: jquery.dataTables.min.js - * Version: 1.9.0 - * Author: Allan Jardine (www.sprymedia.co.uk) - * Info: www.datatables.net - * - * Copyright 2008-2012 Allan Jardine, all rights reserved. - * - * This source file is free software, under either the GPL v2 license or a - * BSD style license, available at: - * http://datatables.net/license_gpl2 - * http://datatables.net/license_bsd - * - * This source file is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details. - */ -(function(i,aa,k,l){var j=function(e){function o(a,b){var c=j.defaults.columns,d=a.aoColumns.length,c=i.extend({},j.models.oColumn,c,{sSortingClass:a.oClasses.sSortable,sSortingClassJUI:a.oClasses.sSortJUI,nTh:b?b:k.createElement("th"),sTitle:c.sTitle?c.sTitle:b?b.innerHTML:"",aDataSort:c.aDataSort?c.aDataSort:[d],mDataProp:c.mDataProp?c.oDefaults:d});a.aoColumns.push(c);if(a.aoPreSearchCols[d]===l||null===a.aoPreSearchCols[d])a.aoPreSearchCols[d]=i.extend({},j.models.oSearch);else{c=a.aoPreSearchCols[d]; -if(c.bRegex===l)c.bRegex=!0;if(c.bSmart===l)c.bSmart=!0;if(c.bCaseInsensitive===l)c.bCaseInsensitive=!0}E(a,d,null)}function E(a,b,c){b=a.aoColumns[b];if(c!==l&&null!==c){if(c.sType!==l)b.sType=c.sType,b._bAutoType=!1;i.extend(b,c);n(b,c,"sWidth","sWidthOrig");if(c.iDataSort!==l)b.aDataSort=[c.iDataSort];n(b,c,"aDataSort")}b.fnGetData=V(b.mDataProp);b.fnSetData=sa(b.mDataProp);if(!a.oFeatures.bSort)b.bSortable=!1;if(!b.bSortable||-1==i.inArray("asc",b.asSorting)&&-1==i.inArray("desc",b.asSorting))b.sSortingClass= -a.oClasses.sSortableNone,b.sSortingClassJUI="";else if(b.bSortable||-1==i.inArray("asc",b.asSorting)&&-1==i.inArray("desc",b.asSorting))b.sSortingClass=a.oClasses.sSortable,b.sSortingClassJUI=a.oClasses.sSortJUI;else if(-1!=i.inArray("asc",b.asSorting)&&-1==i.inArray("desc",b.asSorting))b.sSortingClass=a.oClasses.sSortableAsc,b.sSortingClassJUI=a.oClasses.sSortJUIAscAllowed;else if(-1==i.inArray("asc",b.asSorting)&&-1!=i.inArray("desc",b.asSorting))b.sSortingClass=a.oClasses.sSortableDesc,b.sSortingClassJUI= -a.oClasses.sSortJUIDescAllowed}function r(a){if(!1===a.oFeatures.bAutoWidth)return!1;ba(a);for(var b=0,c=a.aoColumns.length;bm[h])d(a.aoColumns.length+m[h],b[f]);else if("string"===typeof m[h])for(e=0,q=a.aoColumns.length;eb&&a[d]--; -1!=c&&a.splice(c, -1)}function R(a,b,c){var d=a.aoColumns[c];return d.fnRender({iDataRow:b,iDataColumn:c,oSettings:a,aData:a.aoData[b]._aData,mDataProp:d.mDataProp},w(a,b,c,"display"))}function ca(a,b){var c=a.aoData[b],d;if(null===c.nTr){c.nTr=k.createElement("tr");c.nTr._DT_RowIndex=b;if(c._aData.DT_RowId)c.nTr.id=c._aData.DT_RowId;c._aData.DT_RowClass&&i(c.nTr).addClass(c._aData.DT_RowClass);for(var f=0,h=a.aoColumns.length;f=a.fnRecordsDisplay()?0:a.iInitDisplayStart,a.iInitDisplayStart=-1,z(a);if(a.bDeferLoading)a.bDeferLoading=!1,a.iDraw++;else if(a.oFeatures.bServerSide){if(!a.bDestroying&&!va(a))return}else a.iDraw++;if(0!==a.aiDisplay.length){var g=a._iDisplayStart;c=a._iDisplayEnd;if(a.oFeatures.bServerSide)g=0,c=a.aoData.length;for(;g
      • ")[0];a.nTable.parentNode.insertBefore(b,a.nTable);a.nTableWrapper=i('
      ')[0];a.nTableReinsertBefore=a.nTable.nextSibling;for(var c=a.nTableWrapper,d=a.sDom.split(""),f,h,g,e,q,m,o,l=0;l
      ")[0];q=d[l+1];if("'"==q||'"'==q){m="";for(o=2;d[l+o]!=q;)m+=d[l+o], -o++;"H"==m?m="fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix":"F"==m&&(m="fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix");-1!=m.indexOf(".")?(q=m.split("."),e.id=q[0].substr(1,q[0].length-1),e.className=q[1]):"#"==m.charAt(0)?e.id=m.substr(1,m.length-1):e.className=m;l+=o}c.appendChild(e);c=e}else if(">"==g)c=c.parentNode;else if("l"==g&&a.oFeatures.bPaginate&&a.oFeatures.bLengthChange)f=xa(a),h=1;else if("f"==g&&a.oFeatures.bFilter)f= -ya(a),h=1;else if("r"==g&&a.oFeatures.bProcessing)f=za(a),h=1;else if("t"==g)f=Aa(a),h=1;else if("i"==g&&a.oFeatures.bInfo)f=Ba(a),h=1;else if("p"==g&&a.oFeatures.bPaginate)f=Ca(a),h=1;else if(0!==j.ext.aoFeatures.length){e=j.ext.aoFeatures;o=0;for(q=e.length;o'):""===c?'':c+' ',d=k.createElement("div");d.className=a.oClasses.sFilter;d.innerHTML="";if(!a.aanFeatures.f)d.id=a.sTableId+"_filter";c=i("input", -d);c.val(b.sSearch.replace('"',"""));c.bind("keyup.DT",function(){for(var c=a.aanFeatures.f,d=0,g=c.length;d=b.length)a.aiDisplay.splice(0,a.aiDisplay.length),a.aiDisplay=a.aiDisplayMaster.slice();else if(a.aiDisplay.length==a.aiDisplayMaster.length|| -f.sSearch.length>b.length||1==c||0!==b.indexOf(f.sSearch)){a.aiDisplay.splice(0,a.aiDisplay.length);ia(a,1);for(b=0;b/g,""):"string"===typeof a?a.replace(/[\r\n]/g," "):null===a?"":a}function ma(a){return a.replace(RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^)","g"),"\\$1")}function Ba(a){var b=k.createElement("div");b.className=a.oClasses.sInfo;if(!a.aanFeatures.i)a.aoDrawCallback.push({fn:Ia,sName:"information"}),b.id=a.sTableId+"_info";a.nTable.setAttribute("aria-describedby", -a.sTableId+"_info");return b}function Ia(a){if(a.oFeatures.bInfo&&0!==a.aanFeatures.i.length){var b=a._iDisplayStart+1,c=a.fnDisplayEnd(),d=a.fnRecordsTotal(),f=a.fnRecordsDisplay(),h=a.fnFormatNumber(b),g=a.fnFormatNumber(c),e=a.fnFormatNumber(d),q=a.fnFormatNumber(f);a.oScroll.bInfinite&&(h=a.fnFormatNumber(1));h=0===a.fnRecordsDisplay()&&a.fnRecordsDisplay()==a.fnRecordsTotal()?a.oLanguage.sInfoEmpty+a.oLanguage.sInfoPostFix:0===a.fnRecordsDisplay()?a.oLanguage.sInfoEmpty+" "+a.oLanguage.sInfoFiltered.replace("_MAX_", -e)+a.oLanguage.sInfoPostFix:a.fnRecordsDisplay()==a.fnRecordsTotal()?a.oLanguage.sInfo.replace("_START_",h).replace("_END_",g).replace("_TOTAL_",q)+a.oLanguage.sInfoPostFix:a.oLanguage.sInfo.replace("_START_",h).replace("_END_",g).replace("_TOTAL_",q)+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()))+a.oLanguage.sInfoPostFix;null!==a.oLanguage.fnInfoCallback&&(h=a.oLanguage.fnInfoCallback.call(a.oInstance,a,b,c,d,f,h));a=a.aanFeatures.i;b=0;for(c=a.length;b",c,d,f=a.aLengthMenu;if(2==f.length&&"object"===typeof f[0]&&"object"===typeof f[1])for(c=0,d=f[0].length;c'+f[1][c]+"";else for(c=0,d=f.length;c'+f[c]+"";b+="";f=k.createElement("div");if(!a.aanFeatures.l)f.id=a.sTableId+"_length";f.className=a.oClasses.sLength;f.innerHTML=""; -i('select option[value="'+a._iDisplayLength+'"]',f).attr("selected",!0);i("select",f).bind("change.DT",function(){var b=i(this).val(),f=a.aanFeatures.l;for(c=0,d=f.length;ca._iDisplayStart))a._iDisplayStart=0;if(-1==a._iDisplayLength)a._iDisplayStart=0;y(a)});i("select",f).attr("aria-controls",a.sTableId);return f} -function z(a){a._iDisplayEnd=!1===a.oFeatures.bPaginate?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength>a.aiDisplay.length||-1==a._iDisplayLength?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength}function Ca(a){if(a.oScroll.bInfinite)return null;var b=k.createElement("div");b.className=a.oClasses.sPaging+a.sPaginationType;j.ext.oPagination[a.sPaginationType].fnInit(a,b,function(a){z(a);y(a)});a.aanFeatures.p||a.aoDrawCallback.push({fn:function(a){j.ext.oPagination[a.sPaginationType].fnUpdate(a, -function(a){z(a);y(a)})},sName:"pagination"});return b}function oa(a,b){var c=a._iDisplayStart;if("number"===typeof b){if(a._iDisplayStart=b*a._iDisplayLength,a._iDisplayStart>a.fnRecordsDisplay())a._iDisplayStart=0}else if("first"==b)a._iDisplayStart=0;else if("previous"==b){if(a._iDisplayStart=0<=a._iDisplayLength?a._iDisplayStart-a._iDisplayLength:0,0>a._iDisplayStart)a._iDisplayStart=0}else if("next"==b)0<=a._iDisplayLength?a._iDisplayStart+a._iDisplayLengthi(a.nTable).height()-a.oScroll.iLoadGap&&a.fnDisplayEnd()=i.browser.version;g=a.nTable.getElementsByTagName("thead");0d.offsetHeight||"scroll"==i(d).css("overflow-y")))a.nTable.style.width= -p(i(a.nTable).outerWidth()-a.oScroll.iBarWidth)}else if(""!==a.oScroll.sXInner)a.nTable.style.width=p(a.oScroll.sXInner);else if(f==i(d).width()&&i(d).height()f-a.oScroll.iBarWidth)a.nTable.style.width=p(f)}else a.nTable.style.width=p(f);f=i(a.nTable).outerWidth();h=a.nTHead.getElementsByTagName("tr");g=g.getElementsByTagName("tr");N(function(a,b){m=a.style;m.paddingTop="0";m.paddingBottom="0";m.borderTopWidth= -"0";m.borderBottomWidth="0";m.height=0;l=i(a).width();b.style.width=p(l);r.push(l)},g,h);i(g).height(0);null!==a.nTFoot&&(e=j.getElementsByTagName("tr"),j=a.nTFoot.getElementsByTagName("tr"),N(function(a,b){m=a.style;m.paddingTop="0";m.paddingBottom="0";m.borderTopWidth="0";m.borderBottomWidth="0";m.height=0;l=i(a).width();b.style.width=p(l);r.push(l)},e,j),i(e).height(0));N(function(a){a.innerHTML="";a.style.width=p(r.shift())},g);null!==a.nTFoot&&N(function(a){a.innerHTML="";a.style.width=p(r.shift())}, -e);if(i(a.nTable).outerWidth()d.offsetHeight||"scroll"==i(d).css("overflow-y")?f+a.oScroll.iBarWidth:f;if(k&&(d.scrollHeight>d.offsetHeight||"scroll"==i(d).css("overflow-y")))a.nTable.style.width=p(e-a.oScroll.iBarWidth);d.style.width=p(e);b.parentNode.style.width=p(e);if(null!==a.nTFoot)n.parentNode.style.width=p(e);""===a.oScroll.sX?F(a,1,"The table cannot fit into the current element which will cause column misalignment. The table has been drawn at its minimum possible width."): -""!==a.oScroll.sXInner&&F(a,1,"The table cannot fit into the current element which will cause column misalignment. Increase the sScrollXInner value or remove it to allow automatic calculation")}else if(d.style.width=p("100%"),b.parentNode.style.width=p("100%"),null!==a.nTFoot)n.parentNode.style.width=p("100%");if(""===a.oScroll.sY&&k)d.style.height=p(a.nTable.offsetHeight+a.oScroll.iBarWidth);if(""!==a.oScroll.sY&&a.oScroll.bCollapse&&(d.style.height=p(a.oScroll.sY),k=""!==a.oScroll.sX&&a.nTable.offsetWidth> -d.offsetWidth?a.oScroll.iBarWidth:0,a.nTable.offsetHeighttd",b));g=O(a, -h);for(h=d=0;hc)return null;if(null===a.aoData[c].nTr){var d=k.createElement("td");d.innerHTML=w(a,c,b,"");return d}return L(a,c)[b]}function Na(a,b){for(var c=-1,d=-1,f=0;f/g,"");if(h.length>c)c=h.length,d=f}return d}function p(a){if(null===a)return"0px";if("number"==typeof a)return 0>a?"0px":a+"px";var b=a.charCodeAt(a.length-1);return 48>b||57=g)for(b=0;be&&e++}}}function pa(a){if(a.oFeatures.bStateSave&&!a.bDestroying){var b,c;b=a.oScroll.bInfinite;var d={iCreate:(new Date).getTime(),iStart:b?0:a._iDisplayStart, -iEnd:b?a._iDisplayLength:a._iDisplayEnd,iLength:a._iDisplayLength,aaSorting:i.extend(!0,[],a.aaSorting),oSearch:i.extend(!0,{},a.oPreviousSearch),aoSearchCols:i.extend(!0,[],a.aoPreSearchCols),abVisCols:[]};for(b=0,c=a.aoColumns.length;b=d.aiDisplay.length&&(d._iDisplayStart-=d._iDisplayLength,0>d._iDisplayStart))d._iDisplayStart=0;if(c===l||c)z(d),y(d);return e};this.fnDestroy=function(a){var b=u(this[j.ext.iApiIndex]),c=b.nTableWrapper.parentNode,d=b.nTBody,f,e,a=a===l?!1:!0;b.bDestroying=!0;for(f=0,e=b.aoDestroyCallback.length;ftr>td."+b.oClasses.sRowEmpty,b.nTable).parent().remove();b.nTable!=b.nTHead.parentNode&&(i(b.nTable).children("thead").remove(),b.nTable.appendChild(b.nTHead));b.nTFoot&&b.nTable!=b.nTFoot.parentNode&&(i(b.nTable).children("tfoot").remove(),b.nTable.appendChild(b.nTFoot));b.nTable.parentNode.removeChild(b.nTable);i(b.nTableWrapper).remove();b.aaSorting= -[];b.aaSortingFixed=[];Q(b);i(S(b)).removeClass(b.asStripeClasses.join(" "));i("th, td",b.nTHead).removeClass([b.oClasses.sSortable,b.oClasses.sSortableAsc,b.oClasses.sSortableDesc,b.oClasses.sSortableNone].join(" "));b.bJUI&&(i("th span."+b.oClasses.sSortIcon+", td span."+b.oClasses.sSortIcon,b.nTHead).remove(),i("th, td",b.nTHead).each(function(){var a=i("div."+b.oClasses.sSortJUIWrapper,this),c=a.contents();i(this).append(c);a.remove()}));!a&&b.nTableReinsertBefore?c.insertBefore(b.nTable,b.nTableReinsertBefore): -a||c.appendChild(b.nTable);for(f=0,e=b.aoData.length;f=v(d);if(!m)for(f=a;ft<"F"ip>'}else i.extend(g.oClasses,j.ext.oStdClasses);i(this).addClass(g.oClasses.sTable);if(""!==g.oScroll.sX||""!==g.oScroll.sY)g.oScroll.iBarWidth=Oa();if(g.iInitDisplayStart===l)g.iInitDisplayStart=e.iDisplayStart,g._iDisplayStart=e.iDisplayStart;if(e.bStateSave)g.oFeatures.bStateSave=!0,Qa(g,e),A(g,"aoDrawCallback",pa,"state_save");if(null!==e.iDeferLoading)g.bDeferLoading=!0,g._iRecordsTotal=e.iDeferLoading, -g._iRecordsDisplay=e.iDeferLoading;null!==e.aaData&&(h=!0);""!==e.oLanguage.sUrl?(g.oLanguage.sUrl=e.oLanguage.sUrl,i.getJSON(g.oLanguage.sUrl,null,function(a){na(a);i.extend(!0,g.oLanguage,e.oLanguage,a);$(g)}),f=!0):i.extend(!0,g.oLanguage,e.oLanguage);c=!1;d=i(this).children("tbody").children("tr");for(a=0,b=g.asStripeClasses.length;a=g.aoColumns.length&&(g.aaSorting[a][0]=0);var r=g.aoColumns[g.aaSorting[a][0]];g.aaSorting[a][2]===l&&(g.aaSorting[a][2]=0);e.aaSorting===l&&g.saved_aaSorting===l&&(g.aaSorting[a][1]=r.asSorting[0]);for(c=0,d=r.asSorting.length;c< -d;c++)if(g.aaSorting[a][1]==r.asSorting[c]){g.aaSorting[a][2]=c;break}}Q(g);a=i(this).children("thead");0===a.length&&(a=[k.createElement("thead")],this.appendChild(a[0]));g.nTHead=a[0];a=i(this).children("tbody");0===a.length&&(a=[k.createElement("tbody")],this.appendChild(a[0]));g.nTBody=a[0];g.nTBody.setAttribute("role","alert");g.nTBody.setAttribute("aria-live","polite");g.nTBody.setAttribute("aria-relevant","all");a=i(this).children("tfoot");if(0=parseInt(k,10)},iApiIndex:0,ofnSearch:{},oApi:{}, -oStdClasses:{},oJUIClasses:{},oPagination:{},oSort:{},sVersion:j.version,sErrMode:"alert",_oExternConfig:{iNextUnique:0}};j.models.oSearch={bCaseInsensitive:!0,sSearch:"",bRegex:!1,bSmart:!0};j.models.oRow={nTr:null,_aData:[],_aSortData:[],_anHidden:[],_sRowStripe:""};j.models.oColumn={aDataSort:null,asSorting:null,bSearchable:null,bSortable:null,bUseRendered:null,bVisible:null,_bAutoType:!0,fnCreatedCell:null,fnGetData:null,fnRender:null,fnSetData:null,mDataProp:null,nTh:null,nTf:null,sClass:null, -sContentPadding:null,sDefaultContent:null,sName:null,sSortDataType:"std",sSortingClass:null,sSortingClassJUI:null,sTitle:null,sType:null,sWidth:null,sWidthOrig:null};j.defaults={aaData:null,aaSorting:[[0,"asc"]],aaSortingFixed:null,aLengthMenu:[10,25,50,100],aoColumns:null,aoColumnDefs:null,aoSearchCols:[],asStripeClasses:["odd","even"],bAutoWidth:!0,bDeferRender:!1,bDestroy:!1,bFilter:!0,bInfo:!0,bJQueryUI:!1,bLengthChange:!0,bPaginate:!0,bProcessing:!1,bRetrieve:!1,bScrollAutoCss:!0,bScrollCollapse:!1, -bScrollInfinite:!1,bServerSide:!1,bSort:!0,bSortCellsTop:!1,bSortClasses:!0,bStateSave:!1,fnCookieCallback:null,fnCreatedRow:null,fnDrawCallback:null,fnFooterCallback:null,fnFormatNumber:function(e){if(1E3>e)return e;for(var i=e+"",e=i.split(""),j="",i=i.length,l=0;l'+k.sPrevious+''+k.sNext+"":'';i(j).append(k);var t=i("a",j),k=t[0],t=t[1];e.oApi._fnBindAction(k,{action:"previous"},s);e.oApi._fnBindAction(t,{action:"next"},s);if(!e.aanFeatures.p)j.id=e.sTableId+"_paginate",k.id=e.sTableId+"_previous",t.id=e.sTableId+"_next",k.setAttribute("aria-controls",e.sTableId),t.setAttribute("aria-controls",e.sTableId)},fnUpdate:function(e){if(e.aanFeatures.p)for(var i=e.oClasses,j=e.aanFeatures.p,l=0, -k=j.length;l'+k.sFirst+ -''+k.sPrevious+''+k.sNext+''+k.sLast+"");var v=i("a",j),k=v[0],s=v[1],B=v[2],v=v[3];e.oApi._fnBindAction(k,{action:"first"},t);e.oApi._fnBindAction(s,{action:"previous"},t);e.oApi._fnBindAction(B,{action:"next"},t);e.oApi._fnBindAction(v,{action:"last"}, -t);if(!e.aanFeatures.p)j.id=e.sTableId+"_paginate",k.id=e.sTableId+"_first",s.id=e.sTableId+"_previous",B.id=e.sTableId+"_next",v.id=e.sTableId+"_last"},fnUpdate:function(e,l){if(e.aanFeatures.p){var k=j.ext.oPagination.iFullNumbersShowPages,r=Math.floor(k/2),s=Math.ceil(e.fnRecordsDisplay()/e._iDisplayLength),t=Math.ceil(e._iDisplayStart/e._iDisplayLength)+1,v="",B,D=e.oClasses,x,I=e.aanFeatures.p,G=function(i){e.oApi._fnBindAction(this,{page:i+B-1},function(i){e.oApi._fnPageChange(e,i.data.page); -l(e);i.preventDefault()})};s=s-r?(B=s-k+1,r=s):(B=t-Math.ceil(k/2)+1,r=B+k-1);for(k=B;k<=r;k++)v+=t!==k?''+e.fnFormatNumber(k)+"":''+e.fnFormatNumber(k)+"";for(k=0,r=I.length;ki?1:0},"string-desc":function(e,i){return ei?-1:0},"html-pre":function(e){return e.replace(/<.*?>/g,"").toLowerCase()}, -"html-asc":function(e,i){return ei?1:0},"html-desc":function(e,i){return ei?-1:0},"date-pre":function(e){e=Date.parse(e);if(isNaN(e)||""===e)e=Date.parse("01/01/1970 00:00:00");return e},"date-asc":function(e,i){return e-i},"date-desc":function(e,i){return i-e},"numeric-pre":function(e){return"-"==e||""===e?0:1*e},"numeric-asc":function(e,i){return e-i},"numeric-desc":function(e,i){return i-e}});i.extend(j.ext.aTypes,[function(e){if("number"===typeof e)return"numeric";if("string"!== -typeof e)return null;var i,j=!1;i=e.charAt(0);if(-1=="0123456789-".indexOf(i))return null;for(var k=1;k")?"html":null}]);i.fn.DataTable=j;i.fn.dataTable=j;i.fn.dataTableSettings=j.settings;i.fn.dataTableExt= -j.ext})(jQuery,window,document,void 0); From c89451f880dac7024033390fdf45455ab7c82bc1 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Wed, 22 Feb 2012 21:56:55 +0100 Subject: [PATCH 15/21] CC-3340 : Remove "Search" tab from library view --- airtime_mvc/application/layouts/scripts/library.phtml | 2 +- .../application/views/scripts/library/library.phtml | 10 +++------- airtime_mvc/public/js/airtime/library/library.js | 9 ++++----- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/airtime_mvc/application/layouts/scripts/library.phtml b/airtime_mvc/application/layouts/scripts/library.phtml index b2982c1f4..69c0dc544 100644 --- a/airtime_mvc/application/layouts/scripts/library.phtml +++ b/airtime_mvc/application/layouts/scripts/library.phtml @@ -22,7 +22,7 @@
      -
      layout()->library ?>
      +
      layout()->library ?>
      layout()->spl ?>
      diff --git a/airtime_mvc/application/views/scripts/library/library.phtml b/airtime_mvc/application/views/scripts/library/library.phtml index fda9aec34..8a1fead4c 100644 --- a/airtime_mvc/application/views/scripts/library/library.phtml +++ b/airtime_mvc/application/views/scripts/library/library.phtml @@ -1,7 +1,3 @@ - -
      - -
      -
      + +
      + diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index d03803214..85627fc1d 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -83,9 +83,10 @@ function checkImportStatus(){ $.getJSON('/Preference/is-import-in-progress', function(data){ var div = $('#import_status'); if (data == true){ - div.css('visibility', 'visible'); - }else{ - div.css('visibility', 'hidden'); + div.show(); + } + else{ + div.hide(); } }); } @@ -214,8 +215,6 @@ function addQtipToSCIcons(){ $(document).ready(function() { var oTable; - $('.tabs').tabs(); - oTable = $('#library_display').dataTable( { "aoColumns": [ From a1e8903a64641f64ed1b2322fe519d9dfe671b24 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Wed, 22 Feb 2012 22:25:14 +0100 Subject: [PATCH 16/21] CC-3174 : showbuilder fixing some errors found in apache log. --- airtime_mvc/application/controllers/ShowbuilderController.php | 2 -- airtime_mvc/application/models/Show.php | 4 ++-- airtime_mvc/application/models/ShowBuilder.php | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index ba1d683f8..b4f13e631 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -102,8 +102,6 @@ class ShowbuilderController extends Zend_Controller_Action Logging::log("{$e->getFile()}"); Logging::log("{$e->getLine()}"); } - - $this->view->data = $json; } public function scheduleRemoveAction() diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index c46729e3e..ec4cdbcfe 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1396,7 +1396,7 @@ class Application_Model_Show { Application_Model_Preference::SetShowsPopulatedUntil($end_timestamp); } - $sql = "SELECT starts, ends, record, rebroadcast, instance_id, show_id, name, + $sql = "SELECT starts, ends, record, rebroadcast, instance_id, show_id, name, color, background_color, file_id, cc_show_instances.id AS instance_id FROM cc_show_instances LEFT JOIN cc_show ON cc_show.id = cc_show_instances.show_id @@ -1538,7 +1538,7 @@ class Application_Model_Show { $event["end"] = $endDateTime->format("Y-m-d H:i:s"); $event["endUnix"] = $endDateTime->format("U"); $event["allDay"] = false; - $event["description"] = $show["description"]; + //$event["description"] = $show["description"]; $event["showId"] = intval($show["show_id"]); $event["record"] = intval($show["record"]); $event["rebroadcast"] = intval($show["rebroadcast"]); diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php index 01dc84636..01fe8561d 100644 --- a/airtime_mvc/application/models/ShowBuilder.php +++ b/airtime_mvc/application/models/ShowBuilder.php @@ -116,7 +116,7 @@ class Application_Model_ShowBuilder { private function makeHeaderRow($p_item) { $row = $this->defaultRowArray; - $this->getRowTimestamp($p_item, &$row); + $this->getRowTimestamp($p_item, $row); $showStartDT = new DateTime($p_item["si_starts"], new DateTimeZone("UTC")); $showStartDT->setTimezone(new DateTimeZone($this->timezone)); @@ -140,7 +140,7 @@ class Application_Model_ShowBuilder { $epoch_now = time(); $showStartDT = new DateTime($p_item["si_starts"], new DateTimeZone("UTC")); - $this->getRowTimestamp($p_item, &$row); + $this->getRowTimestamp($p_item, $row); //can only schedule the show if it hasn't started and you are allowed. if ($epoch_now < $showStartDT->format('U') && $this->user->canSchedule($p_item["show_id"]) == true) { From 4bc51cbad11a6ec00b849cc5412871b5ff3e2dbf Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Thu, 23 Feb 2012 11:01:52 +0100 Subject: [PATCH 17/21] CC-3174 : showbuilder forgotten unused var. --- airtime_mvc/application/controllers/ShowbuilderController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index b4f13e631..39511bbe9 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -149,8 +149,6 @@ class ShowbuilderController extends Zend_Controller_Action Logging::log("{$e->getFile()}"); Logging::log("{$e->getLine()}"); } - - $this->view->data = $json; } public function scheduleReorderAction() { From aabcaafff0d19d33deb1477cdef1ff1e07975023 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Thu, 23 Feb 2012 11:10:49 +0100 Subject: [PATCH 18/21] CC-3174 : showbuilder nowplaying uses current datatables. --- .../controllers/NowplayingController.php | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/airtime_mvc/application/controllers/NowplayingController.php b/airtime_mvc/application/controllers/NowplayingController.php index 1926d596c..bc02662bf 100644 --- a/airtime_mvc/application/controllers/NowplayingController.php +++ b/airtime_mvc/application/controllers/NowplayingController.php @@ -15,25 +15,25 @@ class NowplayingController extends Zend_Controller_Action public function indexAction() { global $CC_CONFIG; - + $request = $this->getRequest(); $baseUrl = $request->getBaseUrl(); - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - + $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); + //nowplayingdatagrid.js requires this variable, so that datePicker widget can be offset to server time instead of client time $this->view->headScript()->appendScript("var timezoneOffset = ".date("Z")."; //in seconds"); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowplayingdatagrid.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowview.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - + $refer_sses = new Zend_Session_Namespace('referrer'); $userInfo = Zend_Auth::getInstance()->getStorage()->read(); $user = new Application_Model_User($userInfo->id); - + if ($request->isPost()) { $form = new Application_Form_RegisterAirtime(); - + $values = $request->getPost(); if ($values["Publicise"] != 1 && $form->isValid($values)){ Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]); @@ -49,10 +49,10 @@ class NowplayingController extends Zend_Controller_Action Application_Model_Preference::SetEmail($values["Email"]); Application_Model_Preference::SetStationWebSite($values["StationWebSite"]); Application_Model_Preference::SetPublicise($values["Publicise"]); - + $form->Logo->receive(); $imagePath = $form->Logo->getFileName(); - + Application_Model_Preference::SetStationCountry($values["Country"]); Application_Model_Preference::SetStationCity($values["City"]); Application_Model_Preference::SetStationDescription($values["Description"]); @@ -75,10 +75,10 @@ class NowplayingController extends Zend_Controller_Action //popup if previous page was login if($refer_sses->referrer == 'login' && Application_Model_Nowplaying::ShouldShowPopUp() && !Application_Model_Preference::GetSupportFeedback() && $user->isAdmin()){ - + $form = new Application_Form_RegisterAirtime(); - - + + $logo = Application_Model_Preference::GetStationLogo(); if($logo){ $this->view->logoImg = $logo; @@ -94,7 +94,7 @@ class NowplayingController extends Zend_Controller_Action $viewType = $this->_request->getParam('view'); $dateString = $this->_request->getParam('date'); $this->view->entries = Application_Model_Nowplaying::GetDataGridData($viewType, $dateString); - + } /* public function livestreamAction() @@ -107,16 +107,16 @@ class NowplayingController extends Zend_Controller_Action public function dayViewAction() { global $CC_CONFIG; - + $request = $this->getRequest(); $baseUrl = $request->getBaseUrl(); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - + //nowplayingdatagrid.js requires this variable, so that datePicker widget can be offset to server time instead of client time $this->view->headScript()->appendScript("var timezoneOffset = ".date("Z")."; //in seconds"); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowplayingdatagrid.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/dayview.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); } @@ -127,7 +127,7 @@ class NowplayingController extends Zend_Controller_Action Application_Model_Preference::SetRemindMeDate(); die(); } - + public function donotshowregistrationpopupAction() { // unset session From b357b80054b5d46370f8bb2968d6f2b9f4b84a13 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Thu, 23 Feb 2012 12:13:00 +0100 Subject: [PATCH 19/21] CC-3174 : showbuilder created controller Usersettings, noticed hosts couldn't save datatables setting through pref controller. starting to use new cursor arrows. --- airtime_mvc/application/configs/ACL.php | 6 +-- .../controllers/PreferenceController.php | 38 -------------- .../controllers/UsersettingsController.php | 49 ++++++++++++++++++ airtime_mvc/public/css/images/tl-arrow.png | Bin 0 -> 1019 bytes airtime_mvc/public/css/showbuilder.css | 24 +++++++-- .../public/js/airtime/library/library.js | 4 +- .../public/js/airtime/showbuilder/builder.js | 10 ++-- 7 files changed, 78 insertions(+), 53 deletions(-) create mode 100644 airtime_mvc/application/controllers/UsersettingsController.php create mode 100644 airtime_mvc/public/css/images/tl-arrow.png diff --git a/airtime_mvc/application/configs/ACL.php b/airtime_mvc/application/configs/ACL.php index e3001cffc..f0bb211c8 100644 --- a/airtime_mvc/application/configs/ACL.php +++ b/airtime_mvc/application/configs/ACL.php @@ -25,7 +25,8 @@ $ccAcl->add(new Zend_Acl_Resource('library')) ->add(new Zend_Acl_Resource('preference')) ->add(new Zend_Acl_Resource('recorder')) ->add(new Zend_Acl_Resource('showbuilder')) - ->add(new Zend_Acl_Resource('auth')); + ->add(new Zend_Acl_Resource('auth')) + ->add(new Zend_Acl_Resource('usersettings')); /** Creating permissions */ $ccAcl->allow('G', 'index') @@ -34,11 +35,10 @@ $ccAcl->allow('G', 'index') ->allow('G', 'nowplaying') ->allow('G', 'api') ->allow('G', 'auth') - //->allow('G', 'plupload', array('upload-recorded')) ->allow('G', 'recorder') ->allow('G', 'schedule') ->allow('G', 'dashboard') - //->allow('H', 'plupload', array('plupload', 'upload', 'index')) + ->allow('H', 'usersettings') ->allow('H', 'plupload') ->allow('H', 'library') ->allow('H', 'search') diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index ebc78224b..4d2018bba 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -14,10 +14,6 @@ class PreferenceController extends Zend_Controller_Action ->addActionContext('is-import-in-progress', 'json') ->addActionContext('change-stream-setting', 'json') ->addActionContext('get-liquidsoap-status', 'json') - ->addActionContext('get-library-datatable', 'json') - ->addActionContext('set-library-datatable', 'json') - ->addActionContext('get-timeline-datatable', 'json') - ->addActionContext('set-timeline-datatable', 'json') ->initContext(); } @@ -335,40 +331,6 @@ class PreferenceController extends Zend_Controller_Action } die(json_encode($out)); } - - public function setLibraryDatatableAction() { - - $request = $this->getRequest(); - $settings = $request->getParam("settings"); - - $data = serialize($settings); - Application_Model_Preference::SetValue("library_datatable", $data, true); - } - - public function getLibraryDatatableAction() { - - $data = Application_Model_Preference::GetValue("library_datatable", true); - if ($data != "") { - $this->view->settings = unserialize($data); - } - } - - public function setTimelineDatatableAction() { - - $request = $this->getRequest(); - $settings = $request->getParam("settings"); - - $data = serialize($settings); - Application_Model_Preference::SetValue("timeline_datatable", $data, true); - } - - public function getTimelineDatatableAction() { - - $data = Application_Model_Preference::GetValue("timeline_datatable", true); - if ($data != "") { - $this->view->settings = unserialize($data); - } - } } diff --git a/airtime_mvc/application/controllers/UsersettingsController.php b/airtime_mvc/application/controllers/UsersettingsController.php new file mode 100644 index 000000000..c088bfcdd --- /dev/null +++ b/airtime_mvc/application/controllers/UsersettingsController.php @@ -0,0 +1,49 @@ +_helper->getHelper('AjaxContext'); + $ajaxContext->addActionContext('get-library-datatable', 'json') + ->addActionContext('set-library-datatable', 'json') + ->addActionContext('get-timeline-datatable', 'json') + ->addActionContext('set-timeline-datatable', 'json') + ->initContext(); + } + + public function setLibraryDatatableAction() { + + $request = $this->getRequest(); + $settings = $request->getParam("settings"); + + $data = serialize($settings); + Application_Model_Preference::SetValue("library_datatable", $data, true); + } + + public function getLibraryDatatableAction() { + + $data = Application_Model_Preference::GetValue("library_datatable", true); + if ($data != "") { + $this->view->settings = unserialize($data); + } + } + + public function setTimelineDatatableAction() { + + $request = $this->getRequest(); + $settings = $request->getParam("settings"); + + $data = serialize($settings); + Application_Model_Preference::SetValue("timeline_datatable", $data, true); + } + + public function getTimelineDatatableAction() { + + $data = Application_Model_Preference::GetValue("timeline_datatable", true); + if ($data != "") { + $this->view->settings = unserialize($data); + } + } +} \ No newline at end of file diff --git a/airtime_mvc/public/css/images/tl-arrow.png b/airtime_mvc/public/css/images/tl-arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..a7ce13702c66e693e110829b4bae73e369228001 GIT binary patch literal 1019 zcmaJ=OK1~87~WR!5n61aE%k92wo)rJ`${$;OV>8dCN|J5B@HxqF`L~ZGJ2i_roM<6914Q`E?)?`Zlw#GnM{Ok1YEKYLCC(~#*|QRP%81uN#n ziVJ5}rt<3NmO_((J!j}HTZ<2jZSSY8P8aVa8590%$jO`^F*S;{GydMvV&=?cb<#In_D zm8nJ;4}OY$6*3idqRRVVNdQ_foK&rmXGN z%R~ys`kKS?3>T!-0IKT$p_bJ|dpHO8{r*$f%P%{S%|Q<>xjMPH@<0&Eky0+yFmm$< zEi|e)T|pRm736@_j0k2;+dx&XhE`Q6YkOF;b(mFTn(!IZG^9*~6U0nX5fxG3`81zQ z#^R|=LP;lMVv>tS8e9eGOBS?ogKO+_(=E9{BUlcJtU%Yi2#t)3EKo~WGFy8YZ>d-3 z8m+ygT5?%ph7GRuuWN1`k=_ZG&88)rX4^xX^twx$`UAZ4ggl7Ftdh+8pGr|t{0WQ2 zt)l_^^qpLL{HA?)=hThf zU)`b88@s!^k*@a14uyJ1Z(Ip?;78ZHicjBdN?U88?cTw@aqUaI|7K`xwT-&{dEox7 SyZ62Y&oP^xQXY&KFaH73WkenT literal 0 HcmV?d00001 diff --git a/airtime_mvc/public/css/showbuilder.css b/airtime_mvc/public/css/showbuilder.css index 9bc163de2..4d6fe4979 100644 --- a/airtime_mvc/public/css/showbuilder.css +++ b/airtime_mvc/public/css/showbuilder.css @@ -4,9 +4,23 @@ width:100px; } -#show_builder span.ui-icon-triangle-1-e { - float: left; - position: relative; - left: -20px; - top: 15px; +table tr.selected-row td, table tr.selected-row th, +table.datatable tr.selected-row td, table.datatable tr.selected-row th { + border-bottom: 2px solid #db0000 !important; } +.innerWrapper { + position:relative; + width:100%; + } +.marker { + position:absolute; + bottom:-10px; + left:-14px; + width:9px; + height:9px; + background:url(images/tl-arrow.png) no-repeat 0 0; + display:block; +} +tr.selected-row .marker { + background-position: 0 -15px; +} \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 85627fc1d..ed2a50c20 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -256,7 +256,7 @@ $(document).ready(function() { "fnStateSave": function (oSettings, oData) { $.ajax({ - url: "/preference/set-library-datatable", + url: "/usersettings/set-library-datatable", type: "POST", data: {settings : oData, format: "json"}, dataType: "json", @@ -270,7 +270,7 @@ $(document).ready(function() { var o; $.ajax({ - url: "/preference/get-library-datatable", + url: "/usersettings/get-library-datatable", type: "GET", data: {format: "json"}, dataType: "json", diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index de6ff8327..6cecba411 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -205,7 +205,7 @@ $(document).ready(function() { if (aData.header === true) { cl = 'sb-header'; - sSeparatorHTML = ''+aData.title+''+aData.starts+''+aData.ends+''; + sSeparatorHTML = ''+aData.title+''+aData.starts+''+aData.ends+''; fnPrepareSeparatorRow(sSeparatorHTML, cl, 0); } else if (aData.footer === true) { @@ -226,11 +226,11 @@ $(document).ready(function() { fnPrepareSeparatorRow(sSeparatorHTML, cl, 1); } else { - //$(nRow).attr("id", "sched_"+aData.id); node = nRow.children[0]; if (aData.checkbox === true) { - node.innerHTML = ''; + var height = $(node).height(); + node.innerHTML = '
      '; } else { node.innerHTML = ''; @@ -292,7 +292,7 @@ $(document).ready(function() { "fnStateSave": function (oSettings, oData) { $.ajax({ - url: "/preference/set-timeline-datatable", + url: "/usersettings/set-timeline-datatable", type: "POST", data: {settings : oData, format: "json"}, dataType: "json", @@ -306,7 +306,7 @@ $(document).ready(function() { var o; $.ajax({ - url: "/preference/get-timeline-datatable", + url: "/usersettings/get-timeline-datatable", type: "GET", data: {format: "json"}, dataType: "json", From 753c05ce5b2bfce484ee1e098813f0da698bf335 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Thu, 23 Feb 2012 17:46:07 +0100 Subject: [PATCH 20/21] CC-3335 : Timeline: Drag and drop usability improvements cursor must be used to add tracks to timeline, not check boxes. --- .../controllers/ShowbuilderController.php | 2 +- .../application/models/ShowBuilder.php | 33 ++- airtime_mvc/application/models/User.php | 5 +- airtime_mvc/public/css/showbuilder.css | 5 +- .../library/events/library_showbuilder.js | 30 ++- .../public/js/airtime/showbuilder/builder.js | 202 +++++++++++------- 6 files changed, 163 insertions(+), 114 deletions(-) diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index 39511bbe9..7232eefbd 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -107,7 +107,7 @@ class ShowbuilderController extends Zend_Controller_Action public function scheduleRemoveAction() { $request = $this->getRequest(); - $items = $request->getParam("items", null); + $items = $request->getParam("items", array()); try { $scheduler = new Application_Model_Scheduler(); diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php index 01fe8561d..327c18d1b 100644 --- a/airtime_mvc/application/models/ShowBuilder.php +++ b/airtime_mvc/application/models/ShowBuilder.php @@ -9,12 +9,13 @@ class Application_Model_ShowBuilder { private $opts; private $contentDT; + private $epoch_now; private $defaultRowArray = array( "header" => false, "footer" => false, "empty" => false, - "checkbox" => false, + "allowed" => false, "id" => 0, "instance" => "", "starts" => "", @@ -37,6 +38,7 @@ class Application_Model_ShowBuilder { $this->timezone = date_default_timezone_get(); $this->user = Application_Model_User::GetCurrentUser(); $this->opts = $p_opts; + $this->epoch_now = time(); } /* @@ -89,6 +91,7 @@ class Application_Model_ShowBuilder { private function makeFooterRow($p_item) { $row = $this->defaultRowArray; + $this->isAllowed($p_item, $row); $row["footer"] = true; $showEndDT = new DateTime($p_item["si_ends"], new DateTimeZone("UTC")); @@ -101,6 +104,16 @@ class Application_Model_ShowBuilder { return $row; } + private function isAllowed($p_item, &$row) { + + $showStartDT = new DateTime($p_item["si_starts"], new DateTimeZone("UTC")); + + //can only schedule the show if it hasn't started and you are allowed. + if ($this->epoch_now < $showStartDT->format('U') && $this->user->canSchedule($p_item["show_id"]) == true) { + $row["allowed"] = true; + } + } + private function getRowTimestamp($p_item, &$row) { if (is_null($p_item["si_last_scheduled"])) { @@ -116,6 +129,8 @@ class Application_Model_ShowBuilder { private function makeHeaderRow($p_item) { $row = $this->defaultRowArray; + $this->isAllowed($p_item, $row); + Logging::log("making header for show id ".$p_item["show_id"]); $this->getRowTimestamp($p_item, $row); $showStartDT = new DateTime($p_item["si_starts"], new DateTimeZone("UTC")); @@ -137,16 +152,10 @@ class Application_Model_ShowBuilder { private function makeScheduledItemRow($p_item) { $row = $this->defaultRowArray; - $epoch_now = time(); - $showStartDT = new DateTime($p_item["si_starts"], new DateTimeZone("UTC")); + $this->isAllowed($p_item, $row); $this->getRowTimestamp($p_item, $row); - //can only schedule the show if it hasn't started and you are allowed. - if ($epoch_now < $showStartDT->format('U') && $this->user->canSchedule($p_item["show_id"]) == true) { - $row["checkbox"] = true; - } - if (isset($p_item["sched_starts"])) { $schedStartDT = new DateTime($p_item["sched_starts"], new DateTimeZone("UTC")); @@ -172,6 +181,8 @@ class Application_Model_ShowBuilder { $row["empty"] = true; $row["id"] = 0 ; $row["instance"] = intval($p_item["si_id"]); + + //return null; } return $row; @@ -219,7 +230,11 @@ class Application_Model_ShowBuilder { } //make a normal data row. - $display_items[] = $this->makeScheduledItemRow($item); + $row = $this->makeScheduledItemRow($item); + //don't display the empty rows. + if (isset($row)) { + $display_items[] = $row; + } } //make the last footer if there were any scheduled items. diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php index f06a3c918..755a0fbe1 100644 --- a/airtime_mvc/application/models/User.php +++ b/airtime_mvc/application/models/User.php @@ -37,15 +37,16 @@ class Application_Model_User { public function canSchedule($p_showId) { $type = $this->getType(); + $result = false; if ( $type === UTYPE_ADMIN || $type === UTYPE_PROGRAM_MANAGER || CcShowHostsQuery::create()->filterByDbShow($p_showId)->filterByDbHost($this->getId())->count() > 0 ) { - return true; + $result = true; } - return false; + return $result; } public function isUserType($type, $showId=''){ diff --git a/airtime_mvc/public/css/showbuilder.css b/airtime_mvc/public/css/showbuilder.css index 4d6fe4979..fd2cc1e14 100644 --- a/airtime_mvc/public/css/showbuilder.css +++ b/airtime_mvc/public/css/showbuilder.css @@ -4,8 +4,7 @@ width:100px; } -table tr.selected-row td, table tr.selected-row th, -table.datatable tr.selected-row td, table.datatable tr.selected-row th { +table.datatable tr.cursor-selected-row td, table.datatable tr.cursor-selected-row th { border-bottom: 2px solid #db0000 !important; } .innerWrapper { @@ -21,6 +20,6 @@ table.datatable tr.selected-row td, table.datatable tr.selected-row th { background:url(images/tl-arrow.png) no-repeat 0 0; display:block; } -tr.selected-row .marker { +tr.cursor-selected-row .marker { background-position: 0 -15px; } \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index b4588dc34..e73296237 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -41,33 +41,31 @@ var AIRTIME = (function(AIRTIME){ fnAddSelectedItems = function() { var oLibTT = TableTools.fnGetInstance('library_display'), - oSchedTT = TableTools.fnGetInstance('show_builder_table'), aData = oLibTT.fnGetSelectedData(), - item, + i, + length, temp, aMediaIds = [], aSchedIds = []; //process selected files/playlists. - for (item in aData) { - temp = aData[item]; - if (temp !== null && temp.hasOwnProperty('id')) { - aMediaIds.push({"id": temp.id, "type": temp.ftype}); - } + for (i=0, length = aData.length; i < length; i++) { + temp = aData[i]; + aMediaIds.push({"id": temp.id, "type": temp.ftype}); } + + aData = []; + $("#show_builder_table tr.cursor-selected-row").each(function(i, el){ + aData.push($(el).data("aData")); + }); - aData = oSchedTT.fnGetSelectedData(); - //process selected schedule rows to add media after. - for (item in aData) { - temp = aData[item]; - if (temp !== null && temp.hasOwnProperty('id')) { - aSchedIds.push({"id": temp.id, "instance": temp.instance, "timestamp": temp.timestamp}); - } + for (i=0, length = aData.length; i < length; i++) { + temp = aData[i]; + aSchedIds.push({"id": temp.id, "instance": temp.instance, "timestamp": temp.timestamp}); } - AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds); - + AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds); }; //[0] = button text //[1] = id diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 6cecba411..7bbbb17d4 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -62,8 +62,7 @@ $(document).ready(function() { fnAddSelectedItems, fnRemoveSelectedItems, oRange, - fnServerData, - fnShowBuilderRowCallback; + fnServerData; oBaseDatePickerSettings = { dateFormat: 'yy-mm-dd', @@ -178,87 +177,17 @@ $(document).ready(function() { fnServerData.start = oRange.start; fnServerData.end = oRange.end; - fnShowBuilderRowCallback = function ( nRow, aData, iDisplayIndex, iDisplayIndexFull ){ - var i, - sSeparatorHTML, - fnPrepareSeparatorRow, - node, - cl=""; - - //save some info for reordering purposes. - $(nRow).data({"aData": aData}); - - fnPrepareSeparatorRow = function(sRowContent, sClass, iNodeIndex) { - - node = nRow.children[iNodeIndex]; - node.innerHTML = sRowContent; - node.setAttribute('colspan',100); - for (i = iNodeIndex + 1; i < nRow.children.length; i = i+1) { - node = nRow.children[i]; - node.innerHTML = ""; - node.setAttribute("style", "display : none"); - } - - nRow.className = sClass; - }; - - if (aData.header === true) { - cl = 'sb-header'; - - sSeparatorHTML = ''+aData.title+''+aData.starts+''+aData.ends+''; - fnPrepareSeparatorRow(sSeparatorHTML, cl, 0); - } - else if (aData.footer === true) { - node = nRow.children[0]; - cl = 'sb-footer'; - - //check the show's content status. - if (aData.runtime > 0) { - node.innerHTML = ''; - cl = cl + ' ui-state-highlight'; - } - else { - node.innerHTML = ''; - cl = cl + ' ui-state-error'; - } - - sSeparatorHTML = ''+aData.fRuntime+''; - fnPrepareSeparatorRow(sSeparatorHTML, cl, 1); - } - else { - - node = nRow.children[0]; - if (aData.checkbox === true) { - var height = $(node).height(); - node.innerHTML = '
      '; - } - else { - node.innerHTML = ''; - cl = cl + " sb-not-allowed"; - } - - if (aData.empty === true) { - - sSeparatorHTML = 'Show Empty'; - cl = cl + " sb-empty odd"; - - fnPrepareSeparatorRow(sSeparatorHTML, cl, 1); - } - } - }; - fnRemoveSelectedItems = function() { var oTT = TableTools.fnGetInstance('show_builder_table'), aData = oTT.fnGetSelectedData(), - item, + i, + length, temp, aItems = []; - for (item in aData) { - temp = aData[item]; - if (temp !== null && temp.hasOwnProperty('id')) { - aItems.push({"id": temp.id, "instance": temp.instance, "timestamp": temp.timestamp}); - } + for (i=0, length = aData.length; i < length; i++) { + temp = aData[i]; + aItems.push({"id": temp.id, "instance": temp.instance, "timestamp": temp.timestamp}); } AIRTIME.showbuilder.fnRemove(aItems); @@ -266,7 +195,7 @@ $(document).ready(function() { oTable = tableDiv.dataTable( { "aoColumns": [ - /* checkbox */ {"mDataProp": "checkbox", "sTitle": "", "sWidth": "15px"}, + /* checkbox */ {"mDataProp": "allowed", "sTitle": "", "sWidth": "15px"}, /* starts */{"mDataProp": "starts", "sTitle": "Start"}, /* ends */{"mDataProp": "ends", "sTitle": "End"}, /* runtime */{"mDataProp": "runtime", "sTitle": "Duration"}, @@ -341,7 +270,100 @@ $(document).ready(function() { }, "fnServerData": fnServerData, - "fnRowCallback": fnShowBuilderRowCallback, + "fnRowCallback": function ( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { + var i, + sSeparatorHTML, + fnPrepareSeparatorRow, + node, + cl=""; + + //save some info for reordering purposes. + $(nRow).data({"aData": aData}); + + if (aData.allowed !== true) { + $(nRow).addClass("sb-not-allowed"); + } + + fnPrepareSeparatorRow = function(sRowContent, sClass, iNodeIndex) { + + node = nRow.children[iNodeIndex]; + node.innerHTML = sRowContent; + node.setAttribute('colspan',100); + for (i = iNodeIndex + 1; i < nRow.children.length; i = i+1) { + node = nRow.children[i]; + node.innerHTML = ""; + node.setAttribute("style", "display : none"); + } + + $(nRow).addClass(sClass); + }; + + if (aData.header === true) { + cl = 'sb-header'; + + sSeparatorHTML = ''+aData.title+''+aData.starts+''+aData.ends+''; + fnPrepareSeparatorRow(sSeparatorHTML, cl, 0); + } + else if (aData.footer === true) { + node = nRow.children[0]; + cl = 'sb-footer'; + + //check the show's content status. + if (aData.runtime > 0) { + node.innerHTML = ''; + cl = cl + ' ui-state-highlight'; + } + else { + node.innerHTML = ''; + cl = cl + ' ui-state-error'; + } + + sSeparatorHTML = ''+aData.fRuntime+''; + fnPrepareSeparatorRow(sSeparatorHTML, cl, 1); + } + else if (aData.empty === true) { + + sSeparatorHTML = 'Show Empty'; + cl = cl + " sb-empty odd"; + + fnPrepareSeparatorRow(sSeparatorHTML, cl, 0); + } + else { + + node = nRow.children[0]; + if (aData.allowed === true) { + node.innerHTML = ''; + } + else { + node.innerHTML = ''; + } + } + }, + "fnDrawCallback": function(oSettings, json) { + var wrapperDiv, + markerDiv, + td; + + //create cursor arrows. + tableDiv.find("tr:not(:first, .sb-footer, .sb-empty, .sb-not-allowed)").each(function(i, el) { + td = $(el).find("td:first"); + if (td.hasClass("dataTables_empty")) { + return false; + } + + wrapperDiv = $("
      ", { + "class": "innerWrapper", + "css": { + "height": td.height() + } + }); + markerDiv = $("
      ", { + "class": "marker" + }); + + td.append(markerDiv).wrapInner(wrapperDiv); + }); + }, "fnHeaderCallback": function(nHead) { $(nHead).find("input[type=checkbox]").attr("checked", false); }, @@ -366,8 +388,8 @@ $(document).ready(function() { var node = e.currentTarget; //don't select separating rows, or shows without privileges. if ($(node).hasClass("sb-header") - || $(node).hasClass("sb-footer") - || $(node).hasClass("sb-not-allowed")) { + || $(node).hasClass("sb-footer") + || $(node).hasClass("sb-not-allowed")) { return false; } return true; @@ -408,7 +430,7 @@ $(document).ready(function() { if ($(this).is(":checked")) { var allowedNodes; - allowedNodes = oTable.find('tr:not(:first):not(.sb-header):not(.sb-footer):not(.sb-not-allowed)'); + allowedNodes = oTable.find('tr:not(:first, .sb-header, .sb-footer, .sb-not-allowed)'); allowedNodes.each(function(i, el){ oTT.fnSelect(el); @@ -515,7 +537,7 @@ $(document).ready(function() { return { placeholder: "placeholder show-builder-placeholder ui-state-highlight", forcePlaceholderSize: true, - items: 'tr:not(:first):not(.sb-header):not(.sb-footer):not(.sb-not-allowed)', + items: 'tr:not(:first, :last, .sb-header, .sb-footer, .sb-not-allowed)', receive: fnReceive, update: fnUpdate, start: function(event, ui) { @@ -533,4 +555,18 @@ $(document).ready(function() { //set things like a reference to the table. AIRTIME.showbuilder.init(oTable); + //add event to cursors. + tableDiv.find("tbody").on("click", "div.marker", function(event){ + var tr = $(this).parents("tr"); + + if (tr.hasClass("cursor-selected-row")) { + tr.removeClass("cursor-selected-row"); + } + else { + tr.addClass("cursor-selected-row"); + } + + return false; + }); + }); From d93041edb9c5c24c6d2e3e64d989830f2215319e Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Thu, 23 Feb 2012 18:06:08 +0100 Subject: [PATCH 21/21] CC-3174 : showbuilder change default value to prevent apache error logs. --- airtime_mvc/application/controllers/ShowbuilderController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index 7232eefbd..8f10ad4bd 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -83,8 +83,8 @@ class ShowbuilderController extends Zend_Controller_Action public function scheduleAddAction() { $request = $this->getRequest(); - $mediaItems = $request->getParam("mediaIds", null); - $scheduledIds = $request->getParam("schedIds", null); + $mediaItems = $request->getParam("mediaIds", array()); + $scheduledIds = $request->getParam("schedIds", array()); try { $scheduler = new Application_Model_Scheduler();