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

app/client/app.css

@@ -1363,6 +1363,9 @@ nav form input[type="image"]{
 #banned-container {
     color: white;
 }
+.social-link{
+    margin-right: 5px;
+}
 @media (max-width: 991px){
     .contact-img{
         float: none;

app/client/client.js

@@ -321,6 +321,15 @@ function executeCommand(command, params){
                 return true;
             }
         }
+    } else if(command === "ban"){
+        var user = params[0];
+        var time = params[1];
+        var reason = params[2];
+        Meteor.call("banUser", user, time, reason, function(err, res){
+            if(err){
+                console.log(err);
+            }
+        });
     }
 }
 

app/client/templates/footer.html

@@ -6,6 +6,9 @@
         <a href="/privacy" class="footerButtons" id="privacyButton">Privacy |</a>
         <a href="/about" class="footerButtons" id="aboutButton">About |</a>
         <a href="/contact" class="footerButtons" id="contactButton">Contact</a>
-        <p><a href="https://github.com/AkiraLaine/music-app" target="_blank"><i class="fa fa-github"></i></a></p>
+        <br>
+        <a class="social-link" href="https://www.facebook.com/MusareMusic" target="_blank"><i class="fa fa-facebook"></i></a>
+        <a class="social-link" href="https://twitter.com/musareapp" target="_blank"><i class="fa fa-twitter"></i></a>
+        <a class="social-link" href="https://github.com/AkiraLaine/music-app" target="_blank"><i class="fa fa-github"></i></a>
     </footer>
 </template>

app/client/templates/room.html

@@ -407,6 +407,12 @@
                         </div>
                         <div class="modal-body">
                             <ul>
+                                {{#if isAdmin}}
+                                    <h5 style="margin-bottom:0 !important;">Admin Commands:</h5>
+                                    <li>/ban [userName] [time] [reason]</li>
+                                {{/if}}
+                                <br>
+                                <h5 style="margin-bottom:0 !important;">User Commands:</h5>
                                 <li>/help</li>
                                 <li>/commands</li>
                                 <li>/volume</li>