[fix]Fix style; Re-enable checking happening now

This commit is contained in:
Jimmy 2021-04-08 12:52:13 +08:00 committed by CactusPuppy
parent 779ed123e7
commit 385bc72973
No known key found for this signature in database
GPG key ID: 4B33B0A3E15E2C82
4 changed files with 8 additions and 19 deletions

View file

@ -3,7 +3,6 @@
DEFAULT_LOGO = 'snapcon_logo.png'
DEFAULT_COLOR = '#0B3559'
module ConferenceHelper
# Return true if only call_for_papers or call_for_tracks or call_for_booths is open
def one_call_open(*calls)
@ -82,7 +81,7 @@ module ConferenceHelper
def get_happening_now_events_schedules(conference)
events_schedules = conference.program.selected_event_schedules(
includes: [:room, { event: %i[track event_type speakers submitter] }]
)#.select(&:happening_now?)
).select(&:happening_now?)
events_schedules ||= []
events_schedules
end

View file

@ -54,11 +54,11 @@
- if @conference.splashpage.include_happening_now
- if @events_schedules.any?
.row
%h2.text-center{:style => "margin-bottom:30px"} Happening Now
%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
.container{:style => "margin:auto; width:50%"}
!= pagy_nav(@pagy)
.container{ style: "margin:auto; width:50%" }
!= pagy_nav(@pagy)
- else
.row
%h3.text-center There are no events happening now.
@ -66,7 +66,7 @@
.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
%h2.text-left{ style: "margin-bottom:30px" } About the Conference
= markdown(@conference.description, escape_html=false)
.trapezoid