From 8971673c8a98e1e53b3c2d676fcbef44aa194ad7 Mon Sep 17 00:00:00 2001 From: Daniel Yohan Date: Fri, 22 Jan 2021 10:33:24 -0300 Subject: [PATCH 1/3] Added template email --- docker-compose.yml | 4 +- themes/ilhasoft/email/html/email-test.ftl | 40 ++++++++++++++ .../email/html/email-verification.ftl | 52 +++++++++++++++++++ .../ilhasoft/email/html/event-login_error.ftl | 41 +++++++++++++++ .../ilhasoft/email/html/event-remove_totp.ftl | 41 +++++++++++++++ .../email/html/event-update_password.ftl | 41 +++++++++++++++ .../ilhasoft/email/html/event-update_totp.ftl | 41 +++++++++++++++ themes/ilhasoft/email/html/executeActions.ftl | 44 ++++++++++++++++ .../email/html/identity-provider-link.ftl | 41 +++++++++++++++ themes/ilhasoft/email/html/password-reset.ftl | 50 ++++++++++++++++++ .../email/messages/messages_en.properties | 40 ++++++++++++++ themes/ilhasoft/email/text/email-test.ftl | 2 + .../email/text/email-verification.ftl | 2 + .../ilhasoft/email/text/event-login_error.ftl | 2 + .../ilhasoft/email/text/event-remove_totp.ftl | 2 + .../email/text/event-update_password.ftl | 2 + .../ilhasoft/email/text/event-update_totp.ftl | 2 + themes/ilhasoft/email/text/executeActions.ftl | 4 ++ .../email/text/identity-provider-link.ftl | 2 + themes/ilhasoft/email/text/password-reset.ftl | 2 + 20 files changed, 453 insertions(+), 2 deletions(-) create mode 100644 themes/ilhasoft/email/html/email-test.ftl create mode 100644 themes/ilhasoft/email/html/email-verification.ftl create mode 100644 themes/ilhasoft/email/html/event-login_error.ftl create mode 100644 themes/ilhasoft/email/html/event-remove_totp.ftl create mode 100644 themes/ilhasoft/email/html/event-update_password.ftl create mode 100644 themes/ilhasoft/email/html/event-update_totp.ftl create mode 100644 themes/ilhasoft/email/html/executeActions.ftl create mode 100644 themes/ilhasoft/email/html/identity-provider-link.ftl create mode 100644 themes/ilhasoft/email/html/password-reset.ftl create mode 100644 themes/ilhasoft/email/messages/messages_en.properties create mode 100644 themes/ilhasoft/email/text/email-test.ftl create mode 100644 themes/ilhasoft/email/text/email-verification.ftl create mode 100644 themes/ilhasoft/email/text/event-login_error.ftl create mode 100644 themes/ilhasoft/email/text/event-remove_totp.ftl create mode 100644 themes/ilhasoft/email/text/event-update_password.ftl create mode 100644 themes/ilhasoft/email/text/event-update_totp.ftl create mode 100644 themes/ilhasoft/email/text/executeActions.ftl create mode 100644 themes/ilhasoft/email/text/identity-provider-link.ftl create mode 100644 themes/ilhasoft/email/text/password-reset.ftl diff --git a/docker-compose.yml b/docker-compose.yml index 24e54f7..bed2285 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,8 +8,8 @@ services: dockerfile: Dockerfile ports: - "8080:8080" - # volumes: - # - ./themes/ilhasoft/:/opt/jboss/keycloak/themes/ilhasoft/ + volumes: + - ./themes/ilhasoft/:/opt/jboss/keycloak/themes/ilhasoft/ # - ./standalone.xml:/opt/jboss/keycloak/standalone/configuration/standalone.xml environment: KEYCLOAK_USER: "admin" diff --git a/themes/ilhasoft/email/html/email-test.ftl b/themes/ilhasoft/email/html/email-test.ftl new file mode 100644 index 0000000..f2df432 --- /dev/null +++ b/themes/ilhasoft/email/html/email-test.ftl @@ -0,0 +1,40 @@ + + + + + + + + + +
+
+
+ Weni-Logo +
+
+
+ ${msg("emailTestBodyHtml",realmName)?no_esc} +
+
+ +
+ + Weni-Logo + + +
+ Visite o nosso site + Facebook + Instagram + Twitter +
+ +
Weni © Brasil 2020 - Todos os direitos reservados
+ +
Caso você não tenha realizado esta ação, ignore esta mensagem e troque a senha do seu e-mail por segurança. Fale com o suporte se necessário!
+
+
+
+ + diff --git a/themes/ilhasoft/email/html/email-verification.ftl b/themes/ilhasoft/email/html/email-verification.ftl new file mode 100644 index 0000000..1ecc46b --- /dev/null +++ b/themes/ilhasoft/email/html/email-verification.ftl @@ -0,0 +1,52 @@ + + + + + + + + + +
+
+
+ Weni-Logo +
+
+
Hi, ${user.firstName}!
+ +
+ Confirme seu e-mail para acessar a plataforma 😊 +
+ +
Ficamos felizes por te ter conosco! Para prosseguir com o acesso da sua conta, verifique o seu e-mail apertando no botão abaixo ou copiando e colando o link em seu navegador.
+ +
+

Clique aqui para confirmar o e-mail

 +
+

URL expira em ${linkExpiration} minutos

