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

Merge pull request #380 from marshmalien/fix/7562-add-permissions-key-button

Browse Source 
Align key toggle button to role dropdown in user team permissions modal
This commit is contained in:
Marliana Lara
2017-09-01 13:20:17 -04:00
committed by GitHub
parent 10a0c0164b faa45cc606
commit 4877dc4612
2 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html
View File

@@ -98,11 +98,6 @@
2 2
</span> </span>
<translate>Please assign roles to the selected resources</translate> <translate>Please assign roles to the selected resources</translate>
<div class="AddPermissions-keyToggle btn"
ng-class="{'is-active': showKeyPane}"
ng-click="toggleKeyPane()" translate>
Key
</div>
</div> </div>
<div class="Form-tabHolder"> <div class="Form-tabHolder">
<div class="Form-tab" <div class="Form-tab"
@@ -146,10 +141,25 @@
Organizations Organizations
</div> </div>
</div> </div>
<div class="AddPermissions-keyPane" <div class="AddPermissions-roleSet">
ng-show="showKeyPane"> <!-- role drop-downs -->
<div class="AddPermissions-keyRow" <div class="AddPermissions-roleSet-dropdown" ng-repeat="(type, roleSet) in keys"
ng-repeat="key in keys[currentTab()]"> ng-show="tab[type] && showSection2Tab(type)">
<select id="{{type}}-role-select" class="form-control"
ng-model="roleSelection[type]"
ng-options="key as value.name for (key , value) in roleSet">
<option value="" selected hidden />
</select>
</div>
<div class="AddPermissions-keyToggle btn"
ng-class="{'is-active': showKeyPane}"
ng-click="toggleKeyPane()" translate>
Key
</div>
</div>
<div class="AddPermissions-keyPane" ng-show="showKeyPane">
<div class="AddPermissions-keyRow" ng-repeat="key in keys[currentTab()]">
<div class="AddPermissions-keyName"> <div class="AddPermissions-keyName">
{{ key.name }} {{ key.name }}
</div> </div>
@@ -158,29 +168,17 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- role drop-downs --> <!-- lists of selected resources -->
<div ng-repeat="(type, roleSet) in keys" <!-- (type, collection) => ('resource', {id: {}, ... }) -->
ng-show="tab[type] && showSection2Tab(type)"> <div ng-repeat="(type, collection) in allSelected">
<select <rbac-selected-list
id="{{type}}-role-select" class="form-control" resource-type="type"
ng-model="roleSelection[type]" collection="collection"
ng-options="key as value.name for (key , value) in roleSet"> selected="allSelected"
<option value="" selected hidden /> ng-show="tab[type]">
</select> </rbac-selected-list>
</div>
<!-- lists of selected resources -->
<!-- (type, collection) => ('resource', {id: {}, ... }) -->
<div ng-repeat="(type, collection) in allSelected">
<rbac-selected-list
resource-type="type"
collection="collection"
selected="allSelected"
ng-show="tab[type]">
</rbac-selected-list>
</div>
</div> </div>
<!-- end section 2 --> <!-- end section 2 -->
</div> </div>

9
awx/ui/client/src/access/add-rbac.block.less
View File

@@ -220,3 +220,12 @@
.AddPermissions-keyDescription { .AddPermissions-keyDescription {
flex: 1 0 auto; flex: 1 0 auto;
} }
.AddPermissions-roleSet {
display: flex;
.AddPermissions-roleSet-dropdown {
flex: 1;
margin-right: 20px;
}
}