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 error when logging out and in, and made the next/prev buttons more button'y

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-11-17 19:33:02 +01:00
parent 3629d82499
commit 2c4ca881be
6 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
static/css/style.css
View File

@@ -20,6 +20,12 @@
color:white !important; color:white !important;
} }
#pageNumber{
cursor: default;
color: white;
padding:0;
}
.prev_page, .next_page{ .prev_page, .next_page{
cursor: pointer; cursor: pointer;
} }
@@ -27,6 +33,19 @@
.prev_page_hide, .next_page_hide{ .prev_page_hide, .next_page_hide{
visibility: visible !important; visibility: visible !important;
color:gray; color:gray;
cursor:default;
}
#chatPlaylist, #suggestions{
height:calc(100vh - 48px - 64px) !important;
}
.prev_page_hide, .prev_page{
float:left;
}
.next_page_hide, .next_page{
float:right;
} }
.settings_embed:focus{ .settings_embed:focus{
@@ -249,7 +268,7 @@ body {
} }
.main, #main-row, .video-container, #playlist{ .main, #main-row, .video-container, #playlist{
height: calc(100vh - 64px); height: calc(100vh - 65px);
} }
footer{ footer{
@@ -1079,7 +1098,7 @@ ul #chat-log{
/*padding:0px 15px;*/ /*padding:0px 15px;*/
flex:1; flex:1;
position: relative; position: relative;
height: calc(100vh - 64px) !important; height: calc(100vh - 65px) !important;
/*background-color:rgba(0,0,0,0.2);*/ /*background-color:rgba(0,0,0,0.2);*/
} }
@@ -1258,7 +1277,7 @@ nav ul li:hover, nav ul li.active {
} }
.tabs_height{ .tabs_height{
height:calc(100vh - 48px - 64px - 22px) !important; height:calc(100vh - 48px - 64px - 36px) !important;
overflow:auto; overflow:auto;
} }
@@ -1361,7 +1380,7 @@ nav ul li:hover, nav ul li.active {
} }
#bottom-button{ #bottom-button{
bottom: 22px; bottom: 35px;
} }

2
static/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
static/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
static/js/admin.js
View File

@@ -154,16 +154,16 @@ var Admin = {
$(".playlist-tabs").removeClass("hide"); $(".playlist-tabs").removeClass("hide");
} }
if($(".card-action").length !== 0 && if($(".card-action").length !== 0 &&
!Helper.contains($(".card-action").attr("class").split(" "), "hide")){ !Helper.contains($(".card-action").attr("class").split(" "), "hide")){
$(".card-action").addClass("hide"); $(".card-action").addClass("hide");
} }
if($(".playlist-tabs-li a.active").attr("href") == "#suggestions") if($("ul.playlist-tabs-loggedIn .playlist-tab-links.active").attr("href") == "#suggestions")
{ {
$('ul.playlist-tabs').tabs('select_tab', 'wrapper'); $('ul.playlist-tabs').tabs('select_tab', 'wrapper');
$('ul.playlist-tabs-loggedIn').tabs('select_tab', 'wrapper'); $('ul.playlist-tabs-loggedIn').tabs('select_tab', 'wrapper');
$("#wrapper").removeClass("tabs_height"); //$("#wrapper").removeClass("tabs_height");
} else { } else {
$('ul.playlist-tabs').tabs('select_tab', $(".playlist-tabs-loggedIn li a.active").attr("href").substring(1)); $('ul.playlist-tabs').tabs('select_tab', $(".playlist-tabs-loggedIn li a.active").attr("href").substring(1));
} }

8
static/js/list.js
View File