+ +
${link}
+
+ +
+ + Weni-Logo + + +
+ Visite o nosso site + Facebook + Instagram + Twitter +
+ +
Weni © Brasil 2020 - Todos os direitos reservados
+ +
Caso você não tenha realizado esta ação, ignore esta mensagem e troque a senha do seu e-mail por segurança. Fale com o suporte se necessário!
+
+
+
+ + diff --git a/themes/ilhasoft/email/html/event-login_error.ftl b/themes/ilhasoft/email/html/event-login_error.ftl new file mode 100644 index 0000000..ef6efc2 --- /dev/null +++ b/themes/ilhasoft/email/html/event-login_error.ftl @@ -0,0 +1,41 @@ + + + + + + + + + +
+
+
+ Weni-Logo +
+
+
Hi, ${user.firstName}!
+ +
+ ${msg("eventLoginErrorBodyHtml",event.date,event.ipAddress)?no_esc} +
+ +
+ + +
+
+ + diff --git a/themes/ilhasoft/email/html/event-remove_totp.ftl b/themes/ilhasoft/email/html/event-remove_totp.ftl new file mode 100644 index 0000000..f2c4e6b --- /dev/null +++ b/themes/ilhasoft/email/html/event-remove_totp.ftl @@ -0,0 +1,41 @@ + + + + + + + + + +
+
+
+ Weni-Logo +
+
+
Hi, ${user.firstName}!
+ +
+ ${msg("eventRemoveTotpBodyHtml",event.date, event.ipAddress)?no_esc} +
+ +
+ + +
+
+ + diff --git a/themes/ilhasoft/email/html/event-update_password.ftl b/themes/ilhasoft/email/html/event-update_password.ftl new file mode 100644 index 0000000..7539ae4 --- /dev/null +++ b/themes/ilhasoft/email/html/event-update_password.ftl @@ -0,0 +1,41 @@ + + + + + + + + + +
+
+
+ Weni-Logo +
+
+
Hi, ${user.firstName}!
+ +
+ ${msg("eventUpdatePasswordBodyHtml",event.date, event.ipAddress)?no_esc} +
+ +
+ + +
+
+ + diff --git a/themes/ilhasoft/email/html/event-update_totp.ftl b/themes/ilhasoft/email/html/event-update_totp.ftl new file mode 100644 index 0000000..905de6b --- /dev/null +++ b/themes/ilhasoft/email/html/event-update_totp.ftl @@ -0,0 +1,41 @@ + + + + + + + + + +
+
+
+ Weni-Logo +
+
+
Hi, ${user.firstName}!
+ +
+ ${msg("eventUpdateTotpBodyHtml",event.date, event.ipAddress)?no_esc} +
+ +
+ + +
+
+ + diff --git a/themes/ilhasoft/email/html/executeActions.ftl b/themes/ilhasoft/email/html/executeActions.ftl new file mode 100644 index 0000000..2867ab2 --- /dev/null +++ b/themes/ilhasoft/email/html/executeActions.ftl @@ -0,0 +1,44 @@ +<#outputformat "plainText"> +<#assign requiredActionsText><#if requiredActions??><#list requiredActions><#items as reqActionItem>${msg("requiredAction.${reqActionItem}")}<#sep>, + + + + + + + + + + +
+
+
+ Weni-Logo +
+
+
Hi, ${user.firstName}!
+ +
+ ${msg("executeActionsBodyHtml",link, linkExpiration, realmName, requiredActionsText)?no_esc} +
+ +
+ + +
+
+ + diff --git a/themes/ilhasoft/email/html/identity-provider-link.ftl b/themes/ilhasoft/email/html/identity-provider-link.ftl new file mode 100644 index 0000000..21bb15d --- /dev/null +++ b/themes/ilhasoft/email/html/identity-provider-link.ftl @@ -0,0 +1,41 @@ + + + + + + + + + +
+
+
+ Weni-Logo +
+
+
Hi, ${user.firstName}!
+ +
+ ${msg("identityProviderLinkBodyHtml", identityProviderAlias, realmName, identityProviderContext.username, link, linkExpiration)?no_esc} +
+ +
+ + +
+
+ + diff --git a/themes/ilhasoft/email/html/password-reset.ftl b/themes/ilhasoft/email/html/password-reset.ftl new file mode 100644 index 0000000..f82f367 --- /dev/null +++ b/themes/ilhasoft/email/html/password-reset.ftl @@ -0,0 +1,50 @@ + + + + + + + + + +
+
+
+ Weni-Logo +
+
+ + ${msg("passwordResetBodyText1Html")?no_esc} + + ${msg("passwordResetBodyText2Html")?no_esc} + +
+ ${msg("passwordResetBodyHtml",link, linkExpiration)?no_esc} +
+ +
${link}
+
+ + +
+
+ + + + \ No newline at end of file diff --git a/themes/ilhasoft/email/messages/messages_en.properties b/themes/ilhasoft/email/messages/messages_en.properties new file mode 100644 index 0000000..9445e13 --- /dev/null +++ b/themes/ilhasoft/email/messages/messages_en.properties @@ -0,0 +1,40 @@ +emailVerificationSubject=Verify email +emailVerificationBody=Someone has created a {2} account with this email address. If this was you, click the link below to verify your email address\n\n{0}\n\nThis link will expire within {1} minutes.\n\nIf you didn''t create this account, just ignore this message. +emailVerificationBodyHtml=

Someone has created a {2} account with this email address. If this was you, click the link below to verify your email address

Link to e-mail address verification

This link will expire within {1} minutes.

If you didn''t create this account, just ignore this message.

+#emailVerificationBodyHtml=

Someone has created a {2} account with this email address. If this was you, click the link below to verify your email address

Link to e-mail address verification

This link will expire within {1} minutes.

If you didn''t create this account, just ignore this message.

+emailVerificationWelcome= +emailTestSubject=[KEYCLOAK] - SMTP test message +emailTestBody=This is a test message +emailTestBodyHtml=

