Merge branch 'master' of https://github.com/AkiraLaine/music-app

README.md

@@ -1,3 +1,37 @@
+##Visit the official website!
+
+### ** http://musare.com/ **
+
+##Found a bug?
+
+Try these methods frist before reporting a issue:
+
+1. Refresh page or restart browser
+2. Turn off all extensions
+3. Clear cookies and cache
+4. Update browser or try another (Chrome, Firefox)
+5. Flush browser DNS/Sockets and IP DNS
+<hr>
+**Chrome**
+```chrome://net-internals/#dns``` and ```chrome://net-internals/#sockets```
+<hr>
+**Firefox**
+```about:config``` then change ```network.dnsCacheExpiration``` to ```0``` and back to ```60```
+<hr>
+**Windows 7, 8, 10**
+```ipconfig /flushdns```
+<hr>
+**Linux (latest versions)**
+```sudo /etc/init.d/nscd restart```
+<hr>
+**Mac OS X Yosemite**
+```sudo discoveryutil mdnsflushcache```
+<hr>
+
+This did not fix your issue? or you're still not satisfied? Just create a issue ticket at:
+https://github.com/AkiraLaine/musare/issues
+Be sure to be as detailed as possible!
+
 ##Get started with development!
 
 First download Meteor: https://www.meteor.com/

app/app.css

@@ -489,6 +489,11 @@ form button:hover {
         width: 300px !important;
         margin-bottom: 100px !important;
     }
+    #voting{
+        margin: 0 auto !important;
+        width: 300px !important;
+        margin-bottom: 100px !important;
+    }
     #side-panel{
         display: none;
     }
@@ -1059,6 +1064,11 @@ nav form input[type="image"]{
     margin-left: 10px;
 }
 
+#voting {
+    margin-top: 10px;
+    margin-left: 10px;
+}
+
 #loginregistercontainer {
     margin-bottom: 100px;
 }
@@ -1075,6 +1085,9 @@ nav form input[type="image"]{
 .terms, .privacy, .about {
   color: white;
 }
+.about a{
+    color: white;
+}
 #play, #pause, #skip, #shuffle {
     cursor: pointer;
 }

app/templates/about.html

@@ -4,9 +4,9 @@
         <div class="row">
             <div class="about col-md-8 col-md-offset-2">
                 <h2>About</h2>
-                <p>Musare is a modern, open-source Music App.</p>
+                <p>Musare is a modern, collaborative, open-source Music App.</p>
                 <p>Listen to music in one of the various stations, specific to one genre</p>
-                <p>Built by <a href="https://github.com/AkiraLaine">@AkiraLaine</a> and <a href="https://github.com/KrisVos130">@KrisVos130</a></p>
+                <p>Built by <a href="https://github.com/AkiraLaine">@AkiraLaine</a>, <a href="https://github.com/KrisVos130">@KrisVos130</a> and <a href="https://github.com/johand199">@johand199</a></p>
             </div>
         </div>
     </div>

app/templates/home.html

@@ -1,11 +1,15 @@
 <template name="home">
     <div class="homepage">
-      {{> header}}
-      {{#if currentUser}}
-        {{> dashboard}}
-      {{else}}
-        {{> dashboard}}
-      {{/if}}
+        <div class="alert alert-success alert-dismissible" role="alert" style="margin-bottom: 0">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true"><i class="fa fa-times"></i></span></button>
+            <strong>Hey there!</strong> Welcome to Musare - a modern, open-source, collaborative music app.
+        </div>
+        {{> header}}
+        {{#if currentUser}}
+            {{> dashboard}}
+        {{else}}
+            {{> dashboard}}
+        {{/if}}
         <div class="push"></div>
     </div>
     {{> footer}}

app/templates/room.html

@@ -51,6 +51,8 @@
                         <div class="col-md-3">
                             <button type="button" id="toggle-video" class="button">Hide video</button>
                         </div>
+                    </div>
+                    <div class="row" id="voting">
                         <div class="col-md-3">
                         {{#if currentUser}}
                             <button title="Smile to this song." type="button" id="like" class="btn btn-success btn-lg {{liked}}"><i class="fa fa-smile-o"> {{likes}}</i></button>
@@ -119,9 +121,6 @@
 
                     <!-- Modal content-->
                     <div class="modal-content">
-                         <div class="col-md-3">
-                             <button title="Report this song!" type="button" id="report-modal" class="btn btn-warning btn-lg report-button" data-toggle="modal" data-target="#reportModal"><i class="fa fa-flag"></i></button>
-                         </div>
                         <div class="modal-body">
 
                             <button type="button" id="report-prev" class="btn btn-warning btn-lg btn-block">Report previous song ({{previousSongR.title}})</button>