Merge remote-tracking branch 'origin/master'

app/client/app.css

@@ -1323,3 +1323,14 @@ nav form input[type="image"]{
     color: #50a3a2;
     line-height: 18px;
 }
+.faq-small {
+    color: white;
+}
+.questions {
+    color: white;
+    font-size: 100;
+}
+.answers {
+    color: white;
+    font-size: 50
+}

app/client/routes.js

@@ -48,8 +48,8 @@ Router.route("/contact", {
     template: "contact"
 });
 
-Router.route("/api", {
-    template: "api"
+Router.route("/faq", {
+    template: "faq"
 });
 
 Router.route("/privacy", {

app/client/templates/api.html

@@ -1,13 +0,0 @@
-<template name="api">
-    {{> alerts}}
-    <div class="landing">
-	    {{> header}}
-        <div class="row">
-            <div class="about col-md-8 col-md-offset-2">
-                <h2>API</h2>
-                <p>API documentation is under construction...</p>
-                <p>It's not our highest priority at the moment. So please be patient it will come soon.</p>
-            </div>
-        </div>
-    </div>
-</template>

app/client/templates/contact.html

@@ -32,6 +32,7 @@
                 <ul class="contact-ul">
                     <li class="contact-option place-contact"><i class="fa fa-2x fa-map-marker contact-icon"></i> <span itemprop="address">Fredrikstad, Norway</span></li>
                     <li class="contact-option email-contact"><i class="fa fa-2x fa-envelope contact-icon"></i> <span itemprop="email">Johand@johand.me</span></li>
+                    <li class="contact-option twitter-contact"><i class="fa fa-2x fa-twitter contact-icon"></i> <a href="https://twitter.com/johand199">Johand199</a></li>
                 </ul>
             </div>
             <hr class="col-md-8 col-md-offset-2"/>

app/client/templates/faq.html

@@ -0,0 +1,29 @@
+<template name="faq">
+    {{> alerts}}
+    <div class="landing">
+	    {{> header}}
+        <div class="row">
+            <div class="about col-md-8 col-md-offset-2">
+                <h1>FAQ <small class="faq-small">Frequently Asked Questions</small></h1>
+                <hr />
+                <h1 class="questions">How do I add a song?</h1>
+                <h2 class="answers">Yes,</h2>
+                <hr />
+                <h1 class="questions">Can I skip a song?</h1>
+                <h2 class="answers">Yes, and no. You can vote on skipping a song. You can click the blue skip button. when the counter hits 3, the song will be skipped. Admins and mods can skip songs without needing to vote, please do not ask us to skip songs!</h2>
+                <hr />
+                <h1 class="questions">I added a song but I can't find it in the Playlist</h1>
+                <h2 class="answers">When you have requested a song to the be added, a admin or mod need to accept or deny the request.</h2>
+                <hr />
+                <h1 class="questions">How do I get the emoji things in chat?</h1>
+                <h2 class="answers">You can find a full list at <a href="http://emoji.codes/" target="_blank">www.emoji.codes</a></h2>
+                <hr />
+                <h1 class="questions">Is there an API?</h1>
+                <h2 class="answers">No, sorry. But we will add one soon!</h2>
+                <hr />
+                <h1 class="questions">Chat commands?</h1>
+                <h2 class="answers">Just type /commands or /help in chat!</h2>
+            </div>
+        </div>
+    </div>
+</template>

app/client/templates/footer.html

@@ -1,7 +1,7 @@
 <template name="footer">
     <footer>
         <p>Copyright © 2015 All Right Reserved</p>
-        <a href="/api" class="footerButtons" id="apiButton">API |</a>
+        <a href="/faq" class="footerButtons" id="FAQButton">FAQ |</a>
         <a href="/terms" class="footerButtons" id="termsButton">Terms |</a>
         <a href="/privacy" class="footerButtons" id="privacyButton">Privacy |</a>
         <a href="/about" class="footerButtons" id="aboutButton">About |</a>

app/client/templates/room.html

@@ -409,7 +409,7 @@
                             <ul>
                                 <li>/help</li>
                                 <li>/commands</li>
-                                <li>/hey</li>
+                                <li>/volume</li>
                             </ul>
                         </div>
                         <div class="modal-footer">