diff --git a/application/Bootstrap.php b/application/Bootstrap.php index 29eecf9ad..813a9739a 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -54,6 +54,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->headScript()->appendFile('/js/libs/jquery-1.4.4.min.js','text/javascript'); $view->headScript()->appendFile('/js/libs/jquery-ui-1.8.8.custom.min.js','text/javascript'); $view->headScript()->appendFile('/js/libs/stuHover.js','text/javascript'); + $view->headScript()->appendFile('/js/playlist/helperfunctions.js','text/javascript'); $view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript'); } diff --git a/application/configs/navigation.php b/application/configs/navigation.php index c6a66b77e..8749f3b5b 100644 --- a/application/configs/navigation.php +++ b/application/configs/navigation.php @@ -17,11 +17,15 @@ $pages = array( ), array( 'label' => 'Schedule', - 'module' => 'default', - 'controller' => 'Schedule', - 'action' => 'index', - 'resource' => 'schedule', + 'uri' => 'javascript:void(null)', 'pages' => array( + array( + 'label' => 'View', + 'module' => 'default', + 'controller' => 'Schedule', + 'action' => 'index', + 'resource' => 'schedule' + ), array( 'label' => 'Add Show', 'module' => 'default', @@ -55,8 +59,7 @@ $pages = array( ), array( 'label' => 'Configure', - 'module' => 'default', - 'controller' => 'Nowplaying', + 'uri' => 'javascript:void(null)', 'pages' => array( array( 'label' => 'Preferences', diff --git a/public/js/playlist/helperfunctions.js b/public/js/playlist/helperfunctions.js new file mode 100644 index 000000000..0aeea357e --- /dev/null +++ b/public/js/playlist/helperfunctions.js @@ -0,0 +1,98 @@ +/* Takes an input parameter of milliseconds and converts these into + * the format HH:MM:SS */ +function convertToHHMMSS(timeInMS){ + var time = parseInt(timeInMS); + + var hours = parseInt(time / 3600000); + time -= 3600000*hours; + + var minutes = parseInt(time / 60000); + time -= 60000*minutes; + + var seconds = parseInt(time / 1000); + + hours = hours.toString(); + minutes = minutes.toString(); + seconds = seconds.toString(); + + if (hours.length == 1) + hours = "0" + hours; + if (minutes.length == 1) + minutes = "0" + minutes; + if (seconds.length == 1) + seconds = "0" + seconds; + if (hours == "00") + return minutes + ":" + seconds; + else + return "" + hours + ":" + minutes + ":" + seconds; +} + +function convertToHHMMSSmm(timeInMS){ + var time = parseInt(timeInMS); + + var hours = parseInt(time / 3600000); + time -= 3600000*hours; + + var minutes = parseInt(time / 60000); + time -= 60000*minutes; + + var seconds = parseInt(time / 1000); + time -= 1000*seconds; + + var ms = parseInt(time); + + hours = hours.toString(); + minutes = minutes.toString(); + seconds = seconds.toString(); + ms = ms.toString(); + + if (hours.length == 1) + hours = "0" + hours; + if (minutes.length == 1) + minutes = "0" + minutes; + if (seconds.length == 1) + seconds = "0" + seconds; + + if (ms.length == 3) + ms = ms.substring(0, 2); + else if (ms.length == 2) + ms = "0" + ms.substring(0,1); + else if (ms.length == 1) + ms = "00"; + + if (hours == "00") + return minutes + ":" + seconds + "." + ms; + else + return "" + hours + ":" + minutes + ":" + seconds+ "." + ms; +} + +function convertDateToHHMMSS(epochTime){ + var d = new Date(epochTime); + + var hours = d.getUTCHours().toString(); + var minutes = d.getUTCMinutes().toString(); + var seconds = d.getUTCSeconds().toString(); + + if (hours.length == 1) + hours = "0" + hours; + if (minutes.length == 1) + minutes = "0" + minutes; + if (seconds.length == 1) + seconds = "0" + seconds; + return "" + hours + ":" + minutes + ":" + seconds; +} + +function convertDateToPosixTime(s){ + var year = s.substring(0, 4); + var month = s.substring(5, 7); + var day = s.substring(8, 10); + var hour = s.substring(11, 13); + var minute = s.substring(14, 16); + var sec = s.substring(17, 19); + var msec = 0; + if (s.length >= 20){ + msec = s.substring(20); + } + + return Date.UTC(year, month, day, hour, minute, sec, msec); +} \ No newline at end of file diff --git a/public/js/playlist/playlist.js b/public/js/playlist/playlist.js index fec342ad0..d5d1975ea 100644 --- a/public/js/playlist/playlist.js +++ b/public/js/playlist/playlist.js @@ -33,105 +33,6 @@ function notifySongEndListener(){ songEndFunc(); } -/* Takes an input parameter of milliseconds and converts these into - * the format HH:MM:SS */ -function convertToHHMMSS(timeInMS){ - var time = parseInt(timeInMS); - - var hours = parseInt(time / 3600000); - time -= 3600000*hours; - - var minutes = parseInt(time / 60000); - time -= 60000*minutes; - - var seconds = parseInt(time / 1000); - - hours = hours.toString(); - minutes = minutes.toString(); - seconds = seconds.toString(); - - if (hours.length == 1) - hours = "0" + hours; - if (minutes.length == 1) - minutes = "0" + minutes; - if (seconds.length == 1) - seconds = "0" + seconds; - if (hours == "00") - return minutes + ":" + seconds; - else - return "" + hours + ":" + minutes + ":" + seconds; -} - -function convertToHHMMSSmm(timeInMS){ - var time = parseInt(timeInMS); - - var hours = parseInt(time / 3600000); - time -= 3600000*hours; - - var minutes = parseInt(time / 60000); - time -= 60000*minutes; - - var seconds = parseInt(time / 1000); - time -= 1000*seconds; - - var ms = parseInt(time); - - hours = hours.toString(); - minutes = minutes.toString(); - seconds = seconds.toString(); - ms = ms.toString(); - - if (hours.length == 1) - hours = "0" + hours; - if (minutes.length == 1) - minutes = "0" + minutes; - if (seconds.length == 1) - seconds = "0" + seconds; - - if (ms.length == 3) - ms = ms.substring(0, 2); - else if (ms.length == 2) - ms = "0" + ms.substring(0,1); - else if (ms.length == 1) - ms = "00"; - - if (hours == "00") - return minutes + ":" + seconds + "." + ms; - else - return "" + hours + ":" + minutes + ":" + seconds+ "." + ms; -} - -function convertDateToHHMMSS(epochTime){ - var d = new Date(epochTime); - - var hours = d.getUTCHours().toString(); - var minutes = d.getUTCMinutes().toString(); - var seconds = d.getUTCSeconds().toString(); - - if (hours.length == 1) - hours = "0" + hours; - if (minutes.length == 1) - minutes = "0" + minutes; - if (seconds.length == 1) - seconds = "0" + seconds; - return "" + hours + ":" + minutes + ":" + seconds; -} - -function convertDateToPosixTime(s){ - var year = s.substring(0, 4); - var month = s.substring(5, 7); - var day = s.substring(8, 10); - var hour = s.substring(11, 13); - var minute = s.substring(14, 16); - var sec = s.substring(17, 19); - var msec = 0; - if (s.length >= 20){ - msec = s.substring(20); - } - - return Date.UTC(year, month, day, hour, minute, sec, msec); -} - function getTrackInfo(song){ var str = "";