External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-22 08:17:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Align key toggle button to role dropdown in user team permissions modal

Browse Source
This commit is contained in:
Marliana Lara
2017-08-31 15:34:18 -04:00
parent de3b9fc70d
commit faa45cc606
2 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
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,16 +168,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- role drop-downs -->
<div ng-repeat="(type, roleSet) in keys"
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>
<!-- lists of selected resources --> <!-- lists of selected resources -->
@@ -180,8 +180,6 @@
ng-show="tab[type]"> ng-show="tab[type]">
</rbac-selected-list> </rbac-selected-list>
</div> </div>
</div>
<!-- end section 2 --> <!-- end section 2 -->
</div> </div>
<!-- begin footer --> <!-- begin footer -->

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;
}
}