[feat]Add brief version of event partial; fix style
This commit is contained in:
parent
7ae94589fa
commit
497818cc45
3 changed files with 37 additions and 36 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
- 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" }
|
||||
- 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;'
|
||||
|
||||
|
|
@ -27,6 +28,7 @@
|
|||
= 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 !defined?(is_brief) || is_brief == false
|
||||
- if event_schedule.present?
|
||||
= inyourtz(event_schedule.start_time) do
|
||||
%span.track
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue