Merge branch 'master' into devel

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Dec 20 20:07:15 CET 2017
+#Sun Jan 07 23:09:03 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip

src/main/resources/static/index.html

@@ -45,7 +45,15 @@
 <!--  Scripts-->
 <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
 <script src="js/materialize.js"></script>
-<script src="js/init.js"></script>
+<script>
+    $('.button-collapse-1').sideNav({
+        menuWidth: 400, // Default is 300
+        edge: 'right', // Choose the horizontal origin
+        closeOnClick: false, // Closes side-nav on <a> clicks, useful for Angular/Meteor
+        draggable: true // Choose whether you can drag to open on touch screens,
+    });
+</script>
+<!--<script src="js/init.js"></script>-->
 
 </body>
 </html>

src/main/resources/static/js/init.js

@@ -72,15 +72,18 @@ $(document).ready(function() {
             playlistLimit: $('#limit_range').val(),
             onHead: true
         };
+        $('#input_link').val('');
         sendCommand(JSON.stringify(command));
     })
     $('#btn_add_bottom').click(function () {
+
         var command = {
             command: "ADD",
             url: $('#input_link').val(),
             playlistLimit: $('#limit_range').val(),
             onHead: false
         };
+        $('#input_link').val('');
         sendCommand(JSON.stringify(command));
     })
 
@@ -200,7 +203,7 @@ function getPlayList() {
                     content = content.replace("@title", element.title);
                     content = content.replace("@author", element.author);
                     content = content.replace("@lenght", msToTime(element.length));
-                    content = content.replace("@url", element.uri)
+                    content = content.replace(/@url/g, element.uri);
                     template.html(content);
 
                     $('#playlist_list').append(template);
@@ -254,7 +257,7 @@ function updateControl(data){
         $('#btn_next').removeClass("disabled");
     }
 
-    $('#music_img').attr("src","http://img.youtube.com/vi/"+data.info.identifier+"/hqdefault.jpg");
+    $('#music_img').attr("src","https://img.youtube.com/vi/"+data.info.identifier+"/hqdefault.jpg");
     updateModal(data);
 }
 

src/main/resources/templates/music.html

@@ -143,10 +143,10 @@
 
     </div>
 
-    <!-- Playlist -->
 
 
-    <!-- Modal Structure -->
+
+    <!-- Music  -->
     <div id="modal1" class="modal bottom-sheet">
         <div class="modal-content">
             <ul class="collection">
@@ -161,13 +161,15 @@
 
 
 </div>
+
+<!-- Playlist template-->
 <li id="playlist_template" style="visibility: hidden">
     <div class="collapsible-header"><i class="material-icons">drag_handle</i>@title</div>
     <div class="collapsible-body">
         <ul class="collection">
             <li class="collection-item">Author: @author</li>
             <li class="collection-item">Duration: @lenght</li>
-            <li class="collection-item">URL: <a>@url</a></li>
+            <li class="collection-item">URL: <a target="_blank" href="@url">@url</a></li>
         </ul>
     </div>
 </li>