diff options
| author | Corey Hulen <corey@hulen.com> | 2016-04-28 06:53:30 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-04-28 09:53:30 -0400 |
| commit | 9fecf96d3bf49e7c10cff58f656eabf829c83167 (patch) | |
| tree | d7b8fc02ba39f1567fa691d0184f9d69ce6f8916 /templates | |
| parent | b49dc28d7e346e775bd75d1cce8046149440c0a4 (diff) | |
| download | chat-9fecf96d3bf49e7c10cff58f656eabf829c83167.tar.gz chat-9fecf96d3bf49e7c10cff58f656eabf829c83167.tar.bz2 chat-9fecf96d3bf49e7c10cff58f656eabf829c83167.zip | |
PLT-2687 sending email on upgrade and moving profile pic to new location (#2808)
* Fixing CLI and adding unit tests
* Adding the upgrade_db_30 to the help text
* Adding the upgrade_db_30 to the help text
* Adding the upgrade_db_30 to the help text
* Fixing CLI tests
* PLT-2687 sending email on upgrade and moving profile pic to new location
* Fixing img move
* Fixing moving of profile image
* making upgrade email localizable
* Fixing email template
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/email_footer.html | 3 | ||||
| -rw-r--r-- | templates/upgrade_30_body.html | 37 |
2 files changed, 37 insertions, 3 deletions
diff --git a/templates/email_footer.html b/templates/email_footer.html index 6dc7fa483..a15a2e908 100644 --- a/templates/email_footer.html +++ b/templates/email_footer.html @@ -1,9 +1,6 @@ {{define "email_footer"}} <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;"> - <p style="margin: 25px 0;"> - <img width="65" src="{{.Props.SiteURL}}/static/images/circles.png" alt=""> - </p> <p style="padding: 0 50px;"> (c) 2015 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.<br> {{.Props.Footer}} diff --git a/templates/upgrade_30_body.html b/templates/upgrade_30_body.html new file mode 100644 index 000000000..38de49d3b --- /dev/null +++ b/templates/upgrade_30_body.html @@ -0,0 +1,37 @@ +{{define "upgrade_30_body"}} + +<table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="margin-top: 20px; line-height: 1.7; color: #555;"> + <tr> + <td> + <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 660px; font-family: Helvetica, Arial, sans-serif; font-size: 14px; background: #FFF;"> + <tr> + <td style="border: 1px solid #ddd;"> + <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;"> + <tr> + <td> + <table border="0" cellpadding="0" cellspacing="0" style="padding: 20px 50px 0; margin: 0 auto"> + <tr> + <td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;"> + {{ .Html.Info }} + </td> + </tr> + <tr> + {{template "email_info" . }} + </tr> + </table> + </td> + </tr> + <tr> + {{template "email_footer" . }} + </tr> + </table> + </td> + </tr> + </table> + </td> + </tr> +</table> + +{{end}} + + |