-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from Ilhasoft/feature/design-review
Feature/design review
- Loading branch information
Showing
15 changed files
with
271 additions
and
360 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| <#macro loginLayout> | ||
| <form id="kc-form-login" class="${properties.kcFormClass!}" onsubmit="login.disabled = true; return true;" 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-single-neutral-actions-1"></span> | ||
| <#if usernameEditDisabled??> | ||
| <input tabindex="1" id="username" class="${properties.kcInputClass!} has-icon-left" placeholder="${msg("placeholderLoginName")}" name="username" value="${(login.username!'')}" type="text" disabled /> | ||
| <#else> | ||
| <input tabindex="1" id="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> | ||
|
|
||
| <div class="${properties.kcInputWrapperClass!} ${properties.kcInputControlClass!}"> | ||
| <input tabindex="2" id="password" class="${properties.kcInputClass!} has-icon-left has-icon-right" placeholder="${msg("placeholderLoginPassword")}" name="password" type="password" autocomplete="off" /> | ||
| <span class="icon icon-input icon-left icon-lock-2-1"></span> | ||
| <span id="password-icon" onclick="togglePassword('password-icon', 'password')" class="icon icon-clickable icon-input icon-right icon-view-1-1"></span> | ||
| <#if realm.resetPasswordAllowed> | ||
| <div class="forgot-password ${properties.kcInputMessageClass!}"><a tabindex="5" href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a></div> | ||
| </#if> | ||
| <#if realm.rememberMe && !usernameEditDisabled??> | ||
| <div class="input-message"> | ||
| <#if login.rememberMe??> | ||
| <input id="rememberMe" tabindex="3" name="rememberMe" type="checkbox" tabindex="3" checked> ${msg("rememberMe")} | ||
| <#else> | ||
| <input id="rememberMe" tabindex="3" name="rememberMe" type="checkbox" tabindex="3"> ${msg("rememberMe")} | ||
| </#if> | ||
| </div> | ||
| </#if> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="${properties.kcFormGroupClass!}"> | ||
| <div id="kc-form-options" class="${properties.kcFormOptionsClass!}"> | ||
|
|
||
| </div> | ||
|
|
||
| <div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}"> | ||
| <div class="${properties.kcFormButtonsWrapperClass!}"> | ||
| <input tabindex="4" class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}" name="login" id="kc-login" type="submit" value="${msg("doLogIn")}"/> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </form> | ||
| </#macro> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <#import "template.ftl" as layout> | ||
| <#import "login-form.ftl" as loginLayout> | ||
| <@layout.registrationLayout displayInfo=social.displayInfo; section> | ||
| <#if section = "title"> | ||
| ${msg("loginTitle",(realm.displayName!''))} | ||
| <#elseif section = "header"> | ||
| ${msg("loginTitleHtml",(realm.displayNameHtml!''))?no_esc} | ||
| <#elseif section = "form"> | ||
| <div id="modal" class="modal-background"> | ||
| <div class="modal-container"> | ||
| <div class="modal-content"> | ||
| <div class="modal-button-container"> | ||
| <span class="icon-close-1 icon-clickable" onclick="closeModal()"></span> | ||
| </div> | ||
| <div class="modal-center-icon"> | ||
| <span class="icon-alert-circle-1 icon-alert"></span> | ||
| </div> | ||
| <div class="modal-title">${msg("emailVerifyTitle")}</div> | ||
| <div class="modal-text">${msg("emailVerifyInstruction1")}</div> | ||
| </div> | ||
| <div class="modal-message">${msg("emailVerifyInstruction2")} <a href="${url.loginAction}">${msg("emailVerifyInstruction3")}</a></div> | ||
| </div> | ||
| </div> | ||
| <#if realm.password> | ||
| <@loginLayout.loginLayout></@loginLayout.loginLayout> | ||
| </#if> | ||
| <#elseif section = "info" > | ||
| <#if realm.password && realm.registrationAllowed && !usernameEditDisabled??> | ||
| <div id="kc-registration"> | ||
| <span>${msg("noAccount")} <a tabindex="6" href="${url.registrationUrl}">${msg("doRegister")}</a></span> | ||
| </div> | ||
| </#if> | ||
| </#if> | ||
| </@layout.registrationLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.