mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2024-11-29 16:09:55 +00:00
Code Issues Releases Wiki Activity

merge branch lmanul-master

Browse Source
This commit is contained in:
SuperBFG7 2017-12-18 15:00:28 +01:00
parent 604d54a0bb
commit d9182dd2f4
4 changed files with 25 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
build/

41
htdocs/css/bootstrap.css vendored
View File

@ -1993,6 +1993,7 @@ select[multiple].input-lg {
font-weight: normal; font-weight: normal;
line-height: 1.428571429; line-height: 1.428571429;
text-align: center; text-align: center;
text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
@ -2073,6 +2074,11 @@ fieldset[disabled] .btn-default.active {
color: #fff; color: #fff;
background-color: #333; background-color: #333;
} }
.btn-label {
margin-left: 8px;
text-overflow: ellipsis;
vertical-align: middle;
}
.btn-primary { .btn-primary {
color: #fff; color: #fff;
background-color: #428bca; background-color: #428bca;
@ -2370,14 +2376,13 @@ input[type="button"].btn-block {
src: url('../fonts/glyphicons-halflings-regular.eot'); src: url('../fonts/glyphicons-halflings-regular.eot');
src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
} }
#currenttrack {
vertical-align: middle;
}
.glyphicon { .glyphicon {
position: relative;
top: 1px;
display: inline-block; display: inline-block;
font-family: 'Glyphicons Halflings'; font-family: 'Glyphicons Halflings';
font-style: normal; vertical-align: middle;
font-weight: normal;
line-height: 1;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
@ -2415,9 +2420,6 @@ input[type="button"].btn-block {
.glyphicon-heart:before { .glyphicon-heart:before {
content: "\e005"; content: "\e005";
} }
.glyphicon-star:before {
content: "\e006";
}
.glyphicon-star-empty:before { .glyphicon-star-empty:before {
content: "\e007"; content: "\e007";
} }
@ -2457,9 +2459,6 @@ input[type="button"].btn-block {
.glyphicon-cog:before { .glyphicon-cog:before {
content: "\e019"; content: "\e019";
} }
.glyphicon-trash:before {
content: "\e020";
}
.glyphicon-home:before { .glyphicon-home:before {
content: "\e021"; content: "\e021";
} }
@ -2487,9 +2486,6 @@ input[type="button"].btn-block {
.glyphicon-play-circle:before { .glyphicon-play-circle:before {
content: "\e029"; content: "\e029";
} }
.glyphicon-repeat:before {
content: "\e030";
}
.glyphicon-refresh:before { .glyphicon-refresh:before {
content: "\e031"; content: "\e031";
} }
@ -2697,9 +2693,6 @@ input[type="button"].btn-block {
.glyphicon-leaf:before { .glyphicon-leaf:before {
content: "\e103"; content: "\e103";
} }
.glyphicon-fire:before {
content: "\e104";
}
.glyphicon-eye-open:before { .glyphicon-eye-open:before {
content: "\e105"; content: "\e105";
} }
@ -2715,12 +2708,6 @@ input[type="button"].btn-block {
.glyphicon-calendar:before { .glyphicon-calendar:before {
content: "\e109"; content: "\e109";
} }
.glyphicon-random:before {
content: "\e110";
}
.glyphicon-comment:before {
content: "\e111";
}
.glyphicon-magnet:before { .glyphicon-magnet:before {
content: "\e112"; content: "\e112";
} }
@ -2817,9 +2804,6 @@ input[type="button"].btn-block {
.glyphicon-heart-empty:before { .glyphicon-heart-empty:before {
content: "\e143"; content: "\e143";
} }
.glyphicon-link:before {
content: "\e144";
}
.glyphicon-phone:before { .glyphicon-phone:before {
content: "\e145"; content: "\e145";
} }
@ -2880,9 +2864,6 @@ input[type="button"].btn-block {
.glyphicon-record:before { .glyphicon-record:before {
content: "\e165"; content: "\e165";
} }
.glyphicon-save:before {
content: "\e166";
}
.glyphicon-open:before { .glyphicon-open:before {
content: "\e167"; content: "\e167";
} }
@ -3210,7 +3191,7 @@ input[type="button"].btn-block {
} }
.btn-group-lg > .btn { .btn-group-lg > .btn {
padding: 10px 16px; padding: 10px 16px;
font-size: 18px; font-size: 16px;
line-height: 1.33; line-height: 1.33;
border-radius: 6px; border-radius: 6px;
} }

24
htdocs/index.html
View File

@ -170,19 +170,19 @@
<div class="btn-toolbar"> <div class="btn-toolbar">
<div class="btn-group-vertical btn-block btn-group-lg" data-toggle="buttons"> <div class="btn-group-vertical btn-block btn-group-lg" data-toggle="buttons">
<button id="btnrandom" type="button" class="btn btn-default"> <button id="btnrandom" type="button" class="btn btn-default">
<span class="glyphicon glyphicon-random"></span> Random <span class="glyphicon">&#xe110;</span><span class="btn-label">Random</span>
</button> </button>
<button id="btnconsume" type="button" class="btn btn-default"> <button id="btnconsume" type="button" class="btn btn-default">
<span class="glyphicon glyphicon-fire"></span> Consume <span class="glyphicon">&#xe104;</span><span class="btn-label">Consume</span>
</button> </button>
<button id="btnsingle" type="button" class="btn btn-default"> <button id="btnsingle" type="button" class="btn btn-default">
<span class="glyphicon glyphicon-star"></span> Single <span class="glyphicon">&#xe006;</span><span class="btn-label">Single</span>
</button> </button>
<button id="btncrossfade" type="button" class="btn btn-default"> <button id="btncrossfade" type="button" class="btn btn-default">
<span class="glyphicon glyphicon-link"></span> Crossfade <span class="glyphicon">&#xe144;</span><span class="btn-label">Crossfade</span>
</button> </button>
<button id="btnrepeat" type="button" class="btn btn-default"> <button id="btnrepeat" type="button" class="btn btn-default">
<span class="glyphicon glyphicon-repeat"></span> Repeat <span class="glyphicon">&#xe030;</span><span class="btn-label">Repeat</span>
</button> </button>
</div> </div>
<div id="btn-outputs-block" class="btn-group-vertical btn-block btn-group-lg"> <div id="btn-outputs-block" class="btn-group-vertical btn-block btn-group-lg">
@ -205,18 +205,18 @@
<div id="btn-responsive-block" class="btn-group-vertical btn-block btn-group-lg"> <div id="btn-responsive-block" class="btn-group-vertical btn-block btn-group-lg">
<button type="button" class="btn btn-default" onclick="socket.send('MPD_API_RM_ALL');"> <button type="button" class="btn btn-default" onclick="socket.send('MPD_API_RM_ALL');">
<span class="glyphicon glyphicon-trash"></span> Clear queue <span class="glyphicon">&#xe020;</span><span class="btn-label">Clear queue</span>
</button> </button>
<a href="#" data-toggle="modal" data-target="#savequeue" class="btn btn-default"> <a href="#" data-toggle="modal" data-target="#savequeue" class="btn btn-default">
<span class="glyphicon glyphicon-save"></span> Save queue <span class="glyphicon">&#xe166;</span><span class="btn-label">Save queue</span>
</a> </a>
</div> </div>
<div id="btn-responsive-block" class="btn-group-vertical btn-block btn-group-lg" data-toggle="buttons"> <div id="btn-responsive-block" class="btn-group-vertical btn-block btn-group-lg" data-toggle="buttons">
<button type="button" class="btn btn-default" id="btnnotify"> <button type="button" class="btn btn-default" id="btnnotify">
<span class="glyphicon glyphicon-comment"></span> Notifications <span class="glyphicon">&#xe111;</span><span class="btn-label">Notifications</span>
</button> </button>
</div> </div>
</div> </div>
</div><!-- /.col-md-2 --> </div><!-- /.col-md-2 -->
</div><!-- /.row --> </div><!-- /.row -->

2
htdocs/js/mpd.js
View File

@ -539,7 +539,7 @@ function webSocketConnect() {
case "outputnames": case "outputnames":
$('#btn-outputs-block button').remove(); $('#btn-outputs-block button').remove();
$.each(obj.data, function(id, name){ $.each(obj.data, function(id, name){
var btn = $('<button id="btnoutput'+id+'" class="btn btn-default" onclick="toggleoutput(this, '+id+')"><span class="glyphicon glyphicon-volume-up"></span> '+name+'</button>'); var btn = $('<button id="btnoutput'+id+'" class="btn btn-default" onclick="toggleoutput(this, '+id+')"><span class="glyphicon">&#xe038;</span><span class="btn-label" title="'+name+'">'+name+'</span></button>');
btn.appendTo($('#btn-outputs-block')); btn.appendTo($('#btn-outputs-block'));
}); });
/* remove cache, since the buttons have been recreated */ /* remove cache, since the buttons have been recreated */