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

This commit is contained in:
Paul Baranowski 2012-05-15 17:13:20 -04:00
commit c5b1e23486
31 changed files with 153 additions and 55 deletions

View file

@ -46,7 +46,7 @@ function confirmCancelShow(show_instance_id){
}
function confirmCancelRecordedShow(show_instance_id){
if (confirm('Erase current show and stop recording?')) {
if (confirm('Stop recording current show?')) {
var url = "/Schedule/cancel-current-show";
$.ajax({
url: url,

View file

@ -849,7 +849,7 @@ var AIRTIME = (function(AIRTIME){
data = $tr.data("aData");
if (data.record === true) {
msg = 'Erase current show and stop recording?';
msg = 'Stop recording current show?';
}
if (confirm(msg)) {