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

Merge pull request #4612 from mabashian/permissions-columns

Browse Source 
Fixed the column widths on the permissions modals
This commit is contained in:
Michael Abashian
2017-01-09 18:35:34 -05:00
committed by GitHub
parent 17f0555362 e4d661f659
commit b26122d9e1
6 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html
View File

@@ -6,7 +6,7 @@
<div class="List-header"> <div class="List-header">
<div class="List-title"> <div class="List-title">
<div class="List-titleText ng-binding"> <div class="List-titleText ng-binding">
{{ object.name }} {{ object.name || object.username }}
<div class="List-titleLockup"></div> <div class="List-titleLockup"></div>
Add Permissions Add Permissions
</div> </div>

12
awx/ui/client/src/access/add-rbac-user-team/rbac-selected-list.directive.js
View File

@@ -42,8 +42,6 @@ export default ['$compile','templateUrl', 'i18n', 'generateList',
list.listTitleBadge = false; list.listTitleBadge = false;
// @issue - fix field.columnClass values for this view
switch(scope.resourceType){ switch(scope.resourceType){
case 'projects': case 'projects':
@@ -51,6 +49,8 @@ export default ['$compile','templateUrl', 'i18n', 'generateList',
name: list.fields.name, name: list.fields.name,
scm_type: list.fields.scm_type scm_type: list.fields.scm_type
}; };
list.fields.name.columnClass = 'col-md-5 col-sm-5 col-xs-10';
list.fields.scm_type.columnClass = 'col-md-5 col-sm-5 hidden-xs';
break; break;
case 'inventories': case 'inventories':
@@ -58,6 +58,8 @@ export default ['$compile','templateUrl', 'i18n', 'generateList',
name: list.fields.name, name: list.fields.name,
organization: list.fields.organization organization: list.fields.organization
}; };
list.fields.name.columnClass = 'col-md-5 col-sm-5 col-xs-10';
list.fields.organization.columnClass = 'col-md-5 col-sm-5 hidden-xs';
break; break;
case 'job_templates': case 'job_templates':
@@ -67,6 +69,8 @@ export default ['$compile','templateUrl', 'i18n', 'generateList',
name: list.fields.name, name: list.fields.name,
description: list.fields.description description: list.fields.description
}; };
list.fields.name.columnClass = 'col-md-5 col-sm-5 col-xs-10';
list.fields.description.columnClass = 'col-md-5 col-sm-5 hidden-xs';
break; break;
case 'workflow_templates': case 'workflow_templates':
@@ -77,12 +81,16 @@ export default ['$compile','templateUrl', 'i18n', 'generateList',
name: list.fields.name, name: list.fields.name,
description: list.fields.description description: list.fields.description
}; };
list.fields.name.columnClass = 'col-md-5 col-sm-5 col-xs-10';
list.fields.description.columnClass = 'col-md-5 col-sm-5 hidden-xs';
break; break;
case 'credentials': case 'credentials':
list.fields = { list.fields = {
name: list.fields.name, name: list.fields.name,
description: list.fields.description description: list.fields.description
}; };
list.fields.name.columnClass = 'col-md-5 col-sm-5 col-xs-10';
list.fields.description.columnClass = 'col-md-5 col-sm-5 hidden-xs';
} }
list.fields = _.each(list.fields, (field) => field.nosort = true); list.fields = _.each(list.fields, (field) => field.nosort = true);

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

@@ -7,7 +7,7 @@
<div class="List-header"> <div class="List-header">
<div class="List-title"> <div class="List-title">
<div class="List-titleText ng-binding"> <div class="List-titleText ng-binding">
{{ owner.name }} {{ owner.name || owner.username }}
<div class="List-titleLockup"></div> <div class="List-titleLockup"></div>
Add Permissions Add Permissions
</div> </div>

2
awx/ui/client/src/access/rbac-multiselect/permissionsUsers.list.js
View File

@@ -34,7 +34,7 @@
username: { username: {
key: true, key: true,
label: 'Username', label: 'Username',
columnClass: 'col-md-3 col-sm-3 col-xs-9' columnClass: 'col-md-5 col-sm-5 col-xs-11'
}, },
}, },

13
awx/ui/client/src/access/rbac-multiselect/rbac-multiselect-list.directive.js
View File

@@ -43,6 +43,8 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
name: list.fields.name, name: list.fields.name,
scm_type: list.fields.scm_type scm_type: list.fields.scm_type
}; };
list.fields.name.columnClass = 'col-md-6 col-sm-6 col-xs-11';
list.fields.scm_type.columnClass = 'col-md-5 col-sm-5 hidden-xs';
break; break;
case 'Inventories': case 'Inventories':
@@ -50,6 +52,8 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
name: list.fields.name, name: list.fields.name,
organization: list.fields.organization organization: list.fields.organization
}; };
list.fields.name.columnClass = 'col-md-6 col-sm-6 col-xs-11';
list.fields.organization.columnClass = 'col-md-5 col-sm-5 hidden-xs';
break; break;
case 'JobTemplates': case 'JobTemplates':
@@ -59,6 +63,8 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
name: list.fields.name, name: list.fields.name,
description: list.fields.description description: list.fields.description
}; };
list.fields.name.columnClass = 'col-md-6 col-sm-6 col-xs-11';
list.fields.description.columnClass = 'col-md-5 col-sm-5 hidden-xs';
break; break;
case 'WorkflowTemplates': case 'WorkflowTemplates':
@@ -69,6 +75,8 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
name: list.fields.name, name: list.fields.name,
description: list.fields.description description: list.fields.description
}; };
list.fields.name.columnClass = 'col-md-6 col-sm-6 col-xs-11';
list.fields.description.columnClass = 'col-md-5 col-sm-5 hidden-xs';
break; break;
case 'Users': case 'Users':
list.fields = { list.fields = {
@@ -76,12 +84,17 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
first_name: list.fields.first_name, first_name: list.fields.first_name,
last_name: list.fields.last_name last_name: list.fields.last_name
}; };
list.fields.username.columnClass = 'col-md-5 col-sm-5 col-xs-11';
list.fields.first_name.columnClass = 'col-md-3 col-sm-3 hidden-xs';
list.fields.last_name.columnClass = 'col-md-3 col-sm-3 hidden-xs';
break; break;
default: default:
list.fields = { list.fields = {
name: list.fields.name, name: list.fields.name,
description: list.fields.description description: list.fields.description
}; };
list.fields.name.columnClass = 'col-md-6 col-sm-6 col-xs-11';
list.fields.description.columnClass = 'col-md-5 col-sm-5 hidden-xs';
} }
list_html = generateList.build({ list_html = generateList.build({

2
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@@ -311,7 +311,7 @@ export default ['$location', '$compile', '$rootScope', 'Attr', 'Icon',
} }
if (list.multiSelect) { if (list.multiSelect) {
innerTable += '<td class="col-xs-1 select-column List- List-staticColumn--smallStatus"><select-list-item item=\"' + list.iterator + '\"></select-list-item></td>'; innerTable += '<td class="col-xs-1 select-column List-staticColumn--smallStatus"><select-list-item item=\"' + list.iterator + '\"></select-list-item></td>';
} }
// Change layout if a lookup list, place radio buttons before labels // Change layout if a lookup list, place radio buttons before labels