diff --git a/app/views/conferences/_about_and_happening_now.haml b/app/views/conferences/_about_and_happening_now.haml index 14c61e71..d0925a52 100644 --- a/app/views/conferences/_about_and_happening_now.haml +++ b/app/views/conferences/_about_and_happening_now.haml @@ -4,22 +4,22 @@ -# 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 - - if @conference.splashpage.include_happening_now + - if conference.splashpage.include_happening_now - if @events_schedules.any? .row - %h2.text-center{ style: "margin-bottom:30px" } Happening Now - - for event_schedule in @events_schedules - = render 'schedules/event', conference: @conference, event_schedule: event_schedule, event: event_schedule.event - - if @events_schedules_length > @events_schedules_limit - .container{ style: "width:100%; text-align:center" } - != pagy_bootstrap_nav(@pagy) + %h2.text-center{ style: 'margin-bottom:30px' } Happening Now + - events_schedules.each do |event_schedule| + = render 'schedules/event', conference: conference, event_schedule: event_schedule, event: event_schedule.event + - if events_schedules_length > events_schedules_limit + .container{ style: 'width:100%; text-align:center' } + != pagy_bootstrap_nav(pagy) - else .row %h3.text-center There are no events happening now. - - if @conference.description.present? + - 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, escape_html=false) - .trapezoid \ No newline at end of file + %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 6e42734c..98aea92b 100644 --- a/app/views/conferences/show.html.haml +++ b/app/views/conferences/show.html.haml @@ -45,7 +45,10 @@ = render 'header', conference: @conference, venue: @conference.venue -# description / happening now - = render 'about_and_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 -# calls for content, or program - if @conference.splashpage.include_cfp