Merge branch 'develop' into feature/musician_profile_enhancements

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

@@ -9,13 +9,79 @@ body.web.landing_page {
     display:none;
   }
 
+  .badge-number {
+    font-size:125%;
+    color:white;
+    background-color:$ColorScreenPrimary;
+    width:30px;
+    height:30px;
+    //position:absolute;
+    //left:-10px;
+    //top:4px;
+    margin-right:10px;
+    -webkit-border-radius:50%;
+    -moz-border-radius:50%;
+    border-radius:50%;
+    text-align:center;
+    display:inline-block;
+    border:2px solid white;
+  }
+  &.kick {
+
+    h1 {
+      //padding-left:20px;
+    }
+    p {
+      margin-bottom:15px;
+      line-height:120%;
+    }
+    .signup-wrapper {
+      width:75%;
+      text-align:center;
+    }
+    .landing-tag {
+      left: 50%;
+    }
+
+    .cta-container {
+      width:100%;
+      text-align:left;
+      margin-left:0% !important;
+      h1 {
+        margin: 0 0 10px 0;
+      }
+      a {margin-bottom:0 !important}
+    }
+
+    .column:nth-child(1) {
+      width:50% !important;
+
+      .cta-container {
+        margin-top:20px;
+      }
+    }
+
+    .column:nth-child(2) {
+      width:50% !important;
+
+      h2 {
+        margin-bottom:30px;
+      }
+
+      .cta-container a {
+
+        margin-bottom:8px;
+      }
+    }
+
+  }
   &.wo_1 {
 
     .landing-tag {
       left: 50%;
     }
 
-      .cta-container {
+    .cta-container {
       width:75%;
       text-align:center;
       margin-left:0% !important;

web/app/controllers/landings_controller.rb

@@ -22,6 +22,10 @@ class LandingsController < ApplicationController
     end
   end
 
+  def watch_overview_kick
+    render 'watch_kick', layout: 'web'
+  end
+
   def watch_overview
     @promo_buzz = PromoBuzz.active
 

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

@@ -0,0 +1,42 @@
+- provide(:page_name, 'landing_page full kick')
+
+.column
+  h1
+    span.badge-number 1
+    | Learn About the Revolutionary New
+    b  JamBlaster
+  .video-wrapper
+    .video-container
+      iframe src="//www.youtube.com/embed/gAJAIHMyois?rel=0&autoplay=1" frameborder="0" allowfullscreen
+    .cta-container
+      h1
+        span.badge-number 3
+        | Sign Up For Your Free JamKazam Account
+      .signup-wrapper
+        = link_to image_tag("web/cta_button.png", :alt => "Sign up now for your free account!"), signup_path, class: "signup", id: "signup", rel: "external"
+.column
+  h1
+    span.badge-number 2
+    | Learn About the Free JamKazam Service
+  .video-wrapper
+    .video-container
+      iframe src="//www.youtube.com/embed/ylYcvTY9CVo" frameborder="0" allowfullscreen
+    .cta-container
+      h1
+        span.badge-number 4
+        | Figure Out Your Gear to Start Playing!
+      p If you already own an audio interface, then trying using it with our app.
+      p
+        | If you don't own an audio interface, we strongly recommend that you 
+        a href="https://www.kickstarter.com/projects/jamkazam/jamblaster-play-music-in-real-time-with-others-fro" rel="external"
+          | grab a JamBlaster on KickStarter now
+          | .
+        |  It is by far the fastest, easiest, and best way to play online,
+        b  and we’re only able to take orders on it a little longer.
+      p
+        | If you're skeptical, 
+        a href="https://www.youtube.com/watch?v=_7qj5RXyHCo" rel="external"
+          | watch this video
+        |  with endorsements by real users.
+
+br clear="all"

web/config/routes.rb

@@ -26,7 +26,7 @@ SampleApp::Application.routes.draw do
   match '/landing/wo',  to: 'landings#watch_overview',        via: :get, as: 'landing_wo'
   match '/landing/wbt', to: 'landings#watch_bands_tight',     via: :get, as: 'landing_wbt'
   match '/landing/wot', to: 'landings#watch_overview_tight',  via: :get, as: 'landing_wot'
-
+  match '/landing/kick', to: 'landings#watch_overview_kick',  via: :get, as: 'landing_kick'
   # oauth
   match '/auth/:provider/callback', :to => 'sessions#oauth_callback'
   match '/auth/failure', :to => 'sessions#failure'