KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-08 20:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some html decoding errors and added animation to admin panel, fixes #34

Browse Source
This commit is contained in:
Nicolas A. Tonne
2014-10-24 15:41:14 +02:00
parent 21d7684346
commit 889c09c389
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/admin.js
View File

@@ -4,12 +4,11 @@ var pass_corr = "";
function admin() function admin()
{ {
adminTogg = !adminTogg; adminTogg = !adminTogg;
if(!adminTogg){
$("#playlist").height($("#playlist").height()+$("#adminPanel").outerHeight(true)); if(adminTogg) $("#playlist").height($("#playlist").height()-210); //opening
$("#passbox").focus(); if(!adminTogg)setTimeout(function(){$("#playlist").height($("#playlist").height()+210);},501); //closing
}
$("#adminPanel").toggleClass("hiddenAdmin"); $("#adminPanel").toggleClass("hiddenAdmin");
if(adminTogg) $("#playlist").height($("#playlist").height()-$("#adminPanel").outerHeight(true));
} }

2
js/list.js
View File

@@ -34,7 +34,7 @@ function updateList()
$.each(list["songs"], function(j, listeID){ $.each(list["songs"], function(j, listeID){
var video_title=listeID["title"].replace(/\\\'/g, "'").replace(/\\\"/g,"'");; var video_title=listeID["title"].replace(/\\\'/g, "'").replace(/"/g,"'").replace(/&/g,"&");
var video_id = listeID["id"]; var video_id = listeID["id"];
var video_thumb = "http://i.ytimg.com/vi/"+video_id+"/default.jpg"; var video_thumb = "http://i.ytimg.com/vi/"+video_id+"/default.jpg";
var odd = ""; if(j%2==0)odd=" oddlist"; var odd = ""; if(j%2==0)odd=" oddlist";

2
js/youtube.js
View File

@@ -273,7 +273,7 @@ function getTitle()
success: function(data) { success: function(data) {
viewers = $.parseJSON(data); viewers = $.parseJSON(data);
var outPutWord = viewers[5].length > 1 ? "viewers" : "viewer"; var outPutWord = viewers[5].length > 1 ? "viewers" : "viewer";
var title= viewers[4].replace(/\\\'/g, "'").replace(/"/g,"'"); var title= viewers[4].replace(/\\\'/g, "'").replace(/"/g,"'").replace(/&/g,"&");
document.title = title + " • Zöff"; document.title = title + " • Zöff";
document.getElementsByName('v')[0].placeholder = title + " • " + viewers[5].length + " " + outPutWord; document.getElementsByName('v')[0].placeholder = title + " • " + viewers[5].length + " " + outPutWord;
} }

2
static/style.css
View File

@@ -78,7 +78,7 @@ input[type="radio"]{display: none;}
.toggtext{display: inline;} .toggtext{display: inline;}
.adminBox{float:right;} .adminBox{float:right;}
#adminPanel{color:white; height:190px; padding: 10px; overflow:hidden; background-color: rgba(0,0,0,0.2);} #adminPanel{color:white; height:190px; padding: 10px; overflow:hidden; background-color: rgba(0,0,0,0.2); transition: height 0.5s;}
.hiddenAdmin{padding:0 !important; margin:0 !important; height: 0 !important;} .hiddenAdmin{padding:0 !important; margin:0 !important; height: 0 !important;}
.button{background-color: rgba(255,255,255,0.2); border-radius: 4px; border: none;color: white;padding: 5px 15px; margin-top: 15px; transition: all 0.1s ease-in-out;} .button{background-color: rgba(255,255,255,0.2); border-radius: 4px; border: none;color: white;padding: 5px 15px; margin-top: 15px; transition: all 0.1s ease-in-out;}
.button:hover{background-color: rgba(255,255,255,0.4); } .button:hover{background-color: rgba(255,255,255,0.4); }