diff --git a/app/views/conferences/_about_and_happening_now.haml b/app/views/conferences/_about_and_happening_now.haml index 59824008..3cd63c20 100644 --- a/app/views/conferences/_about_and_happening_now.haml +++ b/app/views/conferences/_about_and_happening_now.haml @@ -1,3 +1,16 @@ += content_for :happening_now do + #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 + += content_for :about do + #about + .row + %h2.text-left{ style: 'margin-bottom:30px' } About the Conference + = markdown(conference.description, false) + %section#about-and-happening-now .container .row @@ -5,29 +18,15 @@ - 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 + = yield :happening_now - 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 + = yield :happening_now - if conference.description.present? - 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) + = yield :about - else .col-md-12 - #about - .row - %h2.text-left{ style: 'margin-bottom:30px' } About the Conference - = markdown(conference.description, false) + = yield :about .trapezoid diff --git a/app/views/conferences/_happening_now.haml b/app/views/conferences/_happening_now.haml index 20e3cbd4..54947fa7 100644 --- a/app/views/conferences/_happening_now.haml +++ b/app/views/conferences/_happening_now.haml @@ -3,7 +3,7 @@ .row %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 + = render 'schedules/event', conference: conference, event_schedule: event_schedule, event: event_schedule.event, is_brief: true - if events_schedules_length > events_schedules_limit .container{ style: 'width:100%; text-align:center' } != pagy_bootstrap_nav_js(pagy) diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml index 9373d0c3..2e6fd429 100644 --- a/app/views/schedules/_event.html.haml +++ b/app/views/schedules/_event.html.haml @@ -2,8 +2,9 @@ - header_color = event.event_type&.color || '#f5f5f5' .trapezoid{ style: 'color: white; top: 12px; z-index: 100;' } .panel-heading{ style: "background-color: #{header_color}; color: #{ contrast_color(header_color) }; border-radius: 4px" } - - event.speakers_ordered.each do |speaker| - = image_tag speaker.profile_picture, class: 'img-circle pull-right', alt: speaker.name, style: 'padding: 2px;' + - if !defined?(is_brief) || is_brief == false + - event.speakers_ordered.each do |speaker| + = image_tag speaker.profile_picture, class: 'img-circle pull-right', alt: speaker.name, style: 'padding: 2px;' %p = canceled_replacement_event_label(event, event_schedule) @@ -27,20 +28,21 @@ = markdown(truncate(event.abstract, length: 400)) -# TODO: More informative text or aria-label. = link_to 'more', conference_program_proposal_path(@conference.short_title, event.id) if event.abstract.length > 400 - - if event_schedule.present? - = inyourtz(event_schedule.start_time) do + - if !defined?(is_brief) || is_brief == false + - if event_schedule.present? + = inyourtz(event_schedule.start_time) do + %span.track + %span.fa.fa-clock-o + %span.label{ style: 'background-color: grey' } + = event_schedule.start_time.strftime('%l:%M %P') + \- + = event_schedule.end_time.strftime('%l:%M %P') %span.track - %span.fa.fa-clock-o + %span.fa.fa-map-marker %span.label{ style: 'background-color: grey' } - = event_schedule.start_time.strftime('%l:%M %P') - \- - = event_schedule.end_time.strftime('%l:%M %P') - %span.track - %span.fa.fa-map-marker - %span.label{ style: 'background-color: grey' } - = event_schedule.room.name - - if event.track - %span.track - %span.fa.fa-road - %span.label{ style: "background-color: #{event.track.color}; color: #{ contrast_color(event.track.color) }" } - = event.track.name + = event_schedule.room.name + - if event.track + %span.track + %span.fa.fa-road + %span.label{ style: "background-color: #{event.track.color}; color: #{ contrast_color(event.track.color) }" } + = event.track.name