External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-25 12:55:04 -02:30
Code Issues Packages Projects Releases Wiki Activity

Projects UI audit work

Browse Source
This commit is contained in:
Ken Hoes
2016-05-05 11:09:49 -04:00
committed by John Mitchell
parent 89b97d40ad
commit fbe1d64ed2
13 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -410,11 +410,20 @@ textarea.allowresize {
.popover-title { .popover-title {
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
background-color: @default-interface-txt;
color: @default-bg;
font-weight: 600;
border-bottom: none;
} }
.popover { .popover {
z-index: 2000; z-index: 2000;
min-width: 200px; min-width: 200px;
max-width: 325px; max-width: 325px;
background-color: @default-interface-txt;
color: @default-bg; //white
}
.popover.right>.arrow:after {
border-right-color: @default-interface-txt;
} }
.popover pre { .popover pre {
white-space: pre-wrap; white-space: pre-wrap;
@@ -568,7 +577,7 @@ dd {
.help-link:hover, .help-link:hover,
.ui-widget-content a.help-link:hover { .ui-widget-content a.help-link:hover {
color: @black; color: @default-icon;
text-decoration: none; text-decoration: none;
} }
@@ -2042,7 +2051,6 @@ tr td button i {
box-shadow: none !important; box-shadow: none !important;
} }
.error { .error {
opacity: 1; opacity: 1;
transition: opacity 0.2s; transition: opacity 0.2s;

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

@@ -162,13 +162,12 @@
.Form-subForm { .Form-subForm {
width: 100%; width: 100%;
border-left: 5px solid @default-border; border-left: 5px solid @default-border;
margin-left: -20px;
padding-left: 15px; padding-left: 15px;
margin-bottom: 15px; margin-bottom: 15px;
display: flex;
.Form-formGroup { flex-wrap: wrap;
float: left; flex-direction: row;
} justify-content: space-between;
} }
.Form-subForm--title { .Form-subForm--title {

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

@@ -75,7 +75,7 @@ table, tbody {
} }
.List-tableCell { .List-tableCell {
padding-left: 15px; padding-left: 20px;
padding-right: 15px; padding-right: 15px;
border-top:0px!important; border-top:0px!important;
} }

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

@@ -90,8 +90,10 @@
font-weight: bold; font-weight: bold;
border-radius: 50%; border-radius: 50%;
background-color: @default-list-header-bg; background-color: @default-list-header-bg;
padding: 2px 8px; padding: 1px 8px;
margin-right: 10px; margin-right: 10px;
width: 23px;
height: 23px;
} }
.AddPermissions-separator { .AddPermissions-separator {

2
awx/ui/client/src/controllers/Projects.js
View File

@@ -479,7 +479,7 @@ export function ProjectsAdd(Refresh, $scope, $rootScope, $compile, $location, $l
url: $scope.current_url url: $scope.current_url
}); });
$state.go("^"); $state.go('projects.edit', {id: data.id}, {reload: true});
}) })
.error(function (data, status) { .error(function (data, status) {
Wait('stop'); Wait('stop');

2
awx/ui/client/src/dashboard/hosts/dashboard-hosts.form.js
View File

@@ -57,7 +57,7 @@ export default function(){
default: '---', default: '---',
awPopOver: "<p>Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" + awPopOver: "<p>Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" +
"JSON:<br />\n" + "JSON:<br />\n" +
"<blockquote>{<br />\"somevar\": \"somevalue\",<br />\"password\": \"magic\"<br /> }</blockquote>\n" + "<blockquote>{<br />&emsp;\"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
"YAML:<br />\n" + "YAML:<br />\n" +
"<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" + "<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" +
'<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' + '<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' +

8
awx/ui/client/src/forms/Groups.js
View File

@@ -49,7 +49,7 @@ export default
"<p>Enter variables using either JSON or YAML syntax. Use the " + "<p>Enter variables using either JSON or YAML syntax. Use the " +
"radio button to toggle between the two.</p>" + "radio button to toggle between the two.</p>" +
"JSON:<br />\n" + "JSON:<br />\n" +
"<blockquote>{<br />\"somevar\": \"somevalue\",<br />\"password\": \"magic\"<br /> }</blockquote>\n" + "<blockquote>{<br />&emsp; \"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
"YAML:<br />\n" + "YAML:<br />\n" +
"<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" + "<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" +
'<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' + '<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' +
@@ -171,7 +171,7 @@ export default
dataPlacement: 'right', dataPlacement: 'right',
awPopOver: "<p>Provide key/value pairs using either YAML or JSON.</p>" + awPopOver: "<p>Provide key/value pairs using either YAML or JSON.</p>" +
"JSON:<br />\n" + "JSON:<br />\n" +
"<blockquote>{<br />\"somevar\": \"somevalue\",<br />\"password\": \"magic\"<br /> }</blockquote>\n" + "<blockquote>{<br />&emsp;\"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
"YAML:<br />\n" + "YAML:<br />\n" +
"<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n", "<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n",
dataContainer: 'body' dataContainer: 'body'
@@ -193,7 +193,7 @@ export default
"view ec2.ini in the Ansible github repo.</a></p>" + "view ec2.ini in the Ansible github repo.</a></p>" +
"<p>Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" + "<p>Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" +
"JSON:<br />\n" + "JSON:<br />\n" +
"<blockquote>{<br />\"somevar\": \"somevalue\",<br />\"password\": \"magic\"<br /> }</blockquote>\n" + "<blockquote>{<br />&emsp;\"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
"YAML:<br />\n" + "YAML:<br />\n" +
"<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" + "<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" +
'<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' + '<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' +
@@ -219,7 +219,7 @@ export default
"view vmware.ini in the Ansible github repo.</a></p>" + "view vmware.ini in the Ansible github repo.</a></p>" +
"<p>Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" + "<p>Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" +
"JSON:<br />\n" + "JSON:<br />\n" +
"<blockquote>{<br />\"somevar\": \"somevalue\",<br />\"password\": \"magic\"<br /> }</blockquote>\n" + "<blockquote>{<br />&emsp;\"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
"YAML:<br />\n" + "YAML:<br />\n" +
"<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" + "<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" +
'<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' + '<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' +

4
awx/ui/client/src/forms/Hosts.js
View File

@@ -64,7 +64,7 @@ export default
"default": "---", "default": "---",
awPopOver: "<p>Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" + awPopOver: "<p>Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" +
"JSON:<br />\n" + "JSON:<br />\n" +
"<blockquote>{<br />\"somevar\": \"somevalue\",<br />\"password\": \"magic\"<br /> }</blockquote>\n" + "<blockquote>{<br />&emsp;\"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
"YAML:<br />\n" + "YAML:<br />\n" +
"<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" + "<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" +
'<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' + '<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' +
@@ -87,7 +87,7 @@ export default
}, },
cancel: { cancel: {
ngClick: 'formCancel()', ngClick: 'formCancel()',
ngDisabled: true ngDisabled: true
} }
}, },

2
awx/ui/client/src/forms/Inventories.js
View File

@@ -55,7 +55,7 @@ export default
"default": "---", "default": "---",
awPopOver: "<p>Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" + awPopOver: "<p>Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two.</p>" +
"JSON:<br />\n" + "JSON:<br />\n" +
"<blockquote>{<br />\"somevar\": \"somevalue\",<br />\"password\": \"magic\"<br /> }</blockquote>\n" + "<blockquote>{<br />&emsp;\"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
"YAML:<br />\n" + "YAML:<br />\n" +
"<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" + "<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n" +
'<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' + '<p>View JSON examples at <a href="http://www.json.org" target="_blank">www.json.org</a></p>' +

2
awx/ui/client/src/forms/JobTemplates.js
View File

@@ -248,7 +248,7 @@ export default
awPopOver: "<p>Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter " + awPopOver: "<p>Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter " +
"for ansible-playbook. Provide key/value pairs using either YAML or JSON.</p>" + "for ansible-playbook. Provide key/value pairs using either YAML or JSON.</p>" +
"JSON:<br />\n" + "JSON:<br />\n" +
"<blockquote>{<br />\"somevar\": \"somevalue\",<br />\"password\": \"magic\"<br /> }</blockquote>\n" + "<blockquote>{<br />&emsp;\"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
"YAML:<br />\n" + "YAML:<br />\n" +
"<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n", "<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n",
dataTitle: 'Extra Variables', dataTitle: 'Extra Variables',

2
awx/ui/client/src/forms/Projects.js
View File

@@ -206,7 +206,7 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
type: 'number', type: 'number',
integer: true, integer: true,
min: 0, min: 0,
ngShow: "scm_update_on_launch", ngShow: "scm_update_on_launch && projectSelected",
spinner: true, spinner: true,
"default": '0', "default": '0',
addRequired: false, addRequired: false,

2
awx/ui/client/src/helpers/JobSubmission.js
View File

@@ -496,7 +496,7 @@ function($compile, Rest, GetBasePath, TextareaResize,CreateDialog, GenerateForm,
"<p>Extra variables are passed as command line variables to the playbook run. It is equivalent to the -e or --extra-vars " + "<p>Extra variables are passed as command line variables to the playbook run. It is equivalent to the -e or --extra-vars " +
"command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON.</p>" + "command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON.</p>" +
"JSON:<br />\n" + "JSON:<br />\n" +
"<blockquote>{<br />\"somevar\": \"somevalue\",<br />\"password\": \"magic\"<br /> }</blockquote>\n" + "<blockquote>{<br />&emsp;\"somevar\": \"somevalue\",<br />&emsp;\"password\": \"magic\"<br /> }</blockquote>\n" +
"YAML:<br />\n" + "YAML:<br />\n" +
"<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n"; "<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>\n";

1
awx/ui/client/src/scheduler/schedulertime.block.less
View File

@@ -10,7 +10,6 @@
span.ui-spinner.ui-widget.ui-widget-content.ui-corner-all { span.ui-spinner.ui-widget.ui-widget-content.ui-corner-all {
flex: 1; flex: 1;
width: 100%;
} }
.SchedulerTime-separator { .SchedulerTime-separator {