This is a test message

+identityProviderLinkSubject=Link {0} +identityProviderLinkBody=Someone wants to link your "{1}" account with "{0}" account of user {2} . If this was you, click the link below to link accounts\n\n{3}\n\nThis link will expire within {4} minutes.\n\nIf you don''t want to link account, just ignore this message. If you link accounts, you will be able to login to {1} through {0}. +identityProviderLinkBodyHtml=

Someone wants to link your {1} account with {0} account of user {2} . If this was you, click the link below to link accounts

Link to confirm account linking

This link will expire within {4} minutes.

If you don''t want to link account, just ignore this message. If you link accounts, you will be able to login to {1} through {0}.

+passwordResetSubject=Reset password +passwordResetBody=Someone just requested to change your {2} account''s credentials. If this was you, click on the link below to reset them.\n\n{0}\n\nThis link and code will expire within {1} minutes.\n\nIf you don''t want to reset your credentials, just ignore this message and nothing will be changed. \n\n ** For Intelbras employees it is not possible to change the password through this portal. To change the password you must carry out the procedure through your computer. +passwordResetBodyHtml=

Click here to reset your password

URL expires in {1} minutes

+passwordResetBodyText1Html=
Access the password reset link
+passwordResetBodyText2Html=
You have requested to recover your password. To perform the action, press the button below, or copy and paste the link in your browser, which will redirect you to a password creation page.
+passwordResetBodyText3Html=
If you have not performed this action, ignore this message and change your email password for security. Talk to support if necessary!
+executeActionsSubject=Update Your Account +executeActionsBody=Your administrator has just requested that you update your {2} account by performing the following action(s): {3}. Click on the link below to start this process.\n\n{0}\n\nThis link will expire within {1} minutes.\n\nIf you are unaware that your admin has requested this, just ignore this message and nothing will be changed. +executeActionsBodyHtml=

Your administrator has just requested that you update your {2} account by performing the following action(s): {3}. Click on the link below to start this process.

Link to account update

This link will expire within {1} minutes.

If you are unaware that your admin has requested this, just ignore this message and nothing will be changed.

+eventLoginErrorSubject=Login error +eventLoginErrorBody=A failed login attempt was detected to your account on {0} from {1}. If this was not you, please contact an admin. +eventLoginErrorBodyHtml=

A failed login attempt was detected to your account on {0} from {1}. If this was not you, please contact an admin.

+eventRemoveTotpSubject=Remove OTP +eventRemoveTotpBody=OTP was removed from your account on {0} from {1}. If this was not you, please contact an admin. +eventRemoveTotpBodyHtml=

OTP was removed from your account on {0} from {1}. If this was not you, please contact an admin.

+eventUpdatePasswordSubject=Update password +eventUpdatePasswordBody=Your password was changed on {0} from {1}. If this was not you, please contact an admin. +eventUpdatePasswordBodyHtml=

Your password was changed on {0} from {1}. If this was not you, please contact an admin.

+eventUpdateTotpSubject=Update OTP +eventUpdateTotpBody=OTP was updated for your account on {0} from {1}. If this was not you, please contact an admin. +eventUpdateTotpBodyHtml=

OTP was updated for your account on {0} from {1}. If this was not you, please contact an admin.

