mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2024-12-25 02:20:27 +00:00
Code Issues Releases Wiki Activity

Removed love action

Browse Source 
Moved main menu items in footer
Moved secondary menu items in dropdown
This commit is contained in:
jcorporation 2018-05-17 00:19:03 +01:00
parent a9c48355b4
commit 73c2fe245a
4 changed files with 132 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/css/mpd.css
View File

@ -70,7 +70,6 @@ button {
h1 {
display: block;
overflow: hidden;
text-overflow: ellipsis;
}

97
htdocs/index.html
View File

@ -6,47 +6,48 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="myMPD - fast and lightweight MPD webclient">
<meta name="author" content="mail@jcgames.de">
<title>myMPD</title>
<!-- Bootstrap core CSS -->
<link href="css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template -->
<link href="css/mpd.css" rel="stylesheet">
<link href="assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon">
<script src="js/modernizr-custom.js"></script>
<!-- Webapp -->
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black"/>
<link rel="apple-touch-icon" href="assets/appicon.png"/>
</head>
<body>
<header>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<a class="navbar-brand" href="/#/playing/"><span style="font-size:24px;float:left;margin-right:5px;" class="material-icons">play_circle_outline</span>myMPD</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto" id="nav_links">
<li class="nav-item" id="queue"><a class="nav-link" href="#/queue/0">Queue</a></li>
<li class="nav-item" id="browse"><a class="nav-link" href="#/browse/0/">Browse</a></li>
<li class="nav-item" id="dirble"><a class="nav-link" href="#/dirble/">Dirble</a></li>
<li class="nav-item"><a class="nav-link" href="#" data-toggle="modal" data-target="#addstream">Add Stream</a></li>
<li class="nav-item"><a class="nav-link" href="#" data-toggle="modal" data-target="#settings" onclick="getHost();">Settings</a></li>
</ul>
<nav class="navbar navbar-expand navbar-dark fixed-top bg-dark">
<div class="container justify-content-start">
<div class="dropdown">
<a class="navbar-brand dropdown-toggle" data-toggle="dropdown" href="/#/playing/"><span style="font-size:24px;float:left;margin-right:5px;" class="material-icons">play_circle_outline</span>myMPD</a>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<form id="search" class="form-inline mt-2 mt-md-0" role="search">
<input type="text" class="form-control mr-sm-2" placeholder="Search">
</form>
<div class="dropdown-divider"></div>
<a id="nav-dirble" class="dropdown-item" href="#/dirble/">Dirble</a>
<a id="nav-addstream" class="dropdown-item" href="#" data-toggle="modal" data-target="#addstream">Add Stream</a>
<a id="nav-settings" class="dropdown-item" href="#" data-toggle="modal" data-target="#settings" onclick="getHost();">Settings</a>
<div class="dropdown-divider"></div>
<div id="btn-outputs-block"></div>
</div>
</div>
</div>
<div class="container justify-content-between">
<div class="btn-toolbar" role="toolbar">
<div class="btn-group mr-2" role="group">
<button type="button" class="btn btn-secondary" onclick="socket.send('MPD_API_SET_PREV');">
<span class="material-icons">skip_previous</span>
</button>
<!--
<button type="button" class="btn btn-secondary" onclick="socket.send('MPD_API_SET_STOP');">
<span id="stop-icon" class="material-icons">stop</span>
</button>
-->
<button type="button" class="btn btn-secondary" onclick="clickPlay();">
<span id="play-icon" class="material-icons">pause</span>
</button>
@ -54,21 +55,6 @@
<span class="material-icons">skip_next</span>
</button>
</div>
<div class="btn-group mr-2" role="group">
<button id="btnlove" type="button" class="btn btn-secondary" onclick="clickLove();">
<span class="material-icons">favorit</span>
</button>
</div>
<div class="btn-group mr-2" role="group">
<div class="dropdown">
<button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
<span class="material-icons">settings_remote</span>
<span class="caret"></span>
</button>
<div id="btn-outputs-block" class="dropdown-menu" role="menu" style="padding-left:1em;"></div>
</div>
</div>
<div class="btn-group mr-2">
<div class="btn btn-secondary">
@ -86,26 +72,21 @@
<span id="localplay-icon" class="glyphicon glyphicon-new-window"></span>
</button>
</div>
</div>
<form id="search" class="form-inline mt-2 mt-md-0" role="search">
<input type="text" class="form-control mr-sm-2" placeholder="Search">
</form>
</div><!--/.nav-collapse -->
</div>
</div>
<div class="container justify-content-end"></div>
</nav>
</header>
<main role="main" class="container">
<div class="notifications top-right"></div>
<div class="card">
<!-- Default panel contents -->
<div class="card-header">
<span id="panel-heading">Now playing</span>
<span id="panel-heading-info" class="text pull-right"></span>
</div>
<div class="card-body">
<div class="btn-toolbar hide" id="queue-buttons" role="toolbar">
<div id="trashmode" class="btn-group mr-2" data-toggle="radio">
<button id="btntrashmodeup" type="button" class="btn btn-secondary" title="Delete upward">
@ -133,15 +114,13 @@
<div id="nowplaying">
<div id="album-cover"></div>
<h1>
<span id="track-icon" onclick="clickPlay();" class="material-icons" title="Toggle play/pause">play_arrow</span>
<span id="currenttrack"></span>
</h1>
<h3 id="artist"></h3>
<h4 id="album"></h4>
<p id="counter" class="text pull-right">&nbsp;&nbsp;</p>
<div id="progressbar"></div>
</div><!-- /.panel-body -->
</div>
<ol id="breadcrumb" class="breadcrumb hide">
</ol>
@ -153,8 +132,6 @@
</div>
</div>
<!-- Table -->
<table id="salamisandwich" class="table table-hover hide">
<thead>
<tr>
@ -197,7 +174,18 @@
<li id="next" class="page-item hide"><a class="page-link" href="">Next</a></li>
</ul>
</div>
</main><!-- /.container -->
</div>
</main>
<footer class="footer">
<nav class="navbar navbar-expand navbar-dark fixed-bottom bg-dark">
<div class="d-flex flex-fill navbar-nav" id="navbar-bottom">
<div class="nav-item flex-fill text-center" id="nav-playing"><a class="nav-link" href="#/playing/">Playing</a></div>
<div class="nav-item flex-fill text-center" id="nav-queue"><a class="nav-link" href="#/queue/0">Queue</a></div>
<div class="nav-item flex-fill text-center" id="nav-browse"><a class="nav-link" href="#/browse/0/">Browse</a></div>
</div>
</nav>
</footer>
<!-- Modal -->
<div class="modal fade" id="settings" tabindex="-1" role="dialog" aria-labelledby="settingsLabel" aria-hidden="true">
@ -259,7 +247,6 @@
<span class="glyphicon glyphicon-refresh"></span> Update Database
</button>
</div>
</div>
<hr />
<form role="form">
@ -369,22 +356,20 @@
<h5>Searching...</h5>
</div>
<div class="modal-body">
<div class="progress progress-striped active">
<div class="progress-bar" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 100%">
<span class="sr-only">Please Wait</span>
</div>
</div>
</div>
</div>
<div class="progress">
<div class="progress-bar progress-bar-striped progress-bar-animated bg-success" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width:100%;"></div>
</div>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="js/jquery-3.3.1.min.js"></script>
<script src="js/jquery.cookie.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="js/bootstrap.js"></script>
<script src="js/bootstrap-slider.js"></script>
<script src="js/bootstrap-notify.js"></script>
<script src="js/sammy.js"></script>

2
htdocs/js/custom.js
View File

@ -1,3 +1,3 @@
//Remove some buttons
document.getElementById('btnlove').parentNode.style.display='none';
//document.getElementById('btnlove').parentNode.style.display='none';
document.getElementById('player').parentNode.style.display='none';

36
htdocs/js/mpd.js
View File

@ -40,6 +40,7 @@ var isTouch = Modernizr.touch ? 1 : 0;
var filter = "";
var dirble_api_token = "";
var dirble_stations = false;
var playstate = "";
var app = $.sammy(function() {
@ -56,16 +57,16 @@ var app = $.sammy(function() {
$('#panel-heading-info').empty();
$('#queue-buttons').removeClass('hide');
$('#queue').addClass('active');
$('#nav-queue').addClass('active');
}
function prepare() {
$('#nav_links > li').removeClass('active');
$('#navbar-top > li').removeClass('active');
$('#navbar-bottom > li').removeClass('active');
$('.page-item').addClass('hide');
$('#add-all-songs').addClass('hide');
pagination = 0;
browsepath = '';
$(navbarCollapse).removeClass('show');
}
this.get (/\#\/playing\//, function() {
@ -79,6 +80,7 @@ var app = $.sammy(function() {
$('#panel-heading').text("Now playing");
$('#panel-heading-info').empty();
$('#nowplaying').removeClass('hide');
$('#nav-playing').addClass('active');
});
this.get(/\#\/queue\/(\d+)/, function() {
@ -98,6 +100,7 @@ var app = $.sammy(function() {
$('#dirble_panel').addClass('hide');
$('#queue-buttons').addClass('hide');
$('#nowplaying').addClass('hide');
$('#nav-browse').addClass('active');
socket.send('MPD_API_GET_BROWSE,'+pagination+','+(browsepath ? browsepath : "/"));
// Don't add all songs from root
if (browsepath) {
@ -123,7 +126,6 @@ var app = $.sammy(function() {
$('#breadcrumb').append("<li class=\"breadcrumb-item\"><a uri=\"" + full_path + "\">"+chunk+"</a></li>");
full_path += "/";
});
$('#browse').addClass('active');
});
this.get(/\#\/search\/(.*)/, function() {
@ -156,7 +158,7 @@ var app = $.sammy(function() {
$('#panel-heading').text("Dirble");
$('#panel-heading-info').empty();
$('#dirble').addClass('active');
$('#dirble-nav').addClass('active');
$('#next').addClass('hide');
@ -288,7 +290,7 @@ $(document).ready(function(){
}
}, true);
if (TOKEN === "") $('#dirble').addClass('hide');
if (TOKEN === "") $('#nav-dirble').addClass('hide');
});
function webSocketConnect() {
@ -668,8 +670,6 @@ function webSocketConnect() {
$('#album').text("");
$('#artist').text("");
$('#btnlove').removeClass("active");
$('#currenttrack').text(" " + obj.data.title);
var notification = "<strong><h4>" + obj.data.title + "</h4></strong>";
@ -703,13 +703,13 @@ function webSocketConnect() {
dirble_api_token = obj.data;
if (dirble_api_token) {
$('#dirble').removeClass('hide');
$('#dirble-nav').removeClass('hide');
if (dirble_stations) { dirble_load_stations(); }
else { dirble_load_categories(); }
} else {
$('#dirble').addClass('hide');
$('#dirble-nav').addClass('hide');
}
break;
case 'error':
@ -791,15 +791,15 @@ var updatePlayIcon = function(state)
if(state == 1) { // stop
$("#play-icon").text('play_arrow');
$('#track-icon').text('stop');
document.getElementById('player').pause();
playstate = 'stop';
} else if(state == 2) { // play
$("#play-icon").text('pause');
$('#track-icon').text('play_arrow');
playstate = 'play';
} else { // pause
$("#play-icon").text('play_arrow');
$('#track-icon').text('stop');
document.getElementById('player').pause();
playstate = 'pause';
}
}
@ -825,7 +825,7 @@ function updateDB() {
}
function clickPlay() {
if($('#track-icon').hasClass('glyphicon-stop'))
if( playstate != 'play')
socket.send('MPD_API_SET_PLAY');
else
socket.send('MPD_API_SET_PAUSE');
@ -904,14 +904,6 @@ function basename(path) {
return path.split('/').reverse()[0];
}
function clickLove() {
socket.send("MPD_API_SEND_MESSAGE,mpdas," + ($('#btnlove').hasClass('active') ? "unlove" : "love"));
if ( $('#btnlove').hasClass('active') )
$('#btnlove').removeClass("active");
else
$('#btnlove').addClass("active");
}
$('#btnrandom').on('click', function (e) {
socket.send("MPD_API_TOGGLE_RANDOM," + ($(this).hasClass('btn-success') ? 0 : 1));