diff --git a/app/assets/stylesheets/events.sass b/app/assets/stylesheets/events.sass index feea07f3673424cc213abac49899bdf0c06171e8..020be9482d331772ea840bc17b2cc29ab44370e0 100644 --- a/app/assets/stylesheets/events.sass +++ b/app/assets/stylesheets/events.sass @@ -131,3 +131,11 @@ body.events.show, body.orgas.show, body.tags.show, body.pages img margin-left: 1% margin-right: 1% + +/* Display in events list */ +article.event + box-shadow: -1em 1em 1em -1em gray + margin-left: 1em + padding-left: 1em + padding-bottom: 0.4em + border-bottom-left-radius: 1em diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml index e5202015161209264626f86aaa4d0095175bc9c8..925e12d1a0741b29e61005453668b578f9d7fd98 100644 --- a/app/views/tags/show.html.haml +++ b/app/views/tags/show.html.haml @@ -33,35 +33,34 @@ %em.fa.fa-li.fa-dot-circle-o GeoJSON -- if @events_future.any? || @events_past.any? - - if @events_future.any? +- @events_future.order('start_time asc').each do |event| + %article.event %h3 - %em.fa.fa-forward - = t '.future' - %ul.fa-ul - - @events_future.order('start_time asc').each do |event| - %li - = link_to event do - - if event.locality? - %em.locality.fa-li.fa.fa-globe - - else - %em.locality.fa-li.fa.fa-shield - %em.city= event.city - = event.title - .date= display_date event + %em.city= event.city + = event.title + %p.full_address + - if event.place_name.present? + %span= event.place_name + - if event.address.present? + %span= event.address + %p= display_date event + .description + = description sanitize event.description, + tags: %w(p h1 h2 h3 h4 br table tr th td ul ol li a strong b em i img sub sup span), + attributes: %w(href src width height style title) - - if @events_past.any? - %h3 - %em.fa.fa-backward - = t '.past' - %ul.fa-ul - - @events_past.order('start_time desc').each do |event| - %li - = link_to event do - - if event.locality? - %em.locality.fa-li.fa.fa-globe - - else - %em.locality.fa-li.fa.fa-shield - %em.city= event.city - = event.title - .date= display_date event +- if @events_past.any? + %h2 + %em.fa.fa-backward + = t '.past' + %ul.fa-ul + - @events_past.order('start_time desc').each do |event| + %li + = link_to event do + - if event.locality? + %em.locality.fa-li.fa.fa-globe + - elsif event.tags.any? { |t| t.name.include? 'libre-en-fete' } + = image_tag 'lef-small.png', alt: 'LEF', width: 16, height: 16 + %em.city{ title: event.address }= event.city + = event.title + .date= display_date event