diff options
Diffstat (limited to 'internal/feed')
| -rw-r--r-- | internal/feed/feed.tpl | 67 | ||||
| -rw-r--r-- | internal/feed/mail.go | 4 |
2 files changed, 1 insertions, 70 deletions
diff --git a/internal/feed/feed.tpl b/internal/feed/feed.tpl deleted file mode 100644 index 650176e..0000000 --- a/internal/feed/feed.tpl +++ /dev/null @@ -1,67 +0,0 @@ -{{- /*gotype:github.com/Necoro/feed2imap-go/internal/feed.feeditem*/ -}} -{{define "bottomLine"}} - {{if .content}} - <tr> - <td align="right"> - <span style="color: #ababab; ">{{.descr}}</span> - </td> - <td> - <span style="color: #ababab; ">{{.content}}</span> - </td> - </tr> - {{end}} -{{end}} -<table border="1" width="100%" cellpadding="0" cellspacing="0" borderspacing="0"> - <tr> - <td> - <table width="100%" bgcolor="#EDEDED" cellpadding="4" cellspacing="2"> - <tr> - <td align="right"><b>Feed</b></td> - <td width="100%"> - {{with .Feed.Link}}<a href="{{.}}">{{end}} - <b>{{or .Feed.Title .Feed.Link "Unnammed feed"}}</b> - {{if .Feed.Link}}</a>{{end}} - </td> - </tr> - <tr> - <td align="right"><b>Item</b></td> - <td width="100%"> - {{with .Item.Link}}<a href="{{.}}">{{end}} - <b>{{or .Item.Title .Item.Link}}</b> - {{if .Item.Link}}</a>{{end}} - </td> - </tr> - </table> - </td> - </tr> -</table> -{{with .Item.Content}} - <br /> <!-- originally: only if content and `content !~ /\A\s*</m` --> - {{.}} -{{end}} -{{with .Item.Enclosures}} - <table border="1" width="100%" cellpadding="0" cellspacing="0" borderspacing="0"> - <tr> - <td> - <table width="100%" bgcolor="#EDEDED" cellpadding="2" cellspacing="2"> - <tr><td width="100%"><b>Files:</b></td></tr> - {{range .}} - <tr> - <td> - - <a href={{.URL}}>{{.URL | lastUrlPart}}</a> ({{.Length | byteCount}}, {{.Type}}) - </td> - </tr> - {{end}} - </table> - </td> - </tr> - </table> -{{end}} -<hr width="100%"/> -<table width="100%" cellpadding="0" cellspacing="0"> - {{template "bottomLine" (dict "descr" "Date:" "content" .Item.Published)}} - {{template "bottomLine" (dict "descr" "Author:" "content" .Item.Author.Name)}} - {{template "bottomLine" (dict "descr" "Subject:" "content" .Item.Title)}} - {{template "bottomLine" (dict "descr" "Filed under:" "content" (join ", " .Item.Categories))}} -</table>
\ No newline at end of file diff --git a/internal/feed/mail.go b/internal/feed/mail.go index 4d07c1a..94f2ea1 100644 --- a/internal/feed/mail.go +++ b/internal/feed/mail.go @@ -31,10 +31,8 @@ func fromAdress(feed *Feed, item feeditem, cfg config.Config) []*mail.Address { } } -var htmlTemplate = template.ForFile("internal/feed/feed.tpl") - func writeHtml(writer io.Writer, item feeditem) error { - return htmlTemplate.Execute(writer, item) + return template.Feed.Execute(writer, item) } func writeToBuffer(b *bytes.Buffer, feed *Feed, item feeditem, cfg config.Config) error { |