Merge branch 'master' of https://github.com/Musare/Musare

app/client/client.js

@@ -939,6 +939,15 @@ Template.room.events({
         Meteor.call("submitReport", room, reportData, Session.get("id"), function() {
             $("#close-modal-r").click();
         });
+    },
+    "change #si_or_pl": function(){
+        if($("#select_playlist").is(':selected')){
+            $("#search-info").hide();
+            $("#playlist-buttons").show();
+        } else{
+            $("#search-info").show();
+            $("#playlist-buttons").hide();
+        }
     }
 });
 

app/client/templates/room.html

@@ -165,17 +165,17 @@
                             <h4 class="modal-title">Search for a song</h4>
                         </div>
                         <div class="modal-body">
-                            <!--select name="si_or_pl" id="si_or_pl" class="song-input-select">
+                            <select name="si_or_pl" id="si_or_pl" class="song-input-select">
                                 <option name="single" id="select_single" title="Add a single video to the queue.">Single Video</option>
                                 <option name="playlist" id="select_playlist" title="Add all video's in a playlist to the queue.">Playlist</option>
-                            </select-->
+                            </select>
 
                             <div id="search-info">
                                 <select name="type" id="search_type" class="song-input-select">
                                     <option name="youtube" id="search_youtube">YouTube</option>
                                     <option name="soundcloud" id="search_soundcloud">SoundCloud</option>
                                 </select>
-                                <input type="text" id="song-input" class="song-input">
+                                <input type="text" id="song-input" class="song-input" placeholder="Enter search query" onfocus="this.placeholder = ''" onblur="this.placeholder = 'Enter search query'">
                                 <button type="button" id="search-song" class="button">Search</button>
                                 <div id="song-results"></div>
                             </div>
@@ -193,13 +193,13 @@
                                 <label for="title" class="song-input-label">Song Title</label>
                                 <input class="song-input" name="title" id="title" type="text"/>
                                 <label for="img" class="song-input-label">Song Img</label>
-                                <input class="song-input" name="img" id="img" type="text" />
+                                <input class="song-input" name="img" id="img" type="text"/>
                                 <button type="button" id="add-song-button" class="button">Add Song</button>
                             </div>
 
-                            <!--div id="playlist-buttons">
+                            <div id="playlist-buttons" style="display:none">
                                 <button id="youtube-playlist-button" class="button">Import YouTube Playlist</button>
-                            </div-->
+                            </div>
 
                             <!--small id="search-alert">Searching for a song fills out the above fields automatically, but you will still have to verify them.</small-->
                         </div>