diff --git a/app/views/conference/_program.html.haml b/app/views/conference/_program.html.haml index b998e3c9..82968ad3 100644 --- a/app/views/conference/_program.html.haml +++ b/app/views/conference/_program.html.haml @@ -13,5 +13,6 @@ - else %span The schedule is not ready yet. Stay tuned! -unless @conference.tracks.blank? - = render 'tracks' + - if @conference.include_tracks_in_splash? + = render 'tracks' diff --git a/app/views/conference/_registration.html.haml b/app/views/conference/_registration.html.haml index 0b63646b..03c99a5e 100644 --- a/app/views/conference/_registration.html.haml +++ b/app/views/conference/_registration.html.haml @@ -15,4 +15,5 @@ - if @conference.registration_open? = link_to "Register for #{@conference.short_title}", register_conference_path(@conference.short_title), :class =>"btn btn-success btn-lg", target: '_blank' - if @conference.use_supporter_levels? - = render 'tickets' + - if @conference.include_tickets_in_splash? + = render 'tickets' diff --git a/app/views/conference/show.html.haml b/app/views/conference/show.html.haml index fbf4f76a..a40b4f72 100644 --- a/app/views/conference/show.html.haml +++ b/app/views/conference/show.html.haml @@ -3,31 +3,40 @@ - unless @conference.description.blank? %p= @conference.description -%section{ id: 'program' } - .pad - = render 'program' -%section{ id: 'registration' } -.pad - = render 'registration' +- if @conference.include_program_in_splash? + %section{ id: 'program' } + .pad + = render 'program' + +- if @conference.include_registrations_in_splash? + %section{ id: 'registration' } + .pad + = render 'registration' + -unless @conference.call_for_papers.blank? - %section{ id:'callforpapers' } - .pad - = render 'call_for_papers' + - if @conference.call_for_papers.include_cfp_in_splash? + %section{ id:'callforpapers' } + .pad + = render 'call_for_papers' + -unless @conference.venue.blank? - %section{ id: 'location' } - .pad - = render 'location' -- if @conference.venue + - if @conference.venue.include_venue_in_splash? + %section{ id: 'location' } + .pad + = render 'location' - unless @conference.venue.lodgings.empty? - = render 'lodging' + - if @conference.venue.include_lodgings_in_splash? + = render 'lodging' -%section{ id: 'sponsors' } -.pad - = render 'sponsor' +- if @conference.include_sponsors_in_splash? + %section{ id: 'sponsors' } + .pad + = render 'sponsor' -%section{ id: 'social-media' } -.pad - = render 'social_media' +- if @conference.include_social_media_in_splash? + %section{ id: 'social-media' } + .pad + = render 'social_media' diff --git a/spec/views/conference/show.html.haml_spec.rb b/spec/views/conference/show.html.haml_spec.rb index 0290add8..77f4f58f 100644 --- a/spec/views/conference/show.html.haml_spec.rb +++ b/spec/views/conference/show.html.haml_spec.rb @@ -10,13 +10,21 @@ describe 'conference/show.html.haml' do facebook_url: 'http://www.fbexample.com', google_url: 'http://www.google-example.com', media_type: 'YouTube', - media_id: 'rtyutut') - @conference.call_for_papers = create(:call_for_papers, conference: @conference) + media_id: 'rtyutut', + include_registrations_in_splash: true, + include_program_in_splash: true, + include_sponsors_in_splash: true, + include_social_media_in_splash: true, + include_tracks_in_splash: true, + include_tickets_in_splash: true) + @conference.call_for_papers = create(:call_for_papers, conference: @conference, + include_cfp_in_splash: true) @conference.sponsorship_levels << create(:sponsorship_level, conference: @conference) @sponsorship_level = @conference.sponsorship_levels.first @sponsorship_level.sponsors << create(:sponsor, sponsorship_level: @sponsorship_level, conference: @conference) - @conference.venue = create(:venue) + @conference.venue = create(:venue, include_venue_in_splash: true, + include_lodgings_in_splash: true) @conference.venue.lodgings << create(:lodging, venue: @conference.venue) assign :conference, @conference render