Merge branch 'dev' of github.com:nixolas1/Zoff into dev

static/css/style.css

@@ -162,6 +162,7 @@ hide mdi-action-visibility mdi-action-visibility-off
 {
     transition: background-color .2s;
     min-width: 64px;
+    float:right;
 }
 .nav-btn:hover{background-color:rgba(0,0,0,0.5);}
 .hover-text{display:none;}
@@ -226,3 +227,7 @@ hide mdi-action-visibility mdi-action-visibility-off
 .switch label {
   color:#848484;
 }
+
+.collapsible-body ul li.white-bg{
+  background-color:white !important;
+}

static/js/admin.js

@@ -1,6 +1,7 @@
 var adminTogg = false;
 var pass_corr = "";
 
+
 socket.on("toast", function(msg)
 {
 	pass_corr = "correct";
@@ -11,26 +12,51 @@ socket.on("toast", function(msg)
 	remove_bar();*/
 });
 
+socket.on("pw", function(msg)
+{
+	w_p = false;
+	adminpass = msg;
+	names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay", "skip", "shuffle"];
+	for (var i = 0; i < names.length; i++) {
+			$("input[name="+names[i]+"]").attr("disabled", false);
+	}
+});
+
+socket.on(chan.toLowerCase()+",conf", function(msg)
+{
+	populate_list(msg, true);
+});
+
+$('input[class=conf]').change(function()
+{
+		save();
+});
+
+function pass_save()
+{
+	socket.emit('password', document.getElementById("password").value);
+}
 
 //function used in html onlick
 function save(){
-	submitAdmin($("#adminForm"));
+	submitAdmin(document.getElementById("adminForm").elements);
 }
 
 function submitAdmin(form)
 {
-	voting = form.vote.value;
-	addsongs = form.addsongs.value;
-	longsongs = form.longsongs.value;
-	frontpage = form.frontpage.value;
-	allvideos = form.allvideos.value;
-	removeplay = form.removeplay.value;
-	adminpass = form.pass.value;
-	skipping = form.skip.value;
-	shuffling = form.shuffle.value;
+	console.log(form);
+	voting = form.vote.checked;
+	addsongs = form.addsongs.checked;
+	longsongs = form.longsongs.checked;
+	frontpage = form.frontpage.checked;
+	allvideos = form.allvideos.checked;
+	removeplay = form.removeplay.checked;
+	//adminpass = document.getElementById("password").value;
+	skipping = form.skip.checked;
+	shuffling = form.shuffle.checked;
 
 	configs = [voting, addsongs, longsongs, frontpage, allvideos, removeplay, adminpass, skipping, shuffling];
-	alert(configs)
+	console.log(configs);
 	socket.emit("conf", configs);
 }
 

static/js/list.js

@@ -7,9 +7,10 @@ var showToggle =true;
 var chan = $("#chan").html();
 var list_html = $("#list-song-html").html();
 var hasadmin=0;
+var w_p = true;
 
 socket.on(guid, function(msg){
-	populate_list(msg);
+	populate_list(msg, false);
 });
 
 socket.on("abc", function(){
@@ -17,7 +18,7 @@ socket.on("abc", function(){
 });
 
 socket.on(chan.toLowerCase(), function(msg){
-	populate_list(msg);
+	populate_list(msg, false);
 });
 
 socket.on("skipping", function(obj)
@@ -29,28 +30,34 @@ socket.on("skipping", function(obj)
 	},1500);
 });
 
-function populate_list(msg)
+function populate_list(msg, conf_only)
 {
 	console.log(msg);
-
-	$("#wrapper").empty();
+	console.log(conf_only);
+	if(!conf_only)
+		$("#wrapper").empty();
 
 		$.each(msg, function(j, listeID){
 			if(listeID.hasOwnProperty('startTime')) //check if its config part of list
 			{
 				console.log("startTime");
-				console.log(listeID.addsongs);
 				if(!adminTogg)
 				{
+					if(listeID['adminpass'] == "" || w_p == false) hasadmin = false;
+					else hasadmin = true;
+					music = listeID["allvideos"];
+					longsongs = listeID["longsongs"];
 					names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay", "skip", "shuffle"];
 					for (var i = 0; i < names.length; i++) {
-						document.getElementsByName(names[i])[0].checked = (listeID[names[i]] === 'true');
+						document.getElementsByName(names[i])[0].checked = (listeID[names[i]] === true);
+						if(hasadmin)
+							$("input[name="+names[i]+"]").attr("disabled", true);
 					}
 
-					if(hasadmin)
+					/*if(hasadmin)
 						$("#setpass").text("Channel has admin");
 					else
-						$("#setpass").text("Channel has no admin");
+						$("#setpass").text("Channel has no admin");*/
 				}
 			}else if(!listeID.now_playing){ //check that the song isnt playing
 

static/js/search.js

@@ -120,7 +120,7 @@ function search(search_input){
 		if(search_input !== ""){
 			var keyword= encodeURIComponent(search_input);
 
-			var yt_url='http://gdata.youtube.com/feeds/api/videos?q='+keyword+'&format=5&orderby=relevance&max-results=6&v=2&alt=jsonc';
+			var yt_url='http://gdata.youtube.com/feeds/api/videos?q='+keyword+'&format=5&orderby=relevance&max-results=30&v=2&alt=jsonc';
 
 			$.ajax({
 				type: "GET",
@@ -131,10 +131,11 @@ function search(search_input){
 					if(response.data.items)
 					{
 						var wrapper = "";
+						z = 0;
 						$.each(response.data.items, function(i,data)
 						{
-							if(data.duration > 720 && longS === 0){return;}
-							if(data.category == "Music" || music == 1){
+							if(data.duration > 720 && longsongs == true){return;}
+							if(data.category == "Music" || music == false){
 								var video_title=encodeURIComponent(data.title).replace(/'/g, "\\\'");
 								var views=data.viewCount;
 								var video_thumb = "http://i.ytimg.com/vi/"+data.id+"/default.jpg";
@@ -147,11 +148,12 @@ function search(search_input){
 										</div>\
 								</div>";
 								//<input id='add' title='Add several songs' type='button' class='button' value='+' onclick=\"submit('"+data.id+"','"+video_title+"', false);\">\
-
 								//+data.uploader+" • "+
 								//$("#results").append(finalhtml);
 								wrapper += finalhtml;
+								z++;
 							}
+							return (z !== 6);
 						});
 						//console.log(wrapper);
 						//$("#results").append(wrapper).show("slow");

static/js/youtube.js

@@ -83,7 +83,7 @@ $(document).ready(function()
       closeOnClick: false // Closes side-nav on <a> clicks, useful for Angular/Meteor
     });
 	$('#settings-close').sideNav('hide');
-	
+
 	colorThief = new ColorThief();
 	window.mobilecheck = function() {
 	var check = false;
@@ -181,7 +181,7 @@ function onPlayerStateChange(newState) {
 function getTitle(titt, v)
 {
 	var outPutWord = v > 1 ? "viewers" : "viewer";
-	var title= titt.replace(/\\\'/g, "'").replace(/&quot;/g,"'").replace(/&amp;/g,"&");
+	var title= decodeURIComponent(titt);
 	document.title = title + " • Zöff";
 	if(!window.mobilecheck()){
 		document.getElementById('search').placeholder = title + " • " + v + " " + outPutWord;