merge backed and material

This commit is contained in:
Nicolas A. Tonne
2015-04-12 18:37:04 +02:00
1890 changed files with 322399 additions and 631 deletions

View File

@@ -1,6 +1,23 @@
var adminTogg = false;
var pass_corr = "";
socket.on("success_settings", function(msg)
{
pass_corr = "correct";
document.getElementById("sBar").innerHTML = msg;
$("#sBar").addClass("opacityFull");
document.getElementById("passbox").value = "";
remove_bar();
});
socket.on("error_settings", function(msg){
pass_corr = "wrong";
document.getElementById("eBar").innerHTML = "Error: " + msg;
$("#eBar").addClass("opacityFull");
document.getElementById("passbox").value = "";
remove_bar();
});
function admin()
{
adminTogg = !adminTogg;
@@ -37,33 +54,13 @@ function submitAdmin(form)
skipping = form.skip.value;
shuffling = form.shuffle.value;
confRes = $.ajax({
type: "POST",
url: "php/change.php",
async: false,
data: "conf=start&vote="+voting+"&addsongs="+addsongs+"&longsongs="+longsongs+"&frontpage="+frontpage+
"&allvideos="+allvideos+"&removeplay="+removeplay+"&pass="+adminpass+"&skip="+skipping+"&shuffling="+shuffling,
configs = [voting, addsongs, longsongs, frontpage, allvideos, removeplay, adminpass, skipping, shuffling];
success: function() {
console.log("configurations response: "+response);
}
}).responseText;
pass_corr = confRes;
socket.emit("conf", configs);
}
if(pass_corr=="correct"){
//$("#adminPanel").addClass("success");
document.getElementById("sBar").innerHTML = "Successfully applied settings.";
$("#sBar").addClass("opacityFull");
document.getElementById("passbox").value = "";
}else{
document.getElementById("eBar").innerHTML = "Error: Wrong Admin Password!";
$("#eBar").addClass("opacityFull");
document.getElementById("passbox").value = "";/*$("#adminPanel").addClass("fadeerror");*/
}
console.log(pass_corr);
updateList();
function remove_bar()
{
setTimeout(function(){
$("#adminPanel").removeClass("success");
$("#adminPanel").removeClass("fadeerror");
@@ -75,32 +72,5 @@ function submitAdmin(form)
function shuffle(form)
{
console.log(adminpass);
confRes = $.ajax({
type: "GET",
url: "php/change.php",
async: false,
data: "shuffle=true&pass="+adminpass,
success: function() {
console.log("configurations response: "+response);
}
}).responseText;
if(confRes == "shuffled")
{
document.getElementById("sBar").innerHTML = "Successfully shuffled playlist.";
$("#sBar").addClass("opacityFull");
updateList();
}else if(confRes = "wrong!"){
document.getElementById("eBar").innerHTML = "Error: Wrong Admin Password!";
$("#eBar").addClass("opacityFull");
}else if(confRes = "size"){
document.getElementById("eBar").innerHTML = "Error: Empty Playlist!";
$("#eBar").addClass("opacityFull");
}
setTimeout(function(){
$("#adminPanel").removeClass("success");
$("#adminPanel").removeClass("fadeerror");
$("#eBar").removeClass("opacityFull");
$("#sBar").removeClass("opacityFull");
},1500);
socket.emit('shuffle', adminpass);
}