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

Merge branch '2.5.x' into 2.5.x-installer

Browse source 
Conflicts:
	airtime_mvc/public/index.php
This commit is contained in:
Albert Santoni 2015-06-16 10:37:06 -04:00
commit 8c9981a155
46 changed files with 5024 additions and 996 deletions
Download patch file Download diff file Expand all files Collapse all files

16
airtime_mvc/public/js/airtime/common/common.js
View file

@ -1,11 +1,11 @@
$(document).ready(function() {
$("#Panel").stickyPanel({
topPadding: 1,
afterDetachCSSClass: "floated-panel",
savePanelSpace: true
});
/* Removed as this is now (hopefully) unnecessary */
//$("#Panel").stickyPanel({
// topPadding: 1,
// afterDetachCSSClass: "floated-panel",
// savePanelSpace: true
//});
//this statement tells the browser to fade out any success message after 5 seconds
setTimeout(function(){$(".success").fadeOut("slow", function(){$(this).empty()});}, 5000);
@ -52,8 +52,8 @@ var i18n_days_short = [
$.i18n._("We"),
$.i18n._("Th"),
$.i18n._("Fr"),
$.i18n._("Sa"),
]
$.i18n._("Sa")
];
function adjustDateToServerDate(date, serverTimezoneOffset){
//date object stores time in the browser's localtime. We need to artificially shift

11
airtime_mvc/public/js/airtime/library/library.js
View file

@ -316,15 +316,24 @@ var AIRTIME = (function(AIRTIME) {
};
mod.fnDeleteItems = function(aMedia) {
//Prevent the user from spamming the delete button while the AJAX request is in progress
AIRTIME.button.disableButton("btn-group #sb-trash", false);
//Hack to immediately show the "Processing" div in DataTables to give the user some sort of feedback.
$(".dataTables_processing").css('visibility','visible');
$.post(baseUrl+"library/delete",
{"format": "json", "media": aMedia},
function(json){
if (json.message !== undefined) {
alert(json.message);
}
chosenItems = {};
oTable.fnStandingRedraw();
//Re-enable the delete button
AIRTIME.button.enableButton("btn-group #sb-trash", false);
});
};

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

@ -96,6 +96,11 @@ function setSoundCloudCheckBoxListener() {
});
}
function removeLogo() {
$.post(baseUrl+'Preference/remove-logo', function(json){});
location.reload();
}
$(document).ready(function() {
$('.collapsible-header').live('click',function() {
@ -103,7 +108,8 @@ $(document).ready(function() {
$(this).toggleClass("closed");
return false;
}).next().hide();
/* No longer using AJAX for this form. Zend + our code makes it needlessly hard to deal with. -- Albert
$('#pref_save').live('click', function() {
var data = $('#pref_form').serialize();
var url = baseUrl+'Preference/index';
@ -116,7 +122,7 @@ $(document).ready(function() {
setConfigureMailServerListener();
setEnableSystemEmailsListener();
});
});
});*/
showErrorSections();