diff --git a/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java index 3b9cd3b532..808358d99a 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java @@ -173,6 +173,7 @@ public class ServerInfoAdminResource { if (!Profile.isFeatureEnabled(Profile.Feature.ACCOUNT2)) { themeNames.remove("keycloak-preview"); + themeNames.remove("rh-sso-preview"); } List themes = new LinkedList<>(); diff --git a/themes/src/main/resources-product/theme/rh-sso-preview/account/messages/messages_en.properties b/themes/src/main/resources-product/theme/rh-sso-preview/account/messages/messages_en.properties new file mode 100644 index 0000000000..8bffc28d8f --- /dev/null +++ b/themes/src/main/resources-product/theme/rh-sso-preview/account/messages/messages_en.properties @@ -0,0 +1,4 @@ +# Put new messages for Account Console Here +# Feel free to use any existing messages from the base theme +accountManagementWelcomeMessage=Welcome to RH-SSO Account Management +accountManagementTitle=RH-SSO Account Management \ No newline at end of file diff --git a/themes/src/main/resources-product/theme/rh-sso-preview/account/resources/public/favicon.ico b/themes/src/main/resources-product/theme/rh-sso-preview/account/resources/public/favicon.ico new file mode 100644 index 0000000000..11c5cd2619 Binary files /dev/null and b/themes/src/main/resources-product/theme/rh-sso-preview/account/resources/public/favicon.ico differ diff --git a/themes/src/main/resources-product/theme/rh-sso-preview/account/resources/public/layout.css b/themes/src/main/resources-product/theme/rh-sso-preview/account/resources/public/layout.css new file mode 100644 index 0000000000..c943e1eb33 --- /dev/null +++ b/themes/src/main/resources-product/theme/rh-sso-preview/account/resources/public/layout.css @@ -0,0 +1,3 @@ +.brand { + height: 16px; +} \ No newline at end of file diff --git a/themes/src/main/resources-product/theme/rh-sso-preview/account/resources/public/logo.svg b/themes/src/main/resources-product/theme/rh-sso-preview/account/resources/public/logo.svg new file mode 100644 index 0000000000..a908d8c006 --- /dev/null +++ b/themes/src/main/resources-product/theme/rh-sso-preview/account/resources/public/logo.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/src/main/resources-product/theme/rh-sso-preview/account/theme.properties b/themes/src/main/resources-product/theme/rh-sso-preview/account/theme.properties new file mode 100644 index 0000000000..77454e17fe --- /dev/null +++ b/themes/src/main/resources-product/theme/rh-sso-preview/account/theme.properties @@ -0,0 +1 @@ +parent=keycloak-preview diff --git a/themes/src/main/resources/theme/keycloak-preview/account/index.ftl b/themes/src/main/resources/theme/keycloak-preview/account/index.ftl index dace7e39e9..9972fed0ee 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/index.ftl +++ b/themes/src/main/resources/theme/keycloak-preview/account/index.ftl @@ -7,7 +7,7 @@ - + - - + + - + <#if properties.developmentMode?has_content && properties.developmentMode == "true"> - + <#if properties.extensions?has_content> <#list properties.extensions?split(' ') as script> <#if properties.developmentMode?has_content && properties.developmentMode == "true"> @@ -76,7 +76,7 @@ - + <#if properties.scripts?has_content> <#list properties.scripts?split(' ') as script> @@ -88,6 +88,8 @@ + + @@ -108,7 +110,7 @@ document.getElementById("landingSignOutButton").style.display='inline'; document.getElementById("landingSignOutLink").style.display='inline'; } - + loadjs("/node_modules/systemjs/dist/system.src.js", function() { loadjs("/systemjs.config.js", function() { System.import('${resourceUrl}/Main.js').catch(function (err) { @@ -125,7 +127,7 @@
- Keycloak Logo + Logo

${msg("loadingMessage")}

@@ -143,7 +145,7 @@
@@ -152,7 +154,7 @@ ${msg("backTo",referrerName)}
- + <#if realm.internationalizationEnabled && supportedLocales?size gt 1>
@@ -174,12 +176,12 @@
- +
- +
@@ -192,7 +194,7 @@ ${msg("backTo",referrerName)} - + <#if realm.internationalizationEnabled && supportedLocales?size gt 1> @@ -216,7 +218,7 @@
- +
@@ -285,7 +287,7 @@ document.getElementById("landingLinkedAccountsLink").style.display='block'; }; - // Hidden until feature is complete. + // Hidden until feature is complete. //if (features.isMyResourcesEnabled) { // document.getElementById("landingMyResourcesCard").style.display='block'; //}; diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/App.tsx b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/App.tsx index 7c0b887e4b..7d5c9a1b5d 100644 --- a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/App.tsx +++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/App.tsx @@ -1,4 +1,4 @@ -/* +/* * Copyright 2018 Red Hat, Inc. and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -40,7 +40,7 @@ declare const locale: string; declare const resourceUrl: string; const pFlyImages = resourceUrl + '/node_modules/@patternfly/patternfly/assets/images/'; -const brandImg = resourceUrl + '/app/assets/img/keycloak-logo-min.png'; +const brandImg = resourceUrl + '/public/logo.svg'; const avatarImg = pFlyImages + 'img_avatar.svg'; export interface AppProps {}; @@ -65,7 +65,7 @@ export class App extends React.Component { const Header = ( } + logo={} toolbar={} avatar={} showNavToggle @@ -73,11 +73,9 @@ export class App extends React.Component { ); const Sidebar = } />; - - const fullHeight = { height: '100%'}; - + return ( - + {makeRoutes()} diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/assets/img/favicon.ico b/themes/src/main/resources/theme/keycloak-preview/account/resources/public/favicon.ico similarity index 100% rename from themes/src/main/resources/theme/keycloak-preview/account/resources/app/assets/img/favicon.ico rename to themes/src/main/resources/theme/keycloak-preview/account/resources/public/favicon.ico diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/public/layout.css b/themes/src/main/resources/theme/keycloak-preview/account/resources/public/layout.css new file mode 100644 index 0000000000..42ce078bd1 --- /dev/null +++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/public/layout.css @@ -0,0 +1,3 @@ +.brand { + height: 35px; +} \ No newline at end of file diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/public/logo.svg b/themes/src/main/resources/theme/keycloak-preview/account/resources/public/logo.svg new file mode 100644 index 0000000000..17edc2c06a --- /dev/null +++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/public/logo.svg @@ -0,0 +1 @@ +keycloak_deliverables \ No newline at end of file