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

Merge branch 'master' of github.com:nixolas1/zoff

Browse Source
This commit is contained in:
Nicolas A. Tonne
2014-10-21 14:47:39 +02:00
parent d0c5f92ac7 cc1d5965ef
commit d0a4f602f4
4 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
js/admin.js
View File

@@ -2,7 +2,10 @@ var adminTogg;
function admin() function admin()
{ {
adminTogg = !adminTogg;
if(!adminTogg) $("#playlist").height($("#playlist").height()+$("#adminPanel").outerHeight(true));
$("#adminPanel").toggleClass("hiddenAdmin"); $("#adminPanel").toggleClass("hiddenAdmin");
if(adminTogg) $("#playlist").height($("#playlist").height()-$("#adminPanel").outerHeight(true));
} }

1
js/search.js
View File

@@ -95,6 +95,7 @@ $(document).ready(function()
$("#search").removeClass("success"); $("#search").removeClass("success");
$("#search").removeClass("error"); $("#search").removeClass("error");
},1500); },1500);
updateList();
} }
// if(reply=="added"){$("#search").removeClass('success'); $("#search").addClass('success');} // if(reply=="added"){$("#search").removeClass('success'); $("#search").addClass('success');}

5
php/change.php
View File

@@ -155,7 +155,12 @@ else if(isset($_GET['skip'])){ //skip song request
//$data["conf"]["skips"]=$skips; //$data["conf"]["skips"]=$skips;
if($skips>=$viewers/2){ if($skips>=$viewers/2){
array_shift($data["songs"]); array_shift($data["songs"]);
$q = $data["conf"];
$q = array_key_exists("delsongs", $q);
if(!$data["conf"]["delsongs"] || $q != 1)
{
$data["songs"][$np[0]["id"]] = array("id" => $np[0]["id"], "title" => $np[0]["title"], "votes" => $np[0]["votes"], "added" => time(), "guids" => array()); $data["songs"][$np[0]["id"]] = array("id" => $np[0]["id"], "title" => $np[0]["title"], "votes" => $np[0]["votes"], "added" => time(), "guids" => array());
}
array_shift($data["nowPlaying"]); array_shift($data["nowPlaying"]);
$data["nowPlaying"][$firstSong[0]["id"]] = array("id" => $firstSong[0]["id"], "title" => $firstSong[0]["title"], "votes" => 0, "added" => $firstSong[0]["added"], "guids" => $firstSong[0]["guids"]); $data["nowPlaying"][$firstSong[0]["id"]] = array("id" => $firstSong[0]["id"], "title" => $firstSong[0]["title"], "votes" => 0, "added" => $firstSong[0]["added"], "guids" => $firstSong[0]["guids"]);
//array_push($data["songs"], $add); //array_push($data["songs"], $add);

6
php/panel.php
View File

@@ -2,11 +2,11 @@
<br> <br>
<form id="adminForm" name="ufo" action="" class="daform nomargin" id="base"> <form id="adminForm" name="ufo" action="" class="daform nomargin" id="base">
<label>Anyone can vote <input type="checkbox" name="vote" value="1"></input></label> <label>Only admin can vote <input type="checkbox" name="vote" value="1"></input></label>
<label>Anyone can add songs <input type="checkbox" name="addSongs" value="1"></input></label> <label>Only admin can add songs <input type="checkbox" name="addSongs" value="1"></input></label>
<label>Allow long songs <input type="checkbox" name="longSongs" value="1"></input></label> <label>Allow long songs <input type="checkbox" name="longSongs" value="1"></input></label>
<label>Show playlist on frontpage <input type="checkbox" name="frontPage" value="1"></input></label> <label>Show playlist on frontpage <input type="checkbox" name="frontPage" value="1"></input></label>
<label>Allow only music <input type="checkbox" name="onlyMusic" value="1"></input></label> <label>Only music <input type="checkbox" name="onlyMusic" value="1"></input></label>
<label>Remove song after playing <input type="checkbox" name="removePlay" value="1"></input></label> <label>Remove song after playing <input type="checkbox" name="removePlay" value="1"></input></label>
<input type="button" class="button" value="Save Settings" onclick="submitAdmin(this.form)"> <input type="button" class="button" value="Save Settings" onclick="submitAdmin(this.form)">