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

AC-456 Moved project status badge to Update Status column.

Browse Source
This commit is contained in:
chouseknecht 2013-09-16 11:54:19 -04:00
parent 2e805f75a1
commit fb3aa968f7
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/static/js/lists/Inventories.js
View File

@ -55,6 +55,7 @@ angular.module('InventoriesListDefinition', [])
dropdown: {
type: 'DropDown',
label: 'Jobs',
icon: 'icon-zoom-in',
'class': 'btn-xs',
options: [
{ ngClick: 'viewJobs(\{\{ inventory.id \}\})', label: 'All Jobs' },

1
awx/ui/static/js/lists/Jobs.js
View File

@ -97,6 +97,7 @@ angular.module('JobsListDefinition', [])
dropdown: {
type: 'DropDown',
label: 'View',
icon: 'icon-zoom-in',
'class': 'btn-xs',
options: [
{ ngClick: "viewSummary(\{{ job.id \}\}, '\{\{ job.summary_fields.job_template.name \}\}')", label: 'Host Summary',

20
awx/ui/static/js/lists/Projects.js
View File

@ -23,25 +23,23 @@ angular.module('ProjectsListDefinition', [])
name: {
key: true,
label: 'Name',
badgeIcon: "\{\{ 'icon-failures-' + project.badge \}\}",
badgePlacement: 'left',
badgeToolTip: "Indicates the project\'s health based on its status",
badgeTipPlacement: 'bottom'
},
description: {
label: 'Description',
columnClass: 'hidden-sm hidden-xs',
excludeModal: true
},
last_updated: {
label: 'Last Updated',
type: 'date'
},
status: {
label: 'Update Status',
ngClick: 'showSCMStatus(\{\{ project.id \}\})',
awToolTip: 'View details of last SCM Update',
dataPlacement: 'bottom'
dataPlacement: 'bottom',
badgeIcon: "\{\{ 'icon-failures-' + project.badge \}\}",
badgePlacement: 'left'
},
last_updated: {
label: 'Last Updated',
type: 'date'
}
},
@ -88,7 +86,7 @@ angular.module('ProjectsListDefinition', [])
ngClick: "editProject(\{\{ project.id \}\})",
icon: 'icon-edit',
"class": 'btn-xs btn-default',
awToolTip: 'View/edit project'
awToolTip: 'View/edit project properties'
},
scm_update: {
label: 'Update',
@ -102,7 +100,7 @@ angular.module('ProjectsListDefinition', [])
ngClick: "deleteProject(\{\{ project.id \}\},'\{\{ project.name \}\}')",
icon: 'icon-trash',
"class": 'btn-xs btn-danger',
awToolTip: 'Delete project'
awToolTip: 'Permanently remove project from the database'
}
}
});

3
awx/ui/static/lib/ansible/generator-helpers.js
View File

@ -119,7 +119,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
if (params.type) {
field = list[params.type][fld];
}
else {
else {
field = list['fields'][fld];
}
@ -130,6 +130,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
html += "class=\"btn btn-default";
html += (field['class']) ? " " + field['class'] : " btn-xs";
html += " dropdown-toggle\" data-toggle=\"dropdown\">";
html += (field.icon) ? Icon(field.icon) : "";
html += field.label;
html += " <span class=\"caret\"></span></button>\n";
html += "<ul class=\"dropdown-menu pull-right\" role=\"menu\" aria-labelledby=\"dropdownMenu1\">\n";