minor updates

app/app.css

@@ -177,6 +177,20 @@ body :-ms-input-placeholder {
 ul {
     list-style: none;
 }
+.navbar{
+  background-color: transparent;
+  border: none;
+}
+.navbar a{
+  color: white !important;
+  font-size: 1.3em;
+}
+.navbar-default .navbar-nav > .active > a,
+.navbar-default .navbar-nav > .active > a:hover,
+.navbar-default .navbar-nav > .active > a:focus{
+  background-color: transparent;
+  font-weight: 900;
+}
 .loginlanding {
   background: #50a3a2;
   background: -webkit-linear-gradient(top left, #50a3a2 0%, #53e3a6 100%);
@@ -717,10 +731,6 @@ footer a:hover{
   width: 200px;
   margin-top: 10%;
 }
-#song-modal{
-  margin-top: 40px;
-  margin-bottom: 40px;
-}
 .modal-content{
   background-color: rgb(107, 197, 164);
   color: white;
@@ -737,8 +747,16 @@ footer a:hover{
   left: 0;
   border-radius: 100%;
 }
+.playlist-title{
+  text-align: center;
+  color: white;
+  font-weight: 600;
+}
 #playlist {
-
+  margin: 0;
+  padding: 0;
+  color: white;
+  font-size: 1.5em;
 }
 #s2 {
   opacity: 0.66666666666666;
@@ -837,7 +855,6 @@ footer a:hover{
   width: 160px; /*12.5 px each side*/
   float: right;
   height: 100%;
-  background-color: #97D8C8;
 }
 #volume-container > .slider {
   top: 40%;
@@ -858,4 +875,13 @@ footer a:hover{
   padding-left: 12px;
   padding-right: 12px;
   margin-left: 12px;
-}
+}
+
+#volume-icon{
+  margin-left: 320px !important;
+}
+
+#settings{
+  margin-top: 10px;
+  margin-left: 10px;
+}

app/app.js

@@ -211,15 +211,16 @@ if (Meteor.isClient) {
         },
         "click #toggle-video": function(e){
             e.preventDefault();
-            Session.set("videoShown", !Session.get("videoShown"))
-            if (Session.get("videoShown")) {
+            if (Session.get("videoHidden")) {
                 $("#player").removeClass("hidden");
                 $("#toggle-video").text("Hide video");
                 var player = document.getElementById("player");
                 player.style.height = (player.offsetWidth / 16 * 9) + "px";
+                Session.set("videoHidden", false);
             } else {
                 $("#player").addClass("hidden");
                 $("#toggle-video").text("Show video");
+                Session.set("videoHidden", true);
             }
         },
         "click #return": function(e){
@@ -388,14 +389,6 @@ if (Meteor.isClient) {
         },
         loaded: function() {
           return Session.get("loaded");
-        },
-        chat: function() {
-            var chatArr = Chat.find({type: type}).fetch();
-            if (chatArr.length === 0) {
-                return [];
-            } else {
-                return chatArr[0].messages;
-            }
         }
     });
 
