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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
James 2012-04-25 17:22:05 -04:00
parent fe71487fa2 e12bd35ee2
commit b5a65ae7e4
5 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/Bootstrap.php
View File

@ -65,7 +65,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$view->headScript()->appendFile($baseUrl.'/js/libs/jquery-ui-1.8.18.custom.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/libs/jquery-ui-1.8.18.custom.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$view->headScript()->appendFile($baseUrl.'/js/libs/jquery.stickyPanel.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/libs/jquery.stickyPanel.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$view->headScript()->appendFile($baseUrl.'/js/qtip/jquery.qtip.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/qtip/jquery.qtip.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$view->headScript()->appendFile($baseUrl.'/js/jplayer/jquery.jplayer.min.js?'.$CC_CONFIG['airtime_version']); $view->headScript()->appendFile($baseUrl.'/js/jplayer/jquery.jplayer.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$view->headScript()->appendFile($baseUrl.'/js/sprintf/sprintf-0.7-beta1.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$view->headScript()->appendScript("var baseUrl='$baseUrl/'"); $view->headScript()->appendScript("var baseUrl='$baseUrl/'");
//scripts for now playing bar //scripts for now playing bar

1
airtime_mvc/application/controllers/SystemstatusController.php
View File

@ -10,7 +10,6 @@ class SystemstatusController extends Zend_Controller_Action
$baseUrl = $request->getBaseUrl(); $baseUrl = $request->getBaseUrl();
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/status/status.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/status/status.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/sprintf/sprintf-0.7-beta1.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
} }
public function indexAction() public function indexAction()

9
airtime_mvc/public/js/airtime/common/common.js
View File

@ -85,10 +85,5 @@ function openPreviewWindow(url) {
} }
function pad(number, length) { function pad(number, length) {
var str = '' + number; return sprintf("%'0"+length+"d", number);
while (str.length < length) { }
str = '0' + str;
}
return str;
}

17
airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
View File

@ -11,6 +11,23 @@ function popup(mylink){
return false; return false;
} }
/* Take a string representing a date in the format 2012-04-25 and return
* a javascript date object representing this date. */
function getDateFromString(time){
var date = time.split("-");
if (date.length != 3){
return null;
}
var year = parseInt(date[0], 10);
var month = parseInt(date[1], 10) -1;
var day = parseInt(date[2], 10);
return new Date(year, month, day);
}
function convertSecondsToDaysHoursMinutesSeconds(seconds){ function convertSecondsToDaysHoursMinutesSeconds(seconds){
if (seconds < 0) if (seconds < 0)
seconds = 0; seconds = 0;

15
airtime_mvc/public/js/airtime/schedule/add-show.js
View File

@ -110,7 +110,22 @@ function setAddShowEvents() {
form.find("#add_show_repeats").click(function(){ form.find("#add_show_repeats").click(function(){
$(this).blur(); $(this).blur();
form.find("#schedule-show-when > fieldset:last").toggle(); form.find("#schedule-show-when > fieldset:last").toggle();
var checkBoxSelected = false;
var days = form.find("#add_show_day_check-element input").each( function() {
var currentCheckBox = $(this).attr("checked");
if (currentCheckBox && currentCheckBox == "checked"){
checkBoxSelected = true;
}
});
if (!checkBoxSelected){
var d = getDateFromString(form.find("#add_show_start_date").attr("value"));
if ( d != null)
form.find("#add_show_day_check-"+d.getDay()).attr('checked', true);
}
//must switch rebroadcast displays //must switch rebroadcast displays
if(form.find("#add_show_rebroadcast").attr('checked')) { if(form.find("#add_show_rebroadcast").attr('checked')) {