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

Merge pull request #2678 from leigh-johnson/2676

Browse Source 
Restyle read-only labels, apply read-only label styles when user cannot edit job template
This commit is contained in:
Leigh Johnson
2016-06-29 09:23:19 -04:00
committed by GitHub
parent 8825bc7075 4d14ac1a5f
commit 6a6081dcf7
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/src/job-templates/labels/labelsList.block.less
View File

@@ -18,8 +18,8 @@
padding: 2px 10px; padding: 2px 10px;
margin: 4px 0px; margin: 4px 0px;
font-size: 12px; font-size: 12px;
color: @default-bg; color: @default-interface-txt;
background-color: @default-link; background-color: @default-list-header-bg;
margin-right: 5px; margin-right: 5px;
max-width: 100%; max-width: 100%;
white-space: nowrap; white-space: nowrap;
@@ -42,6 +42,8 @@
} }
.LabelList-tag--deletable { .LabelList-tag--deletable {
color: @default-bg;
background-color: @default-link;
margin-right: 0px; margin-right: 0px;
border-top-left-radius: 0px; border-top-left-radius: 0px;
border-bottom-left-radius: 0px; border-bottom-left-radius: 0px;

4
awx/ui/client/src/job-templates/labels/labelsList.partial.html
View File

@@ -1,10 +1,10 @@
<div class="LabelList-tagContainer" ng-repeat="label in labels"> <div class="LabelList-tagContainer" ng-repeat="label in labels">
<div class="LabelList-deleteContainer" <div class="LabelList-deleteContainer"
ng-click="deleteLabel(job_template.id, job_template.name, label.id, label.name)" ng-click="deleteLabel(job_template.id, job_template.name, label.id, label.name)"
ng-show="showDelete"> ng-show="showDelete && job_template.summary_fields.can_edit">
<i class="fa fa-times LabelList-tagDelete"></i> <i class="fa fa-times LabelList-tagDelete"></i>
</div> </div>
<div class="LabelList-tag" ng-class="{'LabelList-tag--deletable' : showDelete}"> <div class="LabelList-tag" ng-class="{'LabelList-tag--deletable' : (showDelete && job_template.summary_fields.can_edit)}">
<span class="LabelList-name">{{ label.name }}</span> <span class="LabelList-name">{{ label.name }}</span>
</div> </div>
</div> </div>