Merge branch 'february_release' of https://github.com/Musare/Musare into february_release

app/client/app.css

@@ -377,21 +377,6 @@ main {
     margin-top: 10%;
 }
 
-#croom_container, #calert_container {
-    margin-left: auto;
-    margin-right: auto;
-    margin-bottom: 10px;
-    width: 304px !important;
-}
-
-.croom_label, .calert_label {
-    color: white;
-}
-
-.croom, .calert {
-    width: 304px !important;
-}
-
 #calert-priority > option {
     color: black;
 }
@@ -408,9 +393,14 @@ main {
     margin-top: 10%;
 }
 
-.modal-content {
-    background-color: rgb(107, 197, 164);
-    color: white;
+.modal-content, .modal-footer {
+    background-color: rgb(107, 197, 164) !important;
+    color: white !important;
+}
+
+.modal-close {
+    background-color: #fff;
+    color: #53e3a6;
 }
 
 .song-input-label {
@@ -903,46 +893,6 @@ nav form input[type="image"]{
 .song-panel-room{
     float: right;
 }
-/*Credit to: http://thecodeplayer.com/walkthrough/custom-animated-checkbox-inputs-using-css-iconfonts*/
-#two-label {
-    position: relative;
-    padding-left: 30px;
-    font-size: 14px;
-    cursor: pointer;
-    margin-bottom: 15px;
-    color: white;
-    padding-top: 3px;
-}
-#two-label:before, #two-label:after {
-    font-family: FontAwesome;
-    font-size: 21px;
-    /*absolutely positioned*/
-    position: absolute; top: 0; left: 0;
-}
-#two-label:before {
-    content: '\f096'; /*unchecked*/
-}
-#two-label:after {
-    content: '\f046'; /*checked*/
-    /*checked icon will be hidden by default by using 0 max-width and overflow hidden*/
-    max-width: 0;
-    overflow: hidden;
-    opacity: 0.5;
-    /*CSS3 transitions for animated effect*/
-    transition: all 0.35s;
-}
-
-/*hiding the original checkboxes*/
-input[type="checkbox"] {
-    display: none;
-}
-/*when the user checks the checkbox the checked icon will animate in*/
-input[type="checkbox"]:checked + #two-label:after {
-    max-width: 25px; /*an arbitratry number more than the icon's width*/
-    opacity: 1; /*for fade in effect*/
-}
-#two+label:before, #two+label:after {color: hsl(180, 45%, 40%);}
-/*End of checkbox awesomeness!*/
 
 #chat-tab, #global-chat-tab {
     -webkit-transition: background-color 500ms linear;
@@ -1058,8 +1008,12 @@ input[type="checkbox"]:checked + #two-label:after {
 }
 
 .avatar{
-    width: auto;
-    height: auto;
+  width: auto;
+  height: auto;
+}
+.news-box{
+  width: auto;
+  height: auto;
 }
 
 .lowercase{
@@ -1068,4 +1022,23 @@ input[type="checkbox"]:checked + #two-label:after {
 
 .modal-trigger{
     margin-left: 10px;
-}
+}
+
+.content-box{
+    margin-left: 30px;
+    margin-right: 30px;
+}
+
+.news-title{
+    font-size: 30px;
+}
+
+.news-creator{
+    font-style: italic;
+    font-size: 12px;
+}
+
+.news-postTime{
+    font-style: italic;
+    font-size: 12px;
+}

app/client/checkboxes.css

