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 issue with some modals, and showing a toast on wrong list password

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-07-22 18:56:59 +02:00
parent f05f061d89
commit 26cd2feb1b
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/public/assets/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
server/public/assets/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
server/public/assets/js/listeners.js
View File

@@ -613,6 +613,8 @@ function setup_auth_listener() {
$("#player_overlay").css("display", "block"); $("#player_overlay").css("display", "block");
$("#user_password").modal("open"); $("#user_password").modal("open");
Crypt.remove_userpass(chan.toLowerCase()); Crypt.remove_userpass(chan.toLowerCase());
before_toast();
Materialize.toast("That is not the correct password, try again..", 4000);
}); });
socket.on('auth_accepted', function(msg) { socket.on('auth_accepted', function(msg) {
@@ -1769,7 +1771,7 @@ function share_link_modifier_channel(){
} }
function before_toast(){ function before_toast(){
$("#toast-container").remove(); Materialize.Toast.removeAll();
} }
function onepage_load(){ function onepage_load(){

2
server/public/layouts/frontpage.handlebars
View File

@@ -10,7 +10,7 @@
<ul class="right hide-on-med-and-down"> <ul class="right hide-on-med-and-down">
<li><a class="header-buttons waves-effect waves-cyan" id="offline-mode" title="Local mode" href="#">Local</a></li> <li><a class="header-buttons waves-effect waves-cyan" id="offline-mode" title="Local mode" href="#">Local</a></li>
<li><a class="header-buttons waves-effect waves-green" title="Remote control a Zoff player" href="https://remote.zoff.me">Remote</a></li> <li><a class="header-buttons waves-effect waves-green" title="Remote control a Zoff player" href="https://remote.zoff.me">Remote</a></li>
<li><a class="header-buttons modal-trigger waves-effect waves-orange" onclick="$('#about').modal('open')">About</a></li> <li><a class="header-buttons modal-trigger waves-effect waves-orange" data-target="about">About</a></li>
</ul> </ul>
</div> </div>
</nav> </nav>

6
server/public/layouts/main.handlebars
View File

@@ -139,17 +139,17 @@
</p> </p>
<ul class="footer-buttons"> <ul class="footer-buttons">
<li> <li>
<a class="modal-trigger waves-effect cyan darken-2 btn help-button-footer" title="Need help with the site?" onclick="$('#help').modal('open')"> <a class="modal-trigger waves-effect cyan darken-2 btn help-button-footer" title="Need help with the site?" data-target="help">
<i class="material-icons left footer-button-icon">help_outline</i>HELP <i class="material-icons left footer-button-icon">help_outline</i>HELP
</a> </a>
</li> </li>
<li> <li>
<a class="modal-trigger waves-effect blue-grey darken-2 btn help-button-footer hide-on-small-only" id="embed-button" title="Want to embed this channel?" onclick="$('#embed').modal('open')"> <a class="modal-trigger waves-effect blue-grey darken-2 btn help-button-footer hide-on-small-only" id="embed-button" title="Want to embed this channel?" data-target="embed">
<i class="material-icons left footer-button-icon">code</i>EMBED <i class="material-icons left footer-button-icon">code</i>EMBED
</a> </a>
</li> </li>
<li> <li>
<a class="modal-trigger waves-effect red darken-2 btn help-button-footer" id="contact-button" title="Contact us" onclick="$('#contact').modal('open')"> <a class="modal-trigger waves-effect red darken-2 btn help-button-footer" id="contact-button" title="Contact us" data-target="contact">
<i class="material-icons left footer-button-icon">email</i>CONTACT <i class="material-icons left footer-button-icon">email</i>CONTACT
</a> </a>
</li> </li>

2
server/public/layouts/remote.handlebars
View File

@@ -11,7 +11,7 @@
</div> </div>
<ul class="right hide-on-med-and-down"> <ul class="right hide-on-med-and-down">
<li><a class="waves-effect green" title="Remote control a Zoff player" href="https://remote.zoff.me">Remote</a></li> <li><a class="waves-effect green" title="Remote control a Zoff player" href="https://remote.zoff.me">Remote</a></li>
<li><a class="modal-trigger waves-effect waves-orange" onclick="$('#about').modal('open')">About</a></li> <li><a class="modal-trigger waves-effect waves-orange" data-target="about">About</a></li>
</ul> </ul>
</div> </div>
</nav> </nav>