Cleaned up ugly code and fixed error styles

This commit is contained in:
Nixo
2014-10-24 20:31:09 +02:00
parent 5eed75a320
commit b408ab66c2
3 changed files with 21 additions and 27 deletions

View File

@@ -15,11 +15,11 @@ function admin()
function submitAdmin(form) function submitAdmin(form)
{ {
voting = form.vote.value, voting = form.vote.value,
addSongs = form.addSongs.value, addsongs = form.addsongs.value,
longSongs = form.longSongs.value, longsongs = form.longsongs.value,
frontpage = form.frontPage.value, frontpage = form.frontpage.value,
allvideos = form.allvideos.value, allvideos = form.allvideos.value,
removePlay = form.removePlay.value, removeplay = form.removeplay.value,
adminpass = form.pass.value; adminpass = form.pass.value;
@@ -27,7 +27,7 @@ function submitAdmin(form)
type: "POST", type: "POST",
url: "php/change.php", url: "php/change.php",
async: false, async: false,
data: "conf=start&vote="+voting+"&addsongs="+addSongs+"&longsongs="+longSongs+"&frontpage="+frontpage+"&allvideos="+allvideos+"&removeplay="+removePlay+"&pass="+adminpass, data: "conf=start&vote="+voting+"&addsongs="+addsongs+"&longsongs="+longsongs+"&frontpage="+frontpage+"&allvideos="+allvideos+"&removeplay="+removeplay+"&pass="+adminpass,
success: function() { success: function() {
console.log("configurations response: "+response); console.log("configurations response: "+response);

View File

@@ -79,18 +79,12 @@ function updateList()
} }
if(!adminTogg) if(!adminTogg)
{ {
document.getElementsByName("vote")[0].checked = (conf["vote"] === "true"); names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay"];
document.getElementsByName("vote")[1].checked = (conf["vote"] === "false"); for (var i = 0; i < names.length; i++) {
document.getElementsByName("addSongs")[0].checked = (conf["addsongs"] === "true"); document.getElementsByName(names[i])[0].checked = (conf[names[i]] === "true");
document.getElementsByName("addSongs")[1].checked = (conf["addsongs"] === "false"); document.getElementsByName(names[i])[1].checked = (conf[names[i]] === "false");
document.getElementsByName("longSongs")[0].checked = (conf["longsongs"] === "true"); };
document.getElementsByName("longSongs")[1].checked = (conf["longsongs"] === "false");
document.getElementsByName("frontPage")[0].checked = (conf["frontpage"] === "true");
document.getElementsByName("frontPage")[1].checked = (conf["frontpage"] === "false");
document.getElementsByName("allvideos")[0].checked = (conf["allvideos"] === "true");
document.getElementsByName("allvideos")[1].checked = (conf["allvideos"] === "false");
document.getElementsByName("removePlay")[0].checked = (conf["removeplay"] === "true");
document.getElementsByName("removePlay")[1].checked = (conf["removeplay"] === "false");
} }
}, 2500); }, 2500);
} }
@@ -105,13 +99,13 @@ function vote(id, vote){
success: function() { success: function() {
console.log("voted "+vote+" on "+id); console.log("voted "+vote+" on "+id);
if(vote=="pos"){ $("#playlist").addClass("success");} if(vote=="pos"){ $("#playlist").addClass("success");}
else{ $("#playlist").addClass("error");} else{ $("#playlist").addClass("fadeerror");}
updateList(); updateList();
}, },
}).responseText); }).responseText);
setTimeout(function(){ setTimeout(function(){
$("#playlist").removeClass("success"); $("#playlist").removeClass("success");
$("#playlist").removeClass("error"); $("#playlist").removeClass("fadeerror");
},1500); },1500);
} }

View File

@@ -3,8 +3,8 @@
<form id="adminForm" onsubmit="return false" name="ufo" action="" class="daform nomargin" id="base"> <form id="adminForm" onsubmit="return false" name="ufo" action="" class="daform nomargin" id="base">
<div class="toggles"> <div class="toggles">
<div class="toggler"> <div class="toggler">
<label><input type="radio" class="radio"name="frontPage" value="true"><span>Display</span></label> / <label><input type="radio" class="radio"name="frontpage" value="true"><span>Display</span></label> /
<label><input type="radio" class="radio"name="frontPage" value="false"><span>Hide</span></label> <label><input type="radio" class="radio"name="frontpage" value="false"><span>Hide</span></label>
</div> </div>
<div class="toggler"> <div class="toggler">
@@ -13,13 +13,13 @@
</div> </div>
<div class="toggler"> <div class="toggler">
<label><input type="radio" class="radio"name="addSongs" value="true"><span>Admin</span></label> / <label><input type="radio" class="radio"name="addsongs" value="true"><span>Admin</span></label> /
<label><input type="radio" class="radio"name="addSongs" value="false"><span>Anyone</span></label> <label><input type="radio" class="radio"name="addsongs" value="false"><span>Anyone</span></label>
</div> </div>
<div class="toggler"> <div class="toggler">
<label><input type="radio" class="radio"name="longSongs" value="true"><span>Allow</span></label> / <label><input type="radio" class="radio"name="longsongs" value="true"><span>Allow</span></label> /
<label><input type="radio" class="radio"name="longSongs" value="false"><span>Block</span></label> <label><input type="radio" class="radio"name="longsongs" value="false"><span>Block</span></label>
</div> </div>
<div class="toggler"> <div class="toggler">
@@ -28,8 +28,8 @@
</div> </div>
<div class="toggler"> <div class="toggler">
<label><input type="radio" class="radio"name="removePlay" value="true"><span>Remove</span></label> / <label><input type="radio" class="radio"name="removeplay" value="true"><span>Remove</span></label> /
<label><input type="radio" class="radio"name="removePlay" value="false"><span>Keep</span></label> <label><input type="radio" class="radio"name="removeplay" value="false"><span>Keep</span></label>
</div> </div>
</div> </div>