Browse Source

fixed merge confilct derp

Akira Laine 9 years ago
parent
commit
98bae71fb4
1 changed files with 2 additions and 23 deletions
  1. 2 23
      app/client/templates/room.html

+ 2 - 23
app/client/templates/room.html

@@ -111,27 +111,6 @@
                                 </div>
                             </div>
                             {{#if singleVideo}}
-                            <div class="row" id="single-video">
-                                <div class="input-field">
-                                    <input id="song-input" type="text" class="validate">
-                                    <label for="search_for_song">Search for song</label>
-                                </div>
-                                <a class="waves-effect waves-light btn" id="search-song"><i class="material-icons left">search</i>Search</a>
-                                {{#if singleVideoResultsActive}}
-                                <div id="single-video-results">
-                                    <ul class="collection teal-text">
-                                        {{#each result in singleVideoResults}}
-                                        <li class="collection-item avatar youtube-search-result-li">
-                                            <img src="{{result.image}}" onerror="this.src='http://static.boredpanda.com/blog/wp-content/uploads/2014/04/amazing-fox-photos-182.jpg'" alt="" class="video-import-thumbnail">
-                                            <span class="title video-import-text">{{result.title}}</span>
-                                            <p class="video-import-text">{{result.artist}} <br>
-                                                <a href="https://youtube.com/watch?v={{result.id}}" target="_blank">View Video In YouTube</a>
-                                            </p>
-                                            <a href="#" class="secondary-content" id="addSong" data-result="{{result.id}}"><i class="material-icons" data-result="{{result.id}}">add</i></a>
-                                        </li>
-                                        {{/each}}
-                                    </ul>
-                                </div>
                                 {{#if editingSong}}
                                     <div class="row">
                                         <button type="button" id="return-button" style="margin-bottom: 20px;" class="btn btn-small col l4 m4 s8 offset-l4 offset-m4 offset-s2 center waves-effect waves-light">Return</button>
@@ -186,7 +165,7 @@
                                                             <p class="video-import-text">{{result.artist}} <br>
                                                                 <a href="https://youtube.com/watch?v={{result.id}}" target="_blank">View Video In YouTube</a>
                                                             </p>
-                                                            <a href="#!" class="secondary-content" id="addSong" data-result="{{result.id}}"><i class="material-icons" data-result="{{result.id}}">add</i></a>
+                                                            <a href="#" class="secondary-content" id="addSong" data-result="{{result.id}}"><i class="material-icons" data-result="{{result.id}}">add</i></a>
                                                         </li>
                                                     {{/each}}
                                                 </ul>
@@ -216,7 +195,7 @@
                                                     <p class="video-import-text">{{result.artist}} <br>
                                                         <a href="https://youtube.com/watch?v={{result.id}}" target="_blank">View Video In YouTube</a>
                                                     </p>
-                                                    <a href="#!" class="secondary-content" id="removeSong" data-result="{{result.id}}"><i class="material-icons" data-result="{{result.id}}">remove</i></a>
+                                                    <a href="#" class="secondary-content" id="removeSong" data-result="{{result.id}}"><i class="material-icons" data-result="{{result.id}}">remove</i></a>
                                                 </li>
                                             {{/each}}
                                         </ul>