@@ -1,251 +0,0 @@
-.checkbox {
-    padding-left: 20px;
-}
-.checkbox label {
-    display: inline-block;
-    vertical-align: middle;
-    position: relative;
-    padding-left: 5px;
-}
-.checkbox label::before {
-    content: "";
-    display: inline-block;
-    position: absolute;
-    width: 17px;
-    height: 17px;
-    left: 0;
-    margin-left: -20px;
-    border: 1px solid #cccccc;
-    border-radius: 3px;
-    background-color: #fff;
-    -webkit-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
-    -o-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
-    transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
-}
-.checkbox label::after {
-    display: inline-block;
-    position: absolute;
-    width: 16px;
-    height: 16px;
-    left: 0;
-    top: 0;
-    margin-left: -20px;
-    padding-left: 3px;
-    padding-top: 1px;
-    font-size: 11px;
-    color: #555555;
-}
-.checkbox input[type="checkbox"],
-.checkbox input[type="radio"] {
-    opacity: 0;
-    z-index: 1;
-}
-.checkbox input[type="checkbox"]:focus + label::before,
-.checkbox input[type="radio"]:focus + label::before {
-    outline: thin dotted;
-    outline: 5px auto -webkit-focus-ring-color;
-    outline-offset: -2px;
-}
-.checkbox input[type="checkbox"]:checked + label::after,
-.checkbox input[type="radio"]:checked + label::after {
-    font-family: "FontAwesome";
-    content: "\f00c";
-}
-.checkbox input[type="checkbox"]:disabled + label,
-.checkbox input[type="radio"]:disabled + label {
-    opacity: 0.65;
-}
-.checkbox input[type="checkbox"]:disabled + label::before,
-.checkbox input[type="radio"]:disabled + label::before {
-    background-color: #eeeeee;
-    cursor: not-allowed;
-}
-.checkbox.checkbox-circle label::before {
-    border-radius: 50%;
-}
-.checkbox.checkbox-inline {
-    margin-top: 0;
-}
-
-.checkbox-primary input[type="checkbox"]:checked + label::before,
-.checkbox-primary input[type="radio"]:checked + label::before {
-    background-color: #337ab7;
-    border-color: #337ab7;
-}
-.checkbox-primary input[type="checkbox"]:checked + label::after,
-.checkbox-primary input[type="radio"]:checked + label::after {
-    color: #fff;
-}
-
-.checkbox-danger input[type="checkbox"]:checked + label::before,
-.checkbox-danger input[type="radio"]:checked + label::before {
-    background-color: #d9534f;
-    border-color: #d9534f;
-}
-.checkbox-danger input[type="checkbox"]:checked + label::after,
-.checkbox-danger input[type="radio"]:checked + label::after {
-    color: #fff;
-}
-
-.checkbox-info input[type="checkbox"]:checked + label::before,
-.checkbox-info input[type="radio"]:checked + label::before {
-    background-color: #5bc0de;
-    border-color: #5bc0de;
-}
-.checkbox-info input[type="checkbox"]:checked + label::after,
-.checkbox-info input[type="radio"]:checked + label::after {
-    color: #fff;
-}
-
-.checkbox-warning input[type="checkbox"]:checked + label::before,
-.checkbox-warning input[type="radio"]:checked + label::before {
-    background-color: #f0ad4e;
-    border-color: #f0ad4e;
-}
-.checkbox-warning input[type="checkbox"]:checked + label::after,
-.checkbox-warning input[type="radio"]:checked + label::after {
-    color: #fff;
-}
-
-.checkbox-success input[type="checkbox"]:checked + label::before,
-.checkbox-success input[type="radio"]:checked + label::before {
-    background-color: #5cb85c;
-    border-color: #5cb85c;
-}
-.checkbox-success input[type="checkbox"]:checked + label::after,
-.checkbox-success input[type="radio"]:checked + label::after {
-    color: #fff;
-}
-
-.radio {
-    padding-left: 20px;
-}
-.radio label {
-    display: inline-block;
-    vertical-align: middle;
-    position: relative;
-    padding-left: 5px;
-}
-.radio label::before {
-    content: "";
-    display: inline-block;
-    position: absolute;
-    width: 17px;
-    height: 17px;
-    left: 0;
-    margin-left: -20px;
-    border: 1px solid #cccccc;
-    border-radius: 50%;
-    background-color: #fff;
-    -webkit-transition: border 0.15s ease-in-out;
-    -o-transition: border 0.15s ease-in-out;
-    transition: border 0.15s ease-in-out;
-}
-.radio label::after {
-    display: inline-block;
-    position: absolute;
-    content: " ";
-    width: 11px;
-    height: 11px;
-    left: 3px;
-    top: 3px;
-    margin-left: -20px;
-    border-radius: 50%;
-    background-color: #555555;
-    -webkit-transform: scale(0, 0);
-    -ms-transform: scale(0, 0);
-    -o-transform: scale(0, 0);
-    transform: scale(0, 0);
-    -webkit-transition: -webkit-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
-    -moz-transition: -moz-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
-    -o-transition: -o-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
-    transition: transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
-}
-.radio input[type="radio"] {
-    opacity: 0;
-    z-index: 1;
-}
-.radio input[type="radio"]:focus + label::before {
-    outline: thin dotted;
-    outline: 5px auto -webkit-focus-ring-color;
-    outline-offset: -2px;
-}
-.radio input[type="radio"]:checked + label::after {
-    -webkit-transform: scale(1, 1);
-    -ms-transform: scale(1, 1);
-    -o-transform: scale(1, 1);
-    transform: scale(1, 1);
-}
-.radio input[type="radio"]:disabled + label {
-    opacity: 0.65;
-}
-.radio input[type="radio"]:disabled + label::before {
-    cursor: not-allowed;
-}
-.radio.radio-inline {
-    margin-top: 0;
-}
-
-.radio-primary input[type="radio"] + label::after {
-    background-color: #337ab7;
-}
-.radio-primary input[type="radio"]:checked + label::before {
-    border-color: #337ab7;
-}
-.radio-primary input[type="radio"]:checked + label::after {
-    background-color: #337ab7;
-}
-
-.radio-danger input[type="radio"] + label::after {
-    background-color: #d9534f;
-}
-.radio-danger input[type="radio"]:checked + label::before {
-    border-color: #d9534f;
-}
-.radio-danger input[type="radio"]:checked + label::after {
-    background-color: #d9534f;
-}
-
-.radio-info input[type="radio"] + label::after {
-    background-color: #5bc0de;
-}
-.radio-info input[type="radio"]:checked + label::before {
-    border-color: #5bc0de;
-}
-.radio-info input[type="radio"]:checked + label::after {
-    background-color: #5bc0de;
-}
-
-.radio-warning input[type="radio"] + label::after {
-    background-color: #f0ad4e;
-}
-.radio-warning input[type="radio"]:checked + label::before {
-    border-color: #f0ad4e;
-}
-.radio-warning input[type="radio"]:checked + label::after {
-    background-color: #f0ad4e;
-}
-
-.radio-success input[type="radio"] + label::after {
-    background-color: #5cb85c;
-}
-.radio-success input[type="radio"]:checked + label::before {
-    border-color: #5cb85c;
-}
-.radio-success input[type="radio"]:checked + label::after {
-    background-color: #5cb85c;
-}
-
-input[type="checkbox"].styled:checked + label:after,
-input[type="radio"].styled:checked + label:after {
-    font-family: 'FontAwesome';
-    content: "\f00c";
-}
-input[type="checkbox"] .styled:checked + label::before,
-input[type="radio"] .styled:checked + label::before {
-    color: #fff;
-}
-input[type="checkbox"] .styled:checked + label::after,
-input[type="radio"] .styled:checked + label::after {
-    color: #fff;
-}

