shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity

Add capacity adjustment slider label

Browse Source
This commit is contained in:
Marliana Lara 2018-03-15 12:08:46 -04:00
parent e58038b056
commit c156a0af99
No known key found for this signature in database
GPG Key ID: 38C73B40DFA809EE
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/client/lib/components/input/lookup.partial.html
View File

@ -23,12 +23,13 @@
<span class="form-control Form-textInput Form-textInput--variableHeight LabelList-lookupTags"
ng-if="state._lookupTags">
<div class="LabelList-tagContainer" ng-repeat="tag in state._value track by $index">
<div class="LabelList-deleteContainer" ng-click="vm.removeTag(tag)">
<i class="fa fa-times LabelList-tagDelete"></i>
</div>
<div class="LabelList-tag LabelList-tag--deletable">
<span ng-if="tag.hostname" class="LabelList-name">{{ tag.hostname }}</span>
<span ng-if="!tag.hostname" class="LabelList-name">{{ tag }}</span>
<div class="LabelList-tag LabelList-tag--deletable">
<span ng-if="tag.hostname" class="LabelList-name">{{ tag.hostname }}</span>
<span ng-if="!tag.hostname" class="LabelList-name">{{ tag }}</span>
</div>
<div class="LabelList-deleteContainer" ng-click="vm.removeTag(tag)">
<i class="fa fa-times LabelList-tagDelete"></i>
</div>
</div>
</span>
</div>

13
awx/ui/client/src/instance-groups/capacity-adjuster/capacity-adjuster.block.less
View File

@ -1,7 +1,18 @@
.CapacityAdjuster {
margin-right: @at-space-4x;
position: relative;
&-valueLabel {
bottom: @at-space-5x;
color: @at-color-body-text;
font-size: @at-font-size;
position: absolute;
text-align: center;
width: 100%;
}
.at-InputSlider {
align-items: center;
margin-right: @at-space-4x;
}
.at-InputSlider p {

1
awx/ui/client/src/instance-groups/capacity-adjuster/capacity-adjuster.partial.html
View File

@ -1,4 +1,5 @@
<div class="CapacityAdjuster">
<span class="CapacityAdjuster-valueLabel">{{ state.capacity_adjustment }}</span>
<div class="at-InputSlider">
<p>{{min_capacity.label}} {{min_capacity.value}}</p>
<input string-to-number

8
awx/ui/client/src/shared/directives.js
View File

@ -75,12 +75,8 @@ angular.module('AWDirectives', ['RestServices', 'Utilities'])
require: 'ngModel',
restrict: 'A',
link: function(scope, element, attrs, ngModel) {
ngModel.$parsers.push(function(value) {
return '' + value;
});
ngModel.$formatters.push(function(value) {
return parseFloat(value);
});
ngModel.$parsers.push(value => value.toFixed(2));
ngModel.$formatters.push(value => parseFloat(value));
}
};
})