diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/services.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/services.js index 0398bfa63c..5e9fefda63 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/services.js +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/services.js @@ -884,21 +884,22 @@ module.factory('ClientOrigins', function($resource) { }); module.factory('Current', function(Realm, $route, $rootScope) { - var current = {}; - - current.realms = {}; - current.realm = null; + var current = { + realms: {}, + realm: null + }; $rootScope.$on('$routeChangeStart', function() { - current.realm = null; current.realms = Realm.query(null, function(realms) { + var currentRealm = null; if ($route.current.params.realm) { for (var i = 0; i < realms.length; i++) { if (realms[i].realm == $route.current.params.realm) { - current.realm = realms[i]; + currentRealm = realms[i]; } } } + current.realm = currentRealm; }); }); diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/menu.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/menu.html index 8c59d131c3..c85e83e7ba 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/menu.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/menu.html @@ -22,34 +22,4 @@ - - \ No newline at end of file diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-create.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-create.html index a8cad68154..687ea8e14f 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-create.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-create.html @@ -1,4 +1,4 @@ -
+

Add Realm

@@ -49,3 +49,5 @@
+ + \ No newline at end of file diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-list.html index b0df8f3a2b..da0a1fb4f1 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-list.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-list.html @@ -1,4 +1,5 @@ -
+
+

Realms

@@ -13,4 +14,7 @@
-
\ No newline at end of file +
+ + + \ No newline at end of file diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-menu.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-menu.html index a9316470b2..6d937a4bbe 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-menu.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-menu.html @@ -1,5 +1,22 @@ -
-
+
+ +
+

{{current.realm.realm|capitalize}}

+

Select realm

+
+ + +
+ Add Realm +
+
+
+ +

Configure

-
+

Manage

-
- -
-
\ No newline at end of file diff --git a/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/styles.css b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/styles.css index 215c734083..040712bd2c 100644 --- a/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/styles.css +++ b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/css/styles.css @@ -2,12 +2,14 @@ html,body { height: 100%; } +/** .navbar-pf .navbar-brand { background: url('../img/brand.svg') no-repeat 0px 5px; display: block; height: 25px; width: 200px; } +**/ form { margin-top: 20px; @@ -151,4 +153,139 @@ table { .select2-container-multi .select2-choices .select2-search-field { height: 26px; -} \ No newline at end of file +} + + +/*********** 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; +} + +.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; +background-repeat: no-repeat; + 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; +} + diff --git a/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/keyclok-logo.svg b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/keyclok-logo.svg new file mode 100644 index 0000000000..e253b15061 --- /dev/null +++ b/forms/common-themes/src/main/resources/theme/keycloak/admin/resources/img/keyclok-logo.svg @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/forms/common-themes/src/main/resources/theme/keycloak/admin/theme.properties b/forms/common-themes/src/main/resources/theme/keycloak/admin/theme.properties index cf44cbf8ba..f85279f861 100644 --- a/forms/common-themes/src/main/resources/theme/keycloak/admin/theme.properties +++ b/forms/common-themes/src/main/resources/theme/keycloak/admin/theme.properties @@ -1,3 +1,3 @@ parent=base import=common/keycloak -styles=css/styles.css lib/patternfly/css/patternfly.css lib/select2-3.4.1/select2.css css/styles.css \ No newline at end of file +styles=lib/patternfly/css/patternfly.css lib/select2-3.4.1/select2.css css/styles.css \ No newline at end of file