zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-06 16:32:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add kind column to credential list

Browse Source 
* Populate kind column with credential_type name
* Fix replace/revert input group button sizing
This commit is contained in:
gconsidine
2017-07-18 14:39:56 -04:00
parent 415c80a279
commit 6fa3872c86
7 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/lib/components/input/_index.less
View File

@@ -47,12 +47,18 @@
.at-mixin-InputButton();
}
.at-Input-button--fixed-sm {
.at-Input-button--fixed-xs {
.at-mixin-InputButton();
min-width: @at-width-input-button-sm;
height: @at-height-input;
}
.at-Input-button--fixed-sm {
.at-mixin-InputButton();
min-width: @at-width-input-button-md;
height: @at-height-input;
}
.at-Input-button--fixed-md {
.at-mixin-InputButton();
display: inherit;

2
awx/ui/client/lib/components/input/secret.directive.js
View File

@@ -20,11 +20,13 @@ function AtInputSecretController (baseInputController) {
scope = _scope_;
if (!scope.state._value || scope.state._promptOnLaunch) {
scope.mode = 'input';
scope.state._buttonText = vm.strings.get('SHOW');
scope.type = 'password';
vm.toggle = vm.toggleShowHide;
} else {
scope.mode = 'encrypted';
scope.state._buttonText = vm.strings.get('REPLACE');
scope.state._placeholder = vm.strings.get('ENCRYPTED');
vm.toggle = vm.toggleRevertReplace;

6
awx/ui/client/lib/components/input/secret.partial.html
View File

@@ -4,7 +4,11 @@
<div class="input-group">
<span class="input-group-btn at-InputGroup-button">
<button class="btn at-ButtonHollow--white at-Input-button--fixed-sm"
<button class="btn at-ButtonHollow--white"
ng-class="{
'at-Input-button--fixed-xs': mode === 'input',
'at-Input-button--fixed-sm': mode === 'encrypted'
}"
ng-disabled="!state._enableToggle && (state._disabled || form.disabled)"
ng-click="vm.toggle()">
{{ state._buttonText }}