diff --git a/web/app/assets/stylesheets/web/main.css.scss b/web/app/assets/stylesheets/web/main.css.scss
index 2a2891d60..3522b1398 100644
--- a/web/app/assets/stylesheets/web/main.css.scss
+++ b/web/app/assets/stylesheets/web/main.css.scss
@@ -133,15 +133,18 @@ body.web {
}
}
+ &.entity-landing .wrapper.after-black-bar {
+ z-index:-1; // to let sidebar be interactable
+ }
+
.landing-sidebar {
width:350px;
background:#353535;
border:solid 1px #ed3618;
- position:absolute;
- top:30px;
- right:0px;
+ float:right;
+ right:0;
padding:25px;
- padding-top:0px;
+ padding-top:0;
line-height:130%;
h2 {
diff --git a/web/app/controllers/recordings_controller.rb b/web/app/controllers/recordings_controller.rb
index 96bf1e1a1..d56f0ea45 100644
--- a/web/app/controllers/recordings_controller.rb
+++ b/web/app/controllers/recordings_controller.rb
@@ -8,7 +8,12 @@ class RecordingsController < ApplicationController
recording = Recording.find_by_id(params[:id])
@claimed_recording = recording.candidate_claimed_recording if recording
end
- render :layout => "web"
+ if @claimed_recording
+ render :layout => "web"
+ else
+ render text: 'Recording not found', status: 404
+ end
+
end
end
\ No newline at end of file
diff --git a/web/app/views/layouts/web.html.erb b/web/app/views/layouts/web.html.erb
index 708e33124..bb1ceeccd 100644
--- a/web/app/views/layouts/web.html.erb
+++ b/web/app/views/layouts/web.html.erb
@@ -68,7 +68,7 @@
-
+
<%= yield(:after_black_bar) %>
diff --git a/web/app/views/music_sessions/show.html.erb b/web/app/views/music_sessions/show.html.erb
index c0ed420ee..3e2d35829 100644
--- a/web/app/views/music_sessions/show.html.erb
+++ b/web/app/views/music_sessions/show.html.erb
@@ -1,5 +1,6 @@
<% provide(:title, "#{@music_session.description}") %>
<% provide(:description, description_for_music_session(@music_session)) %>
+<% provide(:page_name, 'music-sessions entity-landing') %>
<% content_for :social_meta do %>
@@ -81,7 +82,6 @@
<%= render :partial => "shared/track_details", :locals => {:tracks => @music_session.grouped_tracks} %>
-
<% else %>
SESSION NOT FOUND
diff --git a/web/app/views/recordings/show.html.erb b/web/app/views/recordings/show.html.erb
index 34eccd73e..a550fced8 100644
--- a/web/app/views/recordings/show.html.erb
+++ b/web/app/views/recordings/show.html.erb
@@ -1,6 +1,6 @@
<% provide(:title, "#{@claimed_recording.name}") %>
<% provide(:description, description_for_claimed_recording(@claimed_recording)) %>
-
+<% provide(:page_name, 'recordings entity-landing') %>
<% content_for :social_meta do %>
@@ -91,7 +91,6 @@
<%= render :partial => "shared/track_details", :locals => {:tracks => @claimed_recording.recording.grouped_tracks} %>
-
<% else %>
RECORDING NOT FOUND
diff --git a/web/app/views/shared/_cta_sidebar.html.erb b/web/app/views/shared/_cta_sidebar.html.erb
index 656b2bb1f..9ab1506ac 100644
--- a/web/app/views/shared/_cta_sidebar.html.erb
+++ b/web/app/views/shared/_cta_sidebar.html.erb
@@ -4,7 +4,7 @@
Already have an account?
- <%= image_tag "web/carousel_musicians.jpg", {:width => 350, :alt => "", :class => 'video-slide', :'data-video-header' => 'JamKazam Overview', :'data-video-url' => 'http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1'} %>
- <%= image_tag "web/carousel_fans.jpg", {:width => 350, :alt => ""} %>
- <%= image_tag "web/carousel_bands.jpg", {:width => 350, :alt => ""} %>
+ <%= image_tag "web/thumbnail_jamtracks.jpg", {:width => 350, :alt => "", :class => 'video-slide', :'data-video-header' => 'JamTracks', :'data-video-url' => 'http://www.youtube.com/embed/askHvcCoNfw?autoplay=1'} %>
+ <%= image_tag "web/thumbnail_platform.jpg", {:width => 350, :alt => "", :class => 'video-slide', :'data-video-header' => 'JamKazam Platform', :'data-video-url' => 'http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1'} %>
+ <%= image_tag "web/thumbnail_jamblaster.jpg", {:width => 350, :alt => "", :class => 'video-slide', :'data-video-header' => 'JamKazam Platform', :'data-video-url' => 'http://www.youtube.com/embed/YHZQHfKDdMc?autoplay=1'} %>
\ No newline at end of file