diff --git a/awx/ui/client/lib/components/input/_index.less b/awx/ui/client/lib/components/input/_index.less index dc08df77db..1f8962bccd 100644 --- a/awx/ui/client/lib/components/input/_index.less +++ b/awx/ui/client/lib/components/input/_index.less @@ -261,4 +261,12 @@ width: 16px; } } + + input[type=range][disabled] { + &::-webkit-slider-thumb { + background: @at-color-disabled; + border: solid 1px @at-color-disabled; + cursor: not-allowed; + } + } } \ No newline at end of file diff --git a/awx/ui/client/lib/components/input/lookup.partial.html b/awx/ui/client/lib/components/input/lookup.partial.html index e74c516ab6..88cd218e9c 100644 --- a/awx/ui/client/lib/components/input/lookup.partial.html +++ b/awx/ui/client/lib/components/input/lookup.partial.html @@ -21,7 +21,8 @@ ng-disabled="state._disabled || form.disabled"> + ng-if="state._lookupTags" + ng-disabled="state._disabled || form.disabled">
{{ tag.hostname }} diff --git a/awx/ui/client/lib/components/input/slider.partial.html b/awx/ui/client/lib/components/input/slider.partial.html index e4649149f8..e07abdadfa 100644 --- a/awx/ui/client/lib/components/input/slider.partial.html +++ b/awx/ui/client/lib/components/input/slider.partial.html @@ -6,7 +6,8 @@ ng-model="state._value" min="0" max="100" - ng-change="vm.slide(state._value)"/> + ng-change="vm.slide(state._value)" + ng-disabled="state._disabled || form.disabled"/>

{{ state._value }}%

diff --git a/awx/ui/client/lib/theme/_global.less b/awx/ui/client/lib/theme/_global.less index 2b9f67fdec..109e316be5 100644 --- a/awx/ui/client/lib/theme/_global.less +++ b/awx/ui/client/lib/theme/_global.less @@ -13,6 +13,7 @@ &[disabled] { background: @at-color-disabled; + border-color: @at-color-disabled; } } diff --git a/awx/ui/client/lib/theme/_variables.less b/awx/ui/client/lib/theme/_variables.less index 9f3d5470fa..627d775c8e 100644 --- a/awx/ui/client/lib/theme/_variables.less +++ b/awx/ui/client/lib/theme/_variables.less @@ -115,7 +115,7 @@ @at-color-success: @at-green; @at-color-success-hover: @at-green-hover; -@at-color-disabled: @at-gray-d7; +@at-color-disabled: @at-gray-b7; @at-color-body-background-dark: @at-gray-70; @at-color-body-background-light: @at-gray-eb; @@ -138,7 +138,7 @@ @at-color-input-background: @at-gray-fc; @at-color-input-border: @at-gray-b7; -@at-color-input-button: @at-gray-fc; +@at-color-input-button: @at-white; @at-color-input-button-hover: @at-gray-f2; @at-color-input-disabled: @at-gray-eb; @at-color-input-readonly: @at-color-input-background; diff --git a/awx/ui/client/src/instance-groups/add-edit/edit-instance-group.controller.js b/awx/ui/client/src/instance-groups/add-edit/edit-instance-group.controller.js index ee0802bbe2..458266a1fc 100644 --- a/awx/ui/client/src/instance-groups/add-edit/edit-instance-group.controller.js +++ b/awx/ui/client/src/instance-groups/add-edit/edit-instance-group.controller.js @@ -26,6 +26,8 @@ function EditController ($rootScope, $state, models, strings) { vm.form = instanceGroup.createFormSchema('put'); + vm.form.disabled = !instanceGroup.has('options', 'actions.PUT'); + vm.form.policy_instance_list._lookupTags = true; vm.form.policy_instance_list._model = instance; vm.form.policy_instance_list._placeholder = "Policy Instance List"; diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html index 3752f9876c..e168dfcd53 100644 --- a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html +++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html @@ -59,7 +59,7 @@
- +
diff --git a/awx/ui/client/src/templates/labels/labelsList.block.less b/awx/ui/client/src/templates/labels/labelsList.block.less index 9c240f630e..ccec1c058e 100644 --- a/awx/ui/client/src/templates/labels/labelsList.block.less +++ b/awx/ui/client/src/templates/labels/labelsList.block.less @@ -91,6 +91,10 @@ overflow-y: hidden; } +.LabelList-lookupTags[disabled] { + pointer-events: none; +} + .LabelList-lookupTags--disabled { cursor: not-allowed; background-color: @default-list-header-bg;