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

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

View File

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

View File

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

View File

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

View File

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