mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-25 12:34:58 +01:00
Code Issues Projects Releases Wiki Activity

Use partial collection render for welcome mailer features (#29843)

Browse Source
This commit is contained in:
Matt Jankowski 2024-04-04 12:13:10 -04:00 committed by GitHub
parent 191bf5876e
commit 601834d746
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/application/mailer/_feature.html.haml
View File

@ -4,7 +4,7 @@
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' } %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr %tr
%td.email-feature-td %td.email-feature-td
.email-desktop-flex{ class: ('email-dir-rtl' if defined?(text_first_on_desktop) && !text_first_on_desktop) } .email-desktop-flex{ class: ('email-dir-rtl' if feature_iteration.index.odd?) }
/[if mso] /[if mso]
<table border="0" cellpadding="0" cellspacing="0" align="center" style="width:100%;" role="presentation"><tr><td style="width:50%; vertical-align:top;"> <table border="0" cellpadding="0" cellspacing="0" align="center" style="width:100%;" role="presentation"><tr><td style="width:50%; vertical-align:top;">
.email-desktop-column .email-desktop-column
@ -24,7 +24,7 @@
%tr %tr
%td.email-column-td %td.email-column-td
- if defined?(feature) - if defined?(feature)
%p{ class: ('email-desktop-text-right' if defined?(text_first_on_desktop) && text_first_on_desktop) } %p{ class: ('email-desktop-text-right' if feature_iteration.index.even?) }
= image_tag frontend_asset_url("images/mailer-new/welcome/feature_#{feature}.png"), alt: '', width: 240, height: 230 = image_tag frontend_asset_url("images/mailer-new/welcome/feature_#{feature}.png"), alt: '', width: 240, height: 230
/[if mso] /[if mso]
</td></tr></table> </td></tr></table>

5
app/views/user_mailer/welcome.html.haml
View File

@ -68,7 +68,4 @@
%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' } %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
%tr %tr
%td.email-extra-td %td.email-extra-td
= render 'application/mailer/feature', feature: 'control', text_first_on_desktop: true = render partial: 'application/mailer/feature', collection: %w(control audience moderation creativity)
= render 'application/mailer/feature', feature: 'audience', text_first_on_desktop: false
= render 'application/mailer/feature', feature: 'moderation', text_first_on_desktop: true
= render 'application/mailer/feature', feature: 'creativity', text_first_on_desktop: false