From a1e70d9a297c32ae9a6181ceae4cb7d05edffdce Mon Sep 17 00:00:00 2001 From: echarp Date: Sun, 20 Jul 2014 02:42:46 +0200 Subject: [PATCH] =?UTF-8?q?Les=20changements=20d'un=20evt=20sont=20mainten?= =?UTF-8?q?ant=20mieux=20affich=C3=A9s=20dans=20les=20mails?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/event_mailer/accept.text.haml | 13 +---------- app/views/event_mailer/destroy.text.haml | 13 +---------- app/views/events/show.text.haml | 12 ++++++++++ app/views/moderation_mailer/accept.text.haml | 13 +---------- app/views/moderation_mailer/create.text.haml | 11 +-------- app/views/moderation_mailer/destroy.text.haml | 13 +---------- app/views/moderation_mailer/update.text.haml | 23 +++++++++++++++---- 7 files changed, 35 insertions(+), 63 deletions(-) create mode 100644 app/views/events/show.text.haml diff --git a/app/views/event_mailer/accept.text.haml b/app/views/event_mailer/accept.text.haml index b1bbb08a..8e72a071 100644 --- a/app/views/event_mailer/accept.text.haml +++ b/app/views/event_mailer/accept.text.haml @@ -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' diff --git a/app/views/event_mailer/destroy.text.haml b/app/views/event_mailer/destroy.text.haml index f76d973c..b0546d71 100644 --- a/app/views/event_mailer/destroy.text.haml +++ b/app/views/event_mailer/destroy.text.haml @@ -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' diff --git a/app/views/events/show.text.haml b/app/views/events/show.text.haml new file mode 100644 index 00000000..2b2a418e --- /dev/null +++ b/app/views/events/show.text.haml @@ -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} +===================================================== diff --git a/app/views/moderation_mailer/accept.text.haml b/app/views/moderation_mailer/accept.text.haml index 15a89531..33491afd 100644 --- a/app/views/moderation_mailer/accept.text.haml +++ b/app/views/moderation_mailer/accept.text.haml @@ -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' diff --git a/app/views/moderation_mailer/create.text.haml b/app/views/moderation_mailer/create.text.haml index bfff4625..885ff11b 100644 --- a/app/views/moderation_mailer/create.text.haml +++ b/app/views/moderation_mailer/create.text.haml @@ -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' diff --git a/app/views/moderation_mailer/destroy.text.haml b/app/views/moderation_mailer/destroy.text.haml index 0d0d9731..fbba7da5 100644 --- a/app/views/moderation_mailer/destroy.text.haml +++ b/app/views/moderation_mailer/destroy.text.haml @@ -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' diff --git a/app/views/moderation_mailer/update.text.haml b/app/views/moderation_mailer/update.text.haml index 899f3b3c..b2eba6a0 100644 --- a/app/views/moderation_mailer/update.text.haml +++ b/app/views/moderation_mailer/update.text.haml @@ -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