@@ -80,11 +80,11 @@ var List = {
} }
}); });
if($("#wrapper").children().length > 20 && !$("#pageButtons").length){ if($("#wrapper").children().length > 20 && !$("#pageButtons").length){
$('<div id="pageButtons"><span class="prev_page_hide">< prev</span><a class="prev_page">< prev</a> <span id="pageNumber">1</span> <a class="next_page">next ></a><span class="next_page_hide">next ></span></div>').insertAfter("#wrapper"); $('<div id="pageButtons"><span class="prev_page_hide btn-flat">< prev</span><a class="prev_page waves-effect waves-light btn-flat">< prev</a> <span id="pageNumber" class="btn-flat">1</span> <a class="next_page waves-effect waves-light btn-flat">next ></a><span class="next_page_hide btn-flat">next ></span></div>').insertAfter("#wrapper");
$(".prev_page").toggleClass("hide"); $(".prev_page").toggleClass("hide");
$(".next_page_hide").css("display","none"); $(".next_page_hide").css("display","none");
} else if(!$("#pageButtons").length){ } else if(!$("#pageButtons").length){
$('<div id="pageButtons"><span class="prev_page_hide">< prev</span><a class="prev_page">< prev</a> <span id="pageNumber">1</span> <a class="next_page">next ></a><span class="next_page_hide">next ></span></div>').insertAfter("#wrapper"); $('<div id="pageButtons"><span class="prev_page_hide btn-flat">< prev</span><a class="prev_page waves-effect waves-light btn-flat">< prev</a> <span id="pageNumber" class="btn-flat">1</span> <a class="next_page waves-effect waves-light btn-flat">next ></a><span class="next_page_hide btn-flat">next ></span></div>').insertAfter("#wrapper");
$(".prev_page").toggleClass("hide"); $(".prev_page").toggleClass("hide");
$(".next_page").toggleClass("hide"); $(".next_page").toggleClass("hide");
$(".next_page_hide").css("display","inline-block"); $(".next_page_hide").css("display","inline-block");
@@ -104,7 +104,7 @@ var List = {
List.empty = true; List.empty = true;
$("#wrapper").append("<span id='empty-channel-message'>The playlist is empty.</span>"); $("#wrapper").append("<span id='empty-channel-message'>The playlist is empty.</span>");
if(!$("#pageButtons").length){ if(!$("#pageButtons").length){
$('<div id="pageButtons"><span class="prev_page_hide">< prev</span><a class="prev_page">< prev</a> <span id="pageNumber">1</span> <a class="next_page">next ></a><span class="next_page_hide">next ></span></div>').insertAfter("#wrapper"); $('<div id="pageButtons"><span class="prev_page_hide btn-flat">< prev</span><a class="prev_page waves-effect waves-light btn-flat">< prev</a> <span id="pageNumber" class="btn-flat">1</span> <a class="next_page waves-effect waves-light btn-flat">next ></a><span class="next_page_hide btn-flat">next ></span></div>').insertAfter("#wrapper");
$(".prev_page").toggleClass("hide"); $(".prev_page").toggleClass("hide");
$(".next_page").toggleClass("hide"); $(".next_page").toggleClass("hide");
$(".next_page_hide").css("display","inline-block"); $(".next_page_hide").css("display","inline-block");
@@ -324,7 +324,7 @@ var List = {
Helper.log("All videoes added!"); Helper.log("All videoes added!");
Helper.log("url: https://www.youtube.com/playlist?list=" + playlist_id); Helper.log("url: https://www.youtube.com/playlist?list=" + playlist_id);
$(".exported-list").append("<h5>Exported URL:</h5>"); $(".exported-list").append("<h5>Exported URL:</h5>");
$(".exported-list").append("<a target='_blank' class='btn orange exported-playlist' href='https://www.youtube.com/playlist?list=" + playlist_id + "'>" + chan + "</a>"); $(".exported-list").append("<a target='_blank' class='btn light exported-playlist' href='https://www.youtube.com/playlist?list=" + playlist_id + "'>" + chan + "</a>");
$("#playlist_loader_export").addClass("hide"); $("#playlist_loader_export").addClass("hide");
//$(".youtube_export_button").removeClass("hide"); //$(".youtube_export_button").removeClass("hide");
$(".exported-list-container").removeClass("hide"); $(".exported-list-container").removeClass("hide");

5
static/js/listeners.js
View File

@@ -166,7 +166,8 @@ function init(){
Crypt.set_width($(this).width()); Crypt.set_width($(this).width());
}, },
handles: "e", handles: "e",
minWidth: 350 minWidth: 350,
maxWidth: $(window).width()-221
}); });
if(socket === undefined || Helper.mobilecheck()){ if(socket === undefined || Helper.mobilecheck()){
@@ -821,7 +822,7 @@ $(document).on("mousemove", "#playlist", function(e)
if(((y <= 80 && y >= 48)) && $("#wrapper").scrollTop() > 0){ if(((y <= 80 && y >= 48)) && $("#wrapper").scrollTop() > 0){
$("#top-button").removeClass("hide"); $("#top-button").removeClass("hide");
Helper.addClass("#bottom-button", "hide"); Helper.addClass("#bottom-button", "hide");
}else if(y >= $("#playlist").height() - 45 && y <= $("#playlist").height() - 18 && $("#wrapper").scrollTop() < $("#wrapper")[0].scrollHeight - $("#wrapper").height() - 1){ }else if(y >= $("#playlist").height() - 59 && y <= $("#playlist").height() - 32 && $("#wrapper").scrollTop() < $("#wrapper")[0].scrollHeight - $("#wrapper").height() - 1){
$("#bottom-button").removeClass("hide"); $("#bottom-button").removeClass("hide");
Helper.addClass("#top-button", "hide"); Helper.addClass("#top-button", "hide");
}else{ }else{