diff --git a/web/app/controllers/landings_controller.rb b/web/app/controllers/landings_controller.rb index cd1038904..e7e7150ca 100644 --- a/web/app/controllers/landings_controller.rb +++ b/web/app/controllers/landings_controller.rb @@ -67,12 +67,14 @@ class LandingsController < ApplicationController end def individual_jamtrack + @jam_track = JamTrack.find_by_plan_code("jamtrack-" + params[:plan_code]) gon.jam_track_plan_code = params[:plan_code] ? "jamtrack-" + params[:plan_code] : nil gon.generic = params[:generic] render 'individual_jamtrack', layout: 'web' end def individual_jamtrack_band + @jam_track = JamTrack.find_by_plan_code("jamtrack-" + params[:plan_code]) gon.jam_track_plan_code = params[:plan_code] ? "jamtrack-" + params[:plan_code] : nil render 'individual_jamtrack_band', layout: 'web' diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb index 749a7a3c5..a2d9fd5a1 100644 --- a/web/app/controllers/users_controller.rb +++ b/web/app/controllers/users_controller.rb @@ -212,35 +212,6 @@ class UsersController < ApplicationController render :layout => "web" end - # DO NOT USE CURRENT_USER IN THIS ROUTINE. IT'S CACHED FOR THE WHOLE SITE - def welcome - - @slides = [ - Slide.new("JamKazam Overview", "web/carousel_overview.png", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), - Slide.new("The Revolutionary New JamBlaster!", "web/carousel_jamblaster.png", "http://www.youtube.com/embed/gAJAIHMyois?autoplay=1"), - Slide.new("Kudos From Our Community", "web/carousel_community.png", "http://www.youtube.com/embed/_7qj5RXyHCo?autoplay=1"), - Slide.new("JamKazam Overview", "web/carousel_overview.png", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), - Slide.new("The Revolutionary New JamBlaster!", "web/carousel_fans.jpg", "http://www.youtube.com/embed/gAJAIHMyois?autoplay=1"), - Slide.new("Kudos From Our Community", "web/carousel_community.png", "http://www.youtube.com/embed/_7qj5RXyHCo?autoplay=1") - ] - - @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 - - # temporary--will go away soon - #@jamfest_2014 = Event.find_by_id('80bb6acf-3ddc-4305-9442-75e6ec047c27') # production ID - #@jamfest_2014 = Event.find_by_id('a2dfbd26-9b17-4446-8c61-b67a542ea6ee') unless @jamfest_2014 # development ID - # temporary--end - - #@welcome_page = true - render :layout => "web" - end - # DO NOT USE CURRENT_USER IN THIS ROUTINE. IT'S CACHED FOR THE WHOLE SITE def home diff --git a/web/app/helpers/application_helper.rb b/web/app/helpers/application_helper.rb index 827379344..160a1b3cf 100644 --- a/web/app/helpers/application_helper.rb +++ b/web/app/helpers/application_helper.rb @@ -10,6 +10,14 @@ module ApplicationHelper end end + def meta_description(description) + if description + description + else + 'JamKazam' + end + end + def self.base_uri(request) (request.ssl? ? "https://" : "http://") + request.host_with_port end diff --git a/web/app/helpers/recording_helper.rb b/web/app/helpers/recording_helper.rb index 3d8a6eeec..8eb09f158 100644 --- a/web/app/helpers/recording_helper.rb +++ b/web/app/helpers/recording_helper.rb @@ -49,8 +49,8 @@ module RecordingHelper end end - def description_for_claimed_recording(claimed_recording) - truncate(claimed_recording.name, length:250) + def description_for_claimed_recording(claimed_recording, length = 250) + truncate(claimed_recording.name, length:length) end def listen_mix_url(recording) diff --git a/web/app/views/clients/_home.html.slim b/web/app/views/clients/_home.html.slim index f904459bb..9247d18f0 100644 --- a/web/app/views/clients/_home.html.slim +++ b/web/app/views/clients/_home.html.slim @@ -32,7 +32,7 @@ .homebox-info /! 1 session invitation, 19 public sessions active -if jamtracks - .homecard.jamtrack layout-grid-columns=small_tile_size layout-grid-position=column_positions[2] layout-grid-rows="1" layout-link="jamtrack" + .homecard.jamtrack layout-grid-columns=small_tile_size layout-grid-position=column_positions[2] layout-grid-rows="1" layout-link="jamtrackLanding" h2 jamtracks .homebox-info /! 5 followers, 3 following diff --git a/web/app/views/events/event.html.haml b/web/app/views/events/event.html.haml index 9a9248c6c..b0b9b109a 100644 --- a/web/app/views/events/event.html.haml +++ b/web/app/views/events/event.html.haml @@ -1,5 +1,5 @@ - provide(:title, @event.title) - +- provide(:description, @event.social_description || "Play music together over the Internet as if in the same room.") -content_for :social_meta do %meta{property: 'fb_app_id', content: Rails.application.config.facebook_app_id} diff --git a/web/app/views/extras/settings.html.haml b/web/app/views/extras/settings.html.haml index a90d71b53..c14c73063 100644 --- a/web/app/views/extras/settings.html.haml +++ b/web/app/views/extras/settings.html.haml @@ -1,3 +1,5 @@ +- provide(:description, "Extra settings.") + %h1 Extra Feature Settings %form diff --git a/web/app/views/landings/individual_jamtrack.html.slim b/web/app/views/landings/individual_jamtrack.html.slim index 2383dde19..125fea5c8 100644 --- a/web/app/views/landings/individual_jamtrack.html.slim +++ b/web/app/views/landings/individual_jamtrack.html.slim @@ -1,4 +1,5 @@ - provide(:page_name, 'landing_page full landing_jamtrack individual_jamtrack') +- provide(:description, @jam_track.nil? ? nil : "Preview our JamTrack: #{@jam_track.name}") .two_by_two .row diff --git a/web/app/views/landings/individual_jamtrack_band.html.slim b/web/app/views/landings/individual_jamtrack_band.html.slim index dbe7bc512..79ad8212b 100644 --- a/web/app/views/landings/individual_jamtrack_band.html.slim +++ b/web/app/views/landings/individual_jamtrack_band.html.slim @@ -1,4 +1,5 @@ - provide(:page_name, 'landing_page full landing_jamtrack individual_jamtrack_band') +- provide(:description, @jam_track.nil? ? nil : "Preview our JamTrack: #{@jam_track.name}") .two_by_two .row diff --git a/web/app/views/landings/product_jamblaster.html.slim b/web/app/views/landings/product_jamblaster.html.slim index c31e76678..10fa7eccf 100644 --- a/web/app/views/landings/product_jamblaster.html.slim +++ b/web/app/views/landings/product_jamblaster.html.slim @@ -1,4 +1,5 @@ - provide(:page_name, 'landing_page full landing_product product_jamblaster') +- provide(:description, 'Learn more about the JamBlaster, a device designed from the ground up to meet the unique requirements of real-time, online, distributed music performance') .two_by_two .row diff --git a/web/app/views/landings/product_jamtracks.html.slim b/web/app/views/landings/product_jamtracks.html.slim index 961081f65..a1ff8e5f8 100644 --- a/web/app/views/landings/product_jamtracks.html.slim +++ b/web/app/views/landings/product_jamtracks.html.slim @@ -1,4 +1,5 @@ - provide(:page_name, 'landing_page full landing_product product_jamtracks') +- provide(:description, 'Learn more about JamTracks, which are complete multitrack recordings, with fully isolated tracks for each part') .two_by_two .row diff --git a/web/app/views/landings/product_platform.html.slim b/web/app/views/landings/product_platform.html.slim index 16c2f351c..ecb6d8c9c 100644 --- a/web/app/views/landings/product_platform.html.slim +++ b/web/app/views/landings/product_platform.html.slim @@ -1,4 +1,5 @@ - provide(:page_name, 'landing_page full landing_product product_platform') +- provide(:description, 'Learn more about the JamKazam platform, an innovative live music platform and social network') .two_by_two .row diff --git a/web/app/views/landings/watch_bands_1.html.slim b/web/app/views/landings/watch_bands_1.html.slim index 0815eeefd..a271b1735 100644 --- a/web/app/views/landings/watch_bands_1.html.slim +++ b/web/app/views/landings/watch_bands_1.html.slim @@ -1,4 +1,5 @@ - provide(:page_name, 'landing_page full wb_1') +- provide(:description, 'Watch 6 Bands Play Together from Different Locations') .column h1 Watch 6 Bands Play Together from Different Locations diff --git a/web/app/views/landings/watch_bands_2.html.slim b/web/app/views/landings/watch_bands_2.html.slim index c3470c000..504b83120 100644 --- a/web/app/views/landings/watch_bands_2.html.slim +++ b/web/app/views/landings/watch_bands_2.html.slim @@ -1,4 +1,5 @@ - provide(:page_name, 'landing_page full wb_2') +- provide(:description, 'See How JamKazam Works') .column h1 See How JamKazam Works diff --git a/web/app/views/landings/watch_bands_3.html.slim b/web/app/views/landings/watch_bands_3.html.slim index 7c2668f7c..814578d58 100644 --- a/web/app/views/landings/watch_bands_3.html.slim +++ b/web/app/views/landings/watch_bands_3.html.slim @@ -1,4 +1,5 @@ - provide(:page_name, 'landing_page full wb_3') +- provide(:description, 'See How to Get Started') .column h1 See How to Get Started diff --git a/web/app/views/landings/watch_bands_tight.html.slim b/web/app/views/landings/watch_bands_tight.html.slim index 8a1b204d7..70ce2f991 100644 --- a/web/app/views/landings/watch_bands_tight.html.slim +++ b/web/app/views/landings/watch_bands_tight.html.slim @@ -1,4 +1,5 @@ - provide(:page_name, 'landing_page tight wbt_1') +- provide(:description, 'Watch 6 Bands Play Together from Different Locations') h1 Watch 6 Bands Play Together from Different Locations .video-wrapper diff --git a/web/app/views/landings/watch_overview_1.html.slim b/web/app/views/landings/watch_overview_1.html.slim index b0e8f055d..aef2a3119 100644 --- a/web/app/views/landings/watch_overview_1.html.slim +++ b/web/app/views/landings/watch_overview_1.html.slim @@ -1,4 +1,5 @@ - provide(:page_name, 'landing_page full wo_1') +- provide(:provide, 'Watch Video to See How JamKazam Works') .column h1 Watch Video to See How JamKazam Works diff --git a/web/app/views/landings/watch_overview_2.html.slim b/web/app/views/landings/watch_overview_2.html.slim index 56503906b..07b5f073d 100644 --- a/web/app/views/landings/watch_overview_2.html.slim +++ b/web/app/views/landings/watch_overview_2.html.slim @@ -1,4 +1,5 @@ - provide(:page_name, 'landing_page full wo_2') +- provide(:description, 'Watch 6 Bands Play Together from Different Locations') .column h1 Watch 6 Bands Play Together from Different Locations diff --git a/web/app/views/landings/watch_overview_3.html.slim b/web/app/views/landings/watch_overview_3.html.slim index 09130db84..3a18002c3 100644 --- a/web/app/views/landings/watch_overview_3.html.slim +++ b/web/app/views/landings/watch_overview_3.html.slim @@ -1,4 +1,5 @@ - provide(:page_name, 'landing_page full wo_3') +- provide(:description, 'See How to Get Started Using JamKazam') .column h1 See How to Get Started Using JamKazam diff --git a/web/app/views/landings/watch_overview_tight.html.slim b/web/app/views/landings/watch_overview_tight.html.slim index 8efaffe63..c64f0dc78 100644 --- a/web/app/views/landings/watch_overview_tight.html.slim +++ b/web/app/views/landings/watch_overview_tight.html.slim @@ -1,4 +1,5 @@ - provide(:page_name, 'landing_page tight wot_1') +- provide(:description, 'Watch Overview Video to See How JamKazam Works') h1 Watch Overview Video to See How JamKazam Works .video-wrapper diff --git a/web/app/views/layouts/application.html.erb b/web/app/views/layouts/application.html.erb index 975d3d55e..c461b8a94 100644 --- a/web/app/views/layouts/application.html.erb +++ b/web/app/views/layouts/application.html.erb @@ -36,6 +36,7 @@ <% end %> + <%= include_gon %> <%= csrf_meta_tags %> diff --git a/web/app/views/layouts/client.html.erb b/web/app/views/layouts/client.html.erb index adee2a9d7..518c775c6 100644 --- a/web/app/views/layouts/client.html.erb +++ b/web/app/views/layouts/client.html.erb @@ -2,6 +2,7 @@ <%= full_title(yield(:title)) %> + @@ -25,6 +26,7 @@ <%= include_gon %> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> + <% if content_for?(:social_meta) %> <%= yield(:social_meta) %> <% else %> diff --git a/web/app/views/layouts/corporate.html.erb b/web/app/views/layouts/corporate.html.erb index b852f8341..0e7e8fb1a 100644 --- a/web/app/views/layouts/corporate.html.erb +++ b/web/app/views/layouts/corporate.html.erb @@ -23,6 +23,7 @@ <%= include_gon(:init => true) %> <%= javascript_include_tag "corp/corporate" %> <%= csrf_meta_tags %> + "> <% if content_for?(:social_meta) %> <%= yield(:social_meta) %> <% else %> diff --git a/web/app/views/layouts/landing.html.erb b/web/app/views/layouts/landing.html.erb index 7ae5a821c..70010c915 100644 --- a/web/app/views/layouts/landing.html.erb +++ b/web/app/views/layouts/landing.html.erb @@ -25,6 +25,7 @@ <% end %> <%= include_gon(:init => true) %> <%= csrf_meta_tags %> + <% if content_for?(:social_meta) %> <%= yield(:social_meta) %> <% else %> diff --git a/web/app/views/layouts/minimal.html.erb b/web/app/views/layouts/minimal.html.erb index f29412ae4..7c021b2b0 100644 --- a/web/app/views/layouts/minimal.html.erb +++ b/web/app/views/layouts/minimal.html.erb @@ -25,6 +25,7 @@ <% end %> <%= include_gon(:init => true) %> <%= csrf_meta_tags %> + <% if content_for?(:social_meta) %> <%= yield(:social_meta) %> <% else %> diff --git a/web/app/views/layouts/web.html.erb b/web/app/views/layouts/web.html.erb index ab11e217c..708e33124 100644 --- a/web/app/views/layouts/web.html.erb +++ b/web/app/views/layouts/web.html.erb @@ -25,6 +25,7 @@ <% end %> <%= include_gon(:init => true) %> <%= csrf_meta_tags %> + <% if content_for?(:social_meta) %> <%= yield(:social_meta) %> <% else %> diff --git a/web/app/views/music_sessions/session_info.html.haml b/web/app/views/music_sessions/session_info.html.haml index 7c7e359d7..e49bc10f7 100644 --- a/web/app/views/music_sessions/session_info.html.haml +++ b/web/app/views/music_sessions/session_info.html.haml @@ -1,4 +1,19 @@ - provide(:page_name, 'session_info') +- provide(:description, description_for_music_session(@music_session)) + +- content_for :social_meta do + %meta {property: "fb:app_id", content: Rails.application.config.facebook_app_id} + %meta {property: "og:title", content: title_for_music_session(@music_session)} + %meta {property: "og:url", content: request.original_url} + %meta {property: "og:description", content: description_for_music_session(@music_session)} + %meta {property: "og:image", content: facebook_image_for_music_session(@music_session)} + %meta {property: "og:image:width", content: facebook_image_size_for_music_session(@music_session)} + %meta {property: "og:image:height", content: facebook_image_size_for_music_session(@music_session)} + %meta {property: "og:type", content: 'website'} + %meta {property: "twitter:card", content: 'summary'} + %meta {property: "twitter:site", content: '@jamkazam'} + %meta {property: "twitter:title", content: title_for_music_session(@music_session)} + %meta {property: "twitter:description", content: description_for_music_session(@music_session)} - unless @music_session.nil? - provide(:title, @music_session.name) diff --git a/web/app/views/music_sessions/show.html.erb b/web/app/views/music_sessions/show.html.erb index 8256193fe..c0ed420ee 100644 --- a/web/app/views/music_sessions/show.html.erb +++ b/web/app/views/music_sessions/show.html.erb @@ -1,4 +1,5 @@ <% provide(:title, "#{@music_session.description}") %> +<% provide(:description, description_for_music_session(@music_session)) %> <% content_for :social_meta do %> diff --git a/web/app/views/recordings/show.html.erb b/web/app/views/recordings/show.html.erb index 5bdda20f9..34eccd73e 100644 --- a/web/app/views/recordings/show.html.erb +++ b/web/app/views/recordings/show.html.erb @@ -1,4 +1,5 @@ <% provide(:title, "#{@claimed_recording.name}") %> +<% provide(:description, description_for_claimed_recording(@claimed_recording)) %> <% content_for :social_meta do %> diff --git a/web/app/views/sessions/oauth_complete.erb b/web/app/views/sessions/oauth_complete.erb index a6c22d587..e8c16289b 100644 --- a/web/app/views/sessions/oauth_complete.erb +++ b/web/app/views/sessions/oauth_complete.erb @@ -1,3 +1,5 @@ +<% provide(:description, 'Finished authorization') %> + diff --git a/web/app/views/sessions/signin.html.haml b/web/app/views/sessions/signin.html.haml index e20fa396e..afb2f0648 100644 --- a/web/app/views/sessions/signin.html.haml +++ b/web/app/views/sessions/signin.html.haml @@ -1,5 +1,6 @@ - provide(:title, 'Sign in') - provide(:page_name, 'signin') +- provide(:description, 'Sign into your JamKazam account to meet & play with other musicians') .signin-overlay.signin-page .content-head diff --git a/web/app/views/sessions/twitter_oauth_failure.html.erb b/web/app/views/sessions/twitter_oauth_failure.html.erb index 9ec6255b6..2eb8f45e6 100644 --- a/web/app/views/sessions/twitter_oauth_failure.html.erb +++ b/web/app/views/sessions/twitter_oauth_failure.html.erb @@ -1,3 +1,5 @@ +<% provide(:description, 'Unable to authorize twitter') %> + Unable to authorize application. Reasons: