Skip to content

Commit

Permalink
Merge pull request #64 from weni-ai/fix/typo
Browse files Browse the repository at this point in the history
Fix/typo
  • Loading branch information
cristiantela authored Sep 12, 2023
2 parents a2dcfab + 8b1e51f commit ea340b9
Show file tree
Hide file tree
Showing 21 changed files with 50,633 additions and 26,876 deletions.
118 changes: 68 additions & 50 deletions themes/ilhasoft/login/login-form.ftl
Original file line number Diff line number Diff line change
@@ -1,64 +1,82 @@
<#macro loginLayout>
<form id="kc-form-login" ref="kc-form-login" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
<div class="${properties.kcFormGroupClass!}">
<div class="${properties.kcLabelWrapperClass!}">
<label for="username" class="${properties.kcLabelClass!}"><#if !realm.loginWithEmailAllowed>${msg("username")}<#elseif !realm.registrationEmailAsUsername>${msg("usernameOrEmail")}<#else>${msg("email")}</#if></label>
</div>
<div class="greetings">
<a href="${url.loginUrl}">
<img class="brand-title" src="${url.resourcesPath}/img/login/Weni-Logo-Blue.svg">
</a>

<div class="${properties.kcInputWrapperClass!} ${properties.kcInputControlClass!}">
<label for="username">
<span class="icon icon-input icon-left icon-single-neutral-actions-1"></span>
</label>
${msg("greetings")}
</div>

<#if usernameEditDisabled??>
<input tabindex="1" id="username" ref="username" class="${properties.kcInputClass!} has-icon-left" placeholder="${msg("placeholderLoginName")}" name="username" value="${(login.username!'')}" type="text" disabled />
<#else>
<input tabindex="1" id="username" ref="username" class="${properties.kcInputClass!} has-icon-left" placeholder="${msg("placeholderLoginName")}" name="username" value="${(login.username!'')}" type="text" autofocus autocomplete="off" />
</#if>
</div>
</div>

<div class="${properties.kcFormGroupClass!}">
<div class="${properties.kcLabelWrapperClass!}">
<label for="password" class="${properties.kcLabelClass!}">${msg("password")}</label>
</div>
<form id="kc-form-login" ref="kc-form-login" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
<unnnic-form-element
label="<#if !realm.loginWithEmailAllowed>${msg('username')}<#elseif !realm.registrationEmailAsUsername>${msg('usernameOrEmail')}<#else>${msg('email')}</#if>"
>
<unnnic-input
ref="loginUsername"
v-model="usernameInput"
icon-left="single-neutral-actions-1"
placeholder="${msg('placeholderLoginName')}"
name="username"
:disabled="<#if usernameEditDisabled??>true<#else>false</#if>"
autofocus
></unnnic-input>
</unnnic-form-element>

<div class="${properties.kcInputWrapperClass!} ${properties.kcInputControlClass!}">
<input tabindex="2" id="password" ref="password" class="${properties.kcInputClass!} has-icon-left has-icon-right" placeholder="${msg("placeholderLoginPassword")}" name="password" type="password" autocomplete="off" />
<unnnic-form-element
label="${msg('password')}"
>
<unnnic-input
ref="password"
v-model="passwordInput"
native-type="password"
icon-left="lock-2-1"
placeholder="${msg('placeholderLoginPassword')}"
name="password"
allow-toggle-password
></unnnic-input>
</unnnic-form-element>

<label for="password" class="m-0">
<span class="icon icon-input icon-left icon-lock-2-1"></span>
</label>
<div class="${properties.kcFormGroupClass!}">
<div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
<div class="${properties.kcFormButtonsWrapperClass!} login-buttons">
<unnnic-button
class="login-button"
size="small"
text="${msg('doLogIn')}"
type="primary"
></unnnic-button>

<span id="password-icon" onclick="togglePassword('password-icon', 'password')" class="icon icon-clickable icon-input icon-right icon-view-1-1"></span>
<#if realm.password?? && social.providers??>
<#list social.providers as p>
<a id="zocial-${p.alias}" class="social-link" href="${p.loginUrl}">
<button type="button" class="social-button button-control" id="button-${p.alias}">
<img src="${url.resourcesPath}/img/login/icon-${p.alias}.svg" class="icon-image icon-button-left" >
<span>${msg("loginWith")} ${p.displayName} </span>
</button>
</a>
</#list>
</#if>
</div>
</div>
</div>

<div class="${properties.kcFormGroupClass!}">
<div id="kc-form-options" class="${properties.kcFormOptionsClass!}">
<#if realm.rememberMe && !usernameEditDisabled??>
<div class="input-message remember-me">
<#if login.rememberMe??>
<input id="rememberMe" tabindex="3" name="rememberMe" type="checkbox" tabindex="3" checked>
<#else>
<input id="rememberMe" tabindex="3" name="rememberMe" type="checkbox" tabindex="3">
</#if>

<label for="rememberMe"></label>
<label for="rememberMe">${msg("rememberMe")}</label>
</div>
</#if>
<div id="kc-form-options" class="${properties.kcFormOptionsClass!}">
<#if realm.rememberMe && !usernameEditDisabled??>
<div class="input-message remember-me">
<#if login.rememberMe??>
<input id="rememberMe" tabindex="3" name="rememberMe" type="checkbox" tabindex="3" checked>
<#else>
<input id="rememberMe" tabindex="3" name="rememberMe" type="checkbox" tabindex="3">
</#if>

<#if realm.resetPasswordAllowed>
<div class="forgot-password ${properties.kcInputMessageClass!}"><a tabindex="5" href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a></div>
</#if>
</div>

<div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
<div class="${properties.kcFormButtonsWrapperClass!}">
<input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}" name="login" id="kc-login" ref="kc-login" type="submit" value="${msg("doLogIn")}" />
<label for="rememberMe"></label>
<label for="rememberMe">${msg("rememberMe")}</label>
</div>
</div>
</#if>

<#if realm.resetPasswordAllowed>
<div class="forgot-password ${properties.kcInputMessageClass!}"><a tabindex="5" href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a></div>
</#if>
</div>
</form>
</#macro>
24 changes: 15 additions & 9 deletions themes/ilhasoft/login/login-reset-password.ftl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#import "template.ftl" as layout>
<@layout.registrationLayout displayInfo=true; section>
<@layout.registrationLayout displayInfo=false; section>
<#if section = "title">
${msg("emailForgotTitle")}
<#elseif section = "header">
Expand All @@ -10,17 +10,23 @@
</div>
<form id="kc-reset-password-form" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
<div class="${properties.kcFormGroupClass!}">
<div class="${properties.kcLabelWrapperClass!}">
<label for="username" class="${properties.kcLabelClass!}"><#if !realm.loginWithEmailAllowed>${msg("username")}<#elseif !realm.registrationEmailAsUsername>${msg("usernameOrEmail")}<#else>${msg("email")}</#if></label>
</div>
<div class="${properties.kcInputWrapperClass!} ${properties.kcInputControlClass!}">
<span class="icon icon-input icon-left icon-email-action-unread-1"></span>
<input type="text" oninput="disableButton()" id="required-input" placeholder="${msg("placeholderLoginReset")}" name="username" class="${properties.kcInputClass!} ${messagesPerField.printIfExists('username',properties.kcFormGroupErrorClass!)} has-icon-left" autofocus/>
</div>
<unnnic-form-element
label="<#if !realm.loginWithEmailAllowed>${msg('username')}<#elseif !realm.registrationEmailAsUsername>${msg('usernameOrEmail')}<#else>${msg('email')}</#if>"
>
<unnnic-input
ref="username"
v-model="usernameInput"
icon-left="email-action-unread-1"
placeholder="${msg('placeholderLoginReset')}"
name="username"
:type="'${messagesPerField.printIfExists('username',properties.kcFormGroupErrorClass!)}' ? 'error' : 'normal'"
autofocus
></unnnic-input>
</unnnic-form-element>
</div>

<div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
<input id="required-input-button" disabled class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}" type="submit" value="${msg("doSubmit")}"/>
<input id="required-input-button" class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}" type="submit" value="${msg("doSubmit")}"/>
</div>
</div>

Expand Down
20 changes: 19 additions & 1 deletion themes/ilhasoft/login/login.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,27 @@
</#if>
<#elseif section = "info" >
<#if realm.password && realm.registrationAllowed && !usernameEditDisabled??>
<div id="separator-group">
<div class="separator"></div>
<span class="separator-text"> ${msg("separatorMessage")} </span>
<div class="separator"></div>
</div>

<div id="kc-registration">
<span>${msg("noAccount")} <a tabindex="6" href="${url.registrationUrl}">${msg("doRegister")}</a></span>
<#-- <input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}" name="login" id="kc-login" ref="kc-login" type="submit" value="${msg("doLogIn")}" /> -->
<unnnic-button
class="sign-up-button"
size="small"
text="${msg('doRegisterForFree')}"
type="terciary"
@click.prevent="location.href = '${url.registrationUrl}'"
></unnnic-button>
</div>
</#if>
<div class="footer">
<a class="privacy-policy" target="_blank" href="${properties.urlPrivacyPolicy!}">
${msg('termsOfService')}
</a>
</div>
</#if>
</@layout.registrationLayout>
24 changes: 22 additions & 2 deletions themes/ilhasoft/login/messages/messages_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ separatorMessage=or
loginWith=Login with
backHome=Back to home
doRegister=Sign up
doRegisterForFree=Sign up for free
noAccount=No account?

minCharacters=You need at least 3 characters
Expand All @@ -16,15 +17,33 @@ placeholderRegisterPassword=Enter a password
placeholderRegisterPasswordConfirm=Confirm your password
placeholderRegisterEmail=Enter your e-mail
placeholderLoginReset=Enter your or e-mail for password recovery
headerTitleText=Smart businesses have smart communication
headerTitleText=Smart business has smart communication.
headerTitleSubtext=Evolve the communication of your business by creating <span class=\"keyword\">ChatBots</span> and using <span class=\"keyword\">Artifical Inteligence</span> at Weni.
brandsTitle=Companies that use and approve our technology
brandsTitle=Companies that use and recommend
alreadyAccount=Already registered?
alreadyAccountReset=Did you remember your password?
backToLogin=Sign in with your email
recoverPasswordTitle=Recover Password
doLogIn=Log In

benefits1=Free 30-day trial
benefits2=Library of Weni and community templates
benefits3=ChatGPT and other artificial inteligences
benefits4=Creation of AI projects and flows
benefits5=Communication channels, including WhatsApp Official API

greetings=Welcome, Wenier!
register_greetings=Become a Wenier!

password_instructions_title=At least 8 characters, including at least one uppercase letter, one lowercase letter and one special character.
password_instructions_1=An uppercase letter
password_instructions_2=A lowercase letter
password_instructions_3=A special character (such as @, #, $, %)
password_level_1=Vulnerable
password_level_2=Regular
password_level_3=Good
password_level_4=Very Good

emailSentMessage=An email has been sent to your inbox. Please check your spam folder as well.
emailSendErrorMessage=Failed to send email, please try again later.
emailSentTitle=Password recovery link sent!
Expand All @@ -40,6 +59,7 @@ emailVerifyInstruction3=Click here to send it again
registerAcceptTerms=By registering, you accept our
termsOfUse=Terms of Use
privacyPolicy=Terms of Service, Privacy and Cookie Policy
termsOfService=Terms of service and privacy policy
and=and

AD=Andorra
Expand Down
25 changes: 23 additions & 2 deletions themes/ilhasoft/login/messages/messages_es.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@ emailVerifyInstruction3=Haga clic aquí para reenviar
registerAcceptTerms=Al registrarse, usted acepta nuestra
# termsOfUse=Termos de Uso
privacyPolicy=Condiciones de servicio, política de privacidad y cookies
termsOfService=Condiciones del servicio y política de privacidad
# and=e

verifyEmailMessage=
separatorMessage=o
loginWith=Iniciar sesión com
backHome=Volver a la página de inicio
doregister=Registro
doRegisterForFree=Regístrate gratis

noAccount=¿No tiene una cuenta?

minCharacters=Necesita al menos 3 caracteres
Expand All @@ -33,15 +36,33 @@ placeholderRegisterPassword=Elija una contraseña
placeholderRegisterPasswordConfirm=Confirme su contraseña
placeholderRegisterEmail=Introduzca su dirección de correo electrónico
placeholderLoginReset=Introduzca su correo electrónico para la recuperación
headerTitleText=Las empresas inteligentes tienen una comunicación inteligente
headerTitleText=La empresa inteligente tiene una comunicación inteligente.
headerTitleSubtext=Evoluciona la comunicación de tu empresa con la creación de <span class=\"keyword\">ChatBots</span> y <span class=\"keyword\">Inteligencia Artificial</span> en la plataforma Weni.
brandsTitle=Empresas que utilizan y aprueban nuestra tecnología
brandsTitle=Empresas que utilizan y recomiendan
alreadyAccount=¿Ya tiene una cuenta?
alreadyAccountReset=¿Recuerdas la contraseña?
backToLogin=Volver al inicio de sesión
recoverPasswordTitle=Recuperación de contraseñas
doLogIn=Entre en

benefits1=Prueba gratuita de 30 días
benefits2=Biblioteca de plantillas Weni y de comunidad
benefits3=ChatGPT y otras inteligencias artificiales
benefits4=Creación de proyectos y flujos de IA
benefits5=Canales de comunicación, incluida la API oficial de WhatsApp

greetings=¡Bienvenido, Wenier!
register_greetings=¡Conviértete en un Wenier!

password_instructions_title=Al menos 8 caracteres, incluyendo al menos una letra mayúscula, una letra minúscula y un carácter especial.
password_instructions_1=Una letra mayúscula
password_instructions_2=Una letra minúscula
password_instructions_3=Un carácter especial (como @, #, $, %)
password_level_1=Vulnerable
password_level_2=Regular
password_level_3=Bueno
password_level_4=Excelente

#OTP

loginOtpTitle=Configurar la verificación en dos pasos
Expand Down
24 changes: 22 additions & 2 deletions themes/ilhasoft/login/messages/messages_pt_BR.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ separatorMessage=ou
loginWith=Login com
backHome=Voltar para a página inicial
doregister=Cadastrar
doRegisterForFree=Cadastre-se grátis
noAccount=Não possui conta?

minCharacters=Precisa de, no mínimo, 3 caracteres
Expand All @@ -16,15 +17,33 @@ placeholderRegisterPassword=Escolha uma senha
placeholderRegisterPasswordConfirm=Confirme sua senha
placeholderRegisterEmail=Digite seu e-mail
placeholderLoginReset=Digite seu e-mail para recuperação
headerTitleText=Negócios inteligentes têm comunicação inteligente
headerTitleText=Negócio inteligente tem comunicação inteligente.
headerTitleSubtext=Evolua a comunicação do seu negócio com a criação de <span class=\"keyword\">ChatBots</span> e <span class=\"keyword\">Inteligência Artificial</span> na Weni plataforma.
brandsTitle=Empresas que utilizam e aprovam a nossa tecnologia
brandsTitle=Empresas que utilizam e recomendam
alreadyAccount=Já possui conta?
alreadyAccountReset=Lembrou da senha?
backToLogin=Voltar ao login
recoverPasswordTitle=Recuperação de senha
doLogIn=Entrar

benefits1=Teste grátis por 30 dias
benefits2=Biblioteca de templates Weni e da comunidade
benefits3=ChatGPT e outras inteligências artificiais
benefits4=Criação de projetos e fluxos de IA
benefits5=Canais de comunicação, incluindo WhatsApp API Oficial

greetings=Boas vindas, Wenier!
register_greetings=Seja um Wenier!

password_instructions_title=No mínimo 8 caracters, incluindo pelo menos uma letra maiúscula, uma letra minúscula e um caractere especial.
password_instructions_1=Uma letra maiúscula
password_instructions_2=Uma letra minúscula
password_instructions_3=Um caractere especial (como @, #, $, %)
password_level_1=Vulnerável
password_level_2=Regular
password_level_3=Bom
password_level_4=Ótimo

emailSentMessage=Enviamos um link de redefinição para a caixa de entrada do seu email, confira também a caixa de spam.
emailSendErrorMessage=Falha ao enviar email, tente novamente mais tarde.
emailSentTitle=Link de redefinição de senha enviado!
Expand All @@ -40,6 +59,7 @@ emailVerifyInstruction3=Clique aqui para reenviar
registerAcceptTerms=Ao realizar o cadastro, você afirma concordar com os nossos
termsOfUse=Termos de Uso
privacyPolicy=Termos de Serviço, Privacidade e Política de Cookies
termsOfService=Termos de serviço e política de privacidade
and=e

AD=Andorra
Expand Down
Loading

0 comments on commit ea340b9

Please sign in to comment.