External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 20:00:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

fix of org problems found in audit

Browse Source
This commit is contained in:
John Mitchell 2016-05-04 13:29:57 -04:00
parent 0f77e77cf3
commit a968717222
12 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui/client/legacy-styles/ansible-ui.less
View File

@ -1887,6 +1887,11 @@ tr td button i {
padding-right: 15px;
}
.list-actions {
margin-bottom: 20px;
text-align: left;
}
}
.nvtooltip {
@ -2051,10 +2056,6 @@ tr td button i {
opacity: 0;
}
.list-actions button, .list-actions .checkbox-inline {
margin-top: 10px;
}
/* Overwrite select2 base styles for single/multiple selects so that match up with other form elements. Also overwrite disabled styles. */
.select2-container--disabled,.select2-container--disabled .select2-selection--single,.select2-container--disabled .select2-selection--multiple {
cursor: not-allowed !important;

8
awx/ui/client/legacy-styles/forms.less
View File

@ -463,7 +463,7 @@ input[type='radio']:checked:before {
}
.Form-formGroup--singleColumn {
width: 100%;
width: 100% !important;
padding-right: 0px;
}
@ -473,10 +473,15 @@ input[type='radio']:checked:before {
color: @default-interface-txt;
}
.Form-formGroup {
max-width: 33%;
}
@media only screen and (max-width: 650px) {
.Form-formGroup {
flex: 1 0 auto;
margin-bottom: 25px;
max-width: 100%;
width: 100%;
padding-right: 50px;
}
@ -486,6 +491,7 @@ input[type='radio']:checked:before {
.Form-formGroup {
flex: 1 0 auto;
margin-bottom: 25px;
max-width: 50%;
width: 50%;
padding-right: 50px;
}

8
awx/ui/client/legacy-styles/lists.less
View File

@ -47,6 +47,10 @@ table, tbody {
text-align: right;
}
.List-tableHeader:not([ng-click]) {
cursor: default !important;
}
.List-tableHeaderSort {
color: @list-header-icon;
}
@ -183,10 +187,6 @@ table, tbody {
display: flex;
}
.List-actions {
margin-top: -10px;
}
.List-auxAction + .List-actions {
margin-left: 20px;
}

18
awx/ui/client/src/access/addPermissions/addPermissions.block.less
View File

@ -90,7 +90,7 @@
font-weight: bold;
border-radius: 50%;
background-color: @default-list-header-bg;
padding: 2px 6px;
padding: 2px 8px;
margin-right: 10px;
}
@ -122,9 +122,7 @@
}
.AddPermissions-roleType {
border-radius: 5px;
padding: 0px 6px;
border: 1px solid @d7grey;
font-size: 10px;
color: @default-interface-txt;
text-transform: uppercase;
@ -143,7 +141,7 @@
.AddPermissions-roleRemove {
border-radius: 50%;
padding: 5px 3px;
padding: 3px 4.5px;
line-height: 11px;
color: @default-icon;
background-color: @default-tertiary-bg;
@ -187,11 +185,15 @@
.AddPermissions-keyPane {
margin: 20px 0;
border-radius: 5px;
font-size: 12px;
width: 100%;
padding: 15px;
padding-bottom: 0px;
border: 1px solid @d7grey;
color: @default-interface-txt;
padding-top: 10px;
margin-bottom: 15px;
border-radius: 4px;
border: 1px solid @login-notice-border;
background-color: @login-notice-bg;
color: @login-notice-text;
}
.AddPermissions-keyRow {

23
awx/ui/client/src/access/addPermissions/addPermissions.controller.js
View File

@ -75,18 +75,19 @@ export default ['$rootScope', '$scope', 'GetBasePath', 'Rest', '$q', 'Wait', 'Pr
});
} else {
// selected, so add to the allSelected list
var getName = function(val) {
if (val.type === "user") {
return (val.first_name &&
val.last_name) ?
val.first_name + " " +
val.last_name :
val.username;
} else {
return val.name;
}
};
scope.allSelected.push({
name: function() {
if (val.type === "user") {
return (val.first_name &&
val.last_name) ?
val.first_name + " " +
val.last_name :
val.username;
} else {
return val .name;
}
},
name: getName(val),
type: val.type,
roles: [],
id: val.id

4
awx/ui/client/src/access/addPermissions/addPermissions.partial.html
View File

@ -21,7 +21,7 @@
<div class="AddPermissions-body">
<div class="AddPermissions-directions">
<span class="AddPermissions-directionNumber">
1.
1
</span>
Please select Users / Teams from the lists below.
</div>
@ -55,7 +55,7 @@
<div class="AddPermissions-directions"
ng-show="allSelected && allSelected.length > 0">
<span class="AddPermissions-directionNumber">
2.
2
</span>
Please assign roles to the selected users/teams
<div class="AddPermissions-keyToggle"

4
awx/ui/client/src/license/license.partial.html
View File

@ -76,7 +76,7 @@
<div class="License-body">
<div class="AddPermissions-directions" ng-if="licenseMissing">
<span class="AddPermissions-directionNumber">
1.
1
</span>
<span class="License-helperText">
Please click the button below to visit Ansible's website to get a Tower license key.
@ -89,7 +89,7 @@
<div class="AddPermissions-directions">
<span class="AddPermissions-directionNumber" ng-if="licenseMissing">
2.
2
</span>
<span class="License-helperText">
Choose your license file, agree to the End User License Agreement, and click submit.

6
awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js
View File

@ -4,21 +4,27 @@ export default ['$scope', '$stateParams', '$state', 'Rest', 'UserList', 'Invento
var list = {};
if (mode === 'users') {
list = _.cloneDeep(UserList);
list.emptyListText = "Please add items to this list";
list.actions.add.buttonContent = '&#43; ADD user';
} else if (mode === 'inventories') {
list = _.cloneDeep(InventoryList);
list.emptyListText = "List is empty";
delete list.actions.add;
} else if (mode === 'job_templates') {
list = _.cloneDeep(JobTemplateList);
list.emptyListText = "List is empty";
delete list.actions.add;
} else if (mode === 'teams') {
list = _.cloneDeep(TeamList);
list.emptyListText = "List is empty";
delete list.actions.add;
} else if (mode === 'projects') {
list = _.cloneDeep(ProjectList);
list.emptyListText = "List is empty";
delete list.actions.add;
} else if (mode === 'admins') {
list = _.cloneDeep(UserList);
list.emptyListText = "Please add items to this list";
list.actions.add.buttonContent = '&#43; ADD administrator';
}
return list;

4
awx/ui/client/src/search/tagSearch.block.less
View File

@ -82,11 +82,11 @@
}
.TagSearch-dropdownItem:hover {
background-color: @default-tertiary-bg;
background-color: @default-no-items-bord;
}
.TagSearch-dropdownItem.is-selected {
background-color: @default-no-items-bord;
background-color: @default-white-button-bord;
}
.TagSearch-searchTermContainer {

4
awx/ui/client/src/shared/form-generator.js
View File

@ -1783,7 +1783,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += `
<div class=\"row\"
ng-show=\"${collection.hideSearchAndActions ? false : true}\">
<div class=\"col-lg-8\"
<div class=\"col-lg-8 col-md-8 col-sm-8 col-xs-12\"
ng-show=\"${collection.iterator}Loading == true ||
${collection.iterator}_active_search == true || (
${collection.iterator}Loading == false &&
@ -1793,7 +1793,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
>
${tagSearch}
</div>
<div class=\"col-lg-4\">
<div class=\"col-lg-4 col-md-4 col-sm-4 col-xs-12\">
<div class=\"list-actions\">
${actionButtons}
</div>

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

@ -329,7 +329,7 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate
html += "</div>";
}
html += "<div class=\"List-actions\">";
html += "<div class=\"list-actions\" ng-include=\"'" +
html += "<div ng-include=\"'" +
templateUrl('shared/list-generator/list-actions') +
"'\">\n";

10
awx/ui/client/src/shared/modal/modal.less
View File

@ -37,12 +37,14 @@
height:20px;
font-size: 20px;
background-color:@default-bg;
color:@default-icon;
color:@default-icon-hov;
line-height:1;
opacity: 1;
}
.Modal-exit:hover{
color:@default-icon-hov;
color: @default-icon;
opacity: 1;
}
.Modal-body {
@ -96,6 +98,10 @@
color: @btn-txt-sel;
}
.Modal-errorButton:focus {
color: @btn-txt-sel;
}
.Modal-footerButton {
padding: 4px 8px;
}