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

[feat]Display happening now only if program is also displayed

Browse source
This commit is contained in:
Jimmy 2021-04-10 00:44:42 +08:00 • committed by CactusPuppy
parent 497818cc45
commit fec78dccce
No known key found for this signature in database
GPG key ID: 4B33B0A3E15E2C82
5 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -1,4 +1,4 @@
- if conference.splashpage.include_happening_now
- if conference.splashpage.include_program && conference.splashpage.include_happening_now
- if events_schedules.any?
.row
%h2.text-center{ style: 'margin-bottom:30px' } Happening Now