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

Merge pull request #107 from snap-cloud/michae/fixup-conferences-index-page

Browse source 
Cleanup All Conference Index
This commit is contained in:
Michael Ball 2021-03-08 15:56:22 -08:00 • committed by GitHub
commit 743188d162
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/conferences/_conference_details.html.haml
View file

@ -15,7 +15,7 @@
= "#{conference.venue.city}/#{conference.venue.country_name}" = "#{conference.venue.city}/#{conference.venue.country_name}"
- unless conference.description.blank? - unless conference.description.blank?
%p %p
= markdown(conference.description) = markdown(conference.description, escape_html=false)
.col-md-2 .col-md-2
.btn-group-vertical .btn-group-vertical
- if !@conference || @conference != conference - if !@conference || @conference != conference

8
app/views/conferences/index.html.haml
View file

@ -10,12 +10,12 @@
.col-md-12 .col-md-12
%p.text-right %p.text-right
%button{ type: 'button', class: 'btn btn-link btn-sm', 'data-toggle' => 'collapse', 'data-target' => '#antiquated', 'aria-expanded' => 'true', 'aria-controls' => 'antiquated'} %button{ type: 'button', class: 'btn btn-link btn-sm', 'data-toggle' => 'collapse', 'data-target' => '#antiquated', 'aria-expanded' => 'true', 'aria-controls' => 'antiquated'}
Older conferences Past Conferences
%span.notranslate %span.notranslate
= "(#{@antiquated.count})" = "(#{@antiquated.count})"
%i.fa.fa-chevron-right %i.fa.fa-chevron-right{ style: 'display: none' }
%i.fa.fa-chevron-down{ style: 'display: none' } %i.fa.fa-chevron-down
#antiquated.collapse #antiquated
- @antiquated.each do |conference| - @antiquated.each do |conference|
= render '/conferences/conference_details', conference: conference = render '/conferences/conference_details', conference: conference
- if @antiquated.empty? && @current.empty? && User.empty? - if @antiquated.empty? && @current.empty? && User.empty?