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

[feat]Description / happening now takes the entire row if the other is empty

Browse source
This commit is contained in:
Jimmy 2021-04-09 22:01:57 +08:00
parent 3c7cc6cfdb
commit 02300ee8f2
2 changed files with 32 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,10 +45,11 @@
= render 'header', conference: @conference, venue: @conference.venue
-# description / happening now
= render 'about_and_happening_now', conference: @conference,
events_schedules: @events_schedules, pagy: @pagy,
events_schedules_length: @events_schedules_length,
events_schedules_limit: @events_schedules_limit
- if @conference.splashpage.include_happening_now? || @conference.description.present?
= render 'about_and_happening_now', conference: @conference,
events_schedules: @events_schedules, pagy: @pagy,
events_schedules_length: @events_schedules_length,
events_schedules_limit: @events_schedules_limit
-# calls for content, or program
- if @conference.splashpage.include_cfp