100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Updated template files in order to work with new Keycloak version
Michael Rademaker62bec47b4bba
diff --git a/ui/keycloak/themes/openremote/account/account.ftl b/ui/keycloak/themes/openremote/account/account.ftlindex 0b21074f6..fc7826e32 100644--- a/ui/keycloak/themes/openremote/account/account.ftl+++ b/ui/keycloak/themes/openremote/account/account.ftl@@ -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,21 +22,21 @@<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>diff --git a/ui/keycloak/themes/openremote/account/applications.ftl b/ui/keycloak/themes/openremote/account/applications.ftlindex 6b91eefe4..dd67a9d96 100644--- a/ui/keycloak/themes/openremote/account/applications.ftl+++ b/ui/keycloak/themes/openremote/account/applications.ftl@@ -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>diff --git a/ui/keycloak/themes/openremote/account/password.ftl b/ui/keycloak/themes/openremote/account/password.ftlindex dd2391d93..66dc0b4ed 100644--- a/ui/keycloak/themes/openremote/account/password.ftl+++ b/ui/keycloak/themes/openremote/account/password.ftl@@ -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>diff --git a/ui/keycloak/themes/openremote/account/sessions.ftl b/ui/keycloak/themes/openremote/account/sessions.ftlindex bea0f8d6e..2b367a991 100644--- a/ui/keycloak/themes/openremote/account/sessions.ftl+++ b/ui/keycloak/themes/openremote/account/sessions.ftl@@ -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>\ No newline at end of filediff --git a/ui/keycloak/themes/openremote/account/totp.ftl b/ui/keycloak/themes/openremote/account/totp.ftlindex d4163329d..141d4b69c 100644--- a/ui/keycloak/themes/openremote/account/totp.ftl+++ b/ui/keycloak/themes/openremote/account/totp.ftl@@ -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" autofocusdiff --git a/ui/keycloak/themes/openremote/email/html/password-reset.ftl b/ui/keycloak/themes/openremote/email/html/password-reset.ftlindex 22d026ecb..f36910c2f 100644--- a/ui/keycloak/themes/openremote/email/html/password-reset.ftl+++ b/ui/keycloak/themes/openremote/email/html/password-reset.ftl@@ -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>diff --git a/ui/keycloak/themes/openremote/login/register.ftl b/ui/keycloak/themes/openremote/login/register.ftlindex 6a1d771a1..b22e59cfc 100644--- a/ui/keycloak/themes/openremote/login/register.ftl+++ b/ui/keycloak/themes/openremote/login/register.ftl@@ -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>