AC-525 Fixed inventory and job navigation issues. Fixed nagging horizontal scroll in dialogs with accordions.

This commit is contained in:
chouseknecht
2013-09-26 22:02:40 -04:00
parent 567605cc59
commit 7bfa0c4b0c
9 changed files with 42 additions and 17 deletions

View File

@@ -19,7 +19,7 @@ angular.module('InventoryFormDefinition', [])
navigationLinks: {
inventory: {
href: "/#/inventories/{{ inventory_id }}",
label: "Inventory Properties",
label: "Properties",
icon: "icon-edit",
active: true
},

View File

@@ -10,17 +10,19 @@ angular.module('JobFormDefinition', [])
.value(
'JobForm', {
addTitle: 'Create Job', //Legend in add mode
editTitle: '{{ id }} - {{ name }}', //Legend in edit mode
addTitle: 'Create Job',
editTitle: '{{ id }} - {{ name }}',
name: 'jobs',
well: true,
collapse: true,
collapseMode: 'edit',
collapseTitle: 'Job Template',
twoColumns: true,
navigationLinks: {
details: {
href: "/#/jobs/{{ job_id }}",
label: "\{\{ job_id + '- ' + name \}\}",
listLabel: 'Job Details',
label: 'Status',
icon: 'icon-zoom-in',
active: true,
ngShow: "job_id !== null"

View File

@@ -69,7 +69,7 @@ angular.module('InventoriesListDefinition', [])
icon: 'icon-edit',
'class': 'btn-default btn-xs',
options: [
{ ngClick: "editInventory(\{\{ inventory.id \}\})", label: 'Inventory Properties' },
{ ngClick: "editInventory(\{\{ inventory.id \}\})", label: 'Properties' },
{ ngClick: "editHosts(\{\{ inventory.id \}\})", label: 'Hosts' },
{ ngClick: "editGroups(\{\{ inventory.id \}\})", label: 'Groups' }
]

View File

@@ -21,7 +21,7 @@ angular.module('JobEventsListDefinition', [])
navigationLinks: {
details: {
href: "/#/jobs/{{ job_id }}",
label: 'Job Details',
label: 'Status',
icon: 'icon-zoom-in',
ngShow: "job_id !== null"
},

View File

@@ -19,7 +19,7 @@ angular.module('JobHostDefinition', [])
navigationLinks: {
details: {
href: "/#/jobs/{{ job_id }}",
label: 'Job Details',
label: 'Status',
icon: 'icon-zoom-in',
ngShow: "job_id !== null"
},

View File

@@ -97,11 +97,11 @@ angular.module('JobsListDefinition', [])
icon: 'icon-zoom-in',
'class': 'btn-default btn-xs',
options: [
{ ngClick: "viewSummary(\{{ job.id \}\}, '\{\{ job.summary_fields.job_template.name \}\}')", label: 'Host Summary',
{ ngClick: "editJob(\{\{ job.id \}\}, '\{\{ job.summary_fields.job_template.name \}\}')", label: 'Status' },
{ ngClick: "viewSummary(\{{ job.id \}\}, '\{\{ job.summary_fields.job_template.name \}\}')", label: 'Hosts',
ngHide: "job.status == 'new'" },
{ ngClick: "viewEvents(\{{ job.id \}\}, '\{\{ job.summary_fields.job_template.name \}\}')", label: 'Job Events',
ngHide: "job.status == 'new'" },
{ ngClick: "editJob(\{\{ job.id \}\}, '\{\{ job.summary_fields.job_template.name \}\}')", label: 'Job Details' }
{ ngClick: "viewEvents(\{{ job.id \}\}, '\{\{ job.summary_fields.job_template.name \}\}')", label: 'Events',
ngHide: "job.status == 'new'" }
]
},