Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
robin-dekkers committed Nov 6, 2019
2 parents 0d651a0 + 1e968c1 commit 76914b350bc84abaf383cd929f4aa7dd10aabaef
@@ -8,12 +8,12 @@

<form action="${url.accountUrl}" method="post">

<input type="hidden" id="stateChecker" name="stateChecker" value="${stateChecker?html}">
<input type="hidden" id="stateChecker" name="stateChecker" value="${stateChecker}">

<#if !realm.registrationEmailAsUsername>
<div class="input-field s12 ${messagesPerField.printIfExists('username','has-error')}">
<input type="text" class="validate" id="username" name="username" required
<#if !realm.editUsernameAllowed>disabled="disabled"</#if> value="${(account.username!'')?html}"/>
<#if !realm.editUsernameAllowed>disabled="disabled"</#if> value="${(account.username!'')}"/>
<label for="username">${msg("username")} <#if realm.editUsernameAllowed>
<span class="required">*</span></#if></label>
</div>
@@ -22,32 +22,32 @@
<div class="input-field s12">
<input type="text" class="validate ${messagesPerField.printIfExists('email','invalid')}" id="email"
name="email" autofocus
value="${(account.email!'')?html}" required/>
value="${(account.email!'')}" required/>
<label for="email">${msg("email")} <span class="required">*</span></label>
</div>

<div class="input-field s12 ${messagesPerField.printIfExists('firstName','has-error')}">
<input type="text" class="validate ${messagesPerField.printIfExists('email','invalid')}" id="firstName"
name="firstName"
value="${(account.firstName!'')?html}" required/>
value="${(account.firstName!'')}" required/>
<label for="firstName">${msg("firstName")} <span class="required">*</span></label>
</div>

<div class="input-field s12 ${messagesPerField.printIfExists('lastName','has-error')}">
<input type="text" class="validate ${messagesPerField.printIfExists('email','invalid')}" id="lastName"
name="lastName"
value="${(account.lastName!'')?html}" required/>
value="${(account.lastName!'')}" required/>
<label for="lastName">${msg("lastName")}<span class="required">*</span></label>
</div>

<div class="col s12 center-align">
<button type="submit"
class="btn waves-effect waves-light green darken-1"
class="btn waves-effect waves-light"
name="submitAction" value="Save">${msg("doSave")}
<i class="material-icons right">send</i>
</button>
<button type="submit"
class="btn waves-effect waves-light green darken-1"
class="btn waves-effect waves-light"
name="submitAction" value="Cancel" formnovalidate>${msg("doCancel")}
<i class="material-icons right">cancel</i>
</button>
@@ -5,9 +5,9 @@

<div class="section">

<form action="${url.revokeClientUrl}" method="post">
<input type="hidden" id="stateChecker" name="stateChecker" value="${stateChecker?html}">
<input type="hidden" id="referrer" name="referrer" value="${stateChecker?html}">
<form action="${url.applicationsUrl}" method="post">
<input type="hidden" id="stateChecker" name="stateChecker" value="${stateChecker}">
<input type="hidden" id="referrer" name="referrer" value="${stateChecker}">

<table class="striped">
<thead>
@@ -82,7 +82,7 @@

<td>
<#if (application.client.consentRequired && application.claimsGranted?has_content) || application.additionalGrants?has_content>
<button type="submit" class="btn waves-effect waves-light green darken-1" id='revoke-${application.client.clientId}' name="clientId" value="${application.client.id}">${msg("revoke")}</button>
<button type="submit" class="btn waves-effect waves-light" id='revoke-${application.client.clientId}' name="clientId" value="${application.client.id}">${msg("revoke")}</button>
</#if>
</td>
</tr>
@@ -8,7 +8,7 @@

<input type="text" readonly value="this is not a login form" style="display: none;">
<input type="password" readonly value="this is not a login form" style="display: none;">
<input type="hidden" id="stateChecker" name="stateChecker" value="${stateChecker?html}">
<input type="hidden" id="stateChecker" name="stateChecker" value="${stateChecker}">

