sebclem/ClaptrapBot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'devel'

Browse Source
This commit is contained in:
Sebastien 2018-09-20 12:41:48 +03:00
commit 7a405b4973
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/static/js/music.js
View File

@ -27,7 +27,6 @@ $(document).ready(function() {
btn_add = $('#add_btn'); btn_add = $('#add_btn');
switchAutoFlow = $("#autoflow"); switchAutoFlow = $("#autoflow");
$('.tooltipped').tooltip();
setInterval("getCurentMusic()", 1000); setInterval("getCurentMusic()", 1000);
$('#modalAdd').modal(); $('#modalAdd').modal();

10
src/main/resources/static/js/navabar.js
View File

@ -11,6 +11,7 @@ var nav_name;
$(document).ready(function() { $(document).ready(function() {
$('.tooltipped').tooltip();
$('#nav-mobile').sidenav({ $('#nav-mobile').sidenav({
menuWidth: 400, // Default is 300 menuWidth: 400, // Default is 300
edge: 'left', // Choose the horizontal origin edge: 'left', // Choose the horizontal origin
@ -111,7 +112,7 @@ function tryConnection() {
Cookies.set('token',data.token, { expires: 31 }); Cookies.set('token',data.token, { expires: 31 });
Cookies.set('name', data.name, { expires: 31 }); Cookies.set('name', data.name, { expires: 31 });
debugger; debugger;
location.reload(); window.location.reload(true);
} }
}).fail(function (data) { }).fail(function (data) {
@ -156,7 +157,7 @@ function navListeners() {
Cookies.remove('token'); Cookies.remove('token');
Cookies.remove('name'); Cookies.remove('name');
Cookies.remove('guild'); Cookies.remove('guild');
location.reload(); window.location.reload(true);
}); });
$('#guild_form').change(function () { $('#guild_form').change(function () {
@ -168,13 +169,12 @@ function navListeners() {
$('#btn_ok_guild').click(function () { $('#btn_ok_guild').click(function () {
guild = $('input[name=guildRadio]:checked').val(); guild = $('input[name=guildRadio]:checked').val();
Cookies.set('guild', guild, { expires: 31 }); Cookies.set('guild', guild, { expires: 31 });
location.reload(); window.location.reload(true);
}); });
$('.nav-change-guild').click(function () { $('.nav-change-guild').click(function () {
Cookies.remove('guild'); Cookies.remove('guild');
location.reload(); window.location.reload(true);
}) })
} }

4
src/main/resources/templates/header.html
View File

@ -159,8 +159,8 @@
<div id="modal_guild" class="modal"> <div id="modal_guild" class="modal">
<div class="modal-content" style="padding-bottom: 0px"> <div class="modal-content" style="padding-bottom: 0px">
<div class="row" style="margin-bottom: 0px"> <div class="row" style="margin-bottom: 0px">
<h3 class="col s12 center">Guild Selection</h3> <h3 class="col l12 m12 s12 center">Guild Selection</h3>
<div class="col offset-s4 s4 center"> <div class="col l4 offset-l4 m8 offset-m4 offset-s3 s8 center">
<form id="guild_form" action="#" class="left-align"> <form id="guild_form" action="#" class="left-align">
</form> </form>
</div> </div>