@@ -552,7 +545,7 @@ if (Meteor.isClient) {
     Template.room.onCreated(function () {
         yt_player = undefined;
         _sound = undefined;
-        Session.set("videoShown", false);
+        Session.set("videoHidden", false)
         var tag = document.createElement("script");
         tag.src = "https://www.youtube.com/iframe_api";
         var firstScriptTag = document.getElementsByTagName('script')[0];

app/templates/admin.html

@@ -1,6 +1,6 @@
 <template name="admin">
-    {{> header}}
     <div class="landing">
+      {{> header}}
       <div class="row">
         {{#each queues}}
             <div class="col-md-8 col-md-offset-2 admin-queue-panel">

app/templates/dashboard.html

@@ -1,5 +1,6 @@
 <template name="dashboard">
     <div class="landing">
+      {{> header}}
         <div class="row">
            {{#each rooms}}
               <div class="col-md-4 col-sm-6 col-xs-12">
@@ -7,6 +8,7 @@
                       <h3>{{type}}</h3>
                       {{#with type=type}}
                         <h5>{{currentSong.song.title}}</h5>
+                        <h6>{{currentSong.song.artist}}</h6>
                       {{/with}}
                       <a href="/{{type}}" class="station_link"></a>
                   </div>

app/templates/header.html

@@ -21,22 +21,17 @@
                         <li class="{{isActivePath '/admin'}}"><a href="/admin">Admin</a></li>
                     {{/if}}
                 </ul>
+                {{#if currentUser}}
+                  <ul class="nav navbar-nav navbar-right">
+                    <li><a href="#" class="logout navbar-right">Logout</a></li>
+                  </ul>
+                {{/if}}
                 <!--form class="navbar-form navbar-left" role="search">
                     <div class="form-group">
                         <input type="text" class="form-control" placeholder="Search">
                     </div>
                     <button type="submit" class="btn btn-default">Submit</button>
                 </form-->
-                <ul class="nav navbar-nav navbar-right">
-                    <li class="dropdown">
-                        {{#if currentUser}}
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{currentUser.profile.username}} <span class="caret"></span></a>
-                            <ul class="dropdown-menu">
-                                <li><a href="#" class="logout">Logout</a></li>
-                            </ul>
-                        {{/if}}
-                    </li>
-                </ul>
             </div><!-- /.navbar-collapse -->
         </div><!-- /.container-fluid -->
     </nav>

app/templates/home.html

@@ -1,5 +1,4 @@
 <template name="home">
-    {{> header}}
     {{#if currentUser}}
     <div id="dashboard">
         {{> dashboard}}

app/templates/login.html

@@ -1,4 +1,5 @@
 <template name="login">
+  {{> header}}
     <div class="container">
         <button class="button" id="register">Sign Up</button>
         <h1>Login</h1>

app/templates/playlist.html

@@ -1,14 +1,10 @@
 <template name="playlist">
-    <div class="row">
-        <div class="pl-container col-md-4 col-sm-4 col-xs-4 col-md-offset-4 col-sm-offset-4 col-xs-offset-4">
-            <h4>Playlist</h4>
-            <ul id="playlist">
-                {{#each playlist_songs}}
-                <li class="playlist-song">
-                    {{title}} - {{artist}}
-                </li>
-                {{/each}}
-            </ul>
-        </div>
-    </div>
+  <h2 class="playlist-title">Playlist</h2>
+  <ul id="playlist">
+      {{#each playlist_songs}}
+        <li>
+            <strong>{{title}}</strong> - {{artist}}
+        </li>
+      {{/each}}
+  </ul>
 </template>

app/templates/register.html

@@ -1,4 +1,5 @@
 <template name="register">
+  {{> header}}
     <div class="container">
         <button class="button" id="login">Login</button>
         <h1>Sign Up</h1>

app/templates/room.html

@@ -6,6 +6,7 @@
               <nav>
                   <a class="back" href="/"><i class="fa fa-chevron-left"></i></a>
                   <h3>{{{type}}}</h3>
+                  <i class="fa fa-volume-off" id="volume-icon"></i>
                   <div id="volume-container">
                       <input type="text" id="volume-slider" class="span2" value="" data-slider-min="0" data-slider-max="100" data-slider-step="1" data-slider-value="50" data-slider-orientation="horizontal" data-slider-selection="after" data-slider-tooltip="hide">
                   </div>
@@ -25,10 +26,17 @@
                   <h2 class="room-artist">{{{artist}}}</h2>
                 </div>
               </div>
-              <button type="button" id="song-modal" class="button-nowidth col-md-4 col-sm-4 col-xs-4 col-md-offset-4 col-sm-offset-4 col-xs-offset-4" data-toggle="modal" data-target="#myModal">Add songs</button>
+              <div class="row" id="settings">
+                <div class="col-md-4">
+                  <button type="button" id="song-modal" class="button" data-toggle="modal" data-target="#myModal">Add songs</button>
+                </div>
+                <div class="col-md-4">
+                  <button type="button" id="toggle-video" class="button">Hide video</button>
+                </div>
+              </div>
             </div>
             <div class="col-md-3" id="side-panel">
-
+              {{> playlist}}
             </div>
           </div>
             <!--<h1 class="room-name">{{{type}}}</h1>
@@ -75,7 +83,7 @@
                     </div>
                 </div>
             </div>
-            -->
+          -->
 
             <!-- Modal -->
             <div id="myModal" class="modal fade" role="dialog">