Moved scripts and made toast messages client side

lists/.gitignore

@@ -1,5 +0,0 @@
-# Ignore all
-*
-
-# Not this file
-!.gitignore

php/nochan.php

@@ -20,8 +20,8 @@ if(isset($_GET['chan'])){
                 <a href="zoff.no" class="brand-logo hide-on-med-and-up">Zöff</a>
                 <ul id="nav-mobile" class="right hide-on-med-and-down">
                     <li><a class="modal-trigger" onclick="$('#about').openModal()">About</a></li>
-                    <li><a href="https://github.com/nixolas1/Zoff">GitHub</a></li>
                     <li><a class="modal-trigger" onclick="$('#legal').openModal()">Legal</a></li>
+                    <li><a href="https://github.com/nixolas1/Zoff">GitHub</a></li>
                 </ul>
             </div>
         </nav>

server/server.js

@@ -138,7 +138,7 @@ io.on('connection', function(socket){
           }
         });
       }else
-        socket.emit("toast", "Password Protected List!");
+        socket.emit("toast", "listhaspass");
     });
   });
 
@@ -157,7 +157,7 @@ io.on('connection', function(socket){
         {
           vote(coll, id, guid, socket);
         }else{
-          socket.emit("toast", "Password Protected List!");
+          socket.emit("toast", "listhaspass");
         }
       });
     }
@@ -190,10 +190,10 @@ io.on('connection', function(socket){
             socket.emit("toast", (Math.ceil(lists[coll].length/2) - docs[0]["skips"].length-1) + " more are needed to skip!");
   				});
   			}else{
-          socket.emit("toast", "You've already voted to skip!");
+          socket.emit("toast", "alreadyskip");
         }
   		}else
-        socket.emit("toast", "No Skipping!");
+        socket.emit("toast", "noskip");
   	});
   });
 
@@ -230,14 +230,14 @@ io.on('connection', function(socket){
             db.collection(coll).find({views:{$exists:true}}, function(err, docs)
             {
               io.sockets.emit(coll+",conf", docs);
-              socket.emit("toast", "Successfully applied settings!");
+              socket.emit("toast", "savedsettings");
             });
             //sort_list(coll,undefined,false);
           });
 
       }else
       {
-        socket.emit("toast", "Wrong Password!");
+        socket.emit("toast", "wrongpass");
       }
     });
   });
@@ -255,12 +255,12 @@ io.on('connection', function(socket){
             num = Math.floor(Math.random()*1000000);
             db.collection(coll).update({id:docs["id"]}, {$set:{added:num}}, function(err, d)
             {
-              socket.emit("toast", "Shuffled Playlist!");
+              socket.emit("toast", "shuffled");
             });
           }
         });
       }else
-        socket.emit("toast", "Wrong Password!");
+        socket.emit("toast", "wrongpass");
     });
   });
 
@@ -290,7 +290,7 @@ function del(params, socket)
     if(docs[0]["adminpass"] == hash_pass(params[4]))
     {
       db.collection(coll).remove({id:params[1]}, function(err, docs){
-        socket.emit("toast", "Deleted song!");
+        socket.emit("toast", "deletesong");
         sort_list(coll, undefined, false);
       })
     }
@@ -311,14 +311,14 @@ function vote(coll, id, guid, socket)
   		{
   			db.collection(coll).update({id:id}, {$push :{guids: guid}}, function(err, docs)
   			{
-          socket.emit("toast", "Voted on song!");
+          socket.emit("toast", "voted");
           sort_list(coll, undefined, false);
   			});
   			//sort_list(coll, undefined, false);
   		});
 		}else
     {
-      socket.emit("toast", "You've already voted on that song!");
+      socket.emit("toast", "alreadyvoted");
     }
 	});
 }

static/css/style.css

@@ -56,6 +56,9 @@ nav .brand-logo{
   background-color:rgba(45,45,45,1);
 }
 
+.footer-copyright a { color: #fff;}
+.footer-copyright a:hover{color:#6699FF}
+
 main {
     flex: 1 0 auto;
 }
@@ -167,9 +170,7 @@ hide mdi-action-visibility mdi-action-visibility-off
 }
 
 .chan{
-    opacity: 0.9;
     text-shadow: 4px 4px 9px rgba(0, 0, 0, 0.42);
-
 }
 
 .nav-btn
@@ -206,8 +207,9 @@ hide mdi-action-visibility mdi-action-visibility-off
 #result{height:100px;margin-left:40px;}
 #results{margin-top:-12px;background-color: rgba(0,0,0,0.6);}
 .result:hover {
-  background-color: rgba(0,0,0,0.4);}
-  .result {
+  background-color: rgba(0,0,0,0.4);
+ }
+.result {
   border-bottom: solid 1px #E5E5E5;
   text-align: left;
   height: 70px;
@@ -240,6 +242,10 @@ hide mdi-action-visibility mdi-action-visibility-off
 .switch label input[type=checkbox]:checked + .lever:after {
    background-color: white;
 }
+.switch input[type=checkbox][disabled] + .lever {
+  cursor: default;
+  background-color: #939393;
+}
 
 .switch label {
   color:#848484;

static/js/admin.js

@@ -5,11 +5,36 @@ var pass_corr = "";
 socket.on("toast", function(msg)
 {
 	pass_corr = "correct";
+	switch(msg) {
+	    case "savedsettings":
+	        msg="Saved settings"
+	        break;
+	    case "wrongpass":
+	        msg="Wrong password"
+	        break;
+		case "shuffled":
+	        msg="Shuffled playlist"
+	        break;
+		case "deletesong":
+	        msg="Deleted song"
+	        break;
+		case "vote":
+			msg="Voted on song"
+			break;
+		case "alreadyvoted":
+	        msg="You have already voted on that song"
+	        break;
+		case "listhaspass":
+			msg="The list is passwordprotected"
+			break;
+		case "noskip":
+			msg="Only admin can skip songs on this channel"
+			break;
+		case "alreadyskip":
+			msg="You've already voted to skip!"
+			break;
+	}
 	Materialize.toast(msg, 4000);
-	/*document.getElementById("sBar").innerHTML = msg;
-	$("#sBar").addClass("opacityFull");
-	document.getElementById("passbox").value = "";
-	remove_bar();*/
 });
 
 socket.on("pw", function(msg)
@@ -22,7 +47,7 @@ socket.on("pw", function(msg)
 	}
 	$(".card-action").removeClass("hide");
 	localStorage.setItem("passord_i_klartekst_lol", msg);
-	Materialize.toast("Correct Password!", 4000);
+	Materialize.toast("Correct Password. You are now admin", 4000);
 });
 
 socket.on(chan.toLowerCase()+",conf", function(msg)