Skip to content

Commit

Permalink
feat: simplify and bump to 25.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Mathieu POUSSE committed Oct 7, 2024
1 parent 81bd14f commit a1b98a1
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 225 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.9"

services:
keycloak:
image: quay.io/keycloak/keycloak:23.0.6
image: quay.io/keycloak/keycloak:25.0.6
environment:
KEYCLOAK_ADMIN: admin
KEYCLOAK_ADMIN_PASSWORD: password
Expand Down
153 changes: 0 additions & 153 deletions src/main/resources/theme/cloud-iam-redesign/login/layout-cloud-iam.ftl

This file was deleted.

15 changes: 3 additions & 12 deletions src/main/resources/theme/cloud-iam-redesign/login/login.ftl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#import "layout-cloud-iam.ftl" as layoutCloudIAM>
<@layoutCloudIAM.registrationCloudIamLayout displayMessage=!messagesPerField.existsError('username','password') displayInfo=realm.password && realm.registrationAllowed && !registrationDisabled??; section>
<#import "template.ftl" as layout>
<@layout.registrationLayout displayMessage=!messagesPerField.existsError('username','password') displayInfo=realm.password && realm.registrationAllowed && !registrationDisabled??; section>
<#if section = "header">
${msg("loginAccountTitle")}
<#elseif section = "form">
Expand Down Expand Up @@ -82,15 +82,6 @@
</ul>
</div>
</#if>
<div id="kc-sso-providers" class="${properties.kcFormSocialAccountSectionClass!}">
<hr/>
<br/>
<div id="kc-registration-container">
<div id="kc-registration">
<span><a tabindex="6" href="${url.loginUrl}&sso=true">${msg("signInSSO")}</a></span>
</div>
</div>
</div>
</div>
<#elseif section = "info" >
<#if realm.password && realm.registrationAllowed && !registrationDisabled??>
Expand All @@ -102,4 +93,4 @@
</#if>
</#if>

</@layoutCloudIAM.registrationCloudIamLayout>
</@layout.registrationLayout>
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
doRegister=Sign Up
termsText=<p>Thank you for using Cloud-IAM! We''re happy you''re here.<br/><br/>Please read our <a href="https://www.cloud-iam.com/en/terms" target="_blank">Terms of Service agreement </a> and <a href="https://www.cloud-iam.com/en/data-processing-addendum" target="_blank">Data Policy</a> carefully before accessing or using Cloud-IAM. Because it is such an important contract between us and our users, we have tried to make it as clear as possible. For your convenience, we have presented these terms in a short non-binding summary followed by the full legal terms. <br/> <br/> <b>YOU AGREE THAT BY REGISTERING FOR, ACCESSING OR USING THE SERVICES, YOU ARE ENTERING INTO A LEGALLY BINDING AGREEMENT WITH CLOUD-IAM. IF YOU DO NOT AGREE WITH THESE TERMS, YOU MUST NOT ACCESS OR USE THE SERVICES.</b></p>
termsPlainText=Thank you for using Cloud-IAM! We''re happy you''re here. Please read our Terms of Service agreement and Data processing carefully before accessing or using Cloud-IAM. Because it is such an important contract between us and our users, we have tried to make it as clear as possible. For your convenience, we have presented these terms in a short non-binding summary followed by the full legal terms. YOU AGREE THAT BY REGISTERING FOR, ACCESSING OR USING THE SERVICES, YOU ARE ENTERING INTO A LEGALLY BINDING AGREEMENT WITH CLOUD-IAM. IF YOU DO NOT AGREE WITH THESE TERMS, YOU MUST NOT ACCESS OR USE THE SERVICES.
signInSSO=Sign in with your SSO
organizationName=Organization domain name
invalidOrganizationMessage=Organization is not configured for SSO or does not exist
signInWithAccount=Sign in with your Cloud-IAM account

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#import "layout-cloud-iam.ftl" as layoutCloudIAM>
<@layoutCloudIAM.registrationCloudIamLayout displayMessage=!messagesPerField.existsError('firstName','lastName','email','username','password','password-confirm'); section>
<#import "template.ftl" as layout>
<@layout.registrationLayout displayMessage=!messagesPerField.existsError('firstName','lastName','email','username','password','password-confirm'); section>
<#if section = "header">
${msg("registerTitle")}
<#elseif section = "form">
Expand Down Expand Up @@ -137,4 +137,4 @@
</div>
</form>
</#if>
</@layoutCloudIAM.registrationCloudIamLayout>
</@layout.registrationLayout>
6 changes: 3 additions & 3 deletions src/main/resources/theme/cloud-iam-redesign/login/terms.ftl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#import "layout-cloud-iam.ftl" as layoutCloudIAM>
<@layoutCloudIAM.registrationCloudIamLayout displayMessage=false; section>
<#import "template.ftl" as layout>
<@layout.registrationLayout displayMessage=false; section>
<#if section = "header">
${msg("termsTitle")}
<#elseif section = "form">
Expand All @@ -14,4 +14,4 @@
</form>
<div class="clearfix"></div>
</#if>
</@layoutCloudIAM.registrationCloudIamLayout>
</@layout.registrationLayout>

0 comments on commit a1b98a1

Please sign in to comment.