瀏覽代碼

bug fixes

unknown 9 年之前
父節點
當前提交
ea47c180a3
共有 5 個文件被更改,包括 16 次插入11 次删除
  1. 6 4
      app/app.css
  2. 1 0
      app/app.js
  3. 5 3
      app/templates/admin.html
  4. 2 2
      app/templates/header.html
  5. 2 2
      app/templates/room.html

+ 6 - 4
app/app.css

@@ -589,7 +589,6 @@ footer a:hover{
   background-color: rgb(107, 197, 164);
   background-color: rgb(107, 197, 164);
   color: white;
   color: white;
 }
 }
-
 .song-input-label {
 .song-input-label {
   width: 100%;
   width: 100%;
   text-align: center;
   text-align: center;
@@ -639,6 +638,9 @@ footer a:hover{
   display: block;
   display: block;
   margin: 0 auto 20px auto;
   margin: 0 auto 20px auto;
 }
 }
+#song-media{
+  margin-left: 10px;
+}
 #station-main{
 #station-main{
   margin: 0;
   margin: 0;
   padding: 0;
   padding: 0;
@@ -680,9 +682,6 @@ footer a:hover{
 }
 }
 .chat-message:nth-child(odd) {
 .chat-message:nth-child(odd) {
   color: darkblue;
   color: darkblue;
-}
-#chat-input-container{
-
 }
 }
 #submit{
 #submit{
   margin-left: 10px;
   margin-left: 10px;
@@ -717,3 +716,6 @@ footer a:hover{
 .back:hover{
 .back:hover{
   color: white;
   color: white;
 }
 }
+#doorbell-button{
+  margin-right: 500px;
+}

+ 1 - 0
app/app.js

@@ -845,6 +845,7 @@ if (Meteor.isServer) {
                 }
                 }
                 if (songData !== undefined && Object.keys(songData).length === 5 && songData.type !== undefined && songData.title !== undefined && songData.title !== undefined && songData.artist !== undefined && songData.img !== undefined) {
                 if (songData !== undefined && Object.keys(songData).length === 5 && songData.type !== undefined && songData.title !== undefined && songData.title !== undefined && songData.artist !== undefined && songData.img !== undefined) {
                     songData.duration = getSongDuration(songData.title);
                     songData.duration = getSongDuration(songData.title);
+                    songData.img = getSongAlbumArt(songsData.title);
                     Queues.update({type: type}, {$push: {songs: {id: songData.id, title: songData.title, artist: songData.artist, duration: songData.duration, img: songData.img, type: songData.type}}});
                     Queues.update({type: type}, {$push: {songs: {id: songData.id, title: songData.title, artist: songData.artist, duration: songData.duration, img: songData.img, type: songData.type}}});
                     return true;
                     return true;
                 } else {
                 } else {

+ 5 - 3
app/templates/admin.html

@@ -1,6 +1,7 @@
 <template name="admin">
 <template name="admin">
     {{> header}}
     {{> header}}
-    <div class="landing row">
+    <div class="landing">
+      <div class="row">
         {{#each queues}}
         {{#each queues}}
             <div class="col-md-8 col-md-offset-2 admin-queue-panel">
             <div class="col-md-8 col-md-offset-2 admin-queue-panel">
                 <div class="panel panel-primary">
                 <div class="panel panel-primary">
@@ -28,7 +29,7 @@
                                         <td>{{artist}}</td>
                                         <td>{{artist}}</td>
                                         <td>{{type}}</td>
                                         <td>{{type}}</td>
                                         <td>{{id}}</td>
                                         <td>{{id}}</td>
-                                        <td>{{img}}</td>
+                                        <td class="column-small"><a href="{{img}}" target="_blank"><button class="btn btn-primary preview-button">Preview Image</button></a></td>
                                         <td class="column-small"><button class="btn btn-primary preview-button" data-toggle="modal" data-target="#previewModal">Preview</button></td>
                                         <td class="column-small"><button class="btn btn-primary preview-button" data-toggle="modal" data-target="#previewModal">Preview</button></td>
                                         <td class="column-small"><button class="btn btn-success" id="add-song-button" data-genre="{{../type}}"><i class="fa fa-check-circle"></i></button></td>
                                         <td class="column-small"><button class="btn btn-success" id="add-song-button" data-genre="{{../type}}"><i class="fa fa-check-circle"></i></button></td>
                                         <td class="column-small"><button class="btn btn-danger" id="deny-song-button" data-genre="{{../type}}"><i class="fa fa-ban"></i></button></td>
                                         <td class="column-small"><button class="btn btn-danger" id="deny-song-button" data-genre="{{../type}}"><i class="fa fa-ban"></i></button></td>
@@ -84,4 +85,5 @@
             <li></li>
             <li></li>
         </ul>
         </ul>
     </div>
     </div>
-</template>
+  </div>
+</template>

+ 2 - 2
app/templates/header.html

@@ -9,7 +9,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
                 </button>
-                <a class="navbar-brand" href="#">Music App</a>
+                <a class="navbar-brand" href="/">Music App</a>
             </div>
             </div>
 
 
             <!-- Collect the nav links, forms, and other content for toggling -->
             <!-- Collect the nav links, forms, and other content for toggling -->
@@ -40,4 +40,4 @@
             </div><!-- /.navbar-collapse -->
             </div><!-- /.navbar-collapse -->
         </div><!-- /.container-fluid -->
         </div><!-- /.container-fluid -->
     </nav>
     </nav>
-</template>
+</template>

+ 2 - 2
app/templates/room.html

@@ -10,7 +10,7 @@
               <div id="seeker-container">
               <div id="seeker-container">
                   <div id="seeker-bar"></div>
                   <div id="seeker-bar"></div>
               </div>
               </div>
-              <div class="row">
+              <div class="row" id="song-media">
                 <div class="col-md-8">
                 <div class="col-md-8">
                   <div class="embed-responsive embed-responsive-16by9">
                   <div class="embed-responsive embed-responsive-16by9">
                     <div id="player" class="embed-responsive-item"></div>
                     <div id="player" class="embed-responsive-item"></div>
@@ -38,7 +38,7 @@
                   <i id="submit-message" class="fa fa-paper-plane-o"></i>
                   <i id="submit-message" class="fa fa-paper-plane-o"></i>
                 </div>
                 </div>
               </div> -->
               </div> -->
-              <div id="chat-input-container">
+              <div>
                 <input id="chat-input" placeholder="Type a message...">
                 <input id="chat-input" placeholder="Type a message...">
                 <div id="submit">
                 <div id="submit">
                   <i id="submit-message" class="fa fa-paper-plane-o"></i>
                   <i id="submit-message" class="fa fa-paper-plane-o"></i>