gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[feat]Center happening now events on the splashpage

Browse source
This commit is contained in:
Jimmy 2021-04-07 11:00:03 +08:00
parent eda0c1a175
commit 8d71fa85cd
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/conference_helper.rb
View file

@ -82,7 +82,7 @@ module ConferenceHelper
events_schedules = conference.program.selected_event_schedules( events_schedules = conference.program.selected_event_schedules(
includes: [:room, { event: %i[track event_type speakers submitter] }] includes: [:room, { event: %i[track event_type speakers submitter] }]
).select(&:happening_now?) ).select(&:happening_now?)
events_schedules = [] unless events_schedules events_schedules ||= []
events_schedules events_schedules
end end
end end

3
app/views/conferences/show.html.haml
View file

@ -47,13 +47,12 @@
-# happening now events -# happening now events
- if @conference.splashpage.include_happening_now - if @conference.splashpage.include_happening_now
- if @events_schedules.any? - if @events_schedules.any?
.container{style: "padding: 20;"}
- for event_schedule in @events_schedules - for event_schedule in @events_schedules
.container
= 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
- else - else
.row .row
.col-md-12 .col-md-12
#happening_now_panel
%h3.text-center There are no events happening now. %h3.text-center There are no events happening now.
-# calls for content, or program -# calls for content, or program