Details
diff --git a/forms/common-themes/src/main/resources/theme/base/account/messages/messages_de.properties b/forms/common-themes/src/main/resources/theme/base/account/messages/messages_de.properties
index ad3f459..f977bf7 100644
--- a/forms/common-themes/src/main/resources/theme/base/account/messages/messages_de.properties
+++ b/forms/common-themes/src/main/resources/theme/base/account/messages/messages_de.properties
@@ -10,7 +10,7 @@ federatedIdentitiesHtmlTitle=Federated Identities
accountLogHtmlTitle=Benutzerkonto Log
changePasswordHtmlTitle=Passwort \u00C4ndern
sessionsHtmlTitle=Sessions
-accountManagementTitle=Keycloak Benutzerkontoverwaltung
+accountManagementTitle=IAM Benutzerkontoverwaltung
authenticatorTitle=Authenticator
authenticatorCode=One-time code
@@ -125,4 +125,4 @@ invalidPasswordHistoryMessage=Ung\u00FCltiges Passwort: darf nicht gleich einem
locale_de=Deutsch
locale_en=English
locale_it=Italian
-locale_pt-BR=Portugu\u00EAs (Brasil)
\ No newline at end of file
+locale_pt-BR=Portugu\u00EAs (Brasil)
diff --git a/forms/common-themes/src/main/resources/theme/base/account/messages/messages_en.properties b/forms/common-themes/src/main/resources/theme/base/account/messages/messages_en.properties
index 2c3b8c7..faab6b4 100755
--- a/forms/common-themes/src/main/resources/theme/base/account/messages/messages_en.properties
+++ b/forms/common-themes/src/main/resources/theme/base/account/messages/messages_en.properties
@@ -10,7 +10,7 @@ federatedIdentitiesHtmlTitle=Federated Identities
accountLogHtmlTitle=Account Log
changePasswordHtmlTitle=Change Password
sessionsHtmlTitle=Sessions
-accountManagementTitle=Keycloak Account Management
+accountManagementTitle=IAM Account Management
authenticatorTitle=Authenticator
applicationsHtmlTitle=Applications
@@ -146,4 +146,4 @@ invalidPasswordHistoryMessage=Invalid password: must not be equal to any of last
locale_de=German
locale_en=English
locale_it=Italian
-locale_pt-BR=Portugu\u00EAs (Brasil)
\ No newline at end of file
+locale_pt-BR=Portugu\u00EAs (Brasil)
diff --git a/forms/common-themes/src/main/resources/theme/base/account/messages/messages_it.properties b/forms/common-themes/src/main/resources/theme/base/account/messages/messages_it.properties
index 99eff0c..312fde7 100755
--- a/forms/common-themes/src/main/resources/theme/base/account/messages/messages_it.properties
+++ b/forms/common-themes/src/main/resources/theme/base/account/messages/messages_it.properties
@@ -10,7 +10,7 @@ federatedIdentitiesHtmlTitle=Federated Identities
accountLogHtmlTitle=Account Log
changePasswordHtmlTitle=Cambia Password
sessionsHtmlTitle=Sessioni
-accountManagementTitle=Keycloak Account Management
+accountManagementTitle=IAM Account Management
authenticatorTitle=Authenticator
authenticatorCode=Codice One-time
@@ -124,4 +124,4 @@ invalidPasswordHistoryMessage=Password non valida: non deve ssere uguale ad una
locale_de=German
locale_en=English
locale_it=Italian
-locale_pt-BR=Portugu\u00EAs (Brasil)
\ No newline at end of file
+locale_pt-BR=Portugu\u00EAs (Brasil)
diff --git a/forms/common-themes/src/main/resources/theme/base/account/template.ftl b/forms/common-themes/src/main/resources/theme/base/account/template.ftl
index dfd2b29..ab4a25e 100644
--- a/forms/common-themes/src/main/resources/theme/base/account/template.ftl
+++ b/forms/common-themes/src/main/resources/theme/base/account/template.ftl
@@ -4,7 +4,21 @@
<head>
<meta charset="utf-8">
<title>${msg("accountManagementTitle")}</title>
- <link rel="icon" href="${url.resourcesPath}/img/favicon.ico">
+ <link rel="icon" href="${url.resourcesPath}/lib/rcue/img/favicon.ico">
+ <!-- iPad retina icon -->
+ <link rel="apple-touch-icon-precomposed" sizes="152x152" href="${url.resourcesPath}/lib/rcue/img/apple-touch-icon-precomposed-152.png">
+ <!-- iPad retina icon (iOS < 7) -->
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="${url.resourcesPath}/lib/rcue/img/apple-touch-icon-precomposed-144.png">
+ <!-- iPad non-retina icon -->
+ <link rel="apple-touch-icon-precomposed" sizes="76x76" href="${url.resourcesPath}/lib/rcue/img/apple-touch-icon-precomposed-76.png">
+ <!-- iPad non-retina icon (iOS < 7) -->
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="${url.resourcesPath}/lib/rcue/img/apple-touch-icon-precomposed-72.png">
+ <!-- iPhone 6 Plus icon -->
+ <link rel="apple-touch-icon-precomposed" sizes="120x120" href="${url.resourcesPath}/lib/rcue/img/apple-touch-icon-precomposed-180.png">
+ <!-- iPhone retina icon (iOS < 7) -->
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="${url.resourcesPath}/lib/rcue/img/apple-touch-icon-precomposed-114.png">
+ <!-- iPhone non-retina icon (iOS < 7) -->
+ <link rel="apple-touch-icon-precomposed" sizes="57x57" href="${url.resourcesPath}/lib/rcue/img/apple-touch-icon-precomposed-57.png">
<#if properties.styles?has_content>
<#list properties.styles?split(' ') as style>
<link href="${url.resourcesPath}/${style}" rel="stylesheet" />
@@ -17,36 +31,61 @@
</#if>
</head>
<body class="admin-console user ${bodyClass}">
-
- <header class="navbar navbar-default navbar-pf navbar-main header">
- <nav class="navbar" role="navigation">
+ <nav class="navbar navbar-default navbar-pf" role="navigation">
<div class="navbar-header">
- <div class="container">
- <h1 class="navbar-title">Keycloak</h1>
- </div>
+ <#if referrer?has_content && referrer.url?has_content>
+ <a class="navbar-brand" href="${referrer.url}">
+ <#else>
+ <a class="navbar-brand" href="#">
+ </#if>
+ <span>RED HAT® JBOSS® IDENTITY AND ACCESS MANAGEMENT</span>
+ <!-- <img src="${url.resourcesPath}/img/brand.svg" alt="Red Hat® JBoss® Identity and Access Management" />-->
+ </a>
</div>
- <div class="navbar-collapse navbar-collapse-1">
- <div class="container">
- <ul class="nav navbar-nav navbar-utility">
- <#if realm.internationalizationEnabled>
- <li>
- <div class="kc-dropdown" id="kc-locale-dropdown">
- <a href="#" id="kc-current-locale-link">${locale.current}</a>
- <ul>
- <#list locale.supported as l>
- <li class="kc-dropdown-item"><a href="${l.url}">${l.label}</a></li>
- </#list>
- </ul>
- </div>
- <li>
+ <div class="collapse navbar-collapse navbar-collapse-1">
+ <ul class="nav navbar-nav navbar-utility">
+ <#if realm.internationalizationEnabled>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">${locale.current}</a>
+ <ul class="dropdown-menu">
+ <#list locale.supported as l>
+ <li><a href="${l.url}">${l.label}</a></li>
+ </#list>
+ </ul>
+ </li>
+ </#if>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+ <span class="pficon pficon-user"></span>
+ <#if account.firstName?has_content || account.lastName?has_content>
+ <#if account.firstName?has_content && account.lastName?has_content>
+ ${(account.firstName + " " + account.lastName)?capitalize?html}
+ <#elseif account.firstName?has_content>
+ ${account.firstName?capitalize?html}
+ <#else>
+ ${account.lastName?capitalize?html}
</#if>
- <#if referrer?has_content && referrer.url?has_content><li><a href="${referrer.url}" id="referrer">${msg("backTo",referrer.name)}</a></li></#if>
- <li><a href="${url.logoutUrl}">${msg("doSignOut")}</a></li>
- </ul>
- </div>
+ <#else>
+ ${(account.userName!'')?capitalize?html}
+ </#if>
+ <b class="caret"></b>
+ </a>
+ <ul class="dropdown-menu">
+ <li><a href="${url.logoutUrl}">${msg("doSignOut")}</a></li>
+ </ul>
+ </li>
+ </ul>
+ <ul class="nav navbar-nav navbar-primary">
+ <li>
+ <#if referrer?has_content && referrer.url?has_content>
+ <a href="${referrer.url}">Home</a>
+ <#else>
+ <a href="#">Home</a>
+ </#if>
+ </li>
+ </ul>
</div>
</nav>
- </header>
<div class="container">
<div class="bs-sidebar col-sm-3 ng-scope">
@@ -76,4 +115,4 @@
</body>
</html>
-</#macro>
\ No newline at end of file
+</#macro>
diff --git a/forms/common-themes/src/main/resources/theme/keycloak/account/resources/css/account.css b/forms/common-themes/src/main/resources/theme/keycloak/account/resources/css/account.css
index a18d0f2..df7e61a 100644
--- a/forms/common-themes/src/main/resources/theme/keycloak/account/resources/css/account.css
+++ b/forms/common-themes/src/main/resources/theme/keycloak/account/resources/css/account.css
@@ -9,35 +9,10 @@ body {
height: 100%;
}
-header .navbar {
- margin-bottom: 0;
- min-height: inherit;
-}
-
-.header .container {
- position: relative;
-}
-
-.navbar-title {
- background-image: url('../img/logo.png');
- height: 25px;
- background-repeat: no-repeat;
- width: 103px;
- margin: 3px 10px 5px;
- text-indent: -99999px;
-}
-
-.navbar-pf .navbar-utility {
- right: 20px;
- top: -34px;
- font-size: 12px;
-}
-
-.navbar-pf .navbar-utility > li > a {
- color: #fff !important;
- padding-bottom: 12px;
- padding-top: 11px;
- border-left: medium none;
+.navbar-brand span{
+ font-size: 10pt !important;
+ font-weight: bold;
+ color: #ffffff !important;
}
.container {
@@ -271,4 +246,4 @@ hr + .form-horizontal {
}
.kc-dropdown:hover ul{
display:block;
-}
\ No newline at end of file
+}
diff --git a/forms/common-themes/src/main/resources/theme/keycloak/account/theme.properties b/forms/common-themes/src/main/resources/theme/keycloak/account/theme.properties
index 69a79ec..1b86c62 100644
--- a/forms/common-themes/src/main/resources/theme/keycloak/account/theme.properties
+++ b/forms/common-themes/src/main/resources/theme/keycloak/account/theme.properties
@@ -1,7 +1,8 @@
parent=base
import=common/keycloak
-styles=lib/patternfly/css/patternfly.css css/account.css
+styles=lib/rcue/css/rcue.min.css lib/rcue/css/rcue-additions.min.css css/account.css
+scripts=lib/components/patternfly/components/jquery/dist/jquery.min.js lib/components/patternfly/components/bootstrap/dist/js/bootstrap.min.js lib/components/datatables/media/js/jquery.dataTables.js lib/components/patternfly/dist/js/patternfly.min.js
##### css classes for form buttons
# main class used for all buttons
