From 6ac5a2a17ed00bfd36ad103f56f3797547157fcf Mon Sep 17 00:00:00 2001 From: Stan Silvert Date: Fri, 31 Jan 2020 06:16:52 -0500 Subject: [PATCH] [KEYCLOAK-12744] rh-sso-preview theme for product build * change logo for RH-SSO * Small fixes to rh-sso-preview theme * rh-sso-preview theme Co-authored-by: Erik Jan de Wit --- .../admin/info/ServerInfoAdminResource.java | 1 + .../account/messages/messages_en.properties | 4 + .../account/resources/public/favicon.ico | Bin 0 -> 4427 bytes .../account/resources/public/layout.css | 3 + .../account/resources/public/logo.svg | 101 ++++++++++++++++++ .../rh-sso-preview/account/theme.properties | 1 + .../theme/keycloak-preview/account/index.ftl | 36 ++++--- .../account/resources/app/App.tsx | 12 +-- .../{app/assets/img => public}/favicon.ico | Bin .../account/resources/public/layout.css | 3 + .../account/resources/public/logo.svg | 1 + 11 files changed, 138 insertions(+), 24 deletions(-) create mode 100644 themes/src/main/resources-product/theme/rh-sso-preview/account/messages/messages_en.properties create mode 100644 themes/src/main/resources-product/theme/rh-sso-preview/account/resources/public/favicon.ico create mode 100644 themes/src/main/resources-product/theme/rh-sso-preview/account/resources/public/layout.css create mode 100644 themes/src/main/resources-product/theme/rh-sso-preview/account/resources/public/logo.svg create mode 100644 themes/src/main/resources-product/theme/rh-sso-preview/account/theme.properties rename themes/src/main/resources/theme/keycloak-preview/account/resources/{app/assets/img => public}/favicon.ico (100%) create mode 100644 themes/src/main/resources/theme/keycloak-preview/account/resources/public/layout.css create mode 100644 themes/src/main/resources/theme/keycloak-preview/account/resources/public/logo.svg 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 0000000000000000000000000000000000000000..11c5cd26196c0bb5ad2c06c13e15449f7cc500bf GIT binary patch literal 4427 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@
- Keycloak Logo + Logo
@@ -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