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 errors with logging in when a tab is active

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-04-19 16:04:20 +02:00
parent a8ac3562c0
commit 4f3df427bc
4 changed files with 10 additions and 2877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
index.php
View File

@@ -200,11 +200,11 @@
<div id="playlist" class="col s12 m3"> <div id="playlist" class="col s12 m3">
<div id="top-button" title="Scroll to the top" class="rounded-bottom hide top-button-with-tabs hide-on-small-only">Top</div> <div id="top-button" title="Scroll to the top" class="rounded-bottom hide top-button-with-tabs hide-on-small-only">Top</div>
<div id="bottom-button" title="Scroll to the bottom" class="rounded-top hide hide-on-small-only">Bottom</div> <div id="bottom-button" title="Scroll to the bottom" class="rounded-top hide hide-on-small-only">Bottom</div>
<ul class="tabs playlist-tabs"> <ul class="tabs playlist-tabs" style="width:96%">
<li class="tab col s3"><a class="playlist-tab-links playlist-link active" href="#wrapper">Playlist</a></li> <li class="tab col s3"><a class="playlist-tab-links playlist-link active" href="#wrapper">Playlist</a></li>
<li class="tab col s3"><a class="playlist-tab-links chat-link" href="#chat">Chat</a></li> <li class="tab col s3"><a class="playlist-tab-links chat-link" href="#chat">Chat</a></li>
</ul> </ul>
<ul class="tabs playlist-tabs-loggedIn hide" style="width: 100%;"> <ul class="tabs playlist-tabs-loggedIn hide" style="width: 96%;">
<li class="tab col s3"><a class="playlist-tab-links playlist-link active" href="#wrapper">Playlist</a></li> <li class="tab col s3"><a class="playlist-tab-links playlist-link active" href="#wrapper">Playlist</a></li>
<li class="tab col s3"><a class="playlist-tab-links suggested-link" href="#suggestions">Suggested</a></li> <li class="tab col s3"><a class="playlist-tab-links suggested-link" href="#suggestions">Suggested</a></li>
<li class="tab col s3"><a class="playlist-tab-links chat-link" href="#chat">Chat</a></li> <li class="tab col s3"><a class="playlist-tab-links chat-link" href="#chat">Chat</a></li>

2
static/css/style.css
View File

@@ -665,6 +665,7 @@ hide mdi-action-visibility mdi-action-visibility-off
.playlist-tabs, .playlist-tabs-loggedIn{ .playlist-tabs, .playlist-tabs-loggedIn{
background-color:rgba(0,0,0,0) !important; background-color:rgba(0,0,0,0) !important;
width: 96% !important;
} }
.duration-song{ .duration-song{
@@ -759,6 +760,7 @@ hide mdi-action-visibility mdi-action-visibility-off
background: white; background: white;
background: white; background: white;
overflow-x: hidden; overflow-x: hidden;
width:98%;
} }
#chat-btn i { #chat-btn i {

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

File diff suppressed because one or more lines are too long

5
static/js/admin.js
View File

@@ -89,6 +89,8 @@ var Admin = {
//$("#wrapper").toggleClass("tabs_height"); //$("#wrapper").toggleClass("tabs_height");
//} //}
$('ul.playlist-tabs-loggedIn').tabs('select_tab', 'wrapper');
if(!Helper.contains($("#admin-lock").attr("class").split(" "), "mdi-action-lock-open")) if(!Helper.contains($("#admin-lock").attr("class").split(" "), "mdi-action-lock-open"))
$("#admin-lock").addClass("mdi-action-lock-open clickable"); $("#admin-lock").addClass("mdi-action-lock-open clickable");
}); });
@@ -153,7 +155,8 @@ var Admin = {
$(".card-action").addClass("hide"); $(".card-action").addClass("hide");
} }
$('ul.tabs').tabs('select_tab', 'wrapper'); $('ul.playlist-tabs').tabs('select_tab', 'wrapper');
$('ul.playlist-tabs-loggedIn').tabs('select_tab', 'wrapper');
//$("#wrapper").removeClass("tabs_height"); //$("#wrapper").removeClass("tabs_height");
$("#admin-lock").removeClass("mdi-action-lock-open clickable"); $("#admin-lock").removeClass("mdi-action-lock-open clickable");
$("#password").attr("placeholder", "Enter channel password"); $("#password").attr("placeholder", "Enter channel password");