Merge pull request #8 from fridolin-koch/master

Customisation of 'Trouble Text'
This commit is contained in:
Mathieu Cornic 2017-05-17 10:50:10 +02:00 committed by GitHub
commit 6604b0a159
5 changed files with 28 additions and 12 deletions

View File

@ -276,7 +276,7 @@ The following will inject the action link (or button) into the e-mail:
{{ end }} {{ end }}
``` ```
A good practice is to describe action in footer in case of problem when displaying button and CSS A good practice is to describe action in footer in case of problem when displaying button and CSS. The text for the description is provided through the `TroubleText` field of the `Product` struct. The text may contain a placeholder `{ACTION}` which is expected to be replaced with the text of the button. The default value of `TroubleText` is `If youre having trouble with the button '{ACTION}', copy and paste the URL below into your web browser.`
```html ```html
{{ with .Email.Body.Actions }} {{ with .Email.Body.Actions }}
@ -284,7 +284,7 @@ A good practice is to describe action in footer in case of problem when displayi
<tbody><tr> <tbody><tr>
{{ range $action := . }} {{ range $action := . }}
<td> <td>
<p class="sub">If youre having trouble with the button '{{ $action.Button.Text }}', copy and paste the URL below into your web browser.</p> <p class="sub">{{$.Hermes.Product.TroubleText | replace "{ACTION}" $action.Button.Text}}</p>
<p class="sub"><a href="{{ $action.Button.Link }}">{{ $action.Button.Link }}</a></p> <p class="sub"><a href="{{ $action.Button.Link }}">{{ $action.Button.Link }}</a></p>
</td> </td>
{{ end }} {{ end }}

View File

@ -168,6 +168,20 @@ h := hermes.Hermes{
} }
``` ```
To use a custom fallback text at the end of the email, change the `TroubleText` field of the `hermes.Product` struct. The default value is `If youre having trouble with the button '{ACTION}', copy and paste the URL below into your web browser.`. The `{ACTION}` placeholder will be replaced with the corresponding text of the supplied action button:
```go
// Configure hermes by setting a theme and your product info
h := hermes.Hermes{
// Optional Theme
// Theme: new(Default)
Product: hermes.Product{
// Custom trouble text
TroubleText: "If the {ACTION}-button is not working for you, just copy and paste the URL below into your web browser."
},
}
```
## Elements ## Elements
Hermes supports injecting custom elements such as dictionaries, tables and action buttons into e-mails. Hermes supports injecting custom elements such as dictionaries, tables and action buttons into e-mails.

View File

@ -346,7 +346,7 @@ func (dt *Default) HTMLTemplate() string {
{{ range $action := . }} {{ range $action := . }}
<tr> <tr>
<td> <td>
<p class="sub">If youre having trouble with the button '{{ $action.Button.Text }}', copy and paste the URL below into your web browser.</p> <p class="sub">{{$.Hermes.Product.TroubleText | replace "{ACTION}" $action.Button.Text}}</p>
<p class="sub"><a href="{{ $action.Button.Link }}">{{ $action.Button.Link }}</a></p> <p class="sub"><a href="{{ $action.Button.Link }}">{{ $action.Button.Link }}</a></p>
</td> </td>
</tr> </tr>

View File

@ -33,10 +33,11 @@ const TDRightToLeft TextDirection = "rtl"
// Product represents your company product (brand) // Product represents your company product (brand)
// Appears in header & footer of e-mails // Appears in header & footer of e-mails
type Product struct { type Product struct {
Name string Name string
Link string // e.g. https://matcornic.github.io Link string // e.g. https://matcornic.github.io
Logo string // e.g. https://matcornic.github.io/img/logo.png Logo string // e.g. https://matcornic.github.io/img/logo.png
Copyright string // Copyright © 2017 Hermes. All rights reserved. Copyright string // Copyright © 2017 Hermes. All rights reserved.
TroubleText string // TroubleText is the sentence at the end of the email for users having trouble with the button (default to `If youre having trouble with the button '{ACTION}', copy and paste the URL below into your web browser.`)
} }
// Email is the email containing a body // Email is the email containing a body
@ -120,8 +121,9 @@ func setDefaultHermesValues(h *Hermes) error {
Theme: new(Default), Theme: new(Default),
TextDirection: defaultTextDirection, TextDirection: defaultTextDirection,
Product: Product{ Product: Product{
Name: "Hermes", Name: "Hermes",
Copyright: "Copyright © 2017 Hermes. All rights reserved.", Copyright: "Copyright © 2017 Hermes. All rights reserved.",
TroubleText: "If youre having trouble with the button '{ACTION}', copy and paste the URL below into your web browser.",
}, },
} }
// Merge the given hermes engine configuration with default one // Merge the given hermes engine configuration with default one

View File

@ -102,7 +102,7 @@ func (ed *SimpleExample) assertHTMLContent(t *testing.T, r string) {
assert.Contains(t, r, "http://hermes-link.com", "Product: Should find the link of the product in email") assert.Contains(t, r, "http://hermes-link.com", "Product: Should find the link of the product in email")
assert.Contains(t, r, "Copyright © Hermes-Test", "Product: Should find the Copyright of the product in email") assert.Contains(t, r, "Copyright © Hermes-Test", "Product: Should find the Copyright of the product in email")
assert.Contains(t, r, "http://www.duchess-france.org/wp-content/uploads/2016/01/gopher.png", "Product: Should find the logo of the product in email") assert.Contains(t, r, "http://www.duchess-france.org/wp-content/uploads/2016/01/gopher.png", "Product: Should find the logo of the product in email")
assert.Contains(t, r, "If youre having trouble with the button &#39;Confirm your account&#39;, copy and paste the URL below into your web browser.", "Product: Should find the trouble text in email")
// Assert on email body // Assert on email body
assert.Contains(t, r, "Hi Jon Snow", "Name: Should find the name of the person") assert.Contains(t, r, "Hi Jon Snow", "Name: Should find the name of the person")
assert.Contains(t, r, "Welcome to Hermes", "Intro: Should have intro") assert.Contains(t, r, "Welcome to Hermes", "Intro: Should have intro")