diff options
author | Philipp Korber <p.korber@1aim.com> | 2018-11-16 15:46:43 +0100 |
---|---|---|
committer | Philipp Korber <p.korber@1aim.com> | 2018-11-16 15:46:43 +0100 |
commit | 652d6f0ffeee7302a2cb51059bef75d8b0bb50be (patch) | |
tree | c3851592642938172f280f7428d43e08b0fe2cbe /mail/example_resources/templates/template_a | |
parent | 0947fe8996149fe20a6d47a793f9555790eb2eae (diff) |
refactor: merged sources of mail-headers,mail-internals,mail-core, mail
Originally it was palaned to do a merge with `--allow-unrelated-history`
but this can not be doesn as `mail-core` has a "invalid" history which
has a merge conflict **with itself**. So even rewinding the history on
a empty repo is not possible.
Instead the code was directly coppied over losing history.
But the history is still available in the different
`history-backup-*` branches. It is just that the past history
is decoupled from the current history.
Diffstat (limited to 'mail/example_resources/templates/template_a')
-rw-r--r-- | mail/example_resources/templates/template_a/html/logo.png | bin | 0 -> 343 bytes | |||
-rw-r--r-- | mail/example_resources/templates/template_a/html/mail.html | 5 | ||||
-rw-r--r-- | mail/example_resources/templates/template_a/portfolio.pdf | bin | 0 -> 31571 bytes | |||
-rw-r--r-- | mail/example_resources/templates/template_a/text/mail.txt | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/mail/example_resources/templates/template_a/html/logo.png b/mail/example_resources/templates/template_a/html/logo.png Binary files differnew file mode 100644 index 0000000..f58bea6 --- /dev/null +++ b/mail/example_resources/templates/template_a/html/logo.png diff --git a/mail/example_resources/templates/template_a/html/mail.html b/mail/example_resources/templates/template_a/html/mail.html new file mode 100644 index 0000000..a377e53 --- /dev/null +++ b/mail/example_resources/templates/template_a/html/mail.html @@ -0,0 +1,5 @@ +{% extends "base_mail.html" %} + +{% block head %}<meta charset="utf-8">{% endblock head %} + +{% block body %}logo: <img src="cid:{{cids.logo}}"> Hy {{data.name}}.{% endblock body %} diff --git a/mail/example_resources/templates/template_a/portfolio.pdf b/mail/example_resources/templates/template_a/portfolio.pdf Binary files differnew file mode 100644 index 0000000..3748b05 --- /dev/null +++ b/mail/example_resources/templates/template_a/portfolio.pdf diff --git a/mail/example_resources/templates/template_a/text/mail.txt b/mail/example_resources/templates/template_a/text/mail.txt new file mode 100644 index 0000000..903c8ce --- /dev/null +++ b/mail/example_resources/templates/template_a/text/mail.txt @@ -0,0 +1 @@ +Hy {{data.name}}.
\ No newline at end of file |