diff --git a/airtime_mvc/application/views/scripts/dashboard/about.phtml b/airtime_mvc/application/views/scripts/dashboard/about.phtml index ea94623d6..b2ce0cb38 100644 --- a/airtime_mvc/application/views/scripts/dashboard/about.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/about.phtml @@ -2,7 +2,7 @@

About

Airtime airtime_version ?>, the open radio software for scheduling and remote station management.
-© 2011 Sourcefabric o.p.s 2011. Airtime is distributed under the GNU GPL v.3 +© 2012 Sourcefabric o.p.s. Airtime is distributed under the GNU GPL v.3


diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 635444259..ed31730be 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -2418,7 +2418,7 @@ tfoot tr th { width:142px; height:38px; display:block; - position:absolute; + position:fixed; left:20px; bottom:10px; background-color:#222; diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js index 5e3fdca72..4f2293514 100644 --- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js +++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js @@ -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); diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 10110aa78..a34814822 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -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(); }