mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change image URL in mailer to full path (#6264)

pull/336/head
Yamagishi Kazutoshi 2018-01-16 14:26:46 +09:00 committed by Eugen Rochko
parent e6fd4bea35
commit 9a28052e92
7 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/user_mailer.rb
View File

@ -5,6 +5,8 @@ class UserMailer < Devise::Mailer
helper :instance helper :instance
add_template_helper RoutingHelper
def confirmation_instructions(user, token, **) def confirmation_instructions(user, token, **)
@resource = user @resource = user
@token = token @token = token

4
app/views/layouts/mailer.html.haml
View File

@ -24,7 +24,7 @@
%tr %tr
%td.column-cell %td.column-cell
= link_to root_url do = link_to root_url do
= image_tag asset_pack_path('logo_full.svg'), height: 34, class: 'logo' = image_tag full_pack_url('logo_full.svg'), alt: 'Mastodon', height: 34, class: 'logo'
= yield = yield
@ -52,4 +52,4 @@
%tbody %tbody
%td.column-cell.text-right %td.column-cell.text-right
= link_to root_url do = link_to root_url do
= image_tag asset_pack_path('logo_transparent.svg'), height: 24 = image_tag full_pack_url('logo_transparent.svg'), alt: 'Mastodon', height: 24

2
app/views/user_mailer/confirmation_instructions.html.haml
View File

@ -17,7 +17,7 @@
%tbody %tbody
%tr %tr
%td %td
= image_tag asset_pack_path('icon_email.svg') = image_tag full_pack_url('icon_email.svg'), alt: ''
%h1= t 'devise.mailer.confirmation_instructions.title' %h1= t 'devise.mailer.confirmation_instructions.title'

2
app/views/user_mailer/email_changed.html.haml
View File

@ -17,7 +17,7 @@
%tbody %tbody
%tr %tr
%td %td
= image_tag asset_pack_path('icon_email.svg') = image_tag full_pack_url('icon_email.svg'), alt: ''
%h1= t 'devise.mailer.email_changed.title' %h1= t 'devise.mailer.email_changed.title'
%p.lead= t 'devise.mailer.email_changed.explanation' %p.lead= t 'devise.mailer.email_changed.explanation'

2
app/views/user_mailer/password_change.html.haml
View File

@ -17,7 +17,7 @@
%tbody %tbody
%tr %tr
%td %td
= image_tag asset_pack_path('icon_lock_open.svg') = image_tag full_pack_url('icon_lock_open.svg'), alt: ''
%h1= t 'devise.mailer.password_change.title' %h1= t 'devise.mailer.password_change.title'
%p.lead= t 'devise.mailer.password_change.explanation' %p.lead= t 'devise.mailer.password_change.explanation'

2
app/views/user_mailer/reconfirmation_instructions.html.haml
View File

@ -17,7 +17,7 @@
%tbody %tbody
%tr %tr
%td %td
= image_tag asset_pack_path('icon_email.svg') = image_tag full_pack_url('icon_email.svg'), alt: ''
%h1= t 'devise.mailer.reconfirmation_instructions.title' %h1= t 'devise.mailer.reconfirmation_instructions.title'
%p.lead= t 'devise.mailer.reconfirmation_instructions.explanation' %p.lead= t 'devise.mailer.reconfirmation_instructions.explanation'

2
app/views/user_mailer/reset_password_instructions.html.haml
View File

@ -17,7 +17,7 @@
%tbody %tbody
%tr %tr
%td %td
= image_tag asset_pack_path('icon_lock_open.svg') = image_tag full_pack_url('icon_lock_open.svg'), alt: ''
%h1= t 'devise.mailer.reset_password_instructions.title' %h1= t 'devise.mailer.reset_password_instructions.title'
%p.lead= t 'devise.mailer.reset_password_instructions.explanation' %p.lead= t 'devise.mailer.reset_password_instructions.explanation'