From 29af7a1d297a1ccc3ac3765c5e07e9d0db60c9fd Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Tue, 21 Jul 2015 12:31:05 +0200 Subject: [PATCH 01/13] KEYCLOAK-1427 Added delete realm button to all realm settings tabs --- .../provider/AbstractIdentityProvider.java | 5 ++++ .../admin/resources/js/controllers/realm.js | 24 ++++++++-------- .../admin/resources/partials/brute-force.html | 2 -- .../resources/partials/defense-headers.html | 2 -- .../partials/realm-cache-settings.html | 2 -- .../resources/partials/realm-create.html | 3 -- .../resources/partials/realm-detail.html | 4 --- .../admin/resources/partials/realm-keys.html | 2 -- .../partials/realm-login-settings.html | 2 -- .../admin/resources/partials/realm-smtp.html | 2 -- .../partials/realm-theme-settings.html | 2 -- .../resources/partials/realm-tokens.html | 2 -- .../admin/resources/templates/kc-menu.html | 2 +- .../resources/templates/kc-tabs-realm.html | 28 ++++++++++++------- 14 files changed, 37 insertions(+), 45 deletions(-) diff --git a/broker/core/src/main/java/org/keycloak/broker/provider/AbstractIdentityProvider.java b/broker/core/src/main/java/org/keycloak/broker/provider/AbstractIdentityProvider.java index e402e04706..6da630f557 100755 --- a/broker/core/src/main/java/org/keycloak/broker/provider/AbstractIdentityProvider.java +++ b/broker/core/src/main/java/org/keycloak/broker/provider/AbstractIdentityProvider.java @@ -58,6 +58,11 @@ public abstract class AbstractIdentityProvider return null; } + @Override + public Response performLogin(AuthenticationRequest request) { + return null; + } + @Override public Response keycloakInitiatedBrowserLogout(UserSessionModel userSession, UriInfo uriInfo, RealmModel realm) { return null; diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js index 59a3f8518b..154681d51f 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js @@ -83,7 +83,7 @@ module.controller('GlobalCtrl', function($scope, $http, Auth, WhoAmI, Current, $ get impersonation() { return getAccess('impersonation'); } - } + }; $scope.$watch(function() { return $location.path(); @@ -113,6 +113,18 @@ module.controller('HomeCtrl', function(Realm, Auth, $location) { }); }); +module.controller('RealmTabCtrl', function(Dialog, $scope, Current, Realm, Notifications, $location) { + $scope.removeRealm = function() { + Dialog.confirmDelete(Current.realm.realm, 'realm', function() { + Realm.remove({ id : Current.realm.realm }, function() { + Current.realms = Realm.query(); + Notifications.success("The realm has been deleted."); + $location.url("/"); + }); + }); + }; +}); + module.controller('RealmListCtrl', function($scope, Realm, Current) { $scope.realms = Realm.query(); Current.realms = $scope.realms; @@ -286,16 +298,6 @@ module.controller('RealmDetailCtrl', function($scope, Current, Realm, realm, ser $scope.cancel = function() { window.history.back(); }; - - $scope.remove = function() { - Dialog.confirmDelete($scope.realm.realm, 'realm', function() { - Realm.remove({ id : $scope.realm.realm }, function() { - Current.realms = Realm.query(); - Notifications.success("The realm has been deleted."); - $location.url("/"); - }); - }); - }; }); function genericRealmUpdate($scope, Current, Realm, realm, serverInfo, $http, $location, Dialog, Notifications, url) { diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/brute-force.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/brute-force.html index a4f6db0b87..084e67d5d0 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/brute-force.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/brute-force.html @@ -1,6 +1,4 @@
-

Settings

-
    diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/defense-headers.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/defense-headers.html index d9f3b2c621..61ef8e0633 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/defense-headers.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/defense-headers.html @@ -1,6 +1,4 @@
    -

    Settings

    -
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-cache-settings.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-cache-settings.html index 74febd7625..4b621a1cab 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-cache-settings.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-cache-settings.html @@ -1,6 +1,4 @@
      -

      Settings

      -
      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 c28f12b5a9..0da424e5a7 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,7 +1,4 @@
      - -

      Add Realm

      -
      Import Realm diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-detail.html index 14ea2bc32e..fb71f92003 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-detail.html @@ -1,7 +1,4 @@
      -

      Settings

      -

      Add Realm

      - @@ -29,7 +26,6 @@
      -
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-keys.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-keys.html index 48de4ac5f7..ddda54049e 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-keys.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-keys.html @@ -1,6 +1,4 @@
      -

      Settings

      -
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-login-settings.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-login-settings.html index 10ac3eada5..6117fa8ed0 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-login-settings.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-login-settings.html @@ -1,6 +1,4 @@
      -

      Settings

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-smtp.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-smtp.html index 6e324e5bf6..6c60ecd0b7 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-smtp.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-smtp.html @@ -1,6 +1,4 @@
      -

      Settings

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html index e3fddc20d8..cfc746470c 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html @@ -1,6 +1,4 @@
      -

      Settings

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-tokens.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-tokens.html index 7f4aae9e43..f33f8ca8c6 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-tokens.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-tokens.html @@ -1,6 +1,4 @@
      -

      Settings

      - 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 ed6aa8f8d6..baa3b45d5e 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 @@ -27,7 +27,7 @@ || 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'"> - Settings + Realm Settings
    • Clients
    • Roles
      • diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-realm.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-realm.html index 6cd2f2b278..892570d881 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-realm.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-realm.html @@ -1,10 +1,18 @@ - \ No newline at end of file +
      +

      + {{realm.realm|capitalize}} + +

      +

      Add Realm

      + + +
      \ No newline at end of file From 59f189229c8cb4a1c61e6a9f69cf0a1e9698b0b4 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Tue, 21 Jul 2015 12:43:50 +0200 Subject: [PATCH 02/13] KEYCLOAK-1427 Add remove client button to all client tabs --- .../admin/resources/js/controllers/clients.js | 28 ++++---- .../resources/partials/client-clustering.html | 2 - .../partials/client-credentials.html | 2 - .../resources/partials/client-detail.html | 4 -- .../partials/client-installation.html | 2 - .../admin/resources/partials/client-keys.html | 2 - .../resources/partials/client-mappers.html | 2 - .../resources/partials/client-revocation.html | 2 - .../resources/partials/client-role-list.html | 2 - .../partials/client-scope-mappings.html | 2 - .../resources/partials/client-sessions.html | 2 - .../resources/templates/kc-tabs-client.html | 66 +++++++++++-------- 12 files changed, 51 insertions(+), 65 deletions(-) diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js index 13167668e2..13639198b2 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js @@ -4,6 +4,20 @@ Array.prototype.remove = function(from, to) { return this.push.apply(this, rest); }; +module.controller('ClientTabCtrl', function(Dialog, $scope, Current, Notifications, $location) { + $scope.removeClient = function() { + Dialog.confirmDelete($scope.client.clientId, 'client', function() { + $scope.client.$remove({ + realm : Current.realm.realm, + client : $scope.client.id + }, function() { + $location.url("/realms/" + Current.realm.realm + "/clients"); + Notifications.success("The client has been deleted."); + }); + }); + }; +}); + module.controller('ClientRoleListCtrl', function($scope, $location, realm, client, roles) { $scope.realm = realm; $scope.roles = roles; @@ -834,20 +848,6 @@ module.controller('ClientDetailCtrl', function($scope, realm, client, $route, se $scope.cancel = function() { $location.url("/realms/" + realm.realm + "/clients"); }; - - $scope.remove = function() { - Dialog.confirmDelete($scope.client.clientId, 'client', function() { - $scope.client.$remove({ - realm : realm.realm, - client : $scope.client.id - }, function() { - $location.url("/realms/" + realm.realm + "/clients"); - Notifications.success("The client has been deleted."); - }); - }); - }; - - }); module.controller('ClientScopeMappingCtrl', function($scope, $http, realm, client, clients, Notifications, diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html index 2fa5e24e6f..0a734d5408 100644 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html @@ -5,8 +5,6 @@
    • {{client.clientId}}
      • -

      {{client.clientId|capitalize}}

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-credentials.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-credentials.html index 540dddb2a4..b58af1e866 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-credentials.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-credentials.html @@ -5,8 +5,6 @@
    • {{client.clientId}}
      • -

      {{client.clientId|capitalize}}

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html index d8ea26567f..9cf66f00f6 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html @@ -6,10 +6,6 @@
    • {{client.clientId}}
      • -

      Add Client

      -

      {{client.clientId|capitalize}}

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-installation.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-installation.html index e6886f0a22..375343a8f5 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-installation.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-installation.html @@ -5,8 +5,6 @@
    • {{client.clientId}}
      • -

      {{client.clientId|capitalize}}

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-keys.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-keys.html index f1a0803f4d..bd1faa37cc 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-keys.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-keys.html @@ -5,8 +5,6 @@
    • {{client.clientId}}
      • -

      {{client.clientId|capitalize}}

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers.html index b62902d77f..88be5e1868 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers.html @@ -5,8 +5,6 @@
    • {{client.clientId}}
      • -

      {{client.clientId|capitalize}}

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-revocation.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-revocation.html index 962b802904..6a0c639743 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-revocation.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-revocation.html @@ -5,8 +5,6 @@
    • {{client.clientId}}
      • -

      {{client.clientId|capitalize}}

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-list.html index e6e7f2c53e..bf4f06201f 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-list.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-list.html @@ -5,8 +5,6 @@
    • {{client.clientId}}
      • -

      {{client.clientId|capitalize}}

      -
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-scope-mappings.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-scope-mappings.html index b5a26271c8..6f68ed81d4 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-scope-mappings.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-scope-mappings.html @@ -5,8 +5,6 @@
    • {{client.clientId}}
      • -

      {{client.clientId|capitalize}}

      -

      {{client.clientId}} Scope Mappings

      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-sessions.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-sessions.html index 846cd92326..9c1dc586b3 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-sessions.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-sessions.html @@ -5,8 +5,6 @@
    • {{client.clientId}}
      • -

      {{client.clientId|capitalize}}

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-client.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-client.html index e350e5d090..8af84972eb 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-client.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-client.html @@ -1,33 +1,41 @@ -
        -
      • Settings
        • -
      • Credentials
        • -
      • SAML Keys
        • -
      • Roles
        • -
      • - Mappers - Protocol mappers perform transformation on tokens and documents. They an do things like map user data into protocol claims, or just transform any requests going between the client and auth server. -
        • -
      • - Scope - Scope mappings allow you to restrict which user role mappings are included within the access token requested by the client. -
        • -
      • Revocation
        • - -
      • - Sessions - View active sessions for this client. Allows you to see which users are active and when they logged in. -
        • +
        -
      • Clustering
        • +

        Add Client

        +

        + {{client.clientId|capitalize}} + +

        -
      • - Installation - Helper utility for generating various client adapter configuration formats which you can download or cut and paste to configure your clients. -
        • +
          +
        • Settings
          • +
        • Credentials
          • +
        • SAML Keys
          • +
        • Roles
          • +
        • + Mappers + Protocol mappers perform transformation on tokens and documents. They an do things like map user data into protocol claims, or just transform any requests going between the client and auth server. +
          • +
        • + Scope + Scope mappings allow you to restrict which user role mappings are included within the access token requested by the client. +
          • +
        • Revocation
          • + +
        • + Sessions + View active sessions for this client. Allows you to see which users are active and when they logged in. +
          • -
        • - Service Accounts - Allows you to authenticate this client to Keycloak and retrieve access tokens dedicated to this client. -
          • +
        • Clustering
          • -
        \ No newline at end of file +
      • + Installation + Helper utility for generating various client adapter configuration formats which you can download or cut and paste to configure your clients. +
        • + +
      • + Service Accounts + Allows you to authenticate this client to Keycloak and retrieve access tokens dedicated to this client. +
        • +
      + \ No newline at end of file From 7a1932cab4e57676d4ff010479c7481624afe2f3 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Tue, 21 Jul 2015 13:32:00 +0200 Subject: [PATCH 03/13] KEYCLOAK-1427 Add remove identity provider button to all identity provider tabs --- .../theme/base/admin/resources/js/app.js | 9 ++++++ .../admin/resources/js/controllers/realm.js | 28 +++++++++++-------- .../partials/identity-provider-mappers.html | 8 +----- .../realm-identity-provider-export.html | 9 +----- .../realm-identity-provider-oidc.html | 4 +-- .../realm-identity-provider-saml.html | 10 +------ .../realm-identity-provider-social.html | 9 +----- .../resources/templates/kc-tabs-client.html | 2 +- .../templates/kc-tabs-identity-provider.html | 13 +++++++++ 9 files changed, 44 insertions(+), 48 deletions(-) create mode 100644 forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-identity-provider.html diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js index a500ad5e9b..25bf1e39fe 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js @@ -1606,6 +1606,15 @@ module.directive('kcNavigationUser', function () { } }); +module.directive('kcTabsIdentityProvider', function () { + return { + scope: true, + restrict: 'E', + replace: true, + templateUrl: resourceUrl + '/templates/kc-tabs-identity-provider.html' + } +}); + module.controller('RoleSelectorModalCtrl', function($scope, realm, config, configName, RealmRoles, Client, ClientRole, $modalInstance) { console.log('realm: ' + realm.realm); $scope.selectedRealmRole = { diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js index 154681d51f..84effdad56 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js @@ -595,6 +595,22 @@ module.controller('RealmDefaultRolesCtrl', function ($scope, Realm, realm, clien }); + + +module.controller('IdentityProviderTabCtrl', function(Dialog, $scope, Current, Notifications, $location) { + $scope.removeIdentityProvider = function() { + Dialog.confirmDelete($scope.identityProvider.alias, 'provider', function() { + $scope.identityProvider.$remove({ + realm : Current.realm.realm, + alias : $scope.identityProvider.alias + }, function() { + $location.url("/realms/" + Current.realm.realm + "/identity-provider-settings"); + Notifications.success("The identity provider has been deleted."); + }); + }); + }; +}); + module.controller('RealmIdentityProviderCtrl', function($scope, $filter, $upload, $http, $route, realm, instance, providerFactory, IdentityProvider, serverInfo, $location, Notifications, Dialog) { console.log('RealmIdentityProviderCtrl'); @@ -804,18 +820,6 @@ module.controller('RealmIdentityProviderCtrl', function($scope, $filter, $upload $location.url("/create/identity-provider/" + realm.realm + "/" + provider.id); }; - $scope.remove = function() { - Dialog.confirmDelete($scope.identityProvider.alias, 'provider', function() { - $scope.identityProvider.$remove({ - realm : realm.realm, - alias : $scope.identityProvider.alias - }, function() { - $location.url("/realms/" + realm.realm + "/identity-provider-settings"); - Notifications.success("The client has been deleted."); - }); - }); - }; - $scope.save = function() { if ($scope.newIdentityProvider) { if (!$scope.identityProvider.alias) { diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/identity-provider-mappers.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/identity-provider-mappers.html index 24409e2c06..676a1166e3 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/identity-provider-mappers.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/identity-provider-mappers.html @@ -4,13 +4,7 @@
    • {{identityProvider.alias}}
      • -

      {{identityProvider.alias|capitalize}}

      - - +
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-export.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-export.html index c79b92b917..e811dc9d4b 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-export.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-export.html @@ -4,14 +4,7 @@
    • {{identityProvider.alias}}
      • -

      {{identityProvider.alias|capitalize}}

      -

      Add OpenID Connect Identity Provider

      - - +
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-oidc.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-oidc.html index 2fad5c99b9..fbe6a6a888 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-oidc.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-oidc.html @@ -4,9 +4,7 @@
    • {{identityProvider.alias}}
      • -

      {{identityProvider.alias|capitalize}}

      -

      Add OpenID Connect Identity Provider

      +
      • Settings
        • diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-saml.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-saml.html index 2af44a3468..0650b45280 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-saml.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-saml.html @@ -4,15 +4,7 @@
      • {{identityProvider.alias}}
        • -

        {{identityProvider.alias|capitalize}}

        -

        Add SAML Identity Provider

        - - +
        diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-social.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-social.html index 5cb50d22bc..0bbd5b5f84 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-social.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-social.html @@ -4,14 +4,7 @@
      • {{identityProvider.alias}}
        • -

        {{identityProvider.alias|capitalize}}

        -

        Add Social Identity Provider

        - - +
        diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-client.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-client.html index 8af84972eb..c82d99f99a 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-client.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-client.html @@ -3,7 +3,7 @@

        Add Client

        {{client.clientId|capitalize}} - +

          diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-identity-provider.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-identity-provider.html new file mode 100644 index 0000000000..fbbbe3c7cf --- /dev/null +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-identity-provider.html @@ -0,0 +1,13 @@ +
          +

          + {{identityProvider.alias|capitalize}} + +

          +

          Add Identity Provider

          + + +
          From 2ba7aef2b1f8ca87103caafc7f6fcdb3404ab732 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Tue, 21 Jul 2015 13:48:16 +0200 Subject: [PATCH 04/13] KEYCLOAK-1427 Add remove user federation button to all user federation tabs --- .../theme/base/admin/resources/js/app.js | 9 ++++++ .../admin/resources/js/controllers/users.js | 29 +++++++++++-------- .../resources/partials/federated-generic.html | 9 +----- .../partials/federated-kerberos.html | 9 +----- .../resources/partials/federated-ldap.html | 9 +----- .../resources/partials/federated-mappers.html | 7 +---- .../templates/kc-tabs-user-federation.html | 12 ++++++++ 7 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-user-federation.html diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js index 25bf1e39fe..f26a8edb31 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js @@ -1615,6 +1615,15 @@ module.directive('kcTabsIdentityProvider', function () { } }); +module.directive('kcTabsUserFederation', function () { + return { + scope: true, + restrict: 'E', + replace: true, + templateUrl: resourceUrl + '/templates/kc-tabs-user-federation.html' + } +}); + module.controller('RoleSelectorModalCtrl', function($scope, realm, config, configName, RealmRoles, Client, ClientRole, $modalInstance) { console.log('realm: ' + realm.realm); $scope.selectedRealmRole = { diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js index e885f7ee8c..b55fe2dd10 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js @@ -520,11 +520,27 @@ module.controller('UserFederationCtrl', function($scope, $location, realm, UserF }); +module.controller('UserFederationTabCtrl', function(Dialog, $scope, Current, Notifications, $location) { + $scope.removeUserFederation = function() { + Dialog.confirm('Delete', 'Are you sure you want to permanently delete this provider? All imported users will also be deleted.', function() { + $scope.instance.$remove({ + realm : Current.realm.realm, + instance : $scope.instance.id + }, function() { + $location.url("/realms/" + Current.realm.realm + "/user-federation"); + Notifications.success("The provider has been deleted."); + }); + }); + }; +}); + + module.controller('GenericUserFederationCtrl', function($scope, $location, Notifications, $route, Dialog, realm, instance, providerFactory, UserFederationInstances, UserFederationSync) { console.log('GenericUserFederationCtrl'); $scope.create = !instance.providerName; $scope.providerFactory = providerFactory; + $scope.provider = instance; console.log("providerFactory: " + providerFactory.id); @@ -620,18 +636,6 @@ module.controller('GenericUserFederationCtrl', function($scope, $location, Notif } }; - $scope.remove = function() { - Dialog.confirm('Delete', 'Are you sure you want to permanently delete this provider? All imported users will also be deleted.', function() { - $scope.instance.$remove({ - realm : realm.realm, - instance : $scope.instance.id - }, function() { - $location.url("/realms/" + realm.realm + "/user-federation"); - Notifications.success("The provider has been deleted."); - }); - }); - }; - $scope.triggerFullSync = function() { console.log('GenericCtrl: triggerFullSync'); triggerSync('triggerFullSync'); @@ -882,6 +886,7 @@ module.controller('UserFederationMapperListCtrl', function($scope, $location, No $scope.realm = realm; $scope.provider = provider; + $scope.instance = provider; $scope.mapperTypes = mapperTypes; $scope.mappers = mappers; diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html index 002c965acf..a8d72a4fff 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html @@ -5,14 +5,7 @@
        • Add User Federation Provider
          • -

          {{instance.providerName|capitalize}}

          -

          Add {{instance.providerName|capitalize}} User Federation Provide

          - - +
          diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html index fa2485e3f0..deda98517d 100644 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html @@ -5,14 +5,7 @@
        • Add User Federation Provider
          • -

          Kerberos

          -

          Add Kerberos User Federation Provider

          - - +
          diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html index f01dd4ffc1..59106de3ff 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html @@ -5,14 +5,7 @@
        • Add User Federation Provider
          • -

          LDAP

          -

          Add LDAP User Federation Provider

          - - + diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-mappers.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-mappers.html index 2401b47b9b..ae59be11b2 100644 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-mappers.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-mappers.html @@ -5,12 +5,7 @@
        • User Federation Mappers
          • -

          {{provider.providerName === 'ldap' ? 'LDAP' : (provider.providerName|capitalize)}}

          - - +
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-user-federation.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-user-federation.html new file mode 100644 index 0000000000..3e766813ff --- /dev/null +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-user-federation.html @@ -0,0 +1,12 @@ +
      +

      + {{instance.displayName|capitalize}} + +

      +

      Add User Federation Provider

      + + +
      From f43e4200da1ea62a9826050048dc279d64911152 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Tue, 21 Jul 2015 13:49:19 +0200 Subject: [PATCH 05/13] Removed title on password policy page --- .../resources/partials/password-policy.html | 71 +++++++++---------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html index f9d7c4354c..54bace876a 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html @@ -4,44 +4,41 @@ -
      - Realm Password Policy Specify required password format. You can also set how many times a password is hashed before it is stored in database. Multiple Regex patterns, separated by comma, can be added. -
      - - - - + + + + + + + + + + + + + + +
      -
      -
      - -
      + + + + + - - - - - - - - - - - - - - -
      +
      +
      +
      -
      Policy TypePolicy ValueActions
      {{p.name|capitalize}} - - -
      -
      - +
      +
      Policy TypePolicy ValueActions
      {{p.name|capitalize}} + + +
      +
      From b04ac6cdba73a545d3cdfcbcbb8ad249fc1a64e7 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Tue, 21 Jul 2015 13:53:35 +0200 Subject: [PATCH 06/13] KEYCLOAK-1427 Add remove user button to all user tabs --- .../admin/resources/js/controllers/users.js | 29 ++++++++++--------- .../resources/partials/role-mappings.html | 2 -- .../resources/partials/user-consents.html | 2 -- .../resources/partials/user-credentials.html | 2 -- .../admin/resources/partials/user-detail.html | 4 --- .../user-federated-identity-list.html | 2 -- .../resources/partials/user-sessions.html | 2 -- .../resources/templates/kc-tabs-user.html | 24 ++++++++++----- 8 files changed, 31 insertions(+), 36 deletions(-) diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js index b55fe2dd10..f7968a0357 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js @@ -266,6 +266,21 @@ module.controller('UserListCtrl', function($scope, realm, User, UserImpersonatio }); +module.controller('UserTabCtrl', function($scope, $location, Dialog, Notifications, Current) { + $scope.removeUser = function() { + Dialog.confirmDelete($scope.user.id, 'user', function() { + $scope.user.$remove({ + realm : Current.realm.realm, + userId : $scope.user.id + }, function() { + $location.url("/realms/" + Current.realm.realm + "/users"); + Notifications.success("The user has been deleted."); + }, function() { + Notifications.error("User couldn't be deleted"); + }); + }); + }; +}); module.controller('UserDetailCtrl', function($scope, realm, user, User, UserFederationInstances, UserImpersonation, RequiredActions, $location, Dialog, Notifications) { $scope.realm = realm; @@ -396,20 +411,6 @@ module.controller('UserDetailCtrl', function($scope, realm, user, User, UserFede $scope.cancel = function() { $location.url("/realms/" + realm.realm + "/users"); }; - - $scope.remove = function() { - Dialog.confirmDelete($scope.user.id, 'user', function() { - $scope.user.$remove({ - realm : realm.realm, - userId : $scope.user.id - }, function() { - $location.url("/realms/" + realm.realm + "/users"); - Notifications.success("The user has been deleted."); - }, function() { - Notifications.error("User couldn't be deleted"); - }); - }); - }; }); module.controller('UserCredentialsCtrl', function($scope, realm, user, User, UserCredentials, Notifications, Dialog) { diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-mappings.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-mappings.html index d12b30476d..8223936aff 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-mappings.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-mappings.html @@ -4,8 +4,6 @@
    • {{user.username}}
      • -

      {{user.username|capitalize}}

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-consents.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-consents.html index a22d0aa12c..f12f7beef8 100644 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-consents.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-consents.html @@ -4,8 +4,6 @@
    • {{user.username}}
      • -

      {{user.username|capitalize}}

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-credentials.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-credentials.html index 574dd491ad..ffdfd6e648 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-credentials.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-credentials.html @@ -4,8 +4,6 @@
    • {{user.username}}
      • -

      {{user.username|capitalize}}

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html index f3e76f4ff1..49c5813f58 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html @@ -5,10 +5,6 @@
    • Add User
      • -

      {{user.username|capitalize}}

      -

      Add User

      - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federated-identity-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federated-identity-list.html index e25615d286..36c1449747 100644 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federated-identity-list.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federated-identity-list.html @@ -4,8 +4,6 @@
    • {{user.username}}
      • -

      {{user.username|capitalize}}

      -
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html index 8aa0cc748f..08e520f033 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html @@ -4,8 +4,6 @@
    • {{user.username}}
      • -

      {{user.username|capitalize}}

      -
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-user.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-user.html index caee5c1142..e090fca31e 100644 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-user.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-user.html @@ -1,8 +1,16 @@ - \ No newline at end of file +
      +

      + {{user.username|capitalize}} + +

      +

      Add User

      + + +
      \ No newline at end of file From 0156d47d97433abae68d047127a510cdbcf43186 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Tue, 21 Jul 2015 14:50:42 +0200 Subject: [PATCH 07/13] KEYCLOAK-1535 Set tooltip-placement correctly --- .../admin/resources/partials/password-policy.html | 6 +++--- .../theme/keycloak/admin/resources/css/styles.css | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html index 54bace876a..8e0d39637c 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html @@ -23,7 +23,7 @@ - + @@ -33,8 +33,8 @@ - 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 033f6e0a38..83f09293f1 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 @@ -299,3 +299,17 @@ h1 i { margin-left: 10px; } +/* Action cell */ +.kc-action-cell { + position: relative; + width: 100px; +} + +.kc-action-cell .btn { + border: none; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; +} \ No newline at end of file From 5304b533fce611bf26d5694b1bab644c3da20424 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Tue, 21 Jul 2015 15:25:23 +0200 Subject: [PATCH 08/13] KEYCLOAK-1434 Add edit action to tables --- .../base/admin/resources/partials/client-list.html | 7 ++++++- .../resources/partials/realm-identity-provider.html | 6 +++++- .../base/admin/resources/partials/role-list.html | 6 +++++- .../admin/resources/partials/user-federation.html | 6 +++++- .../base/admin/resources/partials/user-list.html | 11 ++++++++--- .../theme/keycloak/admin/resources/css/styles.css | 4 ++++ 6 files changed, 33 insertions(+), 7 deletions(-) diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html index 4dc4a241b9..b317a70da8 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html @@ -7,7 +7,7 @@
      Policy Type Policy ValueActionsActions
      -
      +       		+
      - + @@ -38,6 +39,10 @@ + diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider.html index 5f6c0a386e..f084347474 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider.html @@ -8,7 +8,7 @@ - + @@ -33,6 +34,9 @@ +
      +
      @@ -29,6 +29,7 @@
      		Client ID Enabled Base URLActions
      {{client.baseUrl}} Not defined + + Edit +
      No results
      +
      		Enabled GUI orderActions
      {{identityProvider.providerId}} {{identityProvider.enabled}} {{identityProvider.config.guiOrder}} + Edit +
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html index 9a97f56c62..b2260f4cbd 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html @@ -9,7 +9,7 @@ - + @@ -37,6 +38,9 @@ + diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html index 047b34557c..13e2f86880 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html @@ -6,7 +6,7 @@
      +
      @@ -30,6 +30,7 @@
      		Role Name Composite DescriptionActions
      {{role.name}} {{role.composite}} {{role.description}} + Edit +
      No results
      - + @@ -29,6 +30,9 @@ + diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html index 67332fa10e..547530c639 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html @@ -5,7 +5,7 @@ - - + @@ -50,7 +50,12 @@ - + + 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 83f09293f1..9bf8af2336 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 @@ -312,4 +312,8 @@ h1 i { left: 0; right: 0; bottom: 0; +} + +.kc-action-cell a { + padding-top: 4px; } \ No newline at end of file From 1a3bf16729cf6866d8fedc91e7a575d09255c2cf Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Wed, 22 Jul 2015 10:04:04 +0200 Subject: [PATCH 09/13] KEYCLOAK-1434 Change edit action to buttons to make sure styles are correct --- .../theme/base/admin/resources/js/app.js | 16 ++++++++++++++++ .../admin/resources/partials/client-list.html | 2 +- .../resources/partials/client-role-list.html | 6 +++++- .../partials/realm-identity-provider.html | 2 +- .../base/admin/resources/partials/role-list.html | 2 +- .../resources/partials/user-federation.html | 2 +- .../base/admin/resources/partials/user-list.html | 2 +- .../keycloak/admin/resources/css/styles.css | 4 ---- 8 files changed, 26 insertions(+), 10 deletions(-) diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js index f26a8edb31..5ddf659deb 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js @@ -1842,4 +1842,20 @@ module.directive('kcTooltip', function($compile) { $compile(label)(scope); } }; +}); + +module.directive( 'kcOpen', function ( $location ) { + return function ( scope, element, attrs ) { + var path; + + attrs.$observe( 'kcOpen', function (val) { + path = val; + }); + + element.bind( 'click', function () { + scope.$apply( function () { + $location.path(path); + }); + }); + }; }); \ No newline at end of file diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html index b317a70da8..9c1cb149c3 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html @@ -41,7 +41,7 @@ Not defined diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-list.html index bf4f06201f..f07d9e3fc2 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-list.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-list.html @@ -10,7 +10,7 @@
      +
      		Provider Name PriorityActions
      {{instance.displayName}} {{instance.providerName|capitalize}} {{instance.priority}} + Edit +
      No user federation providers configured
      +
      @@ -29,7 +29,7 @@
      		Last Name First Name EmailActions
      {{user.lastName}} {{user.firstName}} {{user.email}} + Edit + + +
      Please enter a search, or click on view all users - Edit +
      - + @@ -27,6 +28,9 @@ + diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider.html index f084347474..8c817bc433 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider.html @@ -35,7 +35,7 @@ diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html index b2260f4cbd..3703023a54 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html @@ -39,7 +39,7 @@ diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html index 13e2f86880..8738690c81 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federation.html @@ -31,7 +31,7 @@ diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html index 547530c639..508e07f4e6 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html @@ -51,7 +51,7 @@
      +
      Add Role
      @@ -20,6 +20,7 @@       		Role Name Composite DescriptionActions
      {{role.name}} {{role.composite}} {{role.description}} + +
      No client roles available{{identityProvider.enabled}} {{identityProvider.config.guiOrder}} - Edit +
      {{role.composite}} {{role.description}} - Edit +
      {{instance.providerName|capitalize}} {{instance.priority}} - Edit +
      {{user.firstName}} {{user.email}} - Edit + 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 9bf8af2336..83f09293f1 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 @@ -312,8 +312,4 @@ h1 i { left: 0; right: 0; bottom: 0; -} - -.kc-action-cell a { - padding-top: 4px; } \ No newline at end of file From 8cc8f4c49c8edd20239ecbabca1e37b89ebee66a Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Wed, 22 Jul 2015 10:51:29 +0200 Subject: [PATCH 10/13] Fix tests --- .../keycloak/testsuite/admin/fragment/Navigation.java | 10 +++++----- .../admin/page/settings/PasswordPolicyPage.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/Navigation.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/Navigation.java index f295c8d35a..29b7e50b82 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/Navigation.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/Navigation.java @@ -92,7 +92,7 @@ public class Navigation { } public void settings() { - openPage(settingsLink, "Settings"); + openPage(settingsLink, "Master"); } public void users() { @@ -112,7 +112,7 @@ public class Navigation { } public void tokens() { - openPage(tokensLink, "Settings"); + openPage(tokensLink, "Master"); } public void sessions() { @@ -120,7 +120,7 @@ public class Navigation { } public void security() { - openPage(securityLink, "Settings"); + openPage(securityLink, "Master"); } public void events() { @@ -128,11 +128,11 @@ public class Navigation { } public void login() { - openPage(loginLink, "Settings"); + openPage(loginLink, "Master"); } public void themes() { - openPage(themesLink, "Settings"); + openPage(themesLink, "Master"); } public void roleMappings(String username) { diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/PasswordPolicyPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/PasswordPolicyPage.java index 02e7953c32..09e1214ad9 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/PasswordPolicyPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/PasswordPolicyPage.java @@ -46,7 +46,7 @@ public class PasswordPolicyPage extends AbstractPage { public void removePolicy(PasswordPolicy policy) { int policyInputLocation = findPolicy(policy); - allRows.get(policyInputLocation).findElements(By.tagName("i")).get(0).click(); + allRows.get(policyInputLocation).findElements(By.tagName("button")).get(0).click(); primaryButton.click(); } From 1916fded9590c7c619c347ea9822335481a58219 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Wed, 22 Jul 2015 10:56:34 +0200 Subject: [PATCH 11/13] Fix location of buttons on password-policy form --- .../theme/base/admin/resources/partials/password-policy.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html index 8e0d39637c..718238051d 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html @@ -41,7 +41,7 @@
      -
      +
      From e66d658955359fe23e627fb2addbdb1800a391df Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Wed, 22 Jul 2015 11:49:34 +0200 Subject: [PATCH 12/13] KEYCLOAK-1428 Disable buttons on forms instead of hiding --- .../theme/base/admin/resources/partials/password-policy.html | 4 ++-- .../base/admin/resources/partials/realm-cache-settings.html | 4 ++-- .../theme/base/admin/resources/partials/realm-detail.html | 4 ++-- .../base/admin/resources/partials/realm-login-settings.html | 4 ++-- .../theme/base/admin/resources/partials/realm-smtp.html | 4 ++-- .../base/admin/resources/partials/realm-theme-settings.html | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html index 718238051d..ff4e0f7f15 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/password-policy.html @@ -42,8 +42,8 @@
      - - + +
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-cache-settings.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-cache-settings.html index 4b621a1cab..c7f9b26210 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-cache-settings.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-cache-settings.html @@ -19,8 +19,8 @@
      - - + +
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-detail.html index fb71f92003..e1ff6834a6 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-detail.html @@ -24,8 +24,8 @@
      - - + +
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-login-settings.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-login-settings.html index 6117fa8ed0..adccf3bee6 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-login-settings.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-login-settings.html @@ -62,8 +62,8 @@
      - - + +
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-smtp.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-smtp.html index 6c60ecd0b7..be703d4b5c 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-smtp.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-smtp.html @@ -54,8 +54,8 @@
      - - + +
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html index cfc746470c..caecc6dcb8 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html @@ -86,8 +86,8 @@
      - - + +
      From d5dae7d444523c3e22a1a9de6464bc469b8341e1 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Wed, 22 Jul 2015 14:05:47 +0200 Subject: [PATCH 13/13] KEYCLOAK-1428 Disable buttons on forms instead of hiding --- .../partials/authenticator-config.html | 4 ++-- .../admin/resources/partials/brute-force.html | 4 ++-- .../partials/client-clustering-node.html | 2 +- .../resources/partials/client-clustering.html | 4 ++-- .../admin/resources/partials/client-detail.html | 6 +++--- .../resources/partials/client-mappers-add.html | 8 ++++---- .../resources/partials/client-role-detail.html | 6 +++--- .../resources/partials/defense-headers.html | 4 ++-- .../resources/partials/federated-generic.html | 4 ++-- .../resources/partials/federated-kerberos.html | 4 ++-- .../resources/partials/federated-ldap.html | 4 ++-- .../partials/federated-mapper-detail.html | 17 +++++++++++------ .../identity-provider-mapper-detail.html | 17 +++++++++++------ .../partials/protocol-mapper-detail.html | 4 ++-- .../admin/resources/partials/realm-create.html | 8 ++++---- .../partials/realm-identity-provider-oidc.html | 4 ++-- .../partials/realm-identity-provider-saml.html | 4 ++-- .../realm-identity-provider-social.html | 4 ++-- .../admin/resources/partials/realm-tokens.html | 4 ++-- .../admin/resources/partials/role-detail.html | 4 ++-- .../admin/resources/partials/user-consents.html | 6 +++--- .../admin/resources/partials/user-detail.html | 6 +++--- .../user-federated-identity-detail.html | 9 ++++++--- .../partials/user-federated-identity-list.html | 8 ++++---- .../admin/resources/partials/user-sessions.html | 4 +++- 25 files changed, 82 insertions(+), 67 deletions(-) diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/authenticator-config.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/authenticator-config.html index 9060eeddc2..585680616b 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/authenticator-config.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/authenticator-config.html @@ -38,8 +38,8 @@
      - - + +
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/brute-force.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/brute-force.html index 084e67d5d0..408794a6ee 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/brute-force.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/brute-force.html @@ -96,8 +96,8 @@
      - - + +
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering-node.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering-node.html index 5b275a2912..2a7d70588c 100644 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering-node.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering-node.html @@ -25,7 +25,7 @@
      - +
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html index 0a734d5408..5f59d02267 100644 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html @@ -32,8 +32,8 @@
      - - + +
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html index 9cf66f00f6..49a1997b19 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html @@ -270,12 +270,12 @@
      - +
      - - + +
      diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers-add.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers-add.html index 94c02369bd..f00ca3b01c 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers-add.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers-add.html @@ -22,10 +22,6 @@
    - -
    - -
@@ -48,6 +44,10 @@ + +
+ +
\ No newline at end of file diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-detail.html index 1c11d57377..c0ce766301 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-role-detail.html @@ -43,14 +43,14 @@
- +
- - + +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/defense-headers.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/defense-headers.html index 61ef8e0633..c6bd5b7605 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/defense-headers.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/defense-headers.html @@ -25,8 +25,8 @@
- - + +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html index a8d72a4fff..b74a9abc08 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-generic.html @@ -80,8 +80,8 @@
- - + +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html index deda98517d..f19b2c5cc5 100644 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-kerberos.html @@ -99,8 +99,8 @@
- - + +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html index 59106de3ff..eb75db9445 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-ldap.html @@ -274,8 +274,8 @@
- - + +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-mapper-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-mapper-detail.html index 7904d5bb4c..b60d904050 100644 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-mapper-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/federated-mapper-detail.html @@ -48,14 +48,19 @@ -
- - + +
+
+ + +
-
- - +
+
+ + +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/identity-provider-mapper-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/identity-provider-mapper-detail.html index 1b46810a0f..2c389d7b12 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/identity-provider-mapper-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/identity-provider-mapper-detail.html @@ -47,14 +47,19 @@
-
- - + +
+
+ + +
-
- - +
+
+ + +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/protocol-mapper-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/protocol-mapper-detail.html index 27e49cd1b3..5bee1b5b6d 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/protocol-mapper-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/protocol-mapper-detail.html @@ -81,8 +81,8 @@
- - + +
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 0da424e5a7..630188d847 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 @@ -12,10 +12,10 @@ {{files[0].name}}
-
+
- - + +
@@ -41,7 +41,7 @@
- +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-oidc.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-oidc.html index fbe6a6a888..23ad5207c0 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-oidc.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-oidc.html @@ -215,8 +215,8 @@
- - + +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-saml.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-saml.html index 0650b45280..7c300ae1a9 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-saml.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-saml.html @@ -188,8 +188,8 @@
- - + +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-social.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-social.html index 0bbd5b5f84..06f6c0261d 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-social.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-social.html @@ -101,8 +101,8 @@
- - + +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-tokens.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-tokens.html index f33f8ca8c6..4f5518de23 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-tokens.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-tokens.html @@ -114,8 +114,8 @@
- - + +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-detail.html index e3a52cf44d..49d09c835e 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-detail.html @@ -46,8 +46,8 @@
- - + +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-consents.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-consents.html index f12f7beef8..22db3483a9 100644 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-consents.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-consents.html @@ -35,9 +35,9 @@ - - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html index 49c5813f58..e9da897795 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html @@ -112,9 +112,9 @@
-
- - +
+ +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federated-identity-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federated-identity-detail.html index a9155fe086..aa2bfbcb15 100644 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federated-identity-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federated-identity-detail.html @@ -39,9 +39,12 @@ -
- - + +
+
+ + +
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federated-identity-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federated-identity-list.html index 36c1449747..57b8c7e556 100644 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federated-identity-list.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-federated-identity-list.html @@ -8,10 +8,10 @@ - + - diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html index 08e520f033..b420f476b8 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html @@ -34,7 +34,9 @@ - +
-
+
Create
@@ -29,8 +29,8 @@
{{identity.identityProvider}} {{identity.userId}} {{identity.userName}} -
+ 		+
logout + +