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:
denise 2012-05-30 14:12:28 -04:00
parent 33e97e7b40 4fec2d3982
commit b76d602561
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/views/scripts/dashboard/about.phtml
View File

@ -2,7 +2,7 @@
<h2>About</h2>
<p>
<a href="http://airtime.sourcefabric.org" target="_blank">Airtime</a> <?php echo $this->airtime_version ?>, the open radio software for scheduling and remote station management.<br>
© 2011 <a href="http://www.sourcefabric.org" target="_blank">Sourcefabric</a> o.p.s 2011. Airtime is distributed under the <a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html" target="_blank">GNU GPL v.3</a>
© 2012 <a href="http://www.sourcefabric.org" target="_blank">Sourcefabric</a> o.p.s. Airtime is distributed under the <a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html" target="_blank">GNU GPL v.3</a>
</p>
</div>
<br>

3
airtime_mvc/public/js/airtime/dashboard/dashboard.js
View File

@ -276,7 +276,7 @@ function parseSourceStatus(obj){
function parseSwitchStatus(obj){
if(obj.live_dj_source == "on" && obj.master_dj_source == "off"){
if(obj.live_dj_source == "on"){
live_dj_on_air = true;
}else{
live_dj_on_air = false;
@ -398,7 +398,6 @@ function setSwitchListener(ele){
var sourcename = $(ele).attr('id');
var status_span = $(ele).find("span");
var status = status_span.html();
$.get("/Dashboard/switch-source/format/json/sourcename/"+sourcename+"/status/"+status, function(data){
if(data.error){
alert(data.error);

2
airtime_mvc/public/js/airtime/showbuilder/builder.js
View File

@ -862,7 +862,7 @@ var AIRTIME = (function(AIRTIME){
elements.remove();
*/
var elements = $sbTable.find('tr input:checked').parents('tr');
var elements = $sbTable.find('tr input:checked').parents('tr').not("."+NOW_PLAYING_CLASS);
elements.hide();
}