Merge remote-tracking branch 'origin/february_release' into february_release

app/.meteor/packages

@@ -36,4 +36,4 @@ accounts-facebook
 meteorhacks:npm
 
 
-npm-container
+npm-container

app/client/scripts/main.js

@@ -55,6 +55,10 @@ Handlebars.registerHelper("rooms", function(){
     return Rooms.find({});
 });
 
+Handlebars.registerHelper("songs", function(){
+    return Songs.find({});
+});
+
 Handlebars.registerHelper('active', function(path) {
     return curPath() == path ? 'active' : '';
 });

app/client/scripts/onCreated.js

@@ -8,6 +8,17 @@ Template.alertsDashboard.onCreated(function() {
     }
 });
 
+Template.landing.onCreated(function(){
+    function pageScroll() {
+        window.scrollBy(0,1);
+        if($(window).scrollTop() + $(window).height() == $(document).height()) {
+            $(window).scrollTop(0);
+        }
+        scrolldelay = setTimeout(pageScroll,50);
+    }
+    pageScroll();
+})
+
 Template.banned.onCreated(function() {
     if (rTimeInterval !== undefined) {
         Meteor.clearInterval(rTimeInterval)

app/client/scripts/onRendered.js

@@ -97,4 +97,4 @@ Template.room.onRendered(function() {
         }
         makeSlider();
     });
-});
+});

app/client/scripts/routes.js

@@ -86,6 +86,10 @@ Router.route("/news", {
     template: "news"
 })
 
+Router.route("/welcome", {
+    template: "landing"
+})
+
 Router.route("/project", {
     template: "project"
 })

app/client/stylesheets/app.css

@@ -236,4 +236,11 @@ textarea{
 
 .video-import-text {
     margin-left: 225px !important;
-}
+}
+
+.album-art-row img{
+    width: 10%;
+    float: left;
+    height: 10%;
+    opacity: 0.7;
+}

app/client/templates/landing.html

@@ -0,0 +1,7 @@
+<template name="landing">
+    <div class="album-art-row">
+        {{#each songs}}
+            <img src={{img}} />
+        {{/each}}
+    </div>
+</template>