diff --git a/awx/ui/static/js/forms/Inventories.js b/awx/ui/static/js/forms/Inventories.js index 0a52a2e146..e948744b5a 100644 --- a/awx/ui/static/js/forms/Inventories.js +++ b/awx/ui/static/js/forms/Inventories.js @@ -19,7 +19,7 @@ angular.module('InventoryFormDefinition', []) navigationLinks: { inventory: { href: "/#/inventories/{{ inventory_id }}", - label: "Inventory Properties", + label: "Properties", icon: "icon-edit", active: true }, diff --git a/awx/ui/static/js/forms/Jobs.js b/awx/ui/static/js/forms/Jobs.js index ceae69e3cd..7eb9150423 100644 --- a/awx/ui/static/js/forms/Jobs.js +++ b/awx/ui/static/js/forms/Jobs.js @@ -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" diff --git a/awx/ui/static/js/lists/Inventories.js b/awx/ui/static/js/lists/Inventories.js index d72856af68..91f5459f87 100644 --- a/awx/ui/static/js/lists/Inventories.js +++ b/awx/ui/static/js/lists/Inventories.js @@ -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' } ] diff --git a/awx/ui/static/js/lists/JobEvents.js b/awx/ui/static/js/lists/JobEvents.js index 57db0289a3..ea95717e88 100644 --- a/awx/ui/static/js/lists/JobEvents.js +++ b/awx/ui/static/js/lists/JobEvents.js @@ -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" }, diff --git a/awx/ui/static/js/lists/JobHosts.js b/awx/ui/static/js/lists/JobHosts.js index 011b75f386..2562e68b00 100644 --- a/awx/ui/static/js/lists/JobHosts.js +++ b/awx/ui/static/js/lists/JobHosts.js @@ -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" }, diff --git a/awx/ui/static/js/lists/Jobs.js b/awx/ui/static/js/lists/Jobs.js index 08f64ebb3e..579c27af4d 100644 --- a/awx/ui/static/js/lists/Jobs.js +++ b/awx/ui/static/js/lists/Jobs.js @@ -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'" } ] }, diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less index 986b070f0c..02635560b8 100644 --- a/awx/ui/static/less/ansible-ui.less +++ b/awx/ui/static/less/ansible-ui.less @@ -69,6 +69,10 @@ body { font-size: 16px; } +.modal-dialog .ui-accordion .ui-accordion-content { + overflow: hidden; +} + .overlay { display: none; position: absolute; diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js index 42f54baf77..0d11fce23d 100644 --- a/awx/ui/static/lib/ansible/form-generator.js +++ b/awx/ui/static/lib/ansible/form-generator.js @@ -846,6 +846,20 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies']) html += "
  • {{ crumb.title | capitalize }}
    • \n"; if (navigation) { + + var paths = $location.path().replace(/^\//,'').split('/'); + + if (paths.length == 2) { + html += "
  • "; + if (options.mode == 'edit') { + html += this.form.editTitle; + } + else { + html += this.form.addTitle; + } + html += "
    • \n"; + } + html += "
    • \n"; html += "\n"; html += "
    \n"; @@ -857,14 +871,17 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies']) break; } } + html += "\n"; @@ -1123,7 +1140,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies']) var navigation = { inventory: { href: "/#/inventories/{{ inventory_id }}", - label: "Inventory Properties", + label: "Properties", icon: "icon-edit" }, hosts: { diff --git a/awx/ui/static/lib/ansible/list-generator.js b/awx/ui/static/lib/ansible/list-generator.js index cfe2db4d24..907aab3964 100644 --- a/awx/ui/static/lib/ansible/list-generator.js +++ b/awx/ui/static/lib/ansible/list-generator.js @@ -123,10 +123,12 @@ angular.module('ListGenerator', ['GeneratorHelpers']) for (var itm in navigation) { html += "
  • "; html += navigation[itm].label; - html += (navigation[itm].active) ? " " : ""; html += "
    • \n"; } html += "\n";