+ +requiredAction.CONFIGURE_TOTP=Configure OTP +requiredAction.terms_and_conditions=Terms and Conditions +requiredAction.UPDATE_PASSWORD=Update Password +requiredAction.UPDATE_PROFILE=Update Profile +requiredAction.VERIFY_EMAIL=Verify Email + +emailAccessOurSite=Visit our website diff --git a/themes/ilhasoft/email/text/email-test.ftl b/themes/ilhasoft/email/text/email-test.ftl new file mode 100644 index 0000000..f1becdd --- /dev/null +++ b/themes/ilhasoft/email/text/email-test.ftl @@ -0,0 +1,2 @@ +<#ftl output_format="plainText"> +${msg("emailTestBody", realmName)} \ No newline at end of file diff --git a/themes/ilhasoft/email/text/email-verification.ftl b/themes/ilhasoft/email/text/email-verification.ftl new file mode 100644 index 0000000..152de22 --- /dev/null +++ b/themes/ilhasoft/email/text/email-verification.ftl @@ -0,0 +1,2 @@ +<#ftl output_format="plainText"> +${msg("emailVerificationBody",link, linkExpiration, realmName)} \ No newline at end of file diff --git a/themes/ilhasoft/email/text/event-login_error.ftl b/themes/ilhasoft/email/text/event-login_error.ftl new file mode 100644 index 0000000..bfb4036 --- /dev/null +++ b/themes/ilhasoft/email/text/event-login_error.ftl @@ -0,0 +1,2 @@ +<#ftl output_format="plainText"> +${msg("eventLoginErrorBody",event.date,event.ipAddress)} \ No newline at end of file diff --git a/themes/ilhasoft/email/text/event-remove_totp.ftl b/themes/ilhasoft/email/text/event-remove_totp.ftl new file mode 100644 index 0000000..a7e3b68 --- /dev/null +++ b/themes/ilhasoft/email/text/event-remove_totp.ftl @@ -0,0 +1,2 @@ +<#ftl output_format="plainText"> +${msg("eventRemoveTotpBody",event.date, event.ipAddress)} \ No newline at end of file diff --git a/themes/ilhasoft/email/text/event-update_password.ftl b/themes/ilhasoft/email/text/event-update_password.ftl new file mode 100644 index 0000000..2ec7ea0 --- /dev/null +++ b/themes/ilhasoft/email/text/event-update_password.ftl @@ -0,0 +1,2 @@ +<#ftl output_format="plainText"> +${msg("eventUpdatePasswordBody",event.date, event.ipAddress)} \ No newline at end of file diff --git a/themes/ilhasoft/email/text/event-update_totp.ftl b/themes/ilhasoft/email/text/event-update_totp.ftl new file mode 100644 index 0000000..14778b5 --- /dev/null +++ b/themes/ilhasoft/email/text/event-update_totp.ftl @@ -0,0 +1,2 @@ +<#ftl output_format="plainText"> +${msg("eventUpdateTotpBody",event.date, event.ipAddress)} \ No newline at end of file diff --git a/themes/ilhasoft/email/text/executeActions.ftl b/themes/ilhasoft/email/text/executeActions.ftl new file mode 100644 index 0000000..af9d5c4 --- /dev/null +++ b/themes/ilhasoft/email/text/executeActions.ftl @@ -0,0 +1,4 @@ +<#ftl output_format="plainText"> +<#assign requiredActionsText><#if requiredActions??><#list requiredActions><#items as reqActionItem>${msg("requiredAction.${reqActionItem}")}<#sep>, <#else> + +${msg("executeActionsBody",link, linkExpiration, realmName, requiredActionsText)} \ No newline at end of file diff --git a/themes/ilhasoft/email/text/identity-provider-link.ftl b/themes/ilhasoft/email/text/identity-provider-link.ftl new file mode 100644 index 0000000..0232e12 --- /dev/null +++ b/themes/ilhasoft/email/text/identity-provider-link.ftl @@ -0,0 +1,2 @@ +<#ftl output_format="plainText"> +${msg("identityProviderLinkBody", identityProviderAlias, realmName, identityProviderContext.username, link, linkExpiration)} \ No newline at end of file diff --git a/themes/ilhasoft/email/text/password-reset.ftl b/themes/ilhasoft/email/text/password-reset.ftl new file mode 100644 index 0000000..e22649d --- /dev/null +++ b/themes/ilhasoft/email/text/password-reset.ftl @@ -0,0 +1,2 @@ +<#ftl output_format="plainText"> +${msg("passwordResetBody",link, linkExpiration, realmName)} \ No newline at end of file From 250c3ca64bba8559bbd69e2adec2cfa4da38471a Mon Sep 17 00:00:00 2001 From: Daniel Yohan Date: Fri, 22 Jan 2021 15:13:04 -0300 Subject: [PATCH 2/3] Added template email weni --- .../account/resources/img/favicon.ico | Bin 627 -> 19718 bytes themes/ilhasoft/email/html/email-test.ftl | 8 ++++---- .../email/html/email-verification.ftl | 19 +++++++++--------- .../ilhasoft/email/html/event-login_error.ftl | 8 ++++---- .../ilhasoft/email/html/event-remove_totp.ftl | 10 ++++----- .../email/html/event-update_password.ftl | 10 ++++----- .../ilhasoft/email/html/event-update_totp.ftl | 10 ++++----- themes/ilhasoft/email/html/executeActions.ftl | 10 ++++----- .../email/html/identity-provider-link.ftl | 10 ++++----- themes/ilhasoft/email/html/password-reset.ftl | 13 ++++++------ .../email/messages/messages_en.properties | 17 +++++++++------- .../ilhasoft/login/resources/img/favicon.ico | Bin 627 -> 19718 bytes themes/ilhasoft/welcome/resources/favicon.ico | Bin 627 -> 19718 bytes 13 files changed, 58 insertions(+), 57 deletions(-) diff --git a/themes/ilhasoft/account/resources/img/favicon.ico b/themes/ilhasoft/account/resources/img/favicon.ico index 48188dedaaed851f39dcf435d3bde8e0dce753fd..3af02f9c43f898915d47150410d284a728e31525 100644 GIT binary patch literal 19718 zcmeI3dyErB9LIm9n)*JU;QLg3;0rZIQ6t=GOhhmwJ}|^+g3tJlF)E|_12fFWQA7y^cX zAz%m?0)~JgU!@kT(@cJu= zm&<91C)ScaORIu-p`MpOD{~UQi@5$+P(51H^s=vS&2|p5FW;}iNyMz=Rh5(5Kha;m zQ}Ifq>0;FLH{ZIJ^hJ!T$K`nCJUG9o(k43Sa=GlG<~2B#c_p)SgX~W+?nL>D)Q{K3 zG+l%~v0YVH>AEj3XkU=ZRQLnmMRKf%n#UY*7kv4RyGpKAW zj%IzTlP=WcBw{Jb^B2~R=U|t|sJJhuD?2(U#(wH?RO5to@K?mJQxQiF>*Gzh=bgvP zv7$~tDzsc?1?&$;+N~(F57(25dwtM8f_u;4RB`$~xs#5q2P3wDx{QOb1B!UIZnEeM zcU}5jQAQOfvzX=jP|hPLqtfrk{B?6YO$}hOwg%rnq*8QTy*Q!oHY0{!MI0T8ZaPc& zN_Ej?D5vUQ<$hGQm8IE2%PHoJm&*72$BJxYKiY7l&~MDriO{YKp|2|^em+Bc?Nazp z`#pQ|T7vR_C^Y?bP177vPdQbt=auX#I0?PWYki>a4Aqqr`-ji*3cuM+8EONoa$3q3zeybKD8PJQw(|>PlL4z9^$gtBl9F)i?=z3SRpW zPvE;uYZsk_@f`QYK2V&>F=y#R$>(Ooae=rOlp@|?h>zDu9(%lozp2AX*oB7IFR`Zl zDbG)$j4E|_rRf{jH~U|)WeXjzDqpYb?wA_I&q!fy@^cHnU-McSR?Fpi&P;aFt+mvX z+XemeN`A%*(?+$#X*BgEfHs?ev9=0*{44H1VXX5zAKHB;#uh(|&P{dG$zk+vfBy{H z)i?v+nZ33V_e6e|LLEMD&(Kxg`}O=AK1L(P{^x)U?c+TqT_1>5o(pZvZOe4E?s`|T z)KQs6?O+IjmPOop3_n9 zD{Aq<^Eu)j1x`b1(K~y8*w4&n>8P-JexBjJ1ZMozK6Ct!1X5YLn&(Wk{c@!DhjGp0 zk@wipXVzdp^%H*Y38UvRh57aaw0j)wKO^jZTp~-iBkq;(zZU-S?a+ZcoH5-$pNKVM znvO?s8syZoa-H1Uo~G+`^v*tLhPH|M#7&p$jy3Rk78-fqs}H;$*703S8MNgDPppF1 z)N1ya6Z*nDg?4XiCtX`j?{f0p2L*#=LA>BswGY~dvGGtf-?iRDzZj{guZ`#3DSmcc zP8H9XJ~nnIEV{-|UyYNnQ;k;@PNJO$j2HUHA`#<3Y1a8lc)7{}{Yk_s(jG4_9Zn(! zKVG=^G){Tk318l{5A~W@4!lkoekMS_mG?HhekZXj=7jj)7j@B0dwA_&eOm_&g~oT> zRk5{Hj7RkIr%+CZlZbync=6{>h+~B+W~_CS12}yN?Ouhxhu_%{-#-P{JU@$xvh_+s@LC{q68<%Lw5wCau>HzfPbfN|C89w#hptHA%wjAQqzxp<8qce4U z*HXsW1J2MAH|Bp4!}KuU_u}~;Y%Evb)o#%(Vd8-9Rh)mb9(KN#=cgb${H}>P?I+iF z9%<-3=pY|{_qjb(-VNp*i^qZWS?e@lwo?mgD#2p(r%6eKrZB zO-^2F3pNQ5?90IbLr$JC0EClg3;@A-n=t@HDbE<1ojP*e`Iu~>Obas2L`|HxN+23J kpDTfI*|LKYTgCto&UMC6j(I*}Zn7Oa6&$4a53}q40g=n_$N&HU literal 627 zcmV-(0*w8MP)fnm`u?`7EDZT zU@#004h&*6qDT$3A+1HARIlxQw0Gw~Fqjw}@R{Bx@00f{&kMVRw3Fz%ejPaV7yTE* zFfRVFfUfKNfww^PA5AYAhLPDOVn^Z@5Uq#8eCj{K^1uiH-%|sWPn^Z+JGia8uj_ip zZxduPnQOLfKTs5fNvoYXN5LH&;bDG;iSDDcboJ0G%bfWzLoC#S@B5!sRW1H1Fh4(U zCK8G8Z0;+U=JG_6dl~BMWvaKyqfNox4TZyDm6NS?PHPsf>mtkY)(X?p)044SEDSKQ zTqY7~#q8?iUXO?Cx}0ybNC=-sv&nO(ja);Zsw$GSbv}_!r^h5o;>pJq=GIKi)BxwS zIvtLQX_~mM%k55!1cRzr-Bk6$hn3YADC!p(StiU*sn$CQ!;;MuB0(GzS&ySNfE*{22sK>&cF zD98ZA!^0c7Ty9jX6mNc<6~^+fSY63eDwURie5q8*?sVcL zaG@TFvod&`Xu~G?W|nd+MRD*L$@~KG!V
-
+
Weni-Logo
-
+
${msg("emailTestBodyHtml",realmName)?no_esc}
@@ -30,9 +30,9 @@ Twitter
-
Weni © Brasil 2020 - Todos os direitos reservados
+ ${msg("emailCopyright")?no_esc} -
Caso você não tenha realizado esta ação, ignore esta mensagem e troque a senha do seu e-mail por segurança. Fale com o suporte se necessário!
+ ${msg("emailFooterText")?no_esc}
diff --git a/themes/ilhasoft/email/html/email-verification.ftl b/themes/ilhasoft/email/html/email-verification.ftl index 1ecc46b..d21d88f 100644 --- a/themes/ilhasoft/email/html/email-verification.ftl +++ b/themes/ilhasoft/email/html/email-verification.ftl @@ -8,24 +8,23 @@
-
+
Weni-Logo
-
-
Hi, ${user.firstName}!
+
+
${msg("emailVerificationWelcome",user.firstName)?no_esc}
- Confirme seu e-mail para acessar a plataforma 😊 + ${msg("emailVerificationConfirmation")?no_esc}
-
Ficamos felizes por te ter conosco! Para prosseguir com o acesso da sua conta, verifique o seu e-mail apertando no botão abaixo ou copiando e colando o link em seu navegador.
+ ${msg("emailVerificationText", linkExpiration)?no_esc}
-

