Skip to content

Commit

Permalink
Merge branch 'KEYCLOAK-1426' of https://github.com/andresgalante/keyc…
Browse files Browse the repository at this point in the history 
…loak
  • Loading branch information
@stianst
stianst committed Jul 14, 2015
2 parents d6f1d1b + 2713af1 commit 5a213fc
Show file tree
Hide file tree
Showing 4 changed files with 370 additions and 10 deletions.
4 changes: 4 additions & 0 deletions forms/common-themes/src/main/resources/theme/base/admin/resources/partials/menu.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
</li>
</ul>

<!--
<ul class="nav navbar-nav navbar-primary" data-ng-controller="RealmDropdownCtrl">
<li class="dropdown" data-ng-show="current.realm.realm">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
Expand Down Expand Up @@ -52,4 +54,6 @@
data-ng-show="auth.user">Add Realm</a>
</li>
</ul>
-->
</div>
45 changes: 36 additions & 9 deletions forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-menu.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,31 @@
<div kc-sidebar-resize class="col-sm-3 col-md-2 col-sm-pull-9 col-md-pull-10 sidebar-pf sidebar-pf-left">



<div class="realm-selector">
<h2>
Social Realm
<i class="fa fa-angle-down"></i>
</h2>
<div class="realm-dropmenu">
<!-- if it has more than 5 it generates a scroll bar -->
<ul>
<li><a href="#">Name of the Realm</a></li>
<li><a href="#">Name of the Realm</a></li>
<li><a href="#">Name of the Realm</a></li>
<li><a href="#">Name of the Realm</a></li>
<li><a href="#">Name of the Realm</a></li>
<li><a href="#">Name of the Realm</a></li>
<li><a href="#">Name of the Realm</a></li>
<li><a href="#">Name of the Realm</a></li>
</ul>
<div class="realm-add">
<a href="#" class="btn btn-sm btn-block btn-primary">Add Realm</a>
</div>
</div> <!-- class="realm-dropmenu-->
</div> <!-- realm-selector -->


<div class="nav-category">
<h2>Configure</h2>
<ul class="nav nav-pills nav-stacked">
Expand All @@ -10,22 +37,22 @@ <h2>Configure</h2>
|| path[2] == 'cache-settings'
|| path[2] == 'defense'
|| path[2] == 'keys-settings' || path[2] == 'smtp-settings' || path[2] == 'ldap-settings' || path[2] == 'auth-settings') && path[3] != 'clients') && 'active'">
<a href="#/realms/{{realm.realm}}">Settings</a>
<a href="#/realms/{{realm.realm}}"><span class="pficon pficon-settings"></span> Settings</a>
</li>
<li data-ng-show="access.viewClients" data-ng-class="(path[2] == 'clients' || path[1] == 'client' || path[3] == 'clients') && 'active'"><a href="#/realms/{{realm.realm}}/clients">Clients</a></li>
<li data-ng-show="access.viewRealm" data-ng-class="(path[2] == 'roles' || path[2] == 'default-roles' || (path[1] == 'role' && path[3] != 'clients')) && 'active'"><a href="#/realms/{{realm.realm}}/roles">Roles</a></li>
<li data-ng-show="access.viewRealm" data-ng-class="(path[2] == 'identity-provider-settings' || path[2] == 'identity-provider-mappers') && 'active'"><a href="#/realms/{{realm.realm}}/identity-provider-settings">Identity Providers</a></li>
<li data-ng-show="access.viewRealm" data-ng-class="(path[1] == 'user-federation' || path[2] == 'user-federation') && 'active'"><a href="#/realms/{{realm.realm}}/user-federation">User Federation</a></li>
<li data-ng-show="access.viewRealm" data-ng-class="(path[1] == 'authentication' || path[2] == 'authentication') && 'active'"><a href="#/realms/{{realm.realm}}/authentication/flows">Authentication</a></li>
<li data-ng-show="access.viewClients" data-ng-class="(path[2] == 'clients' || path[1] == 'client' || path[3] == 'clients') && 'active'"><a href="#/realms/{{realm.realm}}/clients"><span class="pficon pficon-user"></span> Clients</a></li>
<li data-ng-show="access.viewRealm" data-ng-class="(path[2] == 'roles' || path[2] == 'default-roles' || (path[1] == 'role' && path[3] != 'clients')) && 'active'"><a href="#/realms/{{realm.realm}}/roles"><i class="fa fa-sitemap"></i> Roles</a></li>
<li data-ng-show="access.viewRealm" data-ng-class="(path[2] == 'identity-provider-settings' || path[2] == 'identity-provider-mappers') && 'active'"><a href="#/realms/{{realm.realm}}/identity-provider-settings"><i class="fa fa-exchange"></i> Identity Providers</a></li>
<li data-ng-show="access.viewRealm" data-ng-class="(path[1] == 'user-federation' || path[2] == 'user-federation') && 'active'"><a href="#/realms/{{realm.realm}}/user-federation"><i class="fa fa-file-text-o"></i> User Federation</a></li>
<li data-ng-show="access.viewRealm" data-ng-class="(path[1] == 'authentication' || path[2] == 'authentication') && 'active'"><a href="#/realms/{{realm.realm}}/authentication/flows"><i class="fa fa-barcode"></i> Authentication</a></li>
</ul>
</div>

