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

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

Browse source
This commit is contained in:
James 2012-09-18 16:50:57 -04:00
commit 3ecbab3259
5 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/models/User.php
View file

@ -1,9 +1,9 @@
<?php
define('UTYPE_HOST', 'H');
define('UTYPE_ADMIN', 'A');
define('UTYPE_GUEST', 'G');
define('UTYPE_PROGRAM_MANAGER', 'P');
define('UTYPE_HOST' , 'H');
define('UTYPE_ADMIN' , 'A');
define('UTYPE_GUEST' , 'G');
define('UTYPE_PROGRAM_MANAGER' , 'P');
class Application_Model_User
{

6
airtime_mvc/application/models/formatters/BitrateFormatter.php
View file

@ -17,12 +17,12 @@ class BitrateFormatter
public function format()
{
$Kbps = bcdiv($this->_bitrate, 1000, 0);
$kbps = bcdiv($this->_bitrate, 1000, 0);
if ($Kbps == 0) {
if ($kbps == 0) {
return "";
} else {
return "{$Kbps} Kbps";
return "$kbps Kbps";
}
}
}

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

@ -366,7 +366,7 @@ var AIRTIME = (function(AIRTIME){
//and verify whether they can be previewed by the browser or not. If not
//then the playlist element is greyed out
mod.validatePlaylistElements = function(){
$.each($(".big_play"), function(index, value){
$.each($(".big_play ui-icon-play"), function(index, value){
if ($(value).attr('blockId') === undefined) {
var mime = $(value).attr("data-mime-type");
if (isAudioSupported(mime)) {

8
airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
View file

@ -255,8 +255,8 @@ function eventRender(event, element, view) {
}
//add scheduled show content empty icon
addIcon = checkEmptyShowStatus(event);
if (!addIcon) {
//addIcon = checkEmptyShowStatus(event);
//if (!addIcon) {
if (view.name === 'agendaDay' || view.name === 'agendaWeek') {
if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) {
if (event.soundcloud_id === -1) {
@ -282,7 +282,7 @@ function eventRender(event, element, view) {
}
}
}
}
//}
//rebroadcast icon
if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.rebroadcast === 1) {
@ -518,6 +518,7 @@ function addQtipToSCIcons(ele){
* This gets checked when we are deciding if the show-empty icon should be added
* at the beginning of an event render callback.
*/
/*
function checkEmptyShowStatus(e) {
var currDate = new Date();
var endTime;
@ -541,6 +542,7 @@ function checkEmptyShowStatus(e) {
return showOver;
}
}
*/
//Alert the error and reload the page
//this function is used to resolve concurrency issue