Clique aqui para confirmar o e-mail

 + ${msg("emailVerificationConfirmationButton", link)?no_esc}
-

URL expira em ${linkExpiration} minutos

${link}
@@ -36,15 +35,15 @@ -
Weni © Brasil 2020 - Todos os direitos reservados
+ ${msg("emailCopyright")?no_esc} -
Caso você não tenha realizado esta ação, ignore esta mensagem e troque a senha do seu e-mail por segurança. Fale com o suporte se necessário!
+ ${msg("emailFooterText")?no_esc}
diff --git a/themes/ilhasoft/email/html/event-login_error.ftl b/themes/ilhasoft/email/html/event-login_error.ftl index ef6efc2..e07f26e 100644 --- a/themes/ilhasoft/email/html/event-login_error.ftl +++ b/themes/ilhasoft/email/html/event-login_error.ftl @@ -8,11 +8,11 @@
-
+
Weni-Logo
-
+
Hi, ${user.firstName}!
@@ -27,13 +27,13 @@ -
Weni © Brasil 2020 - Todos os direitos reservados
+ ${msg("emailCopyright")?no_esc}
diff --git a/themes/ilhasoft/email/html/event-remove_totp.ftl b/themes/ilhasoft/email/html/event-remove_totp.ftl index f2c4e6b..82c86ce 100644 --- a/themes/ilhasoft/email/html/event-remove_totp.ftl +++ b/themes/ilhasoft/email/html/event-remove_totp.ftl @@ -8,12 +8,12 @@
-
+
Weni-Logo
-
-
Hi, ${user.firstName}!
+
+
${msg("emailVerificationWelcome",user.firstName)?no_esc}
${msg("eventRemoveTotpBodyHtml",event.date, event.ipAddress)?no_esc} @@ -27,13 +27,13 @@ -
Weni © Brasil 2020 - Todos os direitos reservados
+ ${msg("emailCopyright")?no_esc}
diff --git a/themes/ilhasoft/email/html/event-update_password.ftl b/themes/ilhasoft/email/html/event-update_password.ftl index 7539ae4..311cfef 100644 --- a/themes/ilhasoft/email/html/event-update_password.ftl +++ b/themes/ilhasoft/email/html/event-update_password.ftl @@ -8,12 +8,12 @@
-
+
Weni-Logo
-
-
Hi, ${user.firstName}!
+
+
${msg("emailVerificationWelcome",user.firstName)?no_esc}
${msg("eventUpdatePasswordBodyHtml",event.date, event.ipAddress)?no_esc} @@ -27,13 +27,13 @@ -
Weni © Brasil 2020 - Todos os direitos reservados
+ ${msg("emailCopyright")?no_esc}
diff --git a/themes/ilhasoft/email/html/event-update_totp.ftl b/themes/ilhasoft/email/html/event-update_totp.ftl index 905de6b..232f22d 100644 --- a/themes/ilhasoft/email/html/event-update_totp.ftl +++ b/themes/ilhasoft/email/html/event-update_totp.ftl @@ -8,12 +8,12 @@
-
+
Weni-Logo
-
-
Hi, ${user.firstName}!
+
+
${msg("emailVerificationWelcome",user.firstName)?no_esc}
${msg("eventUpdateTotpBodyHtml",event.date, event.ipAddress)?no_esc} @@ -27,13 +27,13 @@ -
Weni © Brasil 2020 - Todos os direitos reservados
+ ${msg("emailCopyright")?no_esc}
diff --git a/themes/ilhasoft/email/html/executeActions.ftl b/themes/ilhasoft/email/html/executeActions.ftl index 2867ab2..464f15b 100644 --- a/themes/ilhasoft/email/html/executeActions.ftl +++ b/themes/ilhasoft/email/html/executeActions.ftl @@ -11,12 +11,12 @@
-
+
Weni-Logo
-
-
Hi, ${user.firstName}!
+
+
${msg("emailVerificationWelcome",user.firstName)?no_esc}
${msg("executeActionsBodyHtml",link, linkExpiration, realmName, requiredActionsText)?no_esc} @@ -30,13 +30,13 @@ -
Weni © Brasil 2020 - Todos os direitos reservados
+ ${msg("emailCopyright")?no_esc}
diff --git a/themes/ilhasoft/email/html/identity-provider-link.ftl b/themes/ilhasoft/email/html/identity-provider-link.ftl index 21bb15d..1ea33bb 100644 --- a/themes/ilhasoft/email/html/identity-provider-link.ftl +++ b/themes/ilhasoft/email/html/identity-provider-link.ftl @@ -8,12 +8,12 @@
-
+
Weni-Logo
-
-
Hi, ${user.firstName}!
+
+
${msg("emailVerificationWelcome",user.firstName)?no_esc}
${msg("identityProviderLinkBodyHtml", identityProviderAlias, realmName, identityProviderContext.username, link, linkExpiration)?no_esc} @@ -27,13 +27,13 @@ -
Weni © Brasil 2020 - Todos os direitos reservados
+ ${msg("emailCopyright")?no_esc}
diff --git a/themes/ilhasoft/email/html/password-reset.ftl b/themes/ilhasoft/email/html/password-reset.ftl index f82f367..32da1c3 100644 --- a/themes/ilhasoft/email/html/password-reset.ftl +++ b/themes/ilhasoft/email/html/password-reset.ftl @@ -8,19 +8,19 @@
-
-
+
+
Weni-Logo
-
+
${msg("passwordResetBodyText1Html")?no_esc} - ${msg("passwordResetBodyText2Html")?no_esc} + ${msg("passwordResetBodyText2Html", linkExpiration)?no_esc}
- ${msg("passwordResetBodyHtml",link, linkExpiration)?no_esc} + ${msg("passwordResetBodyHtml",link)?no_esc}
${link}
@@ -30,7 +30,6 @@ Weni-Logo - -
Weni © Brasil 2020 - Todos os direitos reservados
+ ${msg("emailCopyright")?no_esc} ${msg("passwordResetBodyText3Html")?no_esc} diff --git a/themes/ilhasoft/email/messages/messages_en.properties b/themes/ilhasoft/email/messages/messages_en.properties index 9445e13..db516aa 100644 --- a/themes/ilhasoft/email/messages/messages_en.properties +++ b/themes/ilhasoft/email/messages/messages_en.properties @@ -1,19 +1,20 @@ -emailVerificationSubject=Verify email +emailVerificationSubject=Confirm your registration in Weni emailVerificationBody=Someone has created a {2} account with this email address. If this was you, click the link below to verify your email address\n\n{0}\n\nThis link will expire within {1} minutes.\n\nIf you didn''t create this account, just ignore this message. -emailVerificationBodyHtml=

