From 008a6224a952d141579067d02a97d048fdad76e6 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Wed, 3 Jun 2015 15:25:50 -0400 Subject: [PATCH 1/2] fixed order of job template list --- awx/ui/static/js/lists/JobTemplates.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/awx/ui/static/js/lists/JobTemplates.js b/awx/ui/static/js/lists/JobTemplates.js index 5b3e24e6c3..1127186e4a 100644 --- a/awx/ui/static/js/lists/JobTemplates.js +++ b/awx/ui/static/js/lists/JobTemplates.js @@ -19,7 +19,12 @@ export default hover: true, fields: { - smart_status: { + name: { + key: true, + label: 'Name', + // columnClass: 'col-lg-5 col-md-5 col-sm-9 col-xs-8' + }, + smart_status: { label: 'Status', columnClass: 'col-md-2 col-sm-2 col-xs-2', searchable: false, @@ -27,11 +32,6 @@ export default ngInclude: "'/static/partials/job-template-smart-status.html'", type: 'template' }, - name: { - key: true, - label: 'Name', - // columnClass: 'col-lg-5 col-md-5 col-sm-9 col-xs-8' - }, description: { label: 'Description', // columnClass: 'col-lg-4 col-md-3 hidden-sm hidden-xs' From c7f3fa99a294f0d029585057dea33b0399daa7d4 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Wed, 3 Jun 2015 15:53:54 -0400 Subject: [PATCH 2/2] moved smart status to the right of description and gave the correct column class. --- awx/ui/static/js/lists/JobTemplates.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/awx/ui/static/js/lists/JobTemplates.js b/awx/ui/static/js/lists/JobTemplates.js index 1127186e4a..37eeb9bc9d 100644 --- a/awx/ui/static/js/lists/JobTemplates.js +++ b/awx/ui/static/js/lists/JobTemplates.js @@ -24,17 +24,17 @@ export default label: 'Name', // columnClass: 'col-lg-5 col-md-5 col-sm-9 col-xs-8' }, + description: { + label: 'Description', + // columnClass: 'col-lg-4 col-md-3 hidden-sm hidden-xs' + }, smart_status: { label: 'Status', - columnClass: 'col-md-2 col-sm-2 col-xs-2', + columnClass: 'col-md-1 col-sm-2 col-xs-3', searchable: false, nosort: true, ngInclude: "'/static/partials/job-template-smart-status.html'", type: 'template' - }, - description: { - label: 'Description', - // columnClass: 'col-lg-4 col-md-3 hidden-sm hidden-xs' } },