From c5d4ea01f6434c10c7ee21e86c014e00e009c643 Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Thu, 31 Aug 2017 12:52:50 -0400
Subject: [PATCH] Switch running_jobs and capacity table columns

---
 .../instances/instances-list.partial.html           | 13 +++++++------
 .../list/instance-groups-list.partial.html          | 12 ++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
index dc99aae20a..fa408780b6 100644
--- a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
+++ b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
@@ -15,27 +15,28 @@
                         "{{'Name' | translate}}"
                         <i ng-if="columnNoSort !== 'true'" class="fa columnSortIcon fa-sort-up" ng-class="orderByIcon()"></i>
                     </th>
-                    <th id="instance-consumed_capacity-header" class="List-tableHeader list-header  list-header-noSort" translate>
-                        Used Capacity
-                    </th>
                     <th id="instance-jobs_running-header" class="List-tableHeader list-header  list-header-noSort" translate>
                         Running Jobs
                     </th>
+                    <th id="instance-consumed_capacity-header" class="List-tableHeader list-header  list-header-noSort" translate>
+                        Used Capacity
+                    </th>
                 </tr>
             </thead>
             <tbody>
                 <!-- ngRepeat: instance in instances -->
                 <tr ng-class="{isActive: isActive(instance.id)}" id="instance.id" class="List-tableRow instance_class ng-scope" ng-repeat="instance in instances">
                     <td class="List-tableCell hostname-column col-md-5 col-sm-5 col-xs-5">
-                        <a ui-sref="instanceGroups.instances.list.job.list({instance_id: instance.id})" class="ng-binding">{{ instance.hostname }}</a></td>
-                    <td class="List-tableCell List-tableCell--capacityColumn ng-binding">
-                        <capacity-bar capacity="instance.consumed_capacity"></capacity-bar><span>{{ instance.consumed_capacity }}%</span>
+                        <a ui-sref="instanceGroups.instances.list.job.list({instance_id: instance.id})" class="ng-binding">{{ instance.hostname }}</a>
                     </td>
                     <td class="List-tableCell jobs_running-column ng-binding">
                         <a ui-sref="instanceGroups.instances.jobs({instance_group_id: $stateParams.instance_group_id})">
                             {{ instance.jobs_running }}
                         </a>
                     </td>
+                    <td class="List-tableCell List-tableCell--capacityColumn ng-binding">
+                        <capacity-bar capacity="instance.consumed_capacity"></capacity-bar><span>{{ instance.consumed_capacity }}%</span>
+                    </td>
                 </tr>
             </tbody>
         </table>
diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
index 0d358f802f..1a5f8bad1a 100644
--- a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
+++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
@@ -26,12 +26,12 @@
                     "{{'Name' | translate}}"
                     <i ng-if="columnNoSort !== 'true'" class="fa columnSortIcon fa-sort-up" ng-class="orderByIcon()"></i>
                 </th>
-                <th id="instance_group-consumed_capacity-header" class="List-tableHeader list-header list-header-noSort" translate>
-                    Used Capacity
-                </th>
                 <th id="instance_group-jobs_running-header" class="List-tableHeader list-header list-header-noSort" translate>
                     Running Jobs
                 </th>
+                <th id="instance_group-consumed_capacity-header" class="List-tableHeader list-header list-header-noSort" translate>
+                    Used Capacity
+                </th>
             </tr>
         </thead>
         <tbody>
@@ -41,14 +41,14 @@
                     <a ui-sref="instanceGroups.instances.list({instance_group_id: instance_group.id})" class="ng-binding" >{{ instance_group.name }}</a>
                     <span class="badge List-titleBadge">{{ instance_group.instances }}</span>
                 </td>
-                <td class="List-tableCell List-tableCell--capacityColumn ng-binding">
-                    <capacity-bar capacity="instance_group.consumed_capacity"></capacity-bar><span>{{ instance_group.consumed_capacity }}%</span>
-                </td>
                 <td class="List-tableCell jobs_running-column ng-binding">
                     <a ui-sref="instanceGroups.instances.jobs({instance_group_id: instance_group.id})">
                         {{ instance_group.jobs_running }}
                     </a>
                 </td>
+                <td class="List-tableCell List-tableCell--capacityColumn ng-binding">
+                    <capacity-bar capacity="instance_group.consumed_capacity"></capacity-bar><span>{{ instance_group.consumed_capacity }}%</span>
+                </td>
             </tr>
         </tbody>
     </table>