Someone has created a {2} account with this email address. If this was you, click the link below to verify your email address

Link to e-mail address verification

This link will expire within {1} minutes.

If you didn''t create this account, just ignore this message.

-#emailVerificationBodyHtml=

Someone has created a {2} account with this email address. If this was you, click the link below to verify your email address

Link to e-mail address verification

This link will expire within {1} minutes.

If you didn''t create this account, just ignore this message.

-emailVerificationWelcome= +emailVerificationWelcome=Hi, {0}! +emailVerificationConfirmation=Confirm your email to access the platform +emailVerificationConfirmationButton=

Click here to confirm the email

+emailVerificationText=
We are happy to have you with us! To proceed with accessing your account, check your email by pressing the button below or copying and pasting the link in your browser. Stay tuned, the link expires in {0} minutes!
emailTestSubject=[KEYCLOAK] - SMTP test message emailTestBody=This is a test message emailTestBodyHtml=

This is a test message

identityProviderLinkSubject=Link {0} identityProviderLinkBody=Someone wants to link your "{1}" account with "{0}" account of user {2} . If this was you, click the link below to link accounts\n\n{3}\n\nThis link will expire within {4} minutes.\n\nIf you don''t want to link account, just ignore this message. If you link accounts, you will be able to login to {1} through {0}. identityProviderLinkBodyHtml=

