Details
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/index_mock.html b/admin-ui/src/main/resources/META-INF/resources/admin/index_mock.html
index f0d1113..63945f6 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/index_mock.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/index_mock.html
@@ -69,85 +69,89 @@
<header class="navbar navbar-default navbar-pf navbar-main header">
<nav id="kc-navigation" class="navbar" role="navigation">
<div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-1">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <h1 class="navbar-title"><Strong>KeyCloak</Strong> Central Login</h1>
+ <div class="container">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <h1 class="navbar-title"><Strong>KeyCloak</Strong> Central Login</h1>
+ </div>
</div>
<div class="collapse navbar-collapse navbar-collapse-1">
- <ul class="nav navbar-nav navbar-utility" data-ng-show="auth.loggedIn">
- <li class="dropdown">
- <a data-toggle="dropdown" class="dropdown-toggle" href="#">
- <span class="pficon pficon-user"></span>
- {{auth.user.displayName}}<b class="caret"></b>
- </a>
- <ul class="dropdown-menu">
- <li><a href="/auth/rest/realms/keycloak-admin/account?referrer=admin-console">Manage Account</a></li>
- <li class="separator"><a href="/auth/rest/admin/logout">Sign Out</a></li>
- </ul>
- </li>
- </ul>
- <ul class="nav navbar-nav navbar-primary persistent-secondary" data-ng-controller="RealmDropdownCtrl">
- <li class="dropdown context" data-ng-show="showNav()">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
- Realm: {{current.realm.id}}
- <b class="caret"></b>
- </a>
- <ul class="dropdown-menu">
- <li data-ng-repeat="realm in current.realms">
- <a href="" ng-click="changeRealm(realm.id)" >{{realm.id}}</a>
- </li>
- </ul>
- </li>
-
-
- <!--------------------------------------->
- <li class="active">
- <a href="#">Settings</a>
- <ul class="nav navbar-nav navbar-persistent">
- <li class="active">
- <a href="#">General</a>
- </li>
- <li>
- <a href="#">Roles</a>
- </li>
- <li>
- <a href="#">Default Roles</a>
- </li>
- <li>
- <a href="#">Credentials</a>
- </li>
- <li>
- <a href="#">Token</a>
- </li>
- <li>
- <a href="#">Keys</a>
- </li>
- <li>
- <a href="#">Email</a>
- </li>
- </ul>
- </li>
- <li>
- <a href="#">User</a>
- </li>
- <li>
- <a href="#">Applications</a>
- </li>
- <li>
- <a href="#">OAuth Clients</a>
- </li>
- <!--------------------------------------->
-
-
- <li class="active pull-right" data-ng-show="auth.loggedIn">
- <a class="button primary" href="#/create/realm" data-ng-class="path[0] == 'create' && path[1] == 'realm' && 'active'"
- data-ng-show="auth.loggedIn">Add Realm</a>
- </li>
- </ul>
+ <div class="container">
+ <ul class="nav navbar-nav navbar-utility" data-ng-show="auth.loggedIn">
+ <li class="dropdown">
+ <a data-toggle="dropdown" class="dropdown-toggle" href="#">
+ <span class="pficon pficon-user"></span>
+ {{auth.user.displayName}}<b class="caret"></b>
+ </a>
+ <ul class="dropdown-menu">
+ <li><a href="/auth/rest/realms/keycloak-admin/account?referrer=admin-console">Manage Account</a></li>
+ <li class="separator"><a href="/auth/rest/admin/logout">Sign Out</a></li>
+ </ul>
+ </li>
+ </ul>
+ <ul class="nav navbar-nav navbar-primary persistent-secondary" data-ng-controller="RealmDropdownCtrl">
+ <li class="dropdown context" data-ng-show="showNav()">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+ Realm: {{current.realm.id}}
+ <b class="caret"></b>
+ </a>
+ <ul class="dropdown-menu">
+ <li data-ng-repeat="realm in current.realms">
+ <a href="" ng-click="changeRealm(realm.id)" >{{realm.id}}</a>
+ </li>
+ </ul>
+ </li>
+
+
+ <!--------------------------------------->
+ <li class="active">
+ <a href="#">Settings</a>
+ <ul class="nav navbar-nav navbar-persistent">
+ <li class="active">
+ <a href="#">General</a>
+ </li>
+ <li>
+ <a href="#">Roles</a>
+ </li>
+ <li>
+ <a href="#">Default Roles</a>
+ </li>
+ <li>
+ <a href="#">Credentials</a>
+ </li>
+ <li>
+ <a href="#">Token</a>
+ </li>
+ <li>
+ <a href="#">Keys</a>
+ </li>
+ <li>
+ <a href="#">Email</a>
+ </li>
+ </ul>
+ </li>
+ <li>
+ <a href="#">User</a>
+ </li>
+ <li>
+ <a href="#">Applications</a>
+ </li>
+ <li>
+ <a href="#">OAuth Clients</a>
+ </li>
+ <!--------------------------------------->
+
+
+ <li class="active pull-right" data-ng-show="auth.loggedIn">
+ <a class="button primary" href="#/create/realm" data-ng-class="path[0] == 'create' && path[1] == 'realm' && 'active'"
+ data-ng-show="auth.loggedIn">Add Realm</a>
+ </li>
+ </ul>
+ </div>
</div>
</nav>
</header>
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html
index b3ff785..14dcd45 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html
@@ -1,43 +1,47 @@
<nav id="kc-navigation" class="navbar" role="navigation">
<div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-1">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <h1 class="navbar-title">Keycloak</h1>
+ <div class="container">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <h1 class="navbar-title">Keycloak</h1>
+ </div>
</div>
<div class="collapse navbar-collapse navbar-collapse-1">
- <ul class="nav navbar-nav navbar-utility" data-ng-show="auth.loggedIn">
- <li class="dropdown">
- <a data-toggle="dropdown" class="dropdown-toggle" href="#">
- <span class="pficon pficon-user"></span>
- {{auth.user.displayName}}<b class="caret"></b>
- </a>
- <ul class="dropdown-menu">
- <li><a href="/auth/rest/realms/{{auth.user.realm}}/account?referrer=admin-console">Manage Account</a></li>
- <li class="separator"><a href="/auth/rest/admin/logout">Sign Out</a></li>
- </ul>
- </li>
- </ul>
- <ul class="nav navbar-nav navbar-primary persistent-secondary" data-ng-controller="RealmDropdownCtrl">
- <li class="dropdown context" data-ng-show="showNav()">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
- {{current.realm.realm}}
- <b class="caret"></b>
- </a>
- <ul class="dropdown-menu">
- <li data-ng-repeat="realm in current.realms">
- <a href="" ng-click="changeRealm(realm.realm)">{{realm.realm}}</a>
- </li>
- </ul>
- </li>
- <li class="active pull-right" data-ng-show="auth.loggedIn && access.createRealm">
- <a class="button primary" href="#/create/realm" data-ng-class="path[0] == 'create' && path[1] == 'realm' && 'active'"
- data-ng-show="auth.loggedIn">Add Realm</a>
- </li>
- </ul>
+ <div class="container">
+ <ul class="nav navbar-nav navbar-utility" data-ng-show="auth.loggedIn">
+ <li class="dropdown">
+ <a data-toggle="dropdown" class="dropdown-toggle" href="#">
+ <span class="pficon pficon-user"></span>
+ {{auth.user.displayName}}<b class="caret"></b>
+ </a>
+ <ul class="dropdown-menu">
+ <li><a href="/auth/rest/realms/{{auth.user.realm}}/account?referrer=admin-console">Manage Account</a></li>
+ <li class="separator"><a href="/auth/rest/admin/logout">Sign Out</a></li>
+ </ul>
+ </li>
+ </ul>
+ <ul class="nav navbar-nav navbar-primary persistent-secondary" data-ng-controller="RealmDropdownCtrl">
+ <li class="dropdown context" data-ng-show="showNav()">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+ {{current.realm.realm}}
+ <b class="caret"></b>
+ </a>
+ <ul class="dropdown-menu">
+ <li data-ng-repeat="realm in current.realms">
+ <a href="" ng-click="changeRealm(realm.realm)">{{realm.realm}}</a>
+ </li>
+ </ul>
+ </li>
+ <li class="active pull-right" data-ng-show="auth.loggedIn && access.createRealm">
+ <a class="button primary" href="#/create/realm" data-ng-class="path[0] == 'create' && path[1] == 'realm' && 'active'"
+ data-ng-show="auth.loggedIn">Add Realm</a>
+ </li>
+ </ul>
+ </div>
</div>
</nav>
<!-- TODO remove once this page is properly styled -->
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
index 844720d..db4d184 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
@@ -2,12 +2,16 @@ body {
background-color: #F9F9F9;
}
+.header .container {
+ position: relative;
+}
+
.navbar-title {
background-image: url('../img/logo.png');
height: 25px;
background-repeat: no-repeat;
width: 103px;
- margin: 3px 20px 5px;
+ margin: 3px 10px 5px;
text-indent: -99999px;
}
@@ -39,6 +43,11 @@ body {
border-top-color: rgba(255,255,255,0.05);
}
+.navbar-nav > li > .dropdown-menu {
+ left: 15px;
+ margin-top: 1px;
+}
+
.navbar-pf .navbar-primary li.dropdown.context > a {
padding-right: 12px;
}
@@ -64,15 +73,20 @@ body {
background-repeat: repeat-x;
}
+.navbar-pf .navbar-utility {
+ right: 15px;
+ top: -34px;
+}
+
.navbar-pf .navbar-utility li.dropdown > .dropdown-toggle {
border-left: none;
padding-top: 11px;
- padding-bottom: 11px;
+ padding-bottom: 12px;
color: #fff !important;
}
.navbar-pf .navbar-utility li.dropdown > .dropdown-toggle .pficon-user {
- top: 10px;
+ top: 11px;
}
.navbar-pf .navbar-utility > li > a:hover,
diff --git a/forms/common-themes/src/main/resources/theme/account/base/template.ftl b/forms/common-themes/src/main/resources/theme/account/base/template.ftl
index 56941ff..e749c0f 100644
--- a/forms/common-themes/src/main/resources/theme/account/base/template.ftl
+++ b/forms/common-themes/src/main/resources/theme/account/base/template.ftl
@@ -21,17 +21,19 @@
<header class="navbar navbar-default navbar-pf navbar-main header">
<div>
<nav class="navbar" role="navigation">
- <div class="navbar-header">
- <div class="navbar-title">
- </div>
- </div>
+ <div class="container">
+ <div class="navbar-header">
+ <div class="navbar-title">
+ </div>
+ </div>
- <div class="navbar-collapse">
- <ul class="nav navbar-nav navbar-utility">
- <#if referrer?has_content && referrer.baseUrl?has_content><li><a href="${referrer.baseUrl}">Back to ${referrer.name}</a></li></#if>
- <li><a href="${url.logoutUrl}">Sign Out</a></li>
- </ul>
- </div>
+ <div class="navbar-collapse">
+ <ul class="nav navbar-nav navbar-utility">
+ <#if referrer?has_content && referrer.baseUrl?has_content><li><a href="${referrer.baseUrl}">Back to ${referrer.name}</a></li></#if>
+ <li><a href="${url.logoutUrl}">Sign Out</a></li>
+ </ul>
+ </div>
+ </div>
</nav>
</div>
</header>
