From 226e3b5999fee73e0db4878525e449a694c9477a Mon Sep 17 00:00:00 2001
From: eb041592 <35889760+eb041592@users.noreply.github.com>
Date: Sat, 3 Feb 2018 14:51:48 +0100
Subject: [PATCH 1/7] Moved button for notifications to settings

---
 htdocs/index.html | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 9d8f9a3..b0bb66c 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -198,11 +198,6 @@
             </a>
           </div>
 
-            <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">
-               <span class="glyphicon glyphicon-comment"></span> Notifications
-              </button>
-            </div>
         </div>
       </div><!-- /.col-md-2 -->
     </div><!-- /.row -->
@@ -223,6 +218,19 @@
           <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 />
+          <div class="row">
+            <div class="form-group col-md-6">
+              <button type="button" class="btn btn-default btn-block" onclick="updateDB();">
+                <span class="glyphicon glyphicon-refresh"></span> Update Database
+              </button>
+            </div>
+            <div class="form-group col-md-6" data-toggle="buttons">
+              <button type="button" class="btn btn-default btn-block" id="btnnotify">
+                <span class="glyphicon glyphicon-comment"></span> Enable Notifications
+              </button>
+            </div>
+          </div>
           <hr />
           <form role="form">
             <div class="row">
@@ -252,14 +260,6 @@
                   MPD Password is set
                 </div>
               </div>
-
-            </div>
-            <div class="row">
-              <div class="form-group col-md-12">
-                <button type="button" class="btn btn-default" onclick="updateDB();">
-                  <span class="glyphicon glyphicon-refresh"></span> Update DB
-                </button>
-              </div>
             </div>
           </form>
         </div>

From 1b0484a2856d9c0e617b5fae1560ad1d5ac8ba03 Mon Sep 17 00:00:00 2001
From: eb041592 <35889760+eb041592@users.noreply.github.com>
Date: Sat, 3 Feb 2018 15:06:59 +0100
Subject: [PATCH 2/7] Extended text field for stream url across entire width of
 dialog

---
 htdocs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index b0bb66c..d97c12b 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -282,7 +282,7 @@
         <div class="modal-body">
           <form role="form">
             <div class="row">
-              <div class="form-group col-md-9">
+              <div class="form-group col-md-12">
                 <label class="control-label" for="streamurl">Stream URL</label>
                 <input type="text" class="form-control" id="streamurl" />
               </div>

From 2e9d477ee660e3e10275db6426dd46599be9cb68 Mon Sep 17 00:00:00 2001
From: eb041592 <35889760+eb041592@users.noreply.github.com>
Date: Sun, 4 Feb 2018 00:30:45 +0100
Subject: [PATCH 3/7] Hide output button(s) if there is only one configured
 output

---
 htdocs/js/mpd.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/js/mpd.js b/htdocs/js/mpd.js
index 5c8a8d1..ba7dfff 100644
--- a/htdocs/js/mpd.js
+++ b/htdocs/js/mpd.js
@@ -496,10 +496,14 @@ function webSocketConnect() {
                     break;
                 case "outputnames":
                     $('#btn-outputs-block button').remove();
-                    $.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>');
-                        btn.appendTo($('#btn-outputs-block'));
-                    });
+                    if (obj.data.length > 1) {
+		        $.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>');
+                            btn.appendTo($('#btn-outputs-block'));
+                        });
+		    } else {
+                        $('#btn-outputs-block').removeClass('btn-group-vertical');
+		    }
                     /* remove cache, since the buttons have been recreated */
                     last_outputs = '';
                     break;

From 037e7db1dac951f5c68f85f60e1126a28a256b23 Mon Sep 17 00:00:00 2001
From: eb041592 <35889760+eb041592@users.noreply.github.com>
Date: Sun, 4 Feb 2018 01:11:41 +0100
Subject: [PATCH 4/7] Minor formatting

