Url sent in mails are now enclosed in angled brackets,

as recommended in RFC 3986 section C (ftp://ftp.rfc-editor.org/in-notes/rfc3986.txt)

Close #77
filter
echarp 6 years ago
parent 0b4f398f61
commit d574b1624a
  1. 15
      app/views/event_mailer/accept.text.haml
  2. 6
      app/views/event_mailer/create.text.haml
  3. 3
      app/views/moderation_mailer/accept.text.haml
  4. 3
      app/views/moderation_mailer/create.text.haml
  5. 9
      app/views/moderation_mailer/update.text.haml
  6. 3
      app/views/note_mailer/create.text.haml
  7. 3
      app/views/note_mailer/notify.text.haml
  8. 3
      app/views/orga_mailer/accept.text.haml
  9. 6
      app/views/orga_mailer/create.text.haml
  10. 3
      app/views/orga_mailer/update.text.haml

@ -1,18 +1,23 @@
= t '.body', moderator: @current_user
= event_url @event
= surround '<'.html_safe, '>'.html_safe do
= event_url @event
\
= t '.edit_link'
= edit_event_url @event, secret: @event.secret
= surround '<'.html_safe, '>'.html_safe do
= edit_event_url @event, secret: @event.secret
\
= t '.delete_link'
= cancel_event_url @event, secret: @event.secret
= surround '<'.html_safe, '>'.html_safe do
= cancel_event_url @event, secret: @event.secret
\
- if @event.repeat > 0 && !@event.event_id
= t '.repeat_helper', count: @event.repeat
- @event.events.each do |e|
= e
= edit_event_url e, secret: e.secret
= cancel_event_url e, secret: e.secret
= surround '<'.html_safe, '>'.html_safe do
= edit_event_url e, secret: e.secret
= surround '<'.html_safe, '>'.html_safe do
= cancel_event_url e, secret: e.secret
\
= render file: '/events/show'
\

@ -1,8 +1,10 @@
= t '.body', subject: @event.title,
start_time: l(@event.start_time, format: :at)
= edit_event_url @event, secret: @event.secret
= surround '<'.html_safe, '>'.html_safe do
= edit_event_url @event, secret: @event.secret
\
= t '.delete_link'
= cancel_event_url @event, secret: @event.secret
= surround '<'.html_safe, '>'.html_safe do
= cancel_event_url @event, secret: @event.secret
\
= t '.signature'

@ -3,6 +3,7 @@
= render file: '/events/show'
\
= t '.access'
= event_url @event
= surround '<'.html_safe, '>'.html_safe do
= event_url @event
\
= t '.signature'

@ -1,6 +1,7 @@
= t '.body', subject: @event.title, start_time: l(@event.start_time,
format: :at)
= moderations_url
= surround '<'.html_safe, '>'.html_safe do
= moderations_url
\
= render file: '/events/show'
\

@ -13,9 +13,10 @@
Differ.format = Differ::Format::Patch
= Differ.diff new, prev
\
- if @current_user
= edit_moderation_url @event
- else
= edit_event_url @event, secret: @event.secret
= surround '<'.html_safe, '>'.html_safe do
- if @current_user
= edit_moderation_url @event
- else
= edit_event_url @event, secret: @event.secret
\
= t '.signature'

@ -2,6 +2,7 @@
\
= strip_tags @note.contents
\
= moderations_url
= surround '<'.html_safe, '>'.html_safe do
= moderations_url
\
= t '.signature'

@ -6,6 +6,7 @@
\
= t '.edit_link'
\
= edit_event_url @note.event, secret: @note.event.secret
= surround '<'.html_safe, '>'.html_safe do
= edit_event_url @note.event, secret: @note.event.secret
\
= t '.signature'

@ -3,6 +3,7 @@
= render file: '/orgas/show'
\
= t '.access'
= orga_url @orga
= surround '<'.html_safe, '>'.html_safe do
= orga_url @orga
\
= t '.signature'

@ -1,7 +1,9 @@
= t '.body', subject: @orga.name
= edit_orga_url @orga, secret: @orga.secret
= surround '<'.html_safe, '>'.html_safe do
= edit_orga_url @orga, secret: @orga.secret
\
= t '.delete_link'
= cancel_orga_url @orga, secret: @orga.secret
= surround '<'.html_safe, '>'.html_safe do
= cancel_orga_url @orga, secret: @orga.secret
\
= t '.signature'

@ -14,6 +14,7 @@
= Differ.diff new, prev
= t '.access'
= orga_url @orga
= surround '<'.html_safe, '>'.html_safe do
= orga_url @orga
\
= t '.signature'

Loading…
Cancel
Save