diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml index 543bf653257d4da55ea65573e2c15943a93fc90d..644296dd0cef88953ce0308890a71b62fad49fa4 100644 --- a/app/views/events/show.html.haml +++ b/app/views/events/show.html.haml @@ -1,3 +1,7 @@ +%h2 + %em= @event.city + ':' + = @event.title + - if @event.persisted? && request.format == 'text/html' && controller.controller_name != 'moderations' && controller.controller_name != 'notes' && controller.action_name != 'edit' && controller.action_name != 'cancel' #lug-list %h1=t '.lug-list' @@ -21,10 +25,6 @@ %em.fa.fa-thumbs-down =t '.cancel' -%h2 - %em= @event.city + ':' - = @event.title - %h3=t '.dateAndPlace' %p - if @event.same_day? @@ -43,10 +43,10 @@ %h3=t '.description' .description - :markdown - #{sanitize @event.description, - tags: %w(p br table tr td ul ol li a strong b em i img), - attributes: %w(href src width height)} + - markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, autolink: true, tables: true) + = sanitize markdown.render(@event.description), + tags: %w(p br table tr td ul ol li a strong b em i img), + attributes: %w(href src width height) %h3=t '.infos' %p