diff --git a/awx/ui/client/src/access/addPermissions/addPermissions.block.less b/awx/ui/client/src/access/addPermissions/addPermissions.block.less index 6bfdd648e6..e77141818e 100644 --- a/awx/ui/client/src/access/addPermissions/addPermissions.block.less +++ b/awx/ui/client/src/access/addPermissions/addPermissions.block.less @@ -83,6 +83,8 @@ margin-top: 10px; margin-bottom: 20px; color: #848992; + display: flex; + align-items: center; } .AddPermissions-directionNumber { @@ -90,9 +92,7 @@ font-weight: bold; border-radius: 50%; background-color: @default-list-header-bg; - padding-left: 6px; - padding-right: 1px; - padding-bottom: 3px; + padding: 2px 6px; margin-right: 10px; } @@ -164,3 +164,51 @@ .AddPermissions .select2-search__field { text-transform: uppercase; } + +.AddPermissions-keyToggle { + margin-left: auto; + text-transform: uppercase; + padding: 3px 9px; + font-size: 12px; + background-color: @default-bg; + border-radius: 5px; + color: @default-interface-txt; + border: 1px solid @default-second-border; + cursor: pointer; +} + +.AddPermissions-keyToggle:hover { + background-color: @default-tertiary-bg; +} + +.AddPermissions-keyToggle.is-active { + background-color: @default-link; + border-color: @default-link; + color: @default-bg; +} + +.AddPermissions-keyPane { + margin: 20px 0; + border-radius: 5px; + padding: 15px; + padding-bottom: 0px; + border: 1px solid @default-second-border; + color: @default-interface-txt; +} + +.AddPermissions-keyRow { + display: flex; + flex-direction: column; + margin-bottom: 15px; +} + +.AddPermissions-keyName { + flex: 1 0 auto; + text-transform: uppercase; + font-weight: bold; + padding-bottom: 3px; +} + +.AddPermissions-keyDescription { + flex: 1 0 auto; +} diff --git a/awx/ui/client/src/access/addPermissions/addPermissions.controller.js b/awx/ui/client/src/access/addPermissions/addPermissions.controller.js index fb839d0ea6..b95f851f07 100644 --- a/awx/ui/client/src/access/addPermissions/addPermissions.controller.js +++ b/awx/ui/client/src/access/addPermissions/addPermissions.controller.js @@ -51,6 +51,12 @@ export default ['$rootScope', '$scope', 'GetBasePath', 'Rest', '$q', 'Wait', 'Pr .roles[key].description }; }); + scope.showKeyPane = false; + + scope.toggleKeyPane = function() { + scope.showKeyPane = !scope.showKeyPane; + }; + // handle form tab changes scope.toggleFormTabs = function(list) { scope.usersSelected = (list === 'users'); diff --git a/awx/ui/client/src/access/addPermissions/addPermissions.partial.html b/awx/ui/client/src/access/addPermissions/addPermissions.partial.html index 3257e88e6c..f7d39b6da0 100644 --- a/awx/ui/client/src/access/addPermissions/addPermissions.partial.html +++ b/awx/ui/client/src/access/addPermissions/addPermissions.partial.html @@ -58,6 +58,23 @@ 2. Please assign roles to the selected users/teams +