mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-31 02:36:28 +00:00
Rewrote all email messages.
This commit is contained in:
James Cole
@@ -1,24 +1,8 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
|
||||
|
||||
</head>
|
||||
<body itemscope itemtype="http://schema.org/SoftwareApplication">
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
Hey there,
|
||||
</p>
|
||||
{% include 'emails.header-html' %}
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
Firefly III has just blocked a login from user #{{ user_id }} ({{ user_address }}).
|
||||
</p>
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
The blocked code was "{{ code }}".
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:11px;color:#aaa;">
|
||||
The login attempt came from IP {{ ip }}.
|
||||
</p>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
{% include 'emails.footer-html' %}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Hey there,
|
||||
|
||||
{% include 'emails.header-text' %}
|
||||
Firefly III has just blocked a login from user #{{ user_id }} ({{ user_address }}).
|
||||
|
||||
The blocked code was "{{ code }}".
|
||||
|
||||
The login attempt came from IP {{ ip }}
|
||||
{% include 'emails.footer-text' %}
|
||||
@@ -1,24 +1,8 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
|
||||
|
||||
</head>
|
||||
<body itemscope itemtype="http://schema.org/SoftwareApplication">
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
Hey there,
|
||||
</p>
|
||||
{% include 'emails.header-html' %}
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
Firefly III has just blocked a registration for an email addres at domain {{ blocked_domain }}.
|
||||
</p>
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
The blocked email address was "{{ email_address }}".
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:11px;color:#aaa;">
|
||||
The login attempt came from IP {{ ip }}.
|
||||
</p>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
{% include 'emails.footer-html' %}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Hey there,
|
||||
|
||||
{% include 'emails.header-text' %}
|
||||
Firefly III has just blocked a registration for an email addres at domain {{ blocked_domain }}.
|
||||
|
||||
The blocked email address was "{{ email_address }}".
|
||||
|
||||
The login attempt came from IP {{ ip }}.
|
||||
{% include 'emails.footer-text' %}
|
||||
@@ -1,25 +1,14 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
Hey there!
|
||||
</p>
|
||||
|
||||
{% include 'emails.header-html' %}
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is
|
||||
valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is!
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
To active your account, <a href="{{ route }}" style="color:#337ab7">click on this link</a>.
|
||||
To active your account please follow the link below.
|
||||
</p>
|
||||
<p>
|
||||
If the link does not work, you can browse there manually by copy/pasting it:
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
<strong>PLEASE</strong> verify that this activation link goes to the Firefly III installation you expect it to be:
|
||||
</p>
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
<a href="{{ route }}" style="color:#337ab7">{{ route }}</a>
|
||||
@@ -28,15 +17,4 @@
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
You should be redirected to the index page right away. The link expires in about four hours.
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
Thank you, and enjoy!
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
James Cole
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:11px;color:#aaa;">
|
||||
You are getting this activation message because a new registration from IP {{ ip }} triggered it.
|
||||
</p>
|
||||
{% include 'emails.footer-html' %}
|
||||
@@ -1,16 +1,11 @@
|
||||
Hey there!
|
||||
|
||||
{% include 'emails.header-text' %}
|
||||
To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is!
|
||||
|
||||
To active your account, you can click on the following link, or copy/paste it in your web browser:
|
||||
To active your account please follow the link below.
|
||||
|
||||
PLEASE verify that this activation link goes to the Firefly III installation you expect it to be:
|
||||
|
||||
{{ route }}
|
||||
|
||||
You should be redirected to the index page right away. The link expires in about four hours.
|
||||
|
||||
Thank you, and enjoy!
|
||||
|
||||
James Cole
|
||||
|
||||
|
||||
You are getting this activation message because a new registration from IP {{ ip }} triggered it.
|
||||
{% include 'emails.footer-text' %}
|
||||
@@ -1,52 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
Firefly III ran into an error: <span style="font-family: monospace;">{{ errorMessage }}</span>
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
The error was of type "{{ class }}".
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
The error occured on/at: {{ time }}.
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
This error occured in file <span style="font-family: monospace;">{{ file }}</span> on line {{ line }} with code {{ code }}.
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
{% if loggedIn %}
|
||||
The error was encountered by user #{{ user.id }}, <a href="mailto:{{ user.email }}">{{ user.email }}</a>.
|
||||
{% else %}
|
||||
There was no user logged in for this error or no user was detected.
|
||||
{% endif %}
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
The IP address related to this error is: {{ ip }}
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
The full stacktrace is below. If you think this is a bug in Firefly III, you
|
||||
can forward this message to
|
||||
<a href="mailto:thegrumpydictator@gmail.com?subject=BUG!">thegrumpydictator@gmail.com</a>.
|
||||
This can help fix the bug you just encountered.
|
||||
</p>
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
If you prefer, you can also open a new issue on <a href="https://github.com/JC5/firefly-iii/issues/new">Github</a>.
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
The full stacktrace is below:</p>
|
||||
<p style="font-family: monospace;font-size:11px;color:#aaa">
|
||||
{{ stacktrace|nl2br }}
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,10 +1,4 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
|
||||
|
||||
</head>
|
||||
<body>
|
||||
{% include 'emails.header-html' %}
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
Firefly III ran into an error: <span style="font-family: monospace;">{{ errorMessage }}</span>
|
||||
</p>
|
||||
@@ -48,5 +42,4 @@
|
||||
<p style="font-family: monospace;font-size:11px;color:#aaa">
|
||||
{{ stacktrace|nl2br }}
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
||||
{% include 'emails.footer-html' %}
|
||||
@@ -1,3 +1,4 @@
|
||||
{% include 'emails.header-text' %}
|
||||
Firefly III ran into an error: {{ errorMessage }}.
|
||||
|
||||
The error was of type "{{ class }}".
|
||||
@@ -25,3 +26,4 @@ https://github.com/JC5/firefly-iii/issues/new
|
||||
The full stacktrace is below:
|
||||
|
||||
{{ stacktrace }}
|
||||
{% include 'emails.footer-text' %}
|
||||
13
resources/views/emails/footer-html.twig
Normal file
13
resources/views/emails/footer-html.twig
Normal file
@@ -0,0 +1,13 @@
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
Beep boop,
|
||||
</p>
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
The Firefly III Mail Robot
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:11px;color:#aaa;">
|
||||
PS: This message was sent because a request from IP {{ ip }} triggered it.
|
||||
</p>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
6
resources/views/emails/footer-text.twig
Normal file
6
resources/views/emails/footer-text.twig
Normal file
@@ -0,0 +1,6 @@
|
||||
|
||||
Beep boop,
|
||||
|
||||
The Firefly III Mail Robot
|
||||
|
||||
PS: This message was sent because a request from IP {{ ip }} triggered it.
|
||||
10
resources/views/emails/header-html.twig
Normal file
10
resources/views/emails/header-html.twig
Normal file
@@ -0,0 +1,10 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
Hi there,
|
||||
</p>
|
||||
2
resources/views/emails/header-text.twig
Normal file
2
resources/views/emails/header-text.twig
Normal file
@@ -0,0 +1,2 @@
|
||||
Hi there,
|
||||
|
||||
13
resources/views/emails/password-html.twig
Normal file
13
resources/views/emails/password-html.twig
Normal file
@@ -0,0 +1,13 @@
|
||||
{% include 'emails.header-html' %}
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
Somebody tried to reset your password. If it was you, please follow the link below to do so.
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
<strong>PLEASE</strong> verify that the link actually goes to the Firefly III you expect it to go!
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
<a href="{{ url }}">{{ url }}</a>
|
||||
</p>
|
||||
{% include 'emails.footer-html' %}
|
||||
7
resources/views/emails/password-text.twig
Normal file
7
resources/views/emails/password-text.twig
Normal file
@@ -0,0 +1,7 @@
|
||||
{% include 'emails.header-text' %}
|
||||
Somebody tried to reset your password. If it was you, please follow the link below to do so.
|
||||
|
||||
PLEASE verify that the link actually goes to the Firefly III you expect it to go!
|
||||
|
||||
{{ url }}
|
||||
{% include 'emails.footer-text' %}
|
||||
@@ -1 +0,0 @@
|
||||
Click here to reset your password: {{ url('password/reset/' ~ token) }}
|
||||
@@ -1,14 +1,4 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
Hey there,
|
||||
</p>
|
||||
|
||||
{% include 'emails.header-html' %}
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
Welkome to <a style="color:#337ab7" href="{{ address }}">Firefly III</a>. Your registration has made it, and this email is here to confirm it. Yay!
|
||||
</p>
|
||||
@@ -31,17 +21,4 @@
|
||||
link very soon!
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
Enjoy!
|
||||
</p>
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
James Cole
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:11px;color:#aaa;">
|
||||
The registration has been created from IP {{ ip }}
|
||||
</p>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
{% include 'emails.footer-html' %}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
Hey there,
|
||||
|
||||
{% include 'emails.header-text' %}
|
||||
Welkome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay!
|
||||
|
||||
* If you have forgotten your password already, please reset it using the password reset tool.
|
||||
@@ -19,3 +18,4 @@ https://github.com/JC5/firefly-iii/wiki/First-use
|
||||
http://jc5.github.io/firefly-iii//description/
|
||||
|
||||
The registration has been created from IP {{ ip }}
|
||||
{% include 'emails.footer-text' %}
|
||||
Reference in New Issue
Block a user