Adds lodging splash view
Check for venue photo before rendering
This commit is contained in:
parent
01bd45a045
commit
0b6b046016
4 changed files with 38 additions and 8 deletions
|
|
@ -25,11 +25,12 @@
|
||||||
= link_to 'Visit Venue Website', @conference.venue.website, target: '_blank'
|
= link_to 'Visit Venue Website', @conference.venue.website, target: '_blank'
|
||||||
|
|
||||||
|
|
||||||
:javascript
|
- unless @conference.venue.photo.blank?
|
||||||
$(document).ready(function(){
|
:javascript
|
||||||
var photo = "#{@conference.venue.photo}";
|
$(document).ready(function(){
|
||||||
if(photo)
|
var photo = "#{@conference.venue.photo}";
|
||||||
{
|
if(photo)
|
||||||
$('#location').css('background-image', 'url('+photo+')');
|
{
|
||||||
}
|
$('#location').css('background-image', 'url('+photo+')');
|
||||||
});
|
}
|
||||||
|
});
|
||||||
|
|
|
||||||
18
app/views/conference/_lodging.html.haml
Normal file
18
app/views/conference/_lodging.html.haml
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
%div.row.col-md-12.text-center
|
||||||
|
%h2 Lodgings
|
||||||
|
-unless @conference.lodging_description.blank?
|
||||||
|
%p.lead
|
||||||
|
= @conference.lodging_description
|
||||||
|
|
||||||
|
%div.row
|
||||||
|
- @conference.venue.lodgings.each do |r|
|
||||||
|
%div.col-md-3.thumbnail
|
||||||
|
-unless r.photo.blank?
|
||||||
|
= image_tag r.photo(:large), class: 'img-responsive'
|
||||||
|
-unless r.name.blank?
|
||||||
|
%h4.text-center #{ r.name }
|
||||||
|
-unless r.description.blank?
|
||||||
|
%p.text-left #{ r.description }
|
||||||
|
- unless r.website_link.blank?
|
||||||
|
.text-center
|
||||||
|
= link_to 'Go to Website', r.website_link
|
||||||
|
|
@ -13,6 +13,9 @@
|
||||||
-unless @conference.venue.blank?
|
-unless @conference.venue.blank?
|
||||||
%div#location
|
%div#location
|
||||||
= render 'location'
|
= render 'location'
|
||||||
|
- if @conference.venue
|
||||||
|
- unless @conference.venue.lodgings.empty?
|
||||||
|
= render 'lodging'
|
||||||
%div#sponsors
|
%div#sponsors
|
||||||
= render 'sponsor'
|
= render 'sponsor'
|
||||||
%div#social-media
|
%div#social-media
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ describe 'conference/show.html.haml' do
|
||||||
@sponsorship_level.sponsors << create(:sponsor, sponsorship_level: @sponsorship_level,
|
@sponsorship_level.sponsors << create(:sponsor, sponsorship_level: @sponsorship_level,
|
||||||
conference: @conference)
|
conference: @conference)
|
||||||
@conference.venue = create(:venue)
|
@conference.venue = create(:venue)
|
||||||
|
@conference.venue.lodgings << create(:lodging, venue: @conference.venue)
|
||||||
assign :conference, @conference
|
assign :conference, @conference
|
||||||
render
|
render
|
||||||
end
|
end
|
||||||
|
|
@ -60,4 +61,11 @@ describe 'conference/show.html.haml' do
|
||||||
expect(rendered).to include('www.opensuse.org')
|
expect(rendered).to include('www.opensuse.org')
|
||||||
expect(rendered).to include('Lorem Ipsum Dolor')
|
expect(rendered).to include('Lorem Ipsum Dolor')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'renders lodging partial' do
|
||||||
|
expect(view).to render_template(partial: 'conference/_lodging')
|
||||||
|
expect(rendered).to include('Example Hotel')
|
||||||
|
expect(rendered).to include('Lorem Ipsum Dolor')
|
||||||
|
expect(rendered).to include('http://www.example.com')
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue