seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* VRFS-3168 - fix sidebar on session/recording landing pages

This commit is contained in:
Seth Call 2015-05-04 21:36:40 -05:00
parent 0ac94ae6fc
commit 12ea7312a7
6 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/app/assets/stylesheets/web/main.css.scss
View File

@ -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 {

7
web/app/controllers/recordings_controller.rb
View File

@ -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

2
web/app/views/layouts/web.html.erb
View File

@ -68,7 +68,7 @@
</div>
</div>
<div class="wrapper">
<div class="wrapper after-black-bar">
<%= yield(:after_black_bar) %>
</div>

2
web/app/views/music_sessions/show.html.erb
View File

@ -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 %>
<meta property="fb:app_id" content="<%= Rails.application.config.facebook_app_id %>" />
@ -81,7 +82,6 @@
<br clear="all" /><br />
<%= render :partial => "shared/track_details", :locals => {:tracks => @music_session.grouped_tracks} %>
</div>
<br clear="all" />
<% else %>
<div class="left f20 teal"><strong>SESSION NOT FOUND</strong></div>

3
web/app/views/recordings/show.html.erb
View File

@ -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 %>
<meta property="fb:app_id" content="<%= Rails.application.config.facebook_app_id %>" />
@ -91,7 +91,6 @@
<br clear="all" /><br />
<%= render :partial => "shared/track_details", :locals => {:tracks => @claimed_recording.recording.grouped_tracks} %>
</div>
<br clear="all" />
<% else %>
<div class="left f20 orange"><strong>RECORDING NOT FOUND</strong></div>

6
web/app/views/shared/_cta_sidebar.html.erb
View File

@ -4,7 +4,7 @@
<a href="/signin">Already have an account?</a>
</div>
<br /><br />
<%= 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'} %><br /><br />
<%= image_tag "web/carousel_fans.jpg", {:width => 350, :alt => ""} %><br /><br />
<%= 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'} %><br /><br />
<%= 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'} %><br /><br />
<%= 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'} %>
</div>