diff --git a/app/views/conferences/_conference_details.html.haml b/app/views/conferences/_conference_details.html.haml index 02e54c29..d6512c78 100644 --- a/app/views/conferences/_conference_details.html.haml +++ b/app/views/conferences/_conference_details.html.haml @@ -15,7 +15,7 @@ = "#{conference.venue.city}/#{conference.venue.country_name}" - unless conference.description.blank? %p - = markdown(conference.description) + = markdown(conference.description, escape_html=false) .col-md-2 .btn-group-vertical - if !@conference || @conference != conference diff --git a/app/views/conferences/index.html.haml b/app/views/conferences/index.html.haml index 5382989c..fbcb426e 100644 --- a/app/views/conferences/index.html.haml +++ b/app/views/conferences/index.html.haml @@ -10,12 +10,12 @@ .col-md-12 %p.text-right %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 = "(#{@antiquated.count})" - %i.fa.fa-chevron-right - %i.fa.fa-chevron-down{ style: 'display: none' } - #antiquated.collapse + %i.fa.fa-chevron-right{ style: 'display: none' } + %i.fa.fa-chevron-down + #antiquated - @antiquated.each do |conference| = render '/conferences/conference_details', conference: conference - if @antiquated.empty? && @current.empty? && User.empty?