<div class="nav-category">
<h2>Manage</h2>
<ul class="nav nav-pills nav-stacked">
<li data-ng-show="access.viewUsers" data-ng-class="(path[2] == 'users' || path[1] == 'user') && 'active'"><a href="#/realms/{{realm.realm}}/users">Users</a></li>
<li data-ng-show="access.viewRealm" data-ng-class="(path[2] == 'sessions') && 'active'"><a href="#/realms/{{realm.realm}}/sessions/realm">Sessions</a></li>
<li data-ng-show="access.viewEvents" data-ng-class="(path[2] == 'events' || path[2] == 'events-settings') && 'active'"><a href="#/realms/{{realm.realm}}/events">Events</a></li>
<li data-ng-show="access.viewUsers" data-ng-class="(path[2] == 'users' || path[1] == 'user') && 'active'"><a href="#/realms/{{realm.realm}}/users"><span class="pficon pficon-users"></span> Users</a></li>
<li data-ng-show="access.viewRealm" data-ng-class="(path[2] == 'sessions') && 'active'"><a href="#/realms/{{realm.realm}}/sessions/realm"><i class="fa fa-cloud"></i> Sessions</a></li>
<li data-ng-show="access.viewEvents" data-ng-class="(path[2] == 'events' || path[2] == 'events-settings') && 'active'"><a href="#/realms/{{realm.realm}}/events"><i class="fa fa-calendar"></i> Events</a></li>
</ul>
</div>

Expand Down
137 changes: 136 additions & 1 deletion forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,139 @@ table {

.select2-container-multi .select2-choices .select2-search-field {
height: 26px;
}
}


/*********** New Menu ***********/


.sidebar-pf-left{
background: #292e34;
}

.sidebar-pf .nav-pills > li a i, .sidebar-pf .nav-pills > li a span{
color: #72767b;
display: inline-block;
margin-right: 10px;
}
.sidebar-pf .nav-pills > li > a{
color: #dbdada;
padding: 0px 20px 0 30px!important;
line-height: 30px;
border-left-width: 12px;
border-left-style: solid;
border-left-color: #292e34;
margin-left: -6px;
}

.sidebar-pf .nav-pills > li > a:hover{
background: #393f44;
border-color:#292e34;
border-left-color: #393f44;
color: #fff;
}

.sidebar-pf .nav-pills > li > a:after{
display: none!important;
}


.sidebar-pf .nav-pills > li.active > a {
color: #fff;
background: #393f44!important;
border-bottom: 1px solid #000!important;
border-top: 1px solid #000!important;
border-left-color: #39a5dc!important;
}

.sidebar-pf .nav-pills > li.active a i, .sidebar-pf .nav-pills > li.active a span{
color: #39a5dc;
}

/*********** Realm selector ***********/

.realm-selector{
color: #fff;
margin: 0 -20px;
position: relative;
}

.realm-dropmenu{
display: none;
cursor: pointer;
position: absolute;
top: 60px;
left: 0;
right: 0;
z-index: 999;
background: #fff;
}

.realm-selector:hover .realm-dropmenu{
display: block;
}

.realm-add{
padding: 10px;
bor
}

.realm-selector h2{
font-size: 16px;
line-height: 60px;
padding: 0 20px;
margin: 0;
border-bottom: 1px solid #d5d5d6;
}

.realm-selector h2 i{
display: inline-block;
float: right;
line-height: 60px;
}


.realm-selector ul{
padding-left: 0;
margin: 0;
list-style: none;
max-height: 200px;
overflow-y:auto;
}


.realm-selector ul li a{
line-height: 60px;
padding: 0 20px;
border-bottom: 1px solid #d5d5d6;
line-height: 39px;
display: block;
font-size: 14px;
}


/*********** Overwrites header defaults ***********/

.navbar-pf{
border-top: none!important;
}

.navbar-brand{
padding: 0!important;
height: 56px!important;
line-height: 56px;
background-position: center center!important;
background-image: url('../img/keyclok-logo.svg')!important;
background-size: 148px 36px !important;
width: 148px!important;
}

.navbar-pf .navbar-utility > li > a{
padding: 22px 30px 23px 40px!important;
}
/* @media (min-width: 768px) */
.navbar-pf .navbar-utility li.dropdown > .dropdown-toggle .pficon-user {
top: 22px;
left:20px;
}

Loading

0 comments on commit 5a213fc

Please sign in to comment.