app/client/head.html

@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 	  <meta name="keywords" content="music, musare, lisen, app, meteor, edm, rooms, party, good, mus, are, pop">
     <meta name="description" content="Musare is a website where you can enjoy genre specific playlists with lots of songs! The same song plays for everyone at the same time in the same station, so you can also listen to it with friends!">
-	  <meta name="copyright" content="Copyright © 2015 All Right Reserved">
+	  <meta name="copyright" content="Copyright © 2015-2016 All Right Reserved">
     <link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
     <link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
     <link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">
@@ -40,17 +40,6 @@
             window.scrollTo(0, 1);
         }
 
-        // Doorbell Initialising
-        /*window.doorbellOptions = {
-            strings: {
-                'email-input-placeholder': 'Your email address (optional)'
-            },
-            appKey: 'v2Gu14c8s9HgBsAFCXNWIm2vlk11N12Plt2Wu5k2MbQIkM1Ao6kOTCbfN95ElEVM'
-        };
-        (function(d, t) {
-            var g = d.createElement(t);g.id = 'doorbellScript';g.type = 'text/javascript';g.async = true;g.src = 'https://embed.doorbell.io/button/2408?t='+(new Date().getTime());(d.getElementsByTagName('head')[0]||d.getElementsByTagName('body')[0]).appendChild(g);
-        }(document, 'script'));*/
-
         // YouTube Iniialising
         Session.set("YTLoaded", false);
 

