* wip

ruby/lib/jam_ruby/models/connection.rb

@@ -153,7 +153,7 @@ module JamRuby
       true
     end
 
-    def join_the_session(music_session, as_musician, tracks, user, audio_latency)
+      def join_the_session(music_session, as_musician, tracks, user, audio_latency)
       self.music_session_id = music_session.id
       self.as_musician = as_musician
       self.joining_session = true

web/Gemfile

@@ -87,6 +87,7 @@ group :development, :test do
   gem 'execjs', '1.4.0'
   gem 'factory_girl_rails', '4.1.0' # in dev because in use by rake task
   gem 'database_cleaner', '1.3.0' #in dev because in use by rake task
+  gem 'slim'
 end
 group :unix do
   gem 'therubyracer' #, '0.11.0beta8'

web/app/assets/stylesheets/client/content-orig.css.scss

@@ -342,7 +342,7 @@ ul.shortcuts {
 .tagline {
   font-size:30px;
   margin-top:35px;
-  color:#ed3718;
+  color:#ed3618;
   font-weight:300;
   width:345px;
   clear:left;

web/app/assets/stylesheets/client/content.css.scss

@@ -516,7 +516,7 @@ ul.shortcuts {
 .tagline {
   font-size:30px;
   margin-top:35px;
-  color:#ed3718;
+  color:#ed3618;
   font-weight:300;
   width:345px;
   clear:left;

web/app/assets/stylesheets/landings/landing_page.css.scss

@@ -0,0 +1,110 @@
+@import "client/common.css.scss";
+// landing_page is a a/b testing landing page
+
+// #ed3618   - orange
+$headerText: white;
+
+body.web.landing_page {
+  #profile {
+    display:none;
+  }
+
+  .landing-content {
+
+    h1 {
+      color: $headerText !important;
+      font-size:20px;
+      font-weight:normal;
+    }
+    .column {
+      float:left;
+      @include border_box_sizing;
+
+      &:nth-child(1) {
+        width:60%;
+      }
+
+      &:nth-child(2) {
+        width:40%;
+      }
+    }
+
+    .buzz {
+      margin-top:55px;
+      height:268px;
+      overflow:hidden;
+      border-color: $color2;
+      border-style:solid;
+      border-width:1px;
+      background-color:$ColorUIBackground;
+      padding:10px;
+
+      h2 {
+        color: $ColorScreenPrimary !important;
+        font-size:20px;
+      }
+    }
+
+    .video-container {
+      width:75%;
+      margin:20px 0 30px 0;
+      position: relative;
+      padding-bottom: 40.00%;
+      padding-top: 30px; height: 0; overflow: hidden;
+    }
+
+    .video-container iframe,
+    .video-container object,
+    .video-container embed {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+    }
+
+    #signup {
+      margin:10px 0 0 0;
+    }
+
+    .cta-container {
+      margin-left:11%;
+
+      h2 {
+        margin-left:45px;
+      }
+    }
+
+    .more-container {
+      margin-top:35px;
+
+      a {
+        margin-top:40px;
+      }
+    }
+  }
+
+
+  &.full {
+
+  }
+
+  &.tight {
+
+  }
+
+
+  .landing-tag {
+
+    font-size:14px;
+    position: absolute;
+    left: 60%;
+    top: 25px;
+    margin: 0;
+
+    h1 {
+      color: $ColorScreenPrimary !important;
+    }
+  }
+
+}

web/app/assets/stylesheets/web/main.css.scss

@@ -26,7 +26,7 @@ body.web {
 
     .home-questions {
       font-size: 20px;
-      color: #ed3718;
+      color: #ed3618;
       padding-top:30px;
       padding-bottom:40px;
       text-align:center;
@@ -49,7 +49,7 @@ body.web {
     width:400px;
 
     h1 {
-      color:#ed3718;
+      color:#ed3618;
       font-size:26px;
       font-weight:300;
       line-height:30px;
@@ -83,7 +83,7 @@ body.web {
     .wrapper h1 {
       position:relative;
       padding-top:15px;
-      color:#ed3718 !important;
+      color:#ed3618 !important;
       font-weight:normal;
       font-size:40px;
     }
@@ -120,7 +120,7 @@ body.web {
   .landing-sidebar {
     width:350px;
     background:#353535;
-    border:solid 1px #ed3718;
+    border:solid 1px #ed3618;
     position:absolute;
     top:30px;
     right:0px;

web/app/assets/stylesheets/web/web.css

@@ -19,4 +19,5 @@
 *= require web/events
 *= require users/signinCommon
 *= require dialogs/dialog
+*= require landings/landing_page
 */

web/app/assets/stylesheets/web/welcome.css.scss

@@ -50,7 +50,7 @@ body.web {
       top:5px; // XXX remove post release
       width:100%;
       height:400px;
-      border: solid 1px #ed3718;
+      border: solid 1px #ed3618;
       background-color:#353535;
       float:left;
       overflow:hidden;

web/app/controllers/landings_controller.rb

@@ -0,0 +1,23 @@
+class LandingsController < ApplicationController
+
+  respond_to :html
+
+  def watch_bands
+
+    @promo_buzz = PromoBuzz.active
+
+    if Rails.application.config.use_promos_on_homepage
+      @promo_latest = PromoLatest.active
+    else
+      @promo_latest, start = Feed.index(nil, limit: 10)
+    end
+
+    page = params['p']
+    page = 0 unless p
+
+    if page == 0
+      render 'watch_bands', layout: 'web'
+    end
+  end
+end
+

web/app/views/landings/watch_bands.html.slim

@@ -0,0 +1,17 @@
+- provide(:page_name, 'landing_page')
+
+.column
+  h1 Watch 6 Bands Play Together from Different Locations
+  .video-wrapper
+    .video-container
+      iframe src="//www.youtube.com/embed/I2reeNKtRjg" frameborder="0" allowfullscreen
+    .cta-container
+      h2 It's FREE! Ready to Go?
+      = link_to image_tag("web/cta_button.png", :alt => "Sign up now for your free account!"), signup_path, class: "signup", id: "signup"
+.column
+  = render :partial => "users/buzz", locals: {header: 'From Our Community'}
+  .more-container
+    h2 Need to Know More?
+    = link_to 'Watch a Video to See How JamKazam Works', landing_wb_path, class: 'landing_wb'
+
+br clear="all"

web/app/views/users/_buzz.html.erb

@@ -5,7 +5,7 @@
     <br>
     <!-- BEGIN ITEMS -->
     <%= content_tag(:div, :class => "buzz-items") do %>
-        <%= render :partial => "buzz_item", :collection => @promo_buzz %>
+        <%= render :partial => "users/buzz_item", :collection => @promo_buzz %>
     <% end %>
 
     <!-- END ITEMS -->

web/config/routes.rb

@@ -21,6 +21,9 @@ SampleApp::Application.routes.draw do
   match '/signin',  to: 'sessions#create', via: :post
   match '/signout', to: 'sessions#destroy', via: :delete
 
+  # landing pages
+  match '/landing/wb', to: 'landings#watch_bands', via: :get, as: 'landing_wb'
+
   # oauth
   match '/auth/:provider/callback', :to => 'sessions#oauth_callback'
   match '/auth/failure', :to => 'sessions#failure'