diff --git a/web/app/assets/javascripts/fakeJamClient.js b/web/app/assets/javascripts/fakeJamClient.js index 732547d19..239dee94a 100644 --- a/web/app/assets/javascripts/fakeJamClient.js +++ b/web/app/assets/javascripts/fakeJamClient.js @@ -403,6 +403,14 @@ } // Session Functions + + function SessionCurrrentJamTrackPlayPosMs() { + return 0; + } + + function SessionGetJamTracksPlayDurationMs() { + return 60000; + } function SessionAddTrack() {} function SessionAudioResync() { @@ -1031,6 +1039,8 @@ // Session this.SessionAddTrack = SessionAddTrack; + this.SessionCurrrentJamTrackPlayPosMs = SessionCurrrentJamTrackPlayPosMs; + this.SessionGetJamTracksPlayDurationMs = SessionGetJamTracksPlayDurationMs; this.SessionGetControlState = SessionGetControlState; this.SessionGetAllControlState = SessionGetAllControlState; this.SessionSetUserName = SessionSetUserName; diff --git a/web/app/views/landings/individual_jamtrack.html.slim b/web/app/views/landings/individual_jamtrack.html.slim index 125fea5c8..46cf29c9c 100644 --- a/web/app/views/landings/individual_jamtrack.html.slim +++ b/web/app/views/landings/individual_jamtrack.html.slim @@ -1,5 +1,5 @@ - provide(:page_name, 'landing_page full landing_jamtrack individual_jamtrack') -- provide(:description, @jam_track.nil? ? nil : "Preview our JamTrack: #{@jam_track.name}") +- provide(:description, @jam_track.nil? ? nil : "Preview multi-track JamTrack recording: #{@jam_track.name} by #{@jam_track.original_artist}. Way better than a backing track.") .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 79ad8212b..d6dbfb457 100644 --- a/web/app/views/landings/individual_jamtrack_band.html.slim +++ b/web/app/views/landings/individual_jamtrack_band.html.slim @@ -1,5 +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}") +- provide(:description, @jam_track.nil? ? nil : "Preview multi-track JamTrack recording: #{@jam_track.name} by #{@jam_track.original_artist}. Way better than a backing track.") .two_by_two .row diff --git a/web/app/views/sessions/signin.html.haml b/web/app/views/sessions/signin.html.haml index afb2f0648..a326d9148 100644 --- a/web/app/views/sessions/signin.html.haml +++ b/web/app/views/sessions/signin.html.haml @@ -1,6 +1,6 @@ - provide(:title, 'Sign in') - provide(:page_name, 'signin') -- provide(:description, 'Sign into your JamKazam account to meet & play with other musicians') +- provide(:description, 'Sign in to your JamKazam account to connect and play with other musicians.') .signin-overlay.signin-page .content-head diff --git a/web/app/views/users/downloads.html.erb b/web/app/views/users/downloads.html.erb index b694b2b66..021927b78 100644 --- a/web/app/views/users/downloads.html.erb +++ b/web/app/views/users/downloads.html.erb @@ -1,5 +1,5 @@ <% provide(:title, 'Downloads') %> -<% provide(:description, 'Download JamKazam on Windows or Mac') %> +<% provide(:description, 'Download the JamKazam app for Windows or Mac to play music online with others.') %> <%= render "users/downloads" %> diff --git a/web/app/views/users/home.html.slim b/web/app/views/users/home.html.slim index 67654bf6a..d253ee8d8 100644 --- a/web/app/views/users/home.html.slim +++ b/web/app/views/users/home.html.slim @@ -1,5 +1,5 @@ - provide(:page_name, 'home') -- provide(:description, 'Play with other musicians in real-time, and play along with multi-track backing tracks of popular songs') +- provide(:description, 'Play music with others online in real time. Play with multitrack audio of your favorite music. Musician community.') .home-column = link_to image_tag("web/thumbnail_jamtracks.jpg", :alt => "JamTracks explanatory video"), '#', class: "jamtracks-video video-item", 'data-video-header' => 'JamTracks', 'data-video-url' => 'http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1' diff --git a/web/app/views/users/new.html.erb b/web/app/views/users/new.html.erb index a405132b5..83a2c5c0c 100644 --- a/web/app/views/users/new.html.erb +++ b/web/app/views/users/new.html.erb @@ -1,6 +1,6 @@ <% provide(:page_name, 'register') %> <% provide(:title, 'Register') %> -<% provide(:description, 'Sign up for a free JamKazam account') %> +<% provide(:description, 'Sign up for your JamKazam account to play music with others online in real time and network with musicians.') %>