app/client/scripts/routes.js

@@ -70,10 +70,6 @@ Router.route("/privacy", {
     template: "privacy"
 });
 
-Router.route("/about", {
-    template: "about"
-});
-
 Router.route("/feedback", {
     template: "feedback"
 })
@@ -82,6 +78,10 @@ Router.route("/team", {
     template: "team"
 })
 
+Router.route("/news", {
+    template: "news"
+})
+
 Router.route("/project", {
     template: "project"
 })
@@ -142,6 +142,20 @@ Router.route("/admin/alerts", {
     }
 });
 
+Router.route("/admin/news", {
+    waitOn: function() {
+        return [Meteor.subscribe("isModerator", Meteor.userId()), Meteor.subscribe("isAdmin", Meteor.userId())];
+    },
+    action: function() {
+        var user = Meteor.users.findOne({});
+        if (user !== undefined && user.profile !== undefined && (user.profile.rank === "admin")) {
+            this.render("mnews");
+        } else {
+            this.redirect("/");
+        }
+    }
+});
+
 Router.route("/u/:user", function() {
     this.render("profile");
 });
@@ -159,4 +173,4 @@ Router.route("/:type", {
             this.redirect("/");
         }
     }
-});
+});

app/client/templates/about.html

@@ -1,14 +0,0 @@
-<template name="about">
-    {{> alerts}}
-    <div class="landing">
-	    {{> header}}
-        <div class="row">
-            <div class="about col-md-8 col-md-offset-2">
-                <h2>About</h2>
-                <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>, <a href="https://github.com/KrisVos130">@KrisVos130</a> and <a href="https://github.com/johand199">@johand199</a></p>
-            </div>
-        </div>
-    </div>
-</template>

app/client/templates/admin.html

@@ -2,74 +2,92 @@
     {{> alerts}}
     <div class="landing">
         {{> header}}
-          <div class="row" style="margin-top: 20px; height: 100%;">
-            <div class="col-md-6 col-md-offset-1 admin-container" style="height: 80%;">
-              <div>
-                <h1>Stations</h1><a href="#" data-toggle="modal" data-target="#addStation">(+)</a>
-              </div>
-              {{#each playlists}}
-                <p>{{display}}</p>
-                <table class="table" style="border-bottom: 1px solid white;">
-                  <tr>
-                    <th>Songs</th>
-                    <th>Users</th>
-                    <th>Admins</th>
-                    <th>Reports</th>
-                    <th>Queue</th>
-                  </tr>
-                  <tr>
-                    <td>{{songs.length}}</td>
-                    <td>{{roomUserNum}}</td>
-                    <td></td>
-                    <td>{{reportsCount display}}</td>
-                    <td>{{queueCount display}}</td>
-                    <td><a href="/admin/stations" id={{display}}>Edit</a></td>
-                  </tr>
-                </table>
-              {{/each}}
-              <button class="btn btn-danger col-md-6 col-md-offset-3" id="rrating" data-toggle="modal" data-target="#confirmModal">Reset All Ratings</button>
+        <div class="row" style="margin-top: 20px; height: 100%;">
+            <div class="col s12 l6 m10 offset-l1 offset-m1 card-panel teal accent-3 white-text" style="height: 80%;">
+                <div>
+                    <h2 class="center-align">Stations</h2>
+                </div>
+                    <p>{{display}}</p>
+                    <table>
+                        <thead>
+                        <tr>
+                            <th>Type</th>
+                            <th>Songs</th>
+                            <th>Users</th>
+                            <th>Admins</th>
+                            <th>Reports</th>
+                            <th>Queue</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                            {{#each playlists}}
+                                <tr>
+                                    <td>{{display}}</td>
+                                    <td>{{songs.length}}</td>
+                                    <td>{{roomUserNum}}</td>
+                                    <td></td>
+                                    <td>{{reportsCount display}}</td>
+                                    <td>{{queueCount display}}</td>
+                                    <td><a href="/{{type}}/manage" class="btn right" id="manage-{{display}}">Manage</a></td> <!-- TODO Make this redirect to playlist -->
+                                </tr>
+                            {{/each}}
+                        </tbody>
+                    </table>
+                <div class="row">
+                    <button class="btn col m6 s6 l6 waves-effect waves-light" id="rrating" data-toggle="modal"
+                            data-target="#confirmModal">Reset All Ratings
+                    </button>
+                    <a class="waves-effect waves-light btn col m6 s6 l6 modal-trigger" id="new_room" href="#addStation"> <!-- TODO Make this actually open the new room modal  -->
+                        Add Room
+                    </a>
+                </div>
             </div>
-            <div class="col-md-3 col-md-offset-1 admin-container" style="height: 80%;">
-              <div>
-                <h1>Site statistics</h1>
-              </div>
-              <p>Total Users Online: {{usersOnline}}</p>
-              <p>Total Registered Users: {{allUsers}}</p>
-              <a href="/admin/queues">Edit the queues</a>
+            <div class="col s12 m8 l3 offset-l1 offset-m2 card-panel teal accent-3 white-text" style="height: 80%;">
+                <div>
+                    <h2 class="center-align">Site statistics</h2>
+                </div>
+                <div class="section">
+                    <p class="flow-text">Total Users Online: {{usersOnline}}</p>
+                    <p class="flow-text">Total Registered Users: {{allUsers}}</p>
+                </div>
+                <div class="row">
+                    <a class="btn col l12 s12 m12 waves-effect waves-light" href="/admin/queues">Manage Queues</a> <!-- TODO Make this redirect to the queues -->
+                    <a class="btn col l12 s12 m12 waves-effect waves-light" href="/admin/news">Manage News</a>
+                </div>
             </div>
-          </div>
-          <div id="addStation" class="modal fade" role="dialog">
-              <div class="modal-dialog">
-
-                  <!-- Modal content-->
-                  <div class="modal-content">
-                      <div class="modal-header">
-                          <button type="button" class="close" data-dismiss="modal">&times;</button>
-                          <h4 class="modal-title">Create new station</h4>
-                      </div>
-                      <div class="modal-body">
-                        <div id="croom_container">
-                          <label for="croom_display" class="croom_label">Room Display Name (eg 'Edm'):</label>
-                          <div class="input-group">
-                            <input type="text" class="croom" id="croom_display" name="croom" required />
-                          </div>
-                          <label for="croom_tag" class="croom_label">Room Tag Name (eg 'edm'):</label>
-                          <div class="input-group">
-                            <input type="text" class="croom" id="croom_tag" name="croom" required />
-                          </div>
-                          <input type="checkbox" name="two" id="two"/>
-                          <label id="two-label" for="two">Make Room Private?</label>
-                          <button class="btn btn-warning btn-block" id="croom_create">Create</button>
-                        </div>
-                      </div>
-                      <div class="modal-footer">
-                          <button id="close-modal-a" type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                      </div>
-                  </div>
-
-              </div>
-          </div>
+        </div>
+        <div id="addStation" class="modal">
+            <!-- Modal content-->
+            <div class="modal-content">
+                <div class="modal-body">
+                    <h4>Add Room</h4>
+                    <div class="input-field">
+                        <input type="text" class="croom" id="croom_display" name="croom" required/>
+                        <label for="croom_display" class="white-text">Room Display Name</label>
+                    </div>
+                    <div class="input-field">
+                        <input type="text" class="croom" id="croom_tag" name="croom" required/>
+                        <label for="croom_tag" class="white-text">Room Tag</label>
+                    </div>
+                    <input type="checkbox" name="croom_private" id="croom_private"/>
+                    <label for="croom_private" class="white-text">Make Room Private?</label>
+                    <div class="section">
+                        <button class="btn btn-warning btn-block waves-effect waves-light" id="croom_create">Create</button>
+                    </div>
+                    <div class="divider"></div>
+                </div>
+                <div class="modal-footer">
+                    <a href="#!" class=" modal-action modal-close waves-effect waves-light btn-flat">Close</a>
+                </div>
+            </div>
+        </div>
     </div>
+    <script>
+        $(document).ready(function(){
+            // the "href" attribute of .modal-trigger must specify the modal ID that wants to be triggered
+            $('#new_room').leanModal();
+        });
+    </script>
 
     <div id="confirmModal" class="modal fade" role="dialog">
         <div class="modal-dialog">
@@ -81,10 +99,10 @@
                 </div>
                 <div class="modal-body">
                     <h3 style="margin-top: 0">Are you sure you want to reset all likes and dislikes?</h3>
-                    <button id="rreset_confirm" class="btn btn-danger">Reset All Ratings</button>
+                    <button id="rreset_confirm" class="btn btn-danger waves-effect waves-light">Reset All Ratings</button>
                 </div>
                 <div class="modal-footer">
-                    <button id="close-modal" type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                    <button id="close-modal" type="button" class="btn btn-default waves-effect waves-light" data-dismiss="modal">Close</button>
                 </div>
             </div>
         </div>

app/client/templates/header.html

@@ -4,6 +4,7 @@
         <ul id="contributeDrop" class="dropdown-content">
             <li><a href="https://www.github.com/Musare/Musare" target="_blank">Github</a></li>
             <li><a href="donate.html">Donate</a></li>
+            <li><a href="/feedback">Feedback</a></li>
         </ul>
         <ul id="aboutDrop" class="dropdown-content">
             <li><a href="/project">The Project</a></li>
@@ -25,7 +26,7 @@
                 <a href="/" class="brand-logo">Musare</a>
                 <a href="#" data-activates="mobile-navi" class="button-collapse"><i class="material-icons">menu</i></a>
                 <ul class="right hide-on-med-and-down scroll-fix">
-                    <li><a href="/feedback">Feedback</a></li>
+                    <li><a href="/news">News</a></li>
                     <li><a class="dropdown-button" href="#!" data-activates="contributeDrop">Contribute<i
                             class="material-icons right">arrow_drop_down</i></a></li>
                     <li><a class="dropdown-button" href="#!" data-activates="aboutDrop">About<i
@@ -41,7 +42,7 @@
                 <ul class="side-nav" id="mobile-navi" style="width: 240px;">
                     <ul class="collapsible" data-collapsible="accordion">
                         <li>
-                            <a href="/feedback">Feedback</a>
+                            <a href="/news">News</a>
                         </li>
                         <li>
                             <div class="collapsible-header black-text"><i class="material-icons">arrow_drop_down</i>
@@ -50,6 +51,7 @@
                             <div class="collapsible-body black-text">
                                 <a href="https://www.github.com/Musare/Musare" target="_blank">Github</a>
                                 <a href="donate.html">Donate</a>
+                                <a href="/feedback">Feedback</a>
                             </div>
                         </li>
                         <li>

app/client/templates/mnews.html

@@ -0,0 +1,10 @@
+<template name="mnews">
+    <div class="landing">
+	    {{> header}}
+        <div class="row">
+            <div class="about col-md-8 col-md-offset-2">
+              <h1>Manage News Here...</h1>
+            </div>
+        </div>
+    </div>
+</template>

app/client/templates/news.html

@@ -0,0 +1,31 @@
+<template name="news">
+    {{> header}}
+    <main class="content-box">
+        <h3 class="black-text thin">News, Updates & Announcements</h3>
+        <ul class="collection">
+        <!--
+        {{#each chat}}
+        <li class="collection-item news-box">
+            <span class="news-title">{{title}}</span>
+            <hr>
+            <p class="news-content">{{content}}</p>
+            <p class="news-creator">Posted by: {{postBy}}</p>
+            <p class="news-postTime">{{timePostedAgo}}. ({{timePostedDate}})</p>
+        </li>
+        {{/each}}
+        -->
+
+        <!-- TEMP HARDCODED NEWS ARTICLE, soon you can add/remove news from the admin panel -->
+        <li class="collection-item news-box">
+            <span class="news-title">Welcome To Musare 2.0</span>
+            <hr>
+            <p class="news-content">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla rhoncus magna orci, tristique aliquam arcu ultricies non.
+              <br />Vivamus iaculis leo lectus. In quis nunc rhoncus nulla hendrerit pellentesque in nec ipsum. Curabitur facilisis enim nulla, sit amet dapibus lacus aliquet ut. Integer lacinia pharetra semper.
+              <br />Duis mattis varius egestas. Cras sit amet venenatis lacus. Curabitur ut maximus urna, vel pulvinar ex.</p>
+            <p class="news-creator">Posted by: Johand</p>
+            <p class="news-postTime">5days ago. (5/01/2016)</p>
+        </li>
+        </ul>
+    </main>
+    {{> footer}}
+</template>

app/client/templates/project.html

@@ -1,6 +1,6 @@
 <template name="project">
     {{> header}}
-    <main>
+    <main class="content-box">
         <h3 class="black-text thin">The Project</h3>
         <hr>
         <h4 class="thin">What is Musare?</h4>

app/client/templates/team.html

@@ -1,6 +1,6 @@
 <template name="team">
     {{> header}}
-    <main>
+    <main class="content-box">
         <h3 class="black-text thin">The Team</h3>
         <ul class="collection">
             <li class="collection-item avatar">
@@ -27,6 +27,18 @@
                     <i class="material-icons">email</i> <span>krisvos130@gmail.com</span>
                 </div>
             </li>
+            <li class="collection-item avatar">
+                <img src="https://avatars2.githubusercontent.com/u/6952369?v=3&s=460" alt="Kris' Profile Picture"
+                     class="circle">
+                <span class="title">Johannes Andersen</span>
+                <p>Co Founder, <span title="Chief business officer">CBO</span> & Developer</p>
+                <div class="contact-details">
+                    <i class="material-icons">my_location</i> <span>Fredrikstad, Norway</span>
+                </div>
+                <div class="contact-details">
+                    <i class="material-icons">email</i> <span>Johand@Johand.me</span>
+                </div>
+            </li>
             <li class="collection-item avatar">
                 <img src="https://avatars0.githubusercontent.com/u/1158013?v=3&s=460" alt="Wesley's Profile Picture"
                      class="circle">
@@ -42,4 +54,4 @@
         </ul>
     </main>
     {{> footer}}
-</template>
+</template>

app/client/templates/terms.html

@@ -3,7 +3,7 @@
     {{> header}}
     <div style="margin:10px;">
         <h3>Terms of Service</h3>
-        <small>Last updated: Septemeber 29, 2015</small>
+        <small>Last updated: January 4, 2016</small>
         <hr>
         <p class="flow-text">
             By using the musare.com web site ("Service"), or any services of Musare ("Musare"), you are agreeing to be
@@ -101,7 +101,7 @@
                 may not settle any claim, demand, suit or proceeding unless the settlement unconditionally releases
                 Musare of all liability); and (c) provides to You all reasonable assistance, at Your expense.
             </li>
-            <li>The look and feel of the Service is copyright © 2015 Musare. All rights reserved. You may not duplicate,
+            <li>The look and feel of the Service is copyright © 2015-2016 Musare. All rights reserved. You may not duplicate,
                 copy, or reuse any portion of the HTML/CSS, Javascript, or visual design elements or concepts without
                 express written permission from Musare.
             </li>

app/public/.htaccess

@@ -1,14 +0,0 @@
-RewriteEngine On
-RewriteCond %{HTTP_HOST} ^www\.musare\.com$
-RewriteRule ^/?$ "http\:\/\/musare\.com\/" [R=301,L]
-RewriteCond %{HTTP_HOST} ^107\.170\.230\.56
-RewriteRule (.*) http://musare.com/$1 [R=301,L]
-RewriteCond %{HTTP_USER_AGENT} libwww-perl.* 
-RewriteRule .* ? [F,L]
-<IfModule mod_expires.c>
-    ExpiresActive on
-    ExpiresByType image/jpg "access plus 1 month"    
-    ExpiresByType image/jpeg "access plus 1 month"    
-    ExpiresByType image/gif "access plus 1 month"    
-    ExpiresByType image/png "access plus 1 month"
-</IfModule>