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:
BrokenFire 2018-02-20 17:25:45 +01:00
commit 4f638af5c0
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,6 +202,8 @@ function getCurentMusic() {
disconected = false; disconected = false;
$('#modalChanels').modal('close'); $('#modalChanels').modal('close');
$('#btn_play').children().text("pause"); $('#btn_play').children().text("pause");
$('#btn_play').removeClass("amber");
$('#btn_play').addClass("green");
updateControl(data); updateControl(data);
break; break;
@ -210,6 +212,8 @@ function getCurentMusic() {
disconected = false; disconected = false;
$('#modalChanels').modal('close'); $('#modalChanels').modal('close');
$('#btn_play').children().text("play_arrow"); $('#btn_play').children().text("play_arrow");
$('#btn_play').removeClass("green");
$('#btn_play').addClass("amber");
updateControl(data); updateControl(data);

14
src/main/resources/templates/music.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@ -134,17 +134,17 @@
</div> </div>
<div class="row center"> <div class="row center">
<div class="col s2 offset-s3 center"> <div class="col s2 offset-s3 center">
<a class="btn-large blue-grey darken-4 z-depth-3 waves-effect waves-light" id="btn_stop"> <a class="btn-large red darken-4 z-depth-3 waves-effect waves-light" id="btn_stop">
<i class="material-icons medium">stop</i> <i class="material-icons medium">stop</i>
</a> </a>
</div> </div>
<div class="col s2 center"> <div class="col s2 center">
<a class="btn-large blue-grey darken-4 z-depth-3 waves-effect waves-light" id="btn_play"> <a class="btn-large green darken-4 z-depth-3 waves-effect waves-light" id="btn_play">
<i class="material-icons medium">play_arrow</i> <i class="material-icons medium">play_arrow</i>
</a> </a>
</div> </div>
<div class="col s2 center"> <div class="col s2 center">
<a class="btn-large blue-grey darken-4 z-depth-3 waves-effect waves-light" id="btn_next"> <a class="btn-large light-blue darken-4 z-depth-3 waves-effect waves-light" id="btn_next">
<i class="material-icons">skip_next</i> <i class="material-icons">skip_next</i>
</a> </a>
</div> </div>
@ -152,7 +152,7 @@
<div class="row center"> <div class="row center">
<div class="col offset-s5 s2 center"> <div class="col offset-s5 s2 center">
<a class="btn blue-grey darken-4 z-depth-3 waves-effect waves-light modal-trigger" href="#modal_current_info" id="btn_info"> <a class="btn black z-depth-3 waves-effect waves-light modal-trigger" href="#modal_current_info" id="btn_info">
<i class="material-icons">info</i> <i class="material-icons">info</i>
</a> </a>
</div> </div>
@ -166,11 +166,11 @@
<div class="row center valign-wrapper" style="margin: 0px"> <div class="row center valign-wrapper" style="margin: 0px">
<div class="col s4 center"><h5>Playlist</h5></div> <div class="col s4 center"><h5>Playlist</h5></div>
<div class="col s4 center"> <div class="col s4 center">
<a class="waves-effect waves-light btn modal-trigger blue-grey darken-4" id="flush_btn">Flush</a> <a class="waves-effect waves-light btn modal-trigger red darken-4" id="flush_btn"><i class="material-icons">delete_sweep</i></a>
</div> </div>
<div class="col s4 center"> <div class="col s4 center">
<!-- Modal Trigger --> <!-- Modal Trigger -->
<a class="waves-effect waves-light btn modal-trigger blue-grey darken-4" id="add_btn" href="#modalAdd">Add</a> <a class="waves-effect waves-light btn modal-trigger green darken-4" id="add_btn" href="#modalAdd"><i class="material-icons">add_circle_outline</i></a>
<!-- Modal Structure --> <!-- Modal Structure -->
<div id="modalAdd" class="modal disabled"> <div id="modalAdd" class="modal disabled">