<div class="row">
<#if password.passwordSet>
@@ -35,7 +35,7 @@
</div>

<div class="col s12 center-align">
<button class="btn waves-effect waves-light green darken-1" type="submit" name="login"
<button class="btn waves-effect waves-light" type="submit" name="login"
value="Save">${msg("doSave")}
<i class="material-icons right">send</i>
</button>
@@ -1,7 +1,15 @@
:root {
--app-primary-color: #43A047;
--app-secondary-color: #C1D72E;
--app-background-color: #FFFFFF;
--input-background-color: #FFFFFF;
}

html, body {
margin: 0;
padding: 0;
height: 100vh;
background-color: var(--app-background-color);
}

#outer-wrapper {
@@ -99,4 +107,28 @@ header, main, footer {
header, main, footer {
padding-left: 0;
}
}

.input-field >label {
color: var(--app-primary-color);
}

.input-field > input {
background-color: var(--input-background-color) !important;
border-bottom: 1px solid var(--app-primary-color) !important;
-webkit-box-shadow: 0 1px 0 0 var(--app-primary-color) !important;
box-shadow: 0 1px 0 0 var(--app-primary-color) !important;
}

.btn {
background-color: var(--app-primary-color) !important;
}

[type="checkbox"]:checked + span:not(.lever):before {
border-right: 2px solid var(--app-primary-color) !important;
border-bottom: 2px solid var(--app-primary-color) !important;
}

a.top-nav.sidenav-trigger {
color: var(--app-primary-color) !important;
}
@@ -36,6 +36,9 @@

</div>

<a id="logout-all-sessions" href="${url.sessionsLogoutUrl}">${msg("doLogOutAllSessions")}</a>
<form action="${url.sessionsUrl}" method="post">
<input type="hidden" id="stateChecker" name="stateChecker" value="${stateChecker}">
<button id="logout-all-sessions" class="btn btn-default">${msg("doLogOutAllSessions")}</button>
</form>

</@layout.mainLayout>
@@ -39,12 +39,7 @@
<li class="<#if active=='social'>active</#if>"><a href="${url.socialUrl}">${msg("federatedIdentity")}</a></li>
</#if>
<li class="<#if active=='sessions'>active</#if>"><a href="${url.sessionsUrl}">${msg("sessions")}</a></li>
<li class="<#if active=='applications'>active</#if>"><a
href="${url.applicationsUrl}">${msg("applications")}</a></li>
<#if features.log>
<li class="<#if active=='log'>active</#if>"><a href="${url.logUrl}">${msg("log")}</a></li></#if>
</ul>
<a href="#" data-target="menu" class="top-nav sidenav-trigger full hide-on-large-only green-text darken-3"><i class="material-icons">menu</i></a>
</header>

<main>
@@ -42,7 +42,7 @@
<form action="${url.totpUrl}" method="post">

<div class="row">
<input type="hidden" id="stateChecker" name="stateChecker" value="${stateChecker?html}">
<input type="hidden" id="stateChecker" name="stateChecker" value="${stateChecker}">

<div class="input-field col s12">
<input type="text" class="form-control" id="totp" name="totp" autocomplete="off" autofocus
@@ -54,12 +54,12 @@

