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

[fix]Remove unnecessary check in happening_now partial

Browse source
This commit is contained in:
Jimmy 2021-04-22 00:59:38 +08:00 • committed by CactusPuppy
parent 25af76d27a
commit 15f30190e4
No known key found for this signature in database
GPG key ID: 4B33B0A3E15E2C82
2 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/conferences/_about_and_happening_now.haml
View file

@ -15,7 +15,7 @@
.container .container
.row .row
-# happening now events are displayed second in md or lg view -# happening now events are displayed second in md or lg view
- if conference.splashpage.include_happening_now && conference.splashpage.include_program - if conference.splashpage.include_happening_now? && conference.splashpage.include_program?
- if conference.description.present? - if conference.description.present?
.col-md-6.col-md-push-6.col-lg-4.col-lg-push-8 .col-md-6.col-md-push-6.col-lg-4.col-lg-push-8
= yield :happening_now = yield :happening_now

31
app/views/conferences/_happening_now.haml
View file

@ -1,16 +1,15 @@
- if conference.splashpage.include_program && conference.splashpage.include_happening_now - if events_schedules.any?
- if events_schedules.any? .row
.row %h2.text-center{ style: 'margin-bottom:30px' }
%h2.text-center{ style: 'margin-bottom:30px' } - if is_happening_next
- if is_happening_next Happening Next
Happening Next - else
- else Happening Now
Happening Now - events_schedules.each do |event_schedule|
- events_schedules.each do |event_schedule| = render 'schedules/event', conference: conference, event_schedule: event_schedule, event: event_schedule.event, is_brief: true
= render 'schedules/event', conference: conference, event_schedule: event_schedule, event: event_schedule.event, is_brief: true - if events_schedules_length > events_schedules_limit
- if events_schedules_length > events_schedules_limit .container{ style: 'width:100%; text-align:center' }
.container{ style: 'width:100%; text-align:center' } != pagy_bootstrap_nav_js(pagy)
!= pagy_bootstrap_nav_js(pagy) - else
- else .row
.row %h3.text-center There are no events scheduled yet.
%h3.text-center There are no events scheduled yet.