Les changements d'un evt sont maintenant mieux affichés dans les mails
This commit is contained in:
parent
0b7e3d3116
commit
a1e70d9a29
@ -9,17 +9,6 @@
|
||||
=t '.delete_link'
|
||||
= cancel_event_url @event, secret: @event.secret
|
||||
\
|
||||
=====================================================
|
||||
#{Event.human_attribute_name :title}: #{@event.title}
|
||||
#{Event.human_attribute_name :start_time}: #{l @event.start_time, format: :at}
|
||||
#{Event.human_attribute_name :end_time}: #{l @event.end_time, format: :at}
|
||||
#{Event.human_attribute_name :region}: #{@event.region}
|
||||
#{Event.human_attribute_name :city}: #{@event.city}
|
||||
#{Event.human_attribute_name :url}: #{@event.url}
|
||||
#{Event.human_attribute_name :contact}: #{@event.contact}
|
||||
#{Event.human_attribute_name :submitter}: #{@event.submitter}
|
||||
#{Event.human_attribute_name :tags}: #{@event.tags}
|
||||
#{Event.human_attribute_name :description}: #{raw @event.description}
|
||||
=====================================================
|
||||
= render file: '/events/show'
|
||||
\
|
||||
=t '.signature'
|
||||
|
@ -7,17 +7,6 @@
|
||||
=t '.reclamation'
|
||||
\
|
||||
=t '.reminder'
|
||||
=====================================================
|
||||
#{Event.human_attribute_name :title}: #{@event.title}
|
||||
#{Event.human_attribute_name :start_time}: #{l @event.start_time, format: :at}
|
||||
#{Event.human_attribute_name :end_time}: #{l @event.end_time, format: :at}
|
||||
#{Event.human_attribute_name :region}: #{@event.region}
|
||||
#{Event.human_attribute_name :city}: #{@event.city}
|
||||
#{Event.human_attribute_name :url}: #{@event.url}
|
||||
#{Event.human_attribute_name :contact}: #{@event.contact}
|
||||
#{Event.human_attribute_name :submitter}: #{@event.submitter}
|
||||
#{Event.human_attribute_name :tags}: #{@event.tags}
|
||||
#{Event.human_attribute_name :description}: #{raw @event.description}
|
||||
=====================================================
|
||||
= render file: '/events/show'
|
||||
\
|
||||
=t '.signature'
|
||||
|
12
app/views/events/show.text.haml
Normal file
12
app/views/events/show.text.haml
Normal file
@ -0,0 +1,12 @@
|
||||
=====================================================
|
||||
#{Event.human_attribute_name :title}: #{@event.title}
|
||||
#{Event.human_attribute_name :start_time}: #{l @event.start_time, format: :at}
|
||||
#{Event.human_attribute_name :end_time}: #{l @event.end_time, format: :at}
|
||||
#{Event.human_attribute_name :region}: #{@event.region}
|
||||
#{Event.human_attribute_name :city}: #{@event.city}
|
||||
#{Event.human_attribute_name :url}: #{@event.url}
|
||||
#{Event.human_attribute_name :contact}: #{@event.contact}
|
||||
#{Event.human_attribute_name :submitter}: #{@event.submitter}
|
||||
#{Event.human_attribute_name :tags}: #{@event.tags}
|
||||
#{Event.human_attribute_name :description}: #{raw @event.description}
|
||||
=====================================================
|
@ -2,17 +2,6 @@
|
||||
\
|
||||
=t '.body', author: @current_user
|
||||
\
|
||||
=====================================================
|
||||
#{Event.human_attribute_name :title}: #{@event.title}
|
||||
#{Event.human_attribute_name :start_time}: #{l @event.start_time, format: :at}
|
||||
#{Event.human_attribute_name :end_time}: #{l @event.end_time, format: :at}
|
||||
#{Event.human_attribute_name :region}: #{@event.region}
|
||||
#{Event.human_attribute_name :city}: #{@event.city}
|
||||
#{Event.human_attribute_name :url}: #{@event.url}
|
||||
#{Event.human_attribute_name :contact}: #{@event.contact}
|
||||
#{Event.human_attribute_name :submitter}: #{@event.submitter}
|
||||
#{Event.human_attribute_name :tags}: #{@event.tags}
|
||||
#{Event.human_attribute_name :description}: #{raw @event.description}
|
||||
=====================================================
|
||||
= render file: '/events/show'
|
||||
\
|
||||
=t '.signature'
|
||||
|
@ -3,15 +3,6 @@
|
||||
=t '.body', subject: @event.title, start_time: l(@event.start_time, format: :at)
|
||||
= moderations_url
|
||||
\
|
||||
#{Event.human_attribute_name :title}: #{@event.title}
|
||||
#{Event.human_attribute_name :start_time}: #{l @event.start_time, format: :at}
|
||||
#{Event.human_attribute_name :end_time}: #{l @event.end_time, format: :at}
|
||||
#{Event.human_attribute_name :region}: #{@event.region}
|
||||
#{Event.human_attribute_name :city}: #{@event.city}
|
||||
#{Event.human_attribute_name :url}: #{@event.url}
|
||||
#{Event.human_attribute_name :contact}: #{@event.contact}
|
||||
#{Event.human_attribute_name :submitter}: #{@event.submitter}
|
||||
#{Event.human_attribute_name :tags}: #{@event.tags}
|
||||
#{Event.human_attribute_name :description}: #{raw @event.description}
|
||||
= render file: '/events/show'
|
||||
\
|
||||
=t '.signature'
|
||||
|
@ -5,17 +5,6 @@
|
||||
= @reason
|
||||
\
|
||||
=t '.reminder'
|
||||
=====================================================
|
||||
#{Event.human_attribute_name :title}: #{@event.title}
|
||||
#{Event.human_attribute_name :start_time}: #{l @event.start_time, format: :at}
|
||||
#{Event.human_attribute_name :end_time}: #{l @event.end_time, format: :at}
|
||||
#{Event.human_attribute_name :region}: #{@event.region}
|
||||
#{Event.human_attribute_name :city}: #{@event.city}
|
||||
#{Event.human_attribute_name :url}: #{@event.url}
|
||||
#{Event.human_attribute_name :contact}: #{@event.contact}
|
||||
#{Event.human_attribute_name :submitter}: #{@event.submitter}
|
||||
#{Event.human_attribute_name :tags}: #{@event.tags}
|
||||
#{Event.human_attribute_name :description}: #{raw @event.description}
|
||||
=====================================================
|
||||
= render file: '/events/show'
|
||||
\
|
||||
=t '.signature'
|
||||
|
@ -2,11 +2,24 @@
|
||||
\
|
||||
=t '.body', subject: @event.title, author: @current_user||t('.submitter')
|
||||
|
||||
- Differ.format = :ascii
|
||||
= raw Differ.diff(@event.description, @event.description_was).to_s |
|
||||
.gsub(/\[31m/, '') |
|
||||
.gsub(/\[32m/, '') |
|
||||
.gsub(/\[0m/, '') |
|
||||
- new = render file: '/events/show'
|
||||
|
||||
- former = @event
|
||||
- @event = Event.new(title: @event.title_was,
|
||||
start_time: @event.start_time_was,
|
||||
end_time: @event.end_time_was,
|
||||
region: @event.region_was,
|
||||
city: @event.city_was,
|
||||
url: @event.url_was,
|
||||
contact: @event.contact_was,
|
||||
submitter: @event.submitter_was,
|
||||
tags: @event.tags_was,
|
||||
description: @event.description_was)
|
||||
|
||||
- prev = render file: '/events/show'
|
||||
- @event = former
|
||||
|
||||
= raw Differ.diff new, prev
|
||||
\
|
||||
- if @current_user
|
||||
= edit_moderation_url @event
|
||||
|
Loading…
Reference in New Issue
Block a user