friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #8386 from nupplaphil/bug/fix_mail 

Fix & align HTML mail text
This commit is contained in:
Michael Vogel 2020-03-08 22:27:02 +01:00 committed by GitHub
parent ea1bdcc710 06b0df8e46
commit 02027fff13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 75 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
view/templates/email/html.tpl
View File

@ -14,10 +14,12 @@
<div style="clear: both;"></div>
</td>
</tr>
<tr>
<td>
{{$htmlversion nofilter}}
</td>
</tr>
</tbody>
</table>
<p>
{{$htmlversion nofilter}}
</p>
</body>
</html>

58
view/templates/email/notify/html.tpl
View File

@ -1,20 +1,50 @@
<table>
<tbody>
<tr><td colspan="2" style="padding-top:22px;">{{$preamble nofilter}}</td></tr>
<thead>
<tr>
<td colspan="2" style="padding-top:22px;">
{{$preamble nofilter}}
</td>
</tr>
</thead>
{{if $content_allowed}}
<tbody>
{{if $source_photo}}
<tr>
<td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
<td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td>
</tr>
<tr>
<td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
<td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td>
</tr>
{{/if}}
<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
<tr><td style="padding-right:22px;">{{$htmlversion nofilter}}</td></tr>
<tr>
<td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td>
</tr>
<tr>
<td style="padding-right:22px;">{{$htmlversion nofilter}}
</td>
</tr>
{{/if}}
<tr><td colspan="2" style="padding-top:11px;">{{$hsitelink nofilter}}</td></tr>
<tr><td colspan="2" style="padding-bottom:11px;">{{$hitemlink nofilter}}</td></tr>
<tr><td></td><td>{{$thanks}}</td></tr>
<tr><td></td><td>{{$site_admin}}</td></tr>
</tbody>
</tbody>
<tfoot>
<tr>
<td colspan="2" style="padding-top:11px;">
{{$hsitelink nofilter}}
</td>
</tr>
<tr>
<td colspan="2" style="padding-bottom:11px;">
{{$hitemlink nofilter}}
</td>
</tr>
<tr>
<td></td>
<td>
{{$thanks}}
</td>
</tr>
<tr>
<td></td>
<td>
{{$site_admin}}
</td>
</tr>
</tfoot>
</table>

29
view/templates/email/system/html.tpl
View File

@ -1,5 +1,28 @@
<table>
<tr><td style="padding-right:22px;">{{$htmlversion nofilter}}</td></tr>
<tr><td>{{$thanks}}</td></tr>
<tr><td>{{$site_admin}}</td></tr>
<thead>
<tr>
<td>
{{$preamble nofilter}}
</td>
</tr>
</thead>
<tbody>
<tr>
<td style="padding-right:22px;">
{{$htmlversion nofilter}}
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td>
{{$thanks}}
</td>
</tr>
<tr>
<td>
{{$site_admin}}
</td>
</tr>
</tfoot>
</table>