Skip to content

Commit

Permalink
Merge pull request #12 from rocknitive/aquafree-fork
Browse files Browse the repository at this point in the history 
fix email templates
  • Loading branch information
@JcBernack
JcBernack authored Aug 8, 2023
2 parents 861db8f + 90f2d09 commit 2e05974
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
14 changes: 7 additions & 7 deletions application/src/main/resources/templates/account.lockout.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
<tbody>
<tr>
<td role="module-content">
<p>Der Account $lockoutAccount wurde geblockt.</p>
<p>Der Account ${lockoutAccount} wurde geblockt.</p>
</td>
</tr>
</tbody>
Expand Down Expand Up @@ -244,7 +244,7 @@
<td style="padding:18px 0px 18px 0px; line-height:40px; text-align:inherit;"
height="100%" valign="top" bgcolor=""
role="module-content">
<div><h1 style="text-align: inherit">User account $lockoutAccount has been locked.</h1>
<div><h1 style="text-align: inherit">User account ${lockoutAccount} has been locked.</h1>
<div></div>
</div>
</td>
Expand All @@ -263,14 +263,14 @@
role="module-content">
<div>
<div style="font-family: inherit; text-align: inherit">
Your HyGenius account $lockoutAccount has been locked out due to failed credentials were provided more than $maxFailedLoginAttempts times.<br>
Your HyGenius account ${lockoutAccount} has been locked out due to failed credentials were provided more than ${maxFailedLoginAttempts} times.<br>
</div>
<div style="font-family: inherit; text-align: inherit">
<br></div>

<div style="font-family: inherit; text-align: inherit">
<br>
This email was sent to <a href="mailto:$targetEmail" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">$targetEmail</a> by HyGenius
This email was sent to <a href="mailto:${targetEmail}" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">${targetEmail}</a> by HyGenius
</div>
<div></div>
</div>
Expand Down Expand Up @@ -356,7 +356,7 @@
height="100%" valign="top" bgcolor=""
role="module-content">
<div><h1 style="text-align: inherit">
Der Account $lockoutAccount wurde geblockt.</h1>
Der Account ${lockoutAccount} wurde geblockt.</h1>
<div></div>
</div>
</td>
Expand All @@ -375,14 +375,14 @@
role="module-content">
<div>
<div style="font-family: inherit; text-align: inherit">
Der HyGenius-Account $lockoutAccount wurde aufgrund von $maxFailedLoginAttempts Loginversuchen geblockt.<br>
Der HyGenius-Account ${lockoutAccount} wurde aufgrund von ${maxFailedLoginAttempts} Loginversuchen geblockt.<br>
</div>
<div style="font-family: inherit; text-align: inherit">
<br></div>

<div style="font-family: inherit; text-align: inherit">
<br>
Diese Mail wurde von HyGenius an <a href="mailto:$targetEmail" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">$targetEmail</a> gesendet.
Diese Mail wurde von HyGenius an <a href="mailto:${targetEmail}" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">${targetEmail}</a> gesendet.
</div>
<div></div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions application/src/main/resources/templates/activation.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
<td align="center" bgcolor="#0d4b8a"
class="inner-td"
style="border-radius:6px; font-size:16px; text-align:center; background-color:inherit;">
<a href="https://app.aqua-free-services.com/token/$activationToken"
<a href="https://app.aqua-free-services.com/token/${activationToken}"
style="background-color:#0d4b8a; border:1px solid #0D4B8A; border-color:#0D4B8A; border-radius:6px; border-width:1px; color:#ffffff; display:inline-block; font-size:14px; font-weight:normal; letter-spacing:0px; line-height:normal; padding:12px 18px 12px 18px; text-align:center; text-decoration:none; border-style:solid;"
target="_blank">Activate account
now</a>
Expand Down Expand Up @@ -336,7 +336,7 @@
app:
</div>
<div style="font-family: inherit; text-align: inherit">
<em>$activationToken</em></div>
<em>${activationToken}</em></div>
<div></div>
</div>
</td>
Expand Down Expand Up @@ -481,7 +481,7 @@
<td align="center" bgcolor="#0d4b8a"
class="inner-td"
style="border-radius:6px; font-size:16px; text-align:center; background-color:inherit;">
<a href="https://app.aqua-free-services.com/token/$activationToken"
<a href="https://app.aqua-free-services.com/token/${activationToken}"
style="background-color:#0d4b8a; border:1px solid #0D4B8A; border-color:#0D4B8A; border-radius:6px; border-width:1px; color:#ffffff; display:inline-block; font-size:14px; font-weight:normal; letter-spacing:0px; line-height:normal; padding:12px 18px 12px 18px; text-align:center; text-decoration:none; border-style:solid;"
target="_blank">Account jetzt
aktivieren</a>
Expand Down Expand Up @@ -511,7 +511,7 @@
folgenden Aktivierungscode in die App:
</div>
<div style="font-family: inherit; text-align: inherit">
<em>$activationToken</em></div>
<em>${activationToken}</em></div>
<div></div>
</div>
</td>
Expand Down
8 changes: 4 additions & 4 deletions application/src/main/resources/templates/password.was.reset.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@

<div style="font-family: inherit; text-align: inherit">
<br>
<a href="https://hygenius.aqua-free.com/resetToken/$passwordResetToken" class="btn-primary" itemprop="url" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #348eda; margin: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px;">Reset Password</a>
<a href="https://hygenius.aqua-free.com/resetToken/${passwordResetToken}" class="btn-primary" itemprop="url" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #348eda; margin: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px;">Reset Password</a>
</div>
<div></div>
</div>
Expand All @@ -299,7 +299,7 @@
app:
</div>
<div style="font-family: inherit; text-align: inherit">
<em>$passwordResetToken</em></div>
<em>${passwordResetToken}</em></div>
<div></div>
</div>
</td>
Expand Down Expand Up @@ -412,7 +412,7 @@

<div style="font-family: inherit; text-align: inherit">
<br>
<a href="https://hygenius.aqua-free.com/resetToken/$passwordResetToken" class="btn-primary" itemprop="url" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #348eda; margin: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px;">Reset Password</a>
<a href="https://hygenius.aqua-free.com/resetToken/${passwordResetToken}" class="btn-primary" itemprop="url" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #348eda; margin: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px;">Reset Password</a>
</div>
<div></div>
</div>
Expand All @@ -438,7 +438,7 @@
folgenden Code in die App:
</div>
<div style="font-family: inherit; text-align: inherit">
<em>$passwordResetToken</em></div>
<em>${passwordResetToken}</em></div>
<div></div>
</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion msa/tb/docker-cassandra/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends wget nmap procps gnupg2 \
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ $(. /etc/os-release && echo -n $VERSION_CODENAME)-pgdg main" | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null \
&& wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O- | apt-key add - \
&& echo 'deb http://downloads.apache.org/cassandra/debian 40x main' | tee --append /etc/apt/sources.list.d/cassandra.list > /dev/null \
&& echo "deb https://debian.cassandra.apache.org 40x main" | tee -a /etc/apt/sources.list.d/cassandra.sources.list > /dev/null \
&& wget -q https://downloads.apache.org/cassandra/KEYS -O- | apt-key add - \
&& apt-get update \
&& apt-get install -y --no-install-recommends cassandra cassandra-tools postgresql-${PG_MAJOR} \
Expand Down

0 comments on commit 2e05974

Please sign in to comment.