Someone wants to link your {1} account with {0} account of user {2} . If this was you, click the link below to link accounts

Link to confirm account linking

This link will expire within {4} minutes.

If you don''t want to link account, just ignore this message. If you link accounts, you will be able to login to {1} through {0}.

-passwordResetSubject=Reset password +passwordResetSubject=Password recovery passwordResetBody=Someone just requested to change your {2} account''s credentials. If this was you, click on the link below to reset them.\n\n{0}\n\nThis link and code will expire within {1} minutes.\n\nIf you don''t want to reset your credentials, just ignore this message and nothing will be changed. \n\n ** For Intelbras employees it is not possible to change the password through this portal. To change the password you must carry out the procedure through your computer. -passwordResetBodyHtml=

Click here to reset your password

URL expires in {1} minutes

+passwordResetBodyHtml=

Click here to reset your password

 passwordResetBodyText1Html=
Access the password reset link
-passwordResetBodyText2Html=
You have requested to recover your password. To perform the action, press the button below, or copy and paste the link in your browser, which will redirect you to a password creation page.
+passwordResetBodyText2Html=
You have requested to recover your password. To perform the action, press the button below, or copy and paste the link in your browser, which will redirect you to a password creation page. Stay tuned, the link expires in {0} minutes!
passwordResetBodyText3Html=
If you have not performed this action, ignore this message and change your email password for security. Talk to support if necessary!
executeActionsSubject=Update Your Account executeActionsBody=Your administrator has just requested that you update your {2} account by performing the following action(s): {3}. Click on the link below to start this process.\n\n{0}\n\nThis link will expire within {1} minutes.\n\nIf you are unaware that your admin has requested this, just ignore this message and nothing will be changed. @@ -38,3 +39,5 @@ requiredAction.UPDATE_PROFILE=Update Profile requiredAction.VERIFY_EMAIL=Verify Email emailAccessOurSite=Visit our website +emailFooterText=
If you have not performed this action, ignore this message and change your email password for security. Talk to support if necessary!
+emailCopyright=
Weni © Brazil 2020 - All rights reserved
\ No newline at end of file diff --git a/themes/ilhasoft/login/resources/img/favicon.ico b/themes/ilhasoft/login/resources/img/favicon.ico index 48188dedaaed851f39dcf435d3bde8e0dce753fd..3af02f9c43f898915d47150410d284a728e31525 100644 GIT binary patch literal 19718 zcmeI3dyErB9LIm9n)*JU;QLg3;0rZIQ6t=GOhhmwJ}|^+g3tJlF)E|_12fFWQA7y^cX zAz%m?0)~JgU!@kT(@cJu= zm&<91C)ScaORIu-p`MpOD{~UQi@5$+P(51H^s=vS&2|p5FW;}iNyMz=Rh5(5Kha;m zQ}Ifq>0;FLH{ZIJ^hJ!T$K`nCJUG9o(k43Sa=GlG<~2B#c_p)SgX~W+?nL>D)Q{K3 zG+l%~v0YVH>AEj3XkU=ZRQLnmMRKf%n#UY*7kv4RyGpKAW zj%IzTlP=WcBw{Jb^B2~R=U|t|sJJhuD?2(U#(wH?RO5to@K?mJQxQiF>*Gzh=bgvP zv7$~tDzsc?1?&$;+N~(F57(25dwtM8f_u;4RB`$~xs#5q2P3wDx{QOb1B!UIZnEeM zcU}5jQAQOfvzX=jP|hPLqtfrk{B?6YO$}hOwg%rnq*8QTy*Q!oHY0{!MI0T8ZaPc& zN_Ej?D5vUQ<$hGQm8IE2%PHoJm&*72$BJxYKiY7l&~MDriO{YKp|2|^em+Bc?Nazp z`#pQ|T7vR_C^Y?bP177vPdQbt=auX#I0?PWYki>a4Aqqr`-ji*3cuM+8EONoa$3q3zeybKD8PJQw(|>PlL4z9^$gtBl9F)i?=z3SRpW zPvE;uYZsk_@f`QYK2V&>F=y#R$>(Ooae=rOlp@|?h>zDu9(%lozp2AX*oB7IFR`Zl zDbG)$j4E|_rRf{jH~U|)WeXjzDqpYb?wA_I&q!fy@^cHnU-McSR?Fpi&P;aFt+mvX z+XemeN`A%*(?+$#X*BgEfHs?ev9=0*{44H1VXX5zAKHB;#uh(|&P{dG$zk+vfBy{H z)i?v+nZ33V_e6e|LLEMD&(Kxg`}O=AK1L(P{^x)U?c+TqT_1>5o(pZvZOe4E?s`|T z)KQs6?O+IjmPOop3_n9 zD{Aq<^Eu)j1x`b1(K~y8*w4&n>8P-JexBjJ1ZMozK6Ct!1X5YLn&(Wk{c@!DhjGp0 zk@wipXVzdp^%H*Y38UvRh57aaw0j)wKO^jZTp~-iBkq;(zZU-S?a+ZcoH5-$pNKVM znvO?s8syZoa-H1Uo~G+`^v*tLhPH|M#7&p$jy3Rk78-fqs}H;$*703S8MNgDPppF1 z)N1ya6Z*nDg?4XiCtX`j?{f0p2L*#=LA>BswGY~dvGGtf-?iRDzZj{guZ`#3DSmcc zP8H9XJ~nnIEV{-|UyYNnQ;k;@PNJO$j2HUHA`#<3Y1a8lc)7{}{Yk_s(jG4_9Zn(! zKVG=^G){Tk318l{5A~W@4!lkoekMS_mG?HhekZXj=7jj)7j@B0dwA_&eOm_&g~oT> zRk5{Hj7RkIr%+CZlZbync=6{>h+~B+W~_CS12}yN?Ouhxhu_%{-#-P{JU@$xvh_+s@LC{q68<%Lw5wCau>HzfPbfN|C89w#hptHA%wjAQqzxp<8qce4U z*HXsW1J2MAH|Bp4!}KuU_u}~;Y%Evb)o#%(Vd8-9Rh)mb9(KN#=cgb${H}>P?I+iF z9%<-3=pY|{_qjb(-VNp*i^qZWS?e@lwo?mgD#2p(r%6eKrZB zO-^2F3pNQ5?90IbLr$JC0EClg3;@A-n=t@HDbE<1ojP*e`Iu~>Obas2L`|HxN+23J kpDTfI*|LKYTgCto&UMC6j(I*}Zn7Oa6&$4a53}q40g=n_$N&HU literal 627 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 literal 627 zcmV-(0*w8MP)fnm`u?`7EDZT zU@#004h&*6qDT$3A+1HARIlxQw0Gw~Fqjw}@R{Bx@00f{&kMVRw3Fz%ejPaV7yTE* zFfRVFfUfKNfww^PA5AYAhLPDOVn^Z@5Uq#8eCj{K^1uiH-%|sWPn^Z+JGia8uj_ip zZxduPnQOLfKTs5fNvoYXN5LH&;bDG;iSDDcboJ0G%bfWzLoC#S@B5!sRW1H1Fh4(U zCK8G8Z0;+U=JG_6dl~BMWvaKyqfNox4TZyDm6NS?PHPsf>mtkY)(X?p)044SEDSKQ zTqY7~#q8?iUXO?Cx}0ybNC=-sv&nO(ja);Zsw$GSbv}_!r^h5o;>pJq=GIKi)BxwS zIvtLQX_~mM%k55!1cRzr-Bk6$hn3YADC!p(StiU*sn$CQ!;;MuB0(GzS&ySNfE*{22sK>&cF zD98ZA!^0c7Ty9jX6mNc<6~^+fSY63eDwURie5q8*?sVcL zaG@TFvod&`Xu~G?W|nd+MRD*L$@~KG!V Date: Fri, 22 Jan 2021 16:00:23 -0300 Subject: [PATCH 3/3] Updated Template --- .../email/html/email-verification.ftl | 4 +- themes/ilhasoft/email/html/password-reset.ftl | 8 ++-- .../email/messages/messages_en.properties | 6 +-- .../email/messages/messages_pt_BR.properties | 43 +++++++++++++++++++ themes/ilhasoft/email/theme.properties | 3 +- 5 files changed, 52 insertions(+), 12 deletions(-) create mode 100644 themes/ilhasoft/email/messages/messages_pt_BR.properties diff --git a/themes/ilhasoft/email/html/email-verification.ftl b/themes/ilhasoft/email/html/email-verification.ftl index d21d88f..35e0a9d 100644 --- a/themes/ilhasoft/email/html/email-verification.ftl +++ b/themes/ilhasoft/email/html/email-verification.ftl @@ -22,11 +22,9 @@ ${msg("emailVerificationText", linkExpiration)?no_esc}
+ font-family: Lato;margin-top:50px;border-radius: 4px; padding: 1px 0;"> ${msg("emailVerificationConfirmationButton", link)?no_esc}
- -
${link}
diff --git a/themes/ilhasoft/email/html/password-reset.ftl b/themes/ilhasoft/email/html/password-reset.ftl index 32da1c3..c3b7bea 100644 --- a/themes/ilhasoft/email/html/password-reset.ftl +++ b/themes/ilhasoft/email/html/password-reset.ftl @@ -19,11 +19,9 @@ ${msg("passwordResetBodyText2Html", linkExpiration)?no_esc}
- ${msg("passwordResetBodyHtml",link)?no_esc} -
- -
${link}
+ font-family: Lato;margin-top:50px;border-radius: 4px; padding: 1px 0;"> + ${msg("passwordResetBodyHtml",link)?no_esc} +