KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #129

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-07-21 16:23:32 +02:00
parent dff5f9dc7a
commit df34cc44bb
4 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
php/panel.php
View File

@@ -144,3 +144,9 @@
</li> </li>
</ul> </ul>
</li> </li>
<!--
<li class="no-padding">
<h5 id="desc-title">List description</h5>
<span id="description"></span>
</li>
-->

12
server/server.js
View File

@@ -186,7 +186,7 @@ io.on('connection', function(socket){
}else }else
{ {
db.createCollection(coll, function(err, docs){ db.createCollection(coll, function(err, docs){
db.collection(coll).insert({"addsongs":false, "adminpass":"", "allvideos":false, "frontpage":true, "longsongs":false, "removeplay": false, "shuffle": true, "skip": false, "skips": [], "startTime":get_time(), "views": [], "vote": false}, function(err, docs) db.collection(coll).insert({"addsongs":false, "adminpass":"", "allvideos":false, "frontpage":true, "longsongs":false, "removeplay": false, "shuffle": true, "skip": false, "skips": [], "startTime":get_time(), "views": [], "vote": false, "desc": ""}, function(err, docs)
{ {
send_list(coll, socket, true, false, true); send_list(coll, socket, true, false, true);
@@ -432,6 +432,8 @@ io.on('connection', function(socket){
var adminpass = params[6]; var adminpass = params[6];
var skipping = params[7]; var skipping = params[7];
var shuffling = params[8]; var shuffling = params[8];
var description = "";
if(params.length == 10) description = params[9];
if(adminpass != "") if(adminpass != "")
var hash = hash_pass(adminpass); var hash = hash_pass(adminpass);
@@ -450,7 +452,8 @@ io.on('connection', function(socket){
removeplay:removeplay, removeplay:removeplay,
shuffle:shuffling, shuffle:shuffling,
longsongs:longsongs, longsongs:longsongs,
adminpass:hash}}, function(err, docs){ adminpass:hash,
desc: description}}, function(err, docs){
db.collection(coll).find({views:{$exists:true}}, function(err, docs) db.collection(coll).find({views:{$exists:true}}, function(err, docs)
{ {
io.to(coll).emit("conf", docs); io.to(coll).emit("conf", docs);
@@ -692,7 +695,10 @@ function send_list(coll, socket, send, list_send, configs)
if(configs) if(configs)
{ {
db.collection(coll).find({views:{$exists:true}}, function(err, conf){ db.collection(coll).find({views:{$exists:true}}, function(err, conf){
if(conf[0].desc === undefined)
db.collection(coll).update({views:{$exists:true}}, {$set:{"desc":""}});
//db.collection(coll).update({views:{$exists:true}}, {$set:{"desc":""}}, function(err, d){console.log(d)});
io.to(coll).emit("conf", conf); io.to(coll).emit("conf", conf);
}); });
} }

6
static/css/style.css
View File

@@ -261,6 +261,10 @@ hide mdi-action-visibility mdi-action-visibility-off
/*------------------- Channel page ---------------------------------------------------------------------------- */ /*------------------- Channel page ---------------------------------------------------------------------------- */
#description, #desc-title{
color:#444;
}
#main-row{ #main-row{
margin-bottom:-64px; margin-bottom:-64px;
} }
@@ -496,7 +500,7 @@ ul #chat-log{
text-transform: none; text-transform: none;
text-rendering: auto; text-rendering: auto;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
content: "\e684";/*"\e800";*/ content: "\e686";/*"\e800";*/
color:white; color:white;
font-size:65px; font-size:65px;
position:absolute; position:absolute;

5
static/js/admin.js
View File

@@ -149,6 +149,11 @@ var Admin = {
$("#admin-lock").addClass("mdi-action-lock"); $("#admin-lock").addClass("mdi-action-lock");
$("#admin-lock").removeClass("mdi-action-lock-open clickable"); $("#admin-lock").removeClass("mdi-action-lock-open clickable");
} }
/*if(conf_array.desc !== undefined)
{
document.getElementById("description").innerHTML = conf_array.desc;
}*/
}, },
submitAdmin: function(form) submitAdmin: function(form)