arm
/
hermes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

style: Fix indentation of the theme

This commit is contained in:
Thibaut Rousseau 2017-04-01 22:34:29 +02:00
parent f983d8d7c5
commit 8ffbdf7305
2 changed files with 112 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

218
default.go
View File

@ -227,6 +227,7 @@ func (dt *Default) HTMLTemplate() string {
</a> </a>
</td> </td>
</tr> </tr>
<!-- Email Body --> <!-- Email Body -->
<tr> <tr>
<td class="email-body" width="100%"> <td class="email-body" width="100%">
@ -235,121 +236,124 @@ func (dt *Default) HTMLTemplate() string {
<tr> <tr>
<td class="content-cell"> <td class="content-cell">
<h1>{{if .Email.Body.Title }}{{ .Email.Body.Title }}{{ else }}{{ .Email.Body.Greeting }} {{ .Email.Body.Name }},{{ end }}</h1> <h1>{{if .Email.Body.Title }}{{ .Email.Body.Title }}{{ else }}{{ .Email.Body.Greeting }} {{ .Email.Body.Name }},{{ end }}</h1>
{{ with .Email.Body.Intros }} {{ with .Email.Body.Intros }}
{{ if gt (len .) 0 }} {{ if gt (len .) 0 }}
{{ range $line := . }} {{ range $line := . }}
<p>{{ $line }}</p> <p>{{ $line }}</p>
{{ end }} {{ end }}
{{ end }} {{ end }}
{{ end }} {{ end }}
{{ with .Email.Body.Dictionary }} {{ with .Email.Body.Dictionary }}
{{ if gt (len .) 0 }} {{ if gt (len .) 0 }}
<dl class="body-dictionary"> <dl class="body-dictionary">
{{ range $entry := . }} {{ range $entry := . }}
<dt>{{ $entry.Key }}:</dt> <dt>{{ $entry.Key }}:</dt>
<dd>{{ $entry.Value }}</dd> <dd>{{ $entry.Value }}</dd>
{{ end }} {{ end }}
</dl> </dl>
{{ end }} {{ end }}
{{ end }} {{ end }}
<!-- Table --> <!-- Table -->
{{ with .Email.Body.Table }} {{ with .Email.Body.Table }}
{{ $data := .Data }} {{ $data := .Data }}
{{ $columns := .Columns }} {{ $columns := .Columns }}
{{ if gt (len $data) 0 }} {{ if gt (len $data) 0 }}
<table class="data-wrapper" width="100%" cellpadding="0" cellspacing="0"> <table class="data-wrapper" width="100%" cellpadding="0" cellspacing="0">
<tr> <tr>
<td colspan="2"> <td colspan="2">
<table class="data-table" width="100%" cellpadding="0" cellspacing="0"> <table class="data-table" width="100%" cellpadding="0" cellspacing="0">
<tr>
{{ $col := index $data 0 }}
{{ range $entry := $col }}
<th
{{ with $columns }}
{{ $width := index .CustomWidth $entry.Key }}
{{ with $width }}
width="{{ . }}"
{{ end }}
{{ $align := index .CustomAlignement $entry.Key }}
{{ with $align }}
style="text-align:{{ . }}"
{{ end }}
{{ end }}
>
<p>{{ $entry.Key }}</p>
</th>
{{ end }}
</tr>
{{ range $row := $data }}
<tr>
{{ range $cell := $row }}
<td
{{ with $columns }}
{{ $align := index .CustomAlignement $cell.Key }}
{{ with $align }}
style="text-align:{{ . }}"
{{ end }}
{{ end }}
>
{{ $cell.Value }}
</td>
{{ end }}
</tr>
{{ end }}
</table>
</td>
</tr>
</table>
{{ end }}
{{ end }}
<!-- Action -->
{{ with .Email.Body.Actions }}
{{ if gt (len .) 0 }}
{{ range $action := . }}
<p>{{ $action.Instructions }}</p>
<table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0">
<tr> <tr>
{{ $col := index $data 0 }} <td align="center">
{{ range $entry := $col }} <div>
<th <a href="{{ $action.Button.Link }}" class="button" style="background-color: {{ $action.Button.Color }}" target="_blank">
{{ with $columns }} {{ $action.Button.Text }}
{{ $width := index .CustomWidth $entry.Key }} </a>
{{ with $width }} </div>
width="{{ . }}" </td>
{{ end }}
{{ $align := index .CustomAlignement $entry.Key }}
{{ with $align }}
style="text-align:{{ . }}"
{{ end }}
{{ end }}
>
<p>{{ $entry.Key }}</p>
</th>
{{ end }}
</tr> </tr>
{{ range $row := $data }}
<tr>
{{ range $cell := $row }}
<td
{{ with $columns }}
{{ $align := index .CustomAlignement $cell.Key }}
{{ with $align }}
style="text-align:{{ . }}"
{{ end }}
{{ end }}
>
{{ $cell.Value }}
</td>
{{ end }}
</tr>
{{ end }}
</table> </table>
</td> {{ end }}
</tr> {{ end }}
</table> {{ end }}
{{ end }}
{{ end }}
<!-- Action --> {{ with .Email.Body.Outros }}
{{ with .Email.Body.Actions }} {{ if gt (len .) 0 }}
{{ if gt (len .) 0 }} {{ range $line := . }}
{{ range $action := . }} <p>{{ $line }}</p>
<p>{{ $action.Instructions }}</p> {{ end }}
<table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0"> {{ end }}
<tr> {{ end }}
<td align="center">
<div>
<a href="{{ $action.Button.Link }}" class="button" style="background-color: {{ $action.Button.Color }}" target="_blank">{{ $action.Button.Text }}</a>
</div>
</td>
</tr>
</table>
{{ end }}
{{ end }}
{{ end }}
{{ with .Email.Body.Outros }} <p>
{{ if gt (len .) 0 }} {{.Email.Body.Signature}},
{{ range $line := . }} <br />
<p>{{ $line }}</p> {{.Hermes.Product.Name}}
{{ end }} </p>
{{ end }}
{{ end }}
<p> {{ with .Email.Body.Actions }}
{{.Email.Body.Signature}}, <table class="body-sub">
<br> <tbody>
{{.Hermes.Product.Name}} <tr>
</p> {{ range $action := . }}
<td>
{{ with .Email.Body.Actions }} <p class="sub">If you’re having trouble with the button '{{ $action.Button.Text }}', copy and paste the URL below into your web browser.</p>
<table class="body-sub"> <p class="sub"><a href="{{ $action.Button.Link }}">{{ $action.Button.Link }}</a></p>
<tbody><tr> </td>
{{ range $action := . }} {{ end }}
<td> </tr>
<p class="sub">If you’re having trouble with the button '{{ $action.Button.Text }}', copy and paste the URL below into your web browser.</p> </tbody>
<p class="sub"><a href="{{ $action.Button.Link }}">{{ $action.Button.Link }}</a></p> </table>
</td> {{ end }}
{{ end }}
</tr>
</tbody>
</table>
{{ end }}
</td> </td>
</tr> </tr>
</table> </table>

2
hermes.go
View File

@ -124,7 +124,7 @@ func setDefaultHermesValues(h *Hermes) error {
Copyright: "Copyright © 2017 Hermes. All rights reserved.", Copyright: "Copyright © 2017 Hermes. All rights reserved.",
}, },
} }
// Merge the given hermes engine coniguration with default one // Merge the given hermes engine configuration with default one
// Default one overrides all zero values // Default one overrides all zero values
err := mergo.Merge(h, defaultHermes) err := mergo.Merge(h, defaultHermes)
if err != nil { if err != nil {