External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-20 12:40:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2324 from Haokun-Chen/2050

Browse Source 
update tag component to use tag directive
This commit is contained in:
Haokun Chen
2018-06-27 10:24:13 -04:00
committed by GitHub
parent 7aa48708d6 da421f28e8
commit 9f6d431c54
5 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,13 +22,8 @@
ng-if="state._lookupTags" ng-if="state._lookupTags"
ng-disabled="state._disabled || form.disabled"> ng-disabled="state._disabled || form.disabled">
<div class="LabelList-tagContainer" ng-repeat="tag in state._value track by $index"> <div class="LabelList-tagContainer" ng-repeat="tag in state._value track by $index">
<div class="LabelList-tag LabelList-tag--deletable"> <at-tag ng-if="!tag.hostname" tag="tag" remove-tag="vm.removeTag(tag)"></at-tag>
<span ng-if="tag.hostname" class="LabelList-name">{{ tag.hostname }}</span> <at-tag ng-if="tag.hostname" tag="tag.hostname" remove-tag="vm.removeTag(tag)"></at-tag>
<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> </div>
</span> </span>
</div> </div>
@@ -37,4 +32,4 @@
</div> </div>
<div ui-view="{{ state._resource }}"></div> <div ui-view="{{ state._resource }}"></div>
</div> </div>

8
awx/ui/client/src/shared/instance-groups-multiselect/instance-groups.partial.html
View File

@@ -8,13 +8,7 @@
<span id="InstanceGroups" class="form-control Form-textInput Form-textInput--variableHeight input-medium lookup LabelList-lookupTags" <span id="InstanceGroups" class="form-control Form-textInput Form-textInput--variableHeight input-medium lookup LabelList-lookupTags"
ng-disabled="fieldIsDisabled"> ng-disabled="fieldIsDisabled">
<div class="LabelList-tagContainer" ng-repeat="tag in instanceGroupsTags"> <div class="LabelList-tagContainer" ng-repeat="tag in instanceGroupsTags">
<div class="LabelList-tag LabelList-tag--deletable"> <at-tag tag="tag.name" remove-tag="deleteTag(tag)"></at-tag>
<span class="LabelList-name">{{ tag.name }}</span>
</div>
<div class="LabelList-deleteContainer"
ng-click="deleteTag(tag)">
<i class="fa fa-times LabelList-tagDelete"></i>
</div>
</div> </div>
</span> </span>
</div> </div>

9
awx/ui/client/src/shared/multi-select-preview/multi-select-preview.partial.html
View File

@@ -6,13 +6,8 @@
<div class="MultiSelectPreview-previewTags--outer"> <div class="MultiSelectPreview-previewTags--outer">
<div class="MultiSelectPreview-previewTags--inner"> <div class="MultiSelectPreview-previewTags--inner">
<div class="MultiSelectPreview-previewTagContainer" ng-repeat="selectedRow in selectedRows"> <div class="MultiSelectPreview-previewTagContainer" ng-repeat="selectedRow in selectedRows">
<div class="MultiSelectPreview-previewTagContainerDelete" ng-click="unselectSelectedRow($index)"> <at-tag ng-if="selectedRow.name" tag="selectedRow.name" remove-tag="unselectSelectedRow($index)"></at-tag>
<i class="fa fa-times MultiSelectPreview-previewTagContainerTagDelete"></i> <at-tag ng-if="selectedRow.hostname" tag="selectedRow.hostname" remove-tag="unselectSelectedRow($index)"></at-tag>
</div>
<div class="MultiSelectPreview-previewTag MultiSelectPreview-previewTag--deletable">
<span>{{selectedRow.name}}</span>
<span ng-if="selectedRow.hostname">{{selectedRow.hostname}}</span>
</div>
</div> </div>
</div> </div>
</div> </div>

3
awx/ui/client/src/shared/smart-search/smart-search.block.less
View File

@@ -154,6 +154,9 @@
.SmartSearch-deleteContainer:hover > .SmartSearch-tagDelete { .SmartSearch-deleteContainer:hover > .SmartSearch-tagDelete {
color: @default-bg; color: @default-bg;
} }
.SmartSearch-clearAll-container{
.at-mixin-VerticallyCenter();
}
.SmartSearch-clearAll{ .SmartSearch-clearAll{
font-size: 10px; font-size: 10px;
padding-top: 14px; padding-top: 14px;

11
awx/ui/client/src/shared/smart-search/smart-search.partial.html
View File

@@ -20,14 +20,11 @@
<div class="SmartSearch-tagSection"> <div class="SmartSearch-tagSection">
<div class="SmartSearch-flexContainer"> <div class="SmartSearch-flexContainer">
<div class="SmartSearch-tagContainer" ng-repeat="tag in searchTags track by $index"> <div class="SmartSearch-tagContainer" ng-repeat="tag in searchTags track by $index">
<div class="SmartSearch-deleteContainer" ng-click="removeTerm($index)"> <at-tag tag="tag" remove-tag="removeTerm($index)"></at-tag>
<i class="fa fa-times SmartSearch-tagDelete"></i> </div>
</div> <div class="SmartSearch-clearAll-container">
<div class="SmartSearch-tag SmartSearch-tag--deletable"> <a href class="SmartSearch-clearAll" ng-click="clearAllTerms()" translate>CLEAR ALL</a>
<span class="SmartSearch-name">{{tag}}</span>
</div>
</div> </div>
<a href class="SmartSearch-clearAll" ng-click="clearAllTerms()" translate>CLEAR ALL</a>
</div> </div>
</div> </div>
</div> </div>