<div class="col s12 center-align">
<button type="submit"
class="btn waves-effect waves-light green darken-1"
class="btn waves-effect waves-light"
name="submitAction" value="Save">${msg("doSave")}
<i class="material-icons right">send</i>
</button>
<button type="submit"
class="btn waves-effect waves-light green darken-1"
class="btn waves-effect waves-light"
name="submitAction" value="Cancel" formnovalidate>${msg("doCancel")}
<i class="material-icons right">cancel</i>
</button>
@@ -89,7 +89,7 @@
<table border="0" cellpadding="30" cellspacing="0" width="100%">
<tr>
<td align="center" valign="top" class="textContent">
<h1 style="color:#FFFFFF;line-height:100%;font-family:Helvetica,Arial,sans-serif;font-size:35px;font-weight:normal;margin-bottom:5px;text-align:center;">${(realmName!'')?html} Password</h1>
<h1 style="color:#FFFFFF;line-height:100%;font-family:Helvetica,Arial,sans-serif;font-size:35px;font-weight:normal;margin-bottom:5px;text-align:center;">${(realmName!'')} Password</h1>
</td>
</tr>
</table>
@@ -116,7 +116,7 @@
<table border="0" cellpadding="0" cellspacing="0" width="420" style="max-width: 100%;">
<tr>
<td align="center" class="textContent">
<div style="text-align:center;font-family:Helvetica,Arial,sans-serif;font-size:15px;margin-bottom:0;color:#5F5F5F;line-height:135%;">Someone just requested to change your ${(realmName!'')?html} account''s credentials. If this was you, click on the link below to reset them.</div>
<div style="text-align:center;font-family:Helvetica,Arial,sans-serif;font-size:15px;margin-bottom:0;color:#5F5F5F;line-height:135%;">Someone just requested to change your ${(realmName!'')} account''s credentials. If this was you, click on the link below to reset them.</div>
</td>
</tr>
</table>
@@ -144,7 +144,7 @@
<table border="0" cellpadding="0" cellspacing="0" width="50%" class="emailButton" style="background-color: #c1d72e;">
<tr>
<td align="center" valign="middle" class="buttonContent" style="padding-top:15px;padding-bottom:15px;padding-right:15px;padding-left:15px;">
<a style="color:#FFFFFF;text-decoration:none;font-family:Helvetica,Arial,sans-serif;font-size:20px;line-height:135%;" href="${(link!'')?html}" target="_blank">Reset password</a>
<a style="color:#FFFFFF;text-decoration:none;font-family:Helvetica,Arial,sans-serif;font-size:20px;line-height:135%;" href="${(link!'')}" target="_blank">Reset password</a>
</td>
</tr>
</table>
@@ -170,7 +170,7 @@
<table border="0" cellpadding="0" cellspacing="0" width="420" style="max-width: 100%;">
<tr>
<td align="center" class="textContent">
<div style="text-align:center;font-family:Helvetica,Arial,sans-serif;font-size:15px;margin-bottom:0;color:#5F5F5F;line-height:135%;">This link will expire within ${(linkExpiration!'')?html} minutes.If you don''t want to reset your credentials, just ignore this message and nothing will be changed.</div>
<div style="text-align:center;font-family:Helvetica,Arial,sans-serif;font-size:15px;margin-bottom:0;color:#5F5F5F;line-height:135%;">This link will expire within ${(linkExpiration!'')} minutes.If you don''t want to reset your credentials, just ignore this message and nothing will be changed.</div>
</td>
</tr>
</table>
@@ -8,13 +8,13 @@
<form id="kc-reset-password-form" action="${url.loginAction}" method="post">
<div class="row">
<div class="input-field col s12">
<input type="text" id="username" name="username" autofocus/>
<input type="text" id="username" name="username" autofocus required class="validate"/>
<label for="username" class="${properties.kcLabelClass!}"><#if !realm.loginWithEmailAllowed>${msg("username")}<#elseif !realm.registrationEmailAsUsername>${msg("usernameOrEmail")}<#else>${msg("email")}</#if></label>
</div>
</div>

<div class="col s12 center-align">
<button class="btn waves-effect waves-light green darken-1" type="submit" name="login">${msg("doSubmit")}
<button class="btn waves-effect waves-light" type="submit" name="login">${msg("doSubmit")}
<i class="material-icons right">send</i>
</button>
</div>
@@ -23,7 +23,7 @@
autocapitalize="off"
required
class="validate"
name="username" value="${(login.username!'')}" type="text" autofocus/>
name="username" value="${(login.username!'')}" type="text"/>
</#if>
<label for="username"><#if !realm.registrationEmailAsUsername>${msg("usernameOrEmail")}<#else>${msg("email")}</#if></label>
</div>
@@ -51,7 +51,7 @@
</div>

