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

Merge saas-dev into soundcloud

Browse source
This commit is contained in:
Duncan Sommerville 2015-06-10 16:08:52 -04:00
commit 459f9494c3
373 changed files with 6577 additions and 10376 deletions
Download patch file Download diff file Expand all files Collapse all files

17
airtime_mvc/public/js/airtime/preferences/preferences.js
View file

@ -132,22 +132,6 @@ function setCollapsibleWidgetJsCode() {
$('#thirdPartyApi-element input').click(x);
}
//function setSoundCloudCheckBoxListener() {
// var subCheckBox= $("#UseSoundCloud,#SoundCloudDownloadbleOption");
// var mainCheckBox= $("#UploadToSoundcloudOption");
// subCheckBox.change(function(e){
// if (subCheckBox.is(':checked')) {
// mainCheckBox.attr("checked", true);
// }
// });
//
// mainCheckBox.change(function(e){
// if (!mainCheckBox.is(':checked')) {
// $("#UseSoundCloud,#SoundCloudDownloadbleOption").attr("checked", false);
// }
// });
//}
function removeLogo() {
$.post(baseUrl+'Preference/remove-logo', function(json){});
location.reload();
@ -190,7 +174,6 @@ $(document).ready(function() {
showErrorSections();
//setSoundCloudCheckBoxListener();
setMailServerInputReadonly();
setSystemFromEmailReadonly();
setConfigureMailServerListener();

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

@ -194,31 +194,6 @@ function eventRender(event, element, view) {
$(element).find(".fc-event-content").append(div);
}
//add the record/rebroadcast/soundcloud icons if needed
//if (event.record === 1) {
// if (view.name === 'agendaDay' || view.name === 'agendaWeek') {
// if (event.soundcloud_id === -1) {
// $(element).find(".fc-event-time").before('<span class="small-icon recording"></span>');
// } else if ( event.soundcloud_id > 0) {
// $(element).find(".fc-event-time").before('<span class="small-icon recording"></span><span class="small-icon soundcloud"></span>');
// } else if (event.soundcloud_id === -2) {
// $(element).find(".fc-event-time").before('<span class="small-icon recording"></span><span class="small-icon progress"></span>');
// } else if (event.soundcloud_id === -3) {
// $(element).find(".fc-event-time").before('<span class="small-icon recording"></span><span class="small-icon sc-error"></span>');
// }
// } else if (view.name === 'month') {
// if(event.soundcloud_id === -1) {
// $(element).find(".fc-event-title").after('<span class="small-icon recording"></span>');
// } else if (event.soundcloud_id > 0) {
// $(element).find(".fc-event-title").after('<span class="small-icon recording"></span><span class="small-icon soundcloud"></span>');
// } else if (event.soundcloud_id === -2) {
// $(element).find(".fc-event-title").after('<span class="small-icon recording"></span><span class="small-icon progress"></span>');
// } else if (event.soundcloud_id === -3) {
// $(element).find(".fc-event-title").after('<span class="small-icon recording"></span><span class="small-icon sc-error"></span>');
// }
// }
//}
if (event.record === 0 && event.rebroadcast === 0) {
if (view.name === 'agendaDay' || view.name === 'agendaWeek') {

37
airtime_mvc/public/js/airtime/schedule/schedule.js
View file

@ -63,25 +63,6 @@ function confirmCancelRecordedShow(show_instance_id){
}
}
//function uploadToSoundCloud(show_instance_id, el){
//
// var url = baseUrl+"Schedule/upload-to-sound-cloud",
// $el = $(el),
// $span = $el.find(".soundcloud");
//
// $.post(url, {id: show_instance_id, format: "json"});
//
// //first upload to soundcloud.
// if ($span.length === 0){
// $span = $("<span/>", {"class": "progress"});
//
// $el.find(".fc-event-title").after($span);
// }
// else {
// $span.removeClass("soundcloud").addClass("progress");
// }
//}
function checkCalendarSCUploadStatus(){
var url = baseUrl+'Library/get-upload-to-soundcloud-status',
span,
@ -421,24 +402,6 @@ $(document).ready(function() {
oItems.content.callback = callback;
}
//define a soundcloud upload callback.
//if (oItems.soundcloud_upload !== undefined) {
//
// callback = function() {
// uploadToSoundCloud(data.id, this.context);
// };
// oItems.soundcloud_upload.callback = callback;
//}
//define a view on soundcloud callback.
//if (oItems.soundcloud_view !== undefined) {
//
// callback = function() {
// window.open(oItems.soundcloud_view.url);
// };
// oItems.soundcloud_view.callback = callback;
//}
//define a cancel recorded show callback.
if (oItems.cancel_recorded !== undefined) {