diff --git a/web/app/assets/javascripts/facebook_helper.js b/web/app/assets/javascripts/facebook_helper.js index 8bd8b6f9a..5846824ef 100644 --- a/web/app/assets/javascripts/facebook_helper.js +++ b/web/app/assets/javascripts/facebook_helper.js @@ -49,13 +49,13 @@ function initialize(fbAppID) { loginStatusDeferred = $.Deferred(); var fbAppID_ = fbAppID; - window.fbAsyncInit = function() { + window.fbAsyncInit = function() { FB.init({ appId : fbAppID_, // channelUrl : '//WWW.YOUR_DOMAIN.COM/channel.html', status : true, // check the login status upon init? cookie : true, // set sessions cookies to allow server to access the session? - xfbml : false, // parse XFBML tags on this page? + xfbml : true, // parse XFBML tags on this page? oauth : true // enable OAuth 2.0 }); diff --git a/web/app/assets/stylesheets/landings/landing_page.css.scss b/web/app/assets/stylesheets/landings/landing_page.css.scss index bd3986770..8498e9f20 100644 --- a/web/app/assets/stylesheets/landings/landing_page.css.scss +++ b/web/app/assets/stylesheets/landings/landing_page.css.scss @@ -9,6 +9,13 @@ body.web.landing_page { display:none; } + &.wb_2 { + .landing-content { + h1 { + margin-left:120px; + } + } + } .landing-content { h1 { diff --git a/web/app/controllers/landings_controller.rb b/web/app/controllers/landings_controller.rb index 26a238403..65d72cec7 100644 --- a/web/app/controllers/landings_controller.rb +++ b/web/app/controllers/landings_controller.rb @@ -12,11 +12,14 @@ class LandingsController < ApplicationController @promo_latest, start = Feed.index(nil, limit: 10) end - page = params['p'] - page = 0 unless p + page = params['p'].to_i - if page == 0 - render 'watch_bands', layout: 'web' + if page == 2 + render 'watch_bands_2', layout: 'web' + elsif page == 3 + render 'watch_bands_3', layout: 'web' + else + render 'watch_bands_1', layout: 'web' end end end diff --git a/web/app/views/landings/watch_bands.html.slim b/web/app/views/landings/watch_bands_1.html.slim similarity index 86% rename from web/app/views/landings/watch_bands.html.slim rename to web/app/views/landings/watch_bands_1.html.slim index 531e62e00..219b9f8fe 100644 --- a/web/app/views/landings/watch_bands.html.slim +++ b/web/app/views/landings/watch_bands_1.html.slim @@ -1,4 +1,4 @@ -- provide(:page_name, 'landing_page') +- provide(:page_name, 'landing_page wb_1') .column h1 Watch 6 Bands Play Together from Different Locations @@ -12,6 +12,6 @@ = 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' + = link_to 'Watch a Video to See How JamKazam Works', landing_wb_path(p: 2), class: 'landing_wb' br clear="all" \ No newline at end of file diff --git a/web/app/views/landings/watch_bands_2.html.slim b/web/app/views/landings/watch_bands_2.html.slim new file mode 100644 index 000000000..328b9c9fc --- /dev/null +++ b/web/app/views/landings/watch_bands_2.html.slim @@ -0,0 +1,17 @@ +- provide(:page_name, 'landing_page wb_2') + +.column + h1 See How JamKazam Works + .video-wrapper + .video-container + iframe src="//www.youtube.com/embed/ylYcvTY9CVo" 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 Still Need More Info? + = link_to 'Watch a Video to See How to Get Started', landing_wb_path(p: 3), class: 'landing_wb' + +br clear="all" \ No newline at end of file diff --git a/web/app/views/landings/watch_bands_3.html.slim b/web/app/views/landings/watch_bands_3.html.slim new file mode 100644 index 000000000..66b876a1a --- /dev/null +++ b/web/app/views/landings/watch_bands_3.html.slim @@ -0,0 +1,17 @@ +- provide(:page_name, 'landing_page wb_3') + +.column + h1 See How to Get Started + .video-wrapper + .video-container + iframe src="//www.youtube.com/embed/DBo--aj_P1w" 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 Not a Good Time to Sign Up? + = render :partial => 'users/follow_links' + +br clear="all" \ No newline at end of file diff --git a/web/app/views/users/_buzz.html.erb b/web/app/views/users/_buzz.html.erb index bd5a68d53..d227f782a 100644 --- a/web/app/views/users/_buzz.html.erb +++ b/web/app/views/users/_buzz.html.erb @@ -1,7 +1,8 @@ +<% header ||= local_assigns[:header] = local_assigns.fetch(:header, 'JamKazam Buzz...') %> <%= content_tag(:div, :class => "buzz") do %> - <%= content_tag(:h2, "JamKazam Buzz...") %> + <%= content_tag(:h2, header) %>
<%= content_tag(:div, :class => "buzz-items") do %> diff --git a/web/app/views/users/_follow_links.html.slim b/web/app/views/users/_follow_links.html.slim new file mode 100644 index 000000000..825990714 --- /dev/null +++ b/web/app/views/users/_follow_links.html.slim @@ -0,0 +1 @@ +.fb-like data-href="https://developers.facebook.com/docs/plugins/" data-layout="button_count" data-action="like" \ No newline at end of file diff --git a/web/app/views/users/_share_links.html.slim b/web/app/views/users/_share_links.html.slim new file mode 100644 index 000000000..b651c2a2c --- /dev/null +++ b/web/app/views/users/_share_links.html.slim @@ -0,0 +1,4 @@ +.share_links + - [:twitter, :facebook, :google].each do |site| + = link_to(image_tag("content/icon_#{site}.png", :style => "vertical-align:top"), "javascript:void(0)", {'data-site' => site, :class => 'like-link'}) + = ' ' \ No newline at end of file diff --git a/web/app/views/users/welcome.html.haml b/web/app/views/users/welcome.html.haml index 554684ce2..46b03d70e 100644 --- a/web/app/views/users/welcome.html.haml +++ b/web/app/views/users/welcome.html.haml @@ -7,10 +7,7 @@ = link_to image_tag("web/cta_button.png", :alt => "Sign up now for your free account!"), signup_path, class: "signup", id: "signup" .clearleft = link_to "Already have an account?", signin_path, class: "signin", id: "signin" -.share_links - - [:twitter, :facebook, :google].each do |site| - = link_to(image_tag("content/icon_#{site}.png", :style => "vertical-align:top"), "javascript:void(0)", {'data-site' => site, :class => 'like-link'}) - = ' ' += render :partial => 'users/share_links' - content_for :after_black_bar do - if @jamfest_2014