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:
denise 2013-01-14 14:07:55 -05:00
commit 8ea3aca3a0
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/controllers/ListenerstatController.php
View file

@ -52,6 +52,9 @@ class ListenerstatController extends Zend_Controller_Action
$out = array(); $out = array();
foreach ($errorStatus as $v) { foreach ($errorStatus as $v) {
$key = explode('_listener_stat_error', $v['keyname']); $key = explode('_listener_stat_error', $v['keyname']);
if ($v['value'] != 'OK') {
$v['value'] = _("Please make sure admin user/password is correct on System->Streams page.");
}
$out[$key[0]] = $v['value']; $out[$key[0]] = $v['value'];
} }

4
airtime_mvc/public/js/airtime/showbuilder/builder.js
View file

@ -41,10 +41,12 @@ var AIRTIME = (function(AIRTIME){
mod.updateCalendarStatusIcon = function(json) { mod.updateCalendarStatusIcon = function(json) {
if (window.location.pathname.toLowerCase() != "/schedule") {
if (window.location.pathname.toLowerCase() != baseUrl+"/schedule") {
return; return;
} }
var instance_id = json.schedule[0].instance; var instance_id = json.schedule[0].instance;
var lastElem = json.schedule[json.schedule.length-1]; var lastElem = json.schedule[json.schedule.length-1];