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 • committed by CactusPuppy
parent 0c73d24f05
commit 7ae94589fa
No known key found for this signature in database
GPG key ID: 4B33B0A3E15E2C82
2 changed files with 32 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,16 +2,32 @@
.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
.col-md-6.col-md-push-6.col-lg-4.col-lg-push-8 - if conference.splashpage.include_happening_now?
#happening-now - if conference.description.present?
= render 'happening_now', conference: conference, .col-md-6.col-md-push-6.col-lg-4.col-lg-push-8
events_schedules: events_schedules, pagy: pagy, #happening-now
events_schedules_length: events_schedules_length, = render 'happening_now', conference: conference,
events_schedules_limit: events_schedules_limit events_schedules: events_schedules, pagy: pagy,
events_schedules_length: events_schedules_length,
events_schedules_limit: events_schedules_limit
- else
.col-md-12
#happening-now
= render 'happening_now', conference: conference,
events_schedules: events_schedules, pagy: pagy,
events_schedules_length: events_schedules_length,
events_schedules_limit: events_schedules_limit
- if conference.description.present? - if conference.description.present?
.col-md-6.col-md-pull-6.col-lg-8.col-lg-pull-4 - if conference.splashpage.include_happening_now?
#about .col-md-6.col-md-pull-6.col-lg-8.col-lg-pull-4
.row #about
%h2.text-left{ style: 'margin-bottom:30px' } About the Conference .row
= markdown(conference.description, false) %h2.text-left{ style: 'margin-bottom:30px' } About the Conference
= markdown(conference.description, false)
- else
.col-md-12
#about
.row
%h2.text-left{ style: 'margin-bottom:30px' } About the Conference
= markdown(conference.description, false)
.trapezoid .trapezoid

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

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