diff --git a/app/views/conferences/_about_and_happening_now.haml b/app/views/conferences/_about_and_happening_now.haml index 93bf8b2b..59824008 100644 --- a/app/views/conferences/_about_and_happening_now.haml +++ b/app/views/conferences/_about_and_happening_now.haml @@ -2,16 +2,32 @@ .container .row -# happening now events are displayed second in md or lg view - .col-md-6.col-md-push-6.col-lg-4.col-lg-push-8 - #happening-now - = render 'happening_now', conference: conference, - events_schedules: events_schedules, pagy: pagy, - events_schedules_length: events_schedules_length, - events_schedules_limit: events_schedules_limit + - if conference.splashpage.include_happening_now? + - if conference.description.present? + .col-md-6.col-md-push-6.col-lg-4.col-lg-push-8 + #happening-now + = render 'happening_now', conference: conference, + events_schedules: events_schedules, pagy: pagy, + events_schedules_length: events_schedules_length, + events_schedules_limit: events_schedules_limit + - else + .col-md-12 + #happening-now + = render 'happening_now', conference: conference, + events_schedules: events_schedules, pagy: pagy, + events_schedules_length: events_schedules_length, + events_schedules_limit: events_schedules_limit - if conference.description.present? - .col-md-6.col-md-pull-6.col-lg-8.col-lg-pull-4 - #about - .row - %h2.text-left{ style: 'margin-bottom:30px' } About the Conference - = markdown(conference.description, false) + - if conference.splashpage.include_happening_now? + .col-md-6.col-md-pull-6.col-lg-8.col-lg-pull-4 + #about + .row + %h2.text-left{ style: 'margin-bottom:30px' } About the Conference + = markdown(conference.description, false) + - else + .col-md-12 + #about + .row + %h2.text-left{ style: 'margin-bottom:30px' } About the Conference + = markdown(conference.description, false) .trapezoid diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml index 98aea92b..3a73c0b0 100644 --- a/app/views/conferences/show.html.haml +++ b/app/views/conferences/show.html.haml @@ -45,10 +45,11 @@ = render 'header', conference: @conference, venue: @conference.venue -# description / happening now - = render 'about_and_happening_now', conference: @conference, - events_schedules: @events_schedules, pagy: @pagy, - events_schedules_length: @events_schedules_length, - events_schedules_limit: @events_schedules_limit + - if @conference.splashpage.include_happening_now? || @conference.description.present? + = render 'about_and_happening_now', conference: @conference, + events_schedules: @events_schedules, pagy: @pagy, + events_schedules_length: @events_schedules_length, + events_schedules_limit: @events_schedules_limit -# calls for content, or program - if @conference.splashpage.include_cfp