Skip to content

Added queue's total time & case insensitive sorting; ignore empty search string #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
embhd wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Added queue's total time & case insensitive sorting; ignore empty search string #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7b311d9
Removed compiler warning regarding a "comparison of constant -1 with …
embhd Apr 3, 2018
5c3f660
Fixed typo; bit of clean-up
embhd Apr 3, 2018
87c596c
Make sorting while browsing the database case insensitive.
embhd Apr 4, 2018
c077de4
Empty search string doesn't trigger an actual search anymore, since i…
embhd Apr 4, 2018
54e334a
Added additional "totalTime" field to "obj" for the queue's total time.
embhd Apr 4, 2018
0faf70a
Add queue's total time to panel header.
embhd Apr 4, 2018
84b3ea7
Switch queue's line break before album from HTML to CSS.
embhd Apr 4, 2018
c226026
Treat album while browsing the same way as in the queue.
embhd Apr 4, 2018
18417b9
Reset #panel-heading-info on update of #panel-heading.
embhd Apr 4, 2018
8ced27e
Don't even change to the search app, if the string is empty.
embhd Apr 4, 2018
2cb99de
Revert some changes: There's no need to print the artist/album for ea…
embhd Apr 4, 2018
9cbe27b
Go to queue, if a new instance is opened by means of the search URL w…
embhd Apr 4, 2018
058c524
Merge branches 'browse_database', 'empty_search' and 'queue_time'
embhd Apr 4, 2018
71ec2cd
Added missing resets of #panel-heading-info.
embhd Apr 4, 2018
ae2d590
Removed unnecessary CSS selectors; set width of first and last table …
embhd Apr 5, 2018
bf08c06
Keep href of "Browse Database" always up to date.
embhd Apr 6, 2018
0d471dc
Extended case insensitive sorting to playlists.
embhd Apr 6, 2018
3af6e6f
Merge branch 'browse_database'
embhd Apr 6, 2018
ab7eda9
Revert some formatting to allow for auto-merge with branch "fix_outpu…
embhd Apr 7, 2018
1ebb14a
Set focus on text input after clicking "Save Queue"; clear input afte…
embhd Apr 9, 2018
5424a7d
Revert some changes to allow for auto-merge with branch "queue_nowrap".
embhd Apr 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions htdocs/css/mpd.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,19 @@ body {
text-align: right;
}

#salamisandwich td:nth-child(2) span {
font-style:italic;
font-size:90%;
td:nth-child(2) span {
font-style: italic;
font-size: 90%;

display: block;
}

tbody {
cursor: pointer;
}

td:last-child, td:first-child {
td:last-child, td:first-child,
th:last-child, th:first-child {
width: 30px;
}

Expand All @@ -95,7 +98,7 @@ button {
}

#trashmode span:last-child {
display:inline-block;
text-align:left;
width:2.8em;
display: inline-block;
text-align: left;
width: 2.8em;
}
15 changes: 8 additions & 7 deletions htdocs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,11 @@

<div class="col-md-10 col-xs-12">
<div class="notifications top-right"></div>

<div class="panel panel-primary">
<!-- Default panel contents -->
<div class="panel-heading"><b id="panel-heading">Queue</b></div>
<div class="panel-heading"><b id="panel-heading">Queue</b>
<b id="panel-heading-info" class="text pull-right"></b></div>
<div class="panel-body">
<h1>
<span id="track-icon" onclick="clickPlay();" class="glyphicon glyphicon-play"></span>
Expand Down Expand Up @@ -218,7 +219,7 @@ <h4><a href="http://www.ympd.org"><span class="glyphicon glyphicon-play-circle">
<h5>ympd uses following excellent software:</h5>
<h6><a href="http://cesanta.com/docs.html">Mongoose</a> <small>GPLv2</small></h6>
<h6><a href="http://www.musicpd.org/libs/libmpdclient/">libMPDClient</a> <small>BSD License</small></h6>
<hr />
<hr />
<div class="row">
<div class="form-group col-md-6">
<button type="button" class="btn btn-default btn-block" onclick="updateDB();">
Expand Down Expand Up @@ -296,7 +297,7 @@ <h2 class="modal-title" id="addstreamLabel"><span class="glyphicon glyphicon-wre
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->

<div class="modal fade" id="savequeue" tabindex="-1" role="dialog" aria-labelledby="savequeueLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
Expand All @@ -307,9 +308,9 @@ <h2 class="modal-title" id="savequeueLabel"><span class="glyphicon glyphicon-wre
<div class="modal-body">
<form role="form">
<div class="row">
<div class="form-group col-md-9">
<label class="control-label" for="playlistname">Playlist Name</label>
<input type="text" class="form-control" id="playlistname" />
<div class="form-group col-md-12">
<label class="control-label" for="queuename">Playlist Name</label>
<input type="text" class="form-control" id="queuename" />
</div>
</div>
</form>
Expand Down
Loading