---
 htdocs/index.html |  2 +-
 htdocs/js/mpd.js  | 34 +++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index d97c12b..6e6fccb 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -152,7 +152,7 @@
         </ul>
       </div><!-- /.col-md-10 -->
 
-      <div class="col-md-2 col-xs-12" >
+      <div class="col-md-2 col-xs-12">
         <div class="btn-toolbar">
           <div class="btn-group-vertical btn-block btn-group-lg" data-toggle="buttons">
             <button id="btnrandom" type="button" class="btn btn-default">
diff --git a/htdocs/js/mpd.js b/htdocs/js/mpd.js
index ba7dfff..8231f45 100644
--- a/htdocs/js/mpd.js
+++ b/htdocs/js/mpd.js
@@ -227,7 +227,7 @@ function webSocketConnect() {
             var obj = JSON.parse(msg.data);
 
             switch (obj.type) {
-                case "queue":
+                case 'queue':
                     if(current_app !== 'queue')
                         break;
 
@@ -304,9 +304,9 @@ function webSocketConnect() {
                       stop: function(event,ui) {renumber_table('#salamisandwich',ui.item)}
                     }).disableSelection();
                     break;
-                case "search":
+                case 'search':
                     $('#wait').modal('hide');
-                case "browse":
+                case 'browse':
                     if(current_app !== 'browse' && current_app !== 'search')
                         break;
 
@@ -319,7 +319,7 @@ function webSocketConnect() {
                     }
                     for (var item in obj.data) {
                         switch(obj.data[item].type) {
-                            case "directory":
+                            case 'directory':
                                 var clazz = 'dir';
                                 if (filter !== undefined) {
                                     var first = obj.data[item].dir[0];
@@ -338,7 +338,7 @@ function webSocketConnect() {
                                     "<td></td><td></td></tr>"
                                 );
                                 break;
-                            case "playlist":
+                            case 'playlist':
                                 var clazz = 'plist';
                                 if (filter !== "||") {
                                     clazz += ' hide';
@@ -350,7 +350,7 @@ function webSocketConnect() {
                                     "<td></td><td></td></tr>"
                                 );
                                 break;
-                            case "song":
+                            case 'song':
                                 var minutes = Math.floor(obj.data[item].duration / 60);
                                 var seconds = obj.data[item].duration - minutes * 60;
 
@@ -362,7 +362,7 @@ function webSocketConnect() {
                                     "</td><td></td></tr>"
                                 );
                                 break;
-                            case "wrap":
+                            case 'wrap':
                                 if(current_app == 'browse') {
                                     $('#next').removeClass('hide');
                                 } else {
@@ -440,7 +440,7 @@ function webSocketConnect() {
                     });
 
                     break;
-                case "state":
+                case 'state':
                     updatePlayIcon(obj.data.state);
                     updateVolumeIcon(obj.data.volume);
 
@@ -494,7 +494,7 @@ function webSocketConnect() {
 
                     last_state = obj;
                     break;
-                case "outputnames":
+                case 'outputnames':
                     $('#btn-outputs-block button').remove();
                     if (obj.data.length > 1) {
 		        $.each(obj.data, function(id, name){
@@ -502,12 +502,12 @@ function webSocketConnect() {
                             btn.appendTo($('#btn-outputs-block'));
                         });
 		    } else {
-                        $('#btn-outputs-block').removeClass('btn-group-vertical');
+                        $('#btn-outputs-block').addClass('hide');
 		    }
                     /* remove cache, since the buttons have been recreated */
                     last_outputs = '';
                     break;
-                case "outputs":
+                case 'outputs':
                     if(JSON.stringify(obj) === JSON.stringify(last_outputs))
                         break;
                     $.each(obj.data, function(id, enabled){
@@ -518,7 +518,7 @@ function webSocketConnect() {
                     });
                     last_outputs = obj;
                     break;
-                case "disconnected":
+                case 'disconnected':
                     if($('.top-right').has('div').length == 0)
                         $('.top-right').notify({
                             message:{text:"ympd lost connection to MPD "},
@@ -526,11 +526,11 @@ function webSocketConnect() {
                             fadeOut: { enabled: true, delay: 1000 },
                         }).show();
                     break;
-                case "update_queue":
+                case 'update_queue':
                     if(current_app === 'queue')
                         socket.send('MPD_API_GET_QUEUE,'+pagination);
                     break;
-                case "song_change":
+                case 'song_change':
 
                     $('#album').text("");
                     $('#artist').text("");
@@ -558,13 +558,13 @@ function webSocketConnect() {
                         }).show();
                         
                     break;
-                case "mpdhost":
+                case 'mpdhost':
                     $('#mpdhost').val(obj.data.host);
                     $('#mpdport').val(obj.data.port);
                     if(obj.data.passwort_set)
                         $('#mpd_password_set').removeClass('hide');
                     break;
-                case "dirbleapitoken":
+                case 'dirbleapitoken':
                     dirble_api_token = obj.data;
                     
                     if(dirble_stations) {
@@ -573,7 +573,7 @@ function webSocketConnect() {
                         dirble_load_categories();
                     }
                     break;
-                case "error":
+                case 'error':
                     $('.top-right').notify({
                         message:{text: obj.data},
                         type: "danger",

From b091e47d2fe4ab00c50ede59334a09ea6b47f924 Mon Sep 17 00:00:00 2001
From: eb041592 <35889760+eb041592@users.noreply.github.com>
Date: Sun, 4 Feb 2018 01:50:28 +0100
Subject: [PATCH 5/7] Removed default for dirble_api_token from ympd.c

---
 src/ympd.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/ympd.c b/src/ympd.c
index a699b28..3aed7e6 100644
--- a/src/ympd.c
+++ b/src/ympd.c
@@ -80,8 +80,6 @@ int main(int argc, char **argv)
     mpd.port = 6600;
     strcpy(mpd.host, "127.0.0.1");
 
-    strcpy(dirble_api_token, "2e223c9909593b94fc6577361a");
-
     static struct option long_options[] = {
         {"host",         required_argument, 0, 'h'},
         {"port",         required_argument, 0, 'p'},

From b3037d6117124852972a50c3d6d6137fc8fdb15c Mon Sep 17 00:00:00 2001
From: eb041592 <35889760+eb041592@users.noreply.github.com>
Date: Sun, 4 Feb 2018 12:50:44 +0100
Subject: [PATCH 6/7] Hide Dirble app, if no API token is given/available

---
 htdocs/js/mpd.js | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/htdocs/js/mpd.js b/htdocs/js/mpd.js
index 8231f45..0f9e188 100644
--- a/htdocs/js/mpd.js
+++ b/htdocs/js/mpd.js
@@ -110,7 +110,6 @@ var app = $.sammy(function() {
         $('#panel-heading').text("Search: "+searchstr);
     });
 
-
     this.get(/\#\/dirble\/(\d+)\/(\d+)/, function() {
         prepare();
         current_app = 'dirble';
@@ -134,14 +133,9 @@ var app = $.sammy(function() {
 
         dirble_stations = true;
 
-        if(dirble_api_token) {
-            dirble_load_stations();
-        } else {
-            getDirbleApiToken();
-        }
+        if (dirble_api_token) { dirble_load_stations(); }
     });
 
-
     this.get(/\#\/dirble\//, function() {
         prepare();
         current_app = 'dirble';
@@ -157,11 +151,7 @@ var app = $.sammy(function() {
 
         dirble_stations = false;
 
-        if(dirble_api_token) {
-            dirble_load_categories();
-        } else {
-            getDirbleApiToken();
-        }
+        if (dirble_api_token) { dirble_load_categories(); }
     });
 
     this.get("/", function(context) {
@@ -199,7 +189,6 @@ $(document).ready(function(){
     add_filter();
 });
 
-
 function webSocketConnect() {
     if (typeof MozWebSocket != "undefined") {
         socket = new MozWebSocket(get_appropriate_ws_url());
@@ -217,7 +206,9 @@ function webSocketConnect() {
 
             app.run();
             /* emit initial request for output names */
-            socket.send("MPD_API_GET_OUTPUTS");
+            socket.send('MPD_API_GET_OUTPUTS');
+            /* emit initial request for dirble api token */
+            socket.send('MPD_API_GET_DIRBLEAPITOKEN');
         }
 
         socket.onmessage = function got_packet(msg) {
@@ -567,11 +558,15 @@ function webSocketConnect() {
                 case 'dirbleapitoken':
                     dirble_api_token = obj.data;
                     
-                    if(dirble_stations) {
-                        dirble_load_stations();
+		    if (dirble_api_token) {
+		        $('#dirble').removeClass('hide');
+
+                        if (dirble_stations) { dirble_load_stations();   }
+                        else {                 dirble_load_categories(); }
+
                     } else {
-                        dirble_load_categories();
-                    }
+                        $('#dirble').addClass('hide');
+		    }
                     break;
                 case 'error':
                     $('.top-right').notify({
@@ -581,9 +576,8 @@ function webSocketConnect() {
                 default:
                     break;
             }
-
-
         }
+
         socket.onclose = function(){
             console.log("disconnected");
             $('.top-right').notify({
@@ -775,10 +769,6 @@ function getHost() {
     $('#mpd_pw_con').keypress(onEnter);
 }
 
-function getDirbleApiToken() {
-    socket.send('MPD_API_GET_DIRBLEAPITOKEN');
-}
-
 $('#search').submit(function () {
     app.setLocation("#/search/"+$('#search > div > input').val());
     $('#wait').modal('show');

From bd9775de8ef68c3b2392d7ae2d1db67b06323795 Mon Sep 17 00:00:00 2001
From: eb041592 <35889760+eb041592@users.noreply.github.com>
Date: Mon, 5 Feb 2018 00:38:20 +0100
Subject: [PATCH 7/7] Align the labels for the trash mode buttons with
 display:inline-block

---
 htdocs/css/mpd.css | 6 ++++++
 htdocs/index.html  | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/css/mpd.css b/htdocs/css/mpd.css
index 647bfc7..21fb4a8 100644
--- a/htdocs/css/mpd.css
+++ b/htdocs/css/mpd.css
@@ -88,3 +88,9 @@ td:last-child, td:first-child {
 button {
   overflow: hidden;
 }
+
+#trashmode span:last-child {
+  display:inline-block;
+  text-align:left;
+  width:2.8em;
+}
diff --git a/htdocs/index.html b/htdocs/index.html
index 6e6fccb..47fde5f 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -177,15 +177,15 @@
           <div id="trashmode" class="btn-group-vertical btn-block btn-group-lg" data-toggle="radio">
             <button id="btntrashmodeup" type="button" class="btn btn-default">
               <span class="glyphicon glyphicon-chevron-up"></span>
-              <span class="glyphicon glyphicon-trash"></span> up &nbsp;&nbsp;&nbsp;
+              <span class="glyphicon glyphicon-trash"></span> <span>Up</span>
             </button>
             <button id="btntrashmodesingle" type="button" class="btn btn-default active">
               <span class="glyphicon glyphicon-star-empty"></span>
-              <span class="glyphicon glyphicon-trash"></span> single
+              <span class="glyphicon glyphicon-trash"></span> <span>Single</span>
             </button>
             <button id="btntrashmodedown" type="button" class="btn btn-default">
               <span class="glyphicon glyphicon-chevron-down"></span>
-              <span class="glyphicon glyphicon-trash"></span> down&nbsp;
+              <span class="glyphicon glyphicon-trash"></span> <span>Down</span>
             </button>
           </div>