<div class="col s12 center-align">
<button class="btn waves-effect waves-light green darken-1" type="submit" name="login">${msg("doLogIn")}
<button class="btn waves-effect waves-light" type="submit" name="login">${msg("doLogIn")}
<i class="material-icons right">send</i>
</button>
</div>
@@ -0,0 +1,3 @@
backToLogin=Back to login
applicationName=OpenRemote
logoUrl=https://openremote.io
@@ -12,26 +12,26 @@
<#if !realm.registrationEmailAsUsername>
<div class="input-field col s12">
<input type="text" id="username" class="validate ${messagesPerField.printIfExists('username','invalid')}" name="username"
value="${(register.formData.username!'')?html}"/>
value="${(register.formData.username!'')}"/>
<label for="username" class="${properties.kcLabelClass!}">${msg("username")}</label>
</div>
</#if>

<div class="input-field col s12">
<input type="text" id="firstName" class="validate ${messagesPerField.printIfExists('firstName','invalid')}" name="firstName"
value="${(register.formData.firstName!'')?html}"/>
value="${(register.formData.firstName!'')}"/>
<label for="firstName" class="${properties.kcLabelClass!}">${msg("firstName")}</label>
</div>

<div class="input-field col s12">
<input type="text" id="lastName" class="validate ${messagesPerField.printIfExists('lastName','invalid')}" name="lastName"
value="${(register.formData.lastName!'')?html}"/>
value="${(register.formData.lastName!'')}"/>
<label for="lastName" class="${properties.kcLabelClass!}">${msg("lastName")}</label>
</div>

<div class="input-field col s12">
<input type="text" id="email" class="validate ${messagesPerField.printIfExists('email','invalid')}" name="email"
value="${(register.formData.email!'')?html}"/>
value="${(register.formData.email!'')}"/>
<label for="email" class="${properties.kcLabelClass!}">${msg("email")}</label>
</div>

@@ -59,7 +59,7 @@
</div>

<div class="col s12 center-align">
<button class="btn waves-effect waves-light green darken-1" type="submit" name="register">${msg("doRegister")}
<button class="btn waves-effect waves-light" type="submit" name="register">${msg("doRegister")}
<i class="material-icons right">send</i>
</button>
</div>
@@ -1,7 +1,15 @@
:root {
--app-primary-color: #43A047;
--app-secondary-color: #C1D72E;
--app-background-color: #FFFFFF;
--input-background-color: #FFFFFF;
}

html, body {
margin: 0;
padding: 0;
height: 100vh;
background-color: var(--app-background-color);
}

#outer-wrapper {
@@ -87,4 +95,24 @@ i.material-icons {

/* Support for IE. */
font-feature-settings: 'liga';
}

.input-field >label {
color: var(--app-primary-color);
}

.input-field > input {
background-color: var(--input-background-color) !important;
border-bottom: 1px solid var(--app-primary-color) !important;
-webkit-box-shadow: 0 1px 0 0 var(--app-primary-color) !important;
box-shadow: 0 1px 0 0 var(--app-primary-color) !important;
}

.btn {
background-color: var(--app-primary-color) !important;
}

[type="checkbox"]:checked + span:not(.lever):before {
border-right: 2px solid var(--app-primary-color) !important;
border-bottom: 2px solid var(--app-primary-color) !important;
}
@@ -2,7 +2,7 @@
<!DOCTYPE html>
<html>
<head>
<title>OpenRemote Login</title>
<title>${msg("applicationName")}</title>

<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
@@ -42,7 +42,7 @@
</a>
<div class="left-align">
<h5 id="header"><#nested "header"></h5><br>
<p id="sub-header">OpenRemote Login</p>
<p id="sub-header">${msg("applicationName")}</p>
</div>
</div>
</div>

0 comments on commit 76914b3

Please sign in to comment.
You can’t perform that action at this time.