From d42e0d8682ac7567610f07f204251ca2f6b92a4c Mon Sep 17 00:00:00 2001
From: Jeremy Mitchell <mitchell852@gmail.com>
Date: Thu, 12 Oct 2017 08:20:19 -0600
Subject: [PATCH] adds ilo column to servers tables and gets rid of update
 pending flag

---
 .../table.cacheGroupServers.tpl.html          | 36 ++++++++----------
 .../cdnServers/table.cdnServers.tpl.html      | 25 ++++++-------
 .../table.deliveryServiceServers.tpl.html     | 25 ++++++-------
 .../table.physLocationServers.tpl.html        | 37 ++++++++-----------
 .../table.profileServers.tpl.html             | 37 ++++++++-----------
 .../table/servers/table.servers.tpl.html      | 25 ++++++-------
 .../table.statusServers.tpl.html              | 25 ++++++-------
 .../typeServers/table.typeServers.tpl.html    | 25 ++++++-------
 8 files changed, 105 insertions(+), 130 deletions(-)

diff --git a/traffic_portal/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html b/traffic_portal/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html
index 93fa97daea..0b27692eca 100644
--- a/traffic_portal/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html
@@ -45,40 +45,34 @@
             <thead>
             <tr class="headings">
                 <th>Update?</th>
-                <th>hostName</th>
-                <th>domainName</th>
-                <th>cdn</th>
-                <th>cachegroup</th>
-                <th>type</th>
-                <th>location</th>
-                <th>ipAddress</th>
-                <th>ip6Address</th>
-                <th>status</th>
-                <th>profile</th>
-                <th>iloIpAddress</th>
-                <th>iloIpGateway</th>
+                <th>Host Name</th>
+                <th>Domain Name</th>
+                <th>IP</th>
+                <th>IPv6</th>
+                <th>Status</th>
+                <th>Type</th>
+                <th>Profile</th>
+                <th>CDN</th>
+                <th>Cache Group</th>
+                <th>ILO</th>
             </tr>
             </thead>
             <tbody>
             <tr ng-click="editServer(server.id)" ng-repeat="server in ::servers" ng-class="::{'active': server.updPending}">
-                <td class="update-column">
-                    <i class="fa fa-flag" title="Server Update Pending" ng-if="server.updPending"></i>
-                </td>
+                <td ng-class="{'red': server.updPending}"><strong>{{::server.updPending}}</strong></td>
                 <td>{{::server.hostName}}</td>
                 <td>{{::server.domainName}}</td>
-                <td>{{::server.cdnName}}</td>
-                <td>{{::server.cachegroup}}</td>
-                <td>{{::server.type}}</td>
-                <td>{{::server.physLocation}}</td>
                 <td><a ng-click="ssh(server.ipAddress, $event)">{{::server.ipAddress}}</a></td>
                 <td>{{::server.ip6Address}}</td>
                 <td>
                     <span ng-if="!isOffline(server.status)">{{::server.status}}</span>
                     <span ng-if="isOffline(server.status)" uib-popover="{{::offlineReason(server)}}" popover-title="Offline Reason" popover-trigger="mouseenter" popover-placement="bottom" popover-append-to-body="true">{{::server.status}}</span>
                 </td>
+                <td>{{::server.type}}</td>
                 <td>{{::server.profile}}</td>
-                <td>{{::server.iloIpAddress}}</td>
-                <td>{{::server.iloIpGateway}}</td>
+                <td>{{::server.cdnName}}</td>
+                <td>{{::server.cachegroup}}</td>
+                <td><a ng-click="ssh(server.iloIpAddress, $event)">{{::server.iloIpAddress}}</a></td>
             </tr>
             </tbody>
         </table>
diff --git a/traffic_portal/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html b/traffic_portal/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html
index 7882174336..55b0c4bd2b 100644
--- a/traffic_portal/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html
@@ -45,23 +45,21 @@
             <thead>
             <tr class="headings">
                 <th>Update?</th>
-                <th>hostName</th>
-                <th>domainName</th>
-                <th>ipAddress</th>
-                <th>ip6Address</th>
-                <th>status</th>
-                <th>type</th>
-                <th>profile</th>
-                <th>cdn</th>
-                <th>cachegroup</th>
+                <th>Host Name</th>
+                <th>Domain Name</th>
+                <th>IP</th>
+                <th>IPv6</th>
+                <th>Status</th>
+                <th>Type</th>
+                <th>Profile</th>
+                <th>CDN</th>
+                <th>Cache Group</th>
+                <th>ILO</th>
             </tr>
             </thead>
             <tbody>
             <tr ng-click="editServer(server.id)" ng-repeat="server in ::servers" ng-class="::{'active': server.updPending}">
-                <td class="update-column">
-                    <i class="fa fa-flag" ng-if="server.updPending"></i>
-                    <i class="fa fa-ban" ng-if="!server.updPending"></i>
-                </td>
+                <td ng-class="{'red': server.updPending}"><strong>{{::server.updPending}}</strong></td>
                 <td>{{::server.hostName}}</td>
                 <td>{{::server.domainName}}</td>
                 <td><a ng-click="ssh(server.ipAddress, $event)">{{::server.ipAddress}}</a></td>
@@ -74,6 +72,7 @@
                 <td>{{::server.profile}}</td>
                 <td>{{::server.cdnName}}</td>
                 <td>{{::server.cachegroup}}</td>
+                <td><a ng-click="ssh(server.iloIpAddress, $event)">{{::server.iloIpAddress}}</a></td>
             </tr>
             </tbody>
         </table>
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
index 1b4f4d7b05..72e1df146a 100644
--- a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
@@ -36,24 +36,22 @@
             <thead>
             <tr class="headings">
                 <th>Update?</th>
-                <th>hostName</th>
-                <th>domainName</th>
-                <th>ipAddress</th>
-                <th>ip6Address</th>
-                <th>status</th>
-                <th>type</th>
-                <th>profile</th>
-                <th>cdn</th>
-                <th>cachegroup</th>
+                <th>Host Name</th>
+                <th>Domain Name</th>
+                <th>IP</th>
+                <th>IPv6</th>
+                <th>Status</th>
+                <th>Type</th>
+                <th>Profile</th>
+                <th>CDN</th>
+                <th>Cache Group</th>
+                <th>ILO</th>
                 <th></th>
             </tr>
             </thead>
             <tbody>
             <tr ng-repeat="server in ::servers" ng-class="::{'active': server.updPending}">
-                <td class="update-column">
-                    <i class="fa fa-flag" ng-if="server.updPending"></i>
-                    <i class="fa fa-ban" ng-if="!server.updPending"></i>
-                </td>
+                <td ng-class="{'red': server.updPending}"><strong>{{::server.updPending}}</strong></td>
                 <td>{{::server.hostName}}</td>
                 <td>{{::server.domainName}}</td>
                 <td><a ng-click="ssh(server.ipAddress, $event)">{{::server.ipAddress}}</a></td>
@@ -66,6 +64,7 @@
                 <td>{{::server.profile}}</td>
                 <td>{{::server.cdnName}}</td>
                 <td>{{::server.cachegroup}}</td>
+                <td><a ng-click="ssh(server.iloIpAddress, $event)">{{::server.iloIpAddress}}</a></td>
                 <td><button type="button" class="btn btn-link" title="Unlink Server from Delivery Service" ng-click="confirmRemoveServer(server)"><i class="fa fa-chain-broken"></i></button></td>
             </tr>
             </tbody>
diff --git a/traffic_portal/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html b/traffic_portal/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html
index 81f36c4e63..c8f7652ab7 100644
--- a/traffic_portal/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html
@@ -35,41 +35,34 @@
             <thead>
             <tr class="headings">
                 <th>Update?</th>
-                <th>hostName</th>
-                <th>domainName</th>
-                <th>cdn</th>
-                <th>cachegroup</th>
-                <th>type</th>
-                <th>location</th>
-                <th>ipAddress</th>
-                <th>ip6Address</th>
-                <th>status</th>
-                <th>profile</th>
-                <th>iloIpAddress</th>
-                <th>iloIpGateway</th>
+                <th>Host Name</th>
+                <th>Domain Name</th>
+                <th>IP</th>
+                <th>IPv6</th>
+                <th>Status</th>
+                <th>Type</th>
+                <th>Profile</th>
+                <th>CDN</th>
+                <th>Cache Group</th>
+                <th>ILO</th>
             </tr>
             </thead>
             <tbody>
             <tr ng-click="editServer(server.id)" ng-repeat="server in ::servers">
-                <td class="update-column">
-                    <i class="fa fa-flag" ng-if="server.updPending"></i>
-                    <i class="fa fa-ban" ng-if="!server.updPending"></i>
-                </td>
+                <td ng-class="{'red': server.updPending}"><strong>{{::server.updPending}}</strong></td>
                 <td>{{::server.hostName}}</td>
                 <td>{{::server.domainName}}</td>
-                <td>{{::server.cdnName}}</td>
-                <td>{{::server.cachegroup}}</td>
-                <td>{{::server.type}}</td>
-                <td>{{::server.physLocation}}</td>
                 <td><a ng-click="ssh(server.ipAddress, $event)">{{::server.ipAddress}}</a></td>
                 <td>{{::server.ip6Address}}</td>
                 <td>
                     <span ng-if="!isOffline(server.status)">{{::server.status}}</span>
                     <span ng-if="isOffline(server.status)" uib-popover="{{::offlineReason(server)}}" popover-title="Offline Reason" popover-trigger="mouseenter" popover-placement="bottom" popover-append-to-body="true">{{::server.status}}</span>
                 </td>
+                <td>{{::server.type}}</td>
                 <td>{{::server.profile}}</td>
-                <td>{{::server.iloIpAddress}}</td>
-                <td>{{::server.iloIpGateway}}</td>
+                <td>{{::server.cdnName}}</td>
+                <td>{{::server.cachegroup}}</td>
+                <td><a ng-click="ssh(server.iloIpAddress, $event)">{{::server.iloIpAddress}}</a></td>
             </tr>
             </tbody>
         </table>
diff --git a/traffic_portal/app/src/common/modules/table/profileServers/table.profileServers.tpl.html b/traffic_portal/app/src/common/modules/table/profileServers/table.profileServers.tpl.html
index b858fdba6b..36bd90961d 100644
--- a/traffic_portal/app/src/common/modules/table/profileServers/table.profileServers.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/profileServers/table.profileServers.tpl.html
@@ -35,41 +35,34 @@
             <thead>
             <tr class="headings">
                 <th>Update?</th>
-                <th>hostName</th>
-                <th>domainName</th>
-                <th>cdn</th>
-                <th>cachegroup</th>
-                <th>type</th>
-                <th>location</th>
-                <th>ipAddress</th>
-                <th>ip6Address</th>
-                <th>status</th>
-                <th>profile</th>
-                <th>iloIpAddress</th>
-                <th>iloIpGateway</th>
+                <th>Host Name</th>
+                <th>Domain Name</th>
+                <th>IP</th>
+                <th>IPv6</th>
+                <th>Status</th>
+                <th>Type</th>
+                <th>Profile</th>
+                <th>CDN</th>
+                <th>Cache Group</th>
+                <th>ILO</th>
             </tr>
             </thead>
             <tbody>
             <tr ng-click="editServer(server.id)" ng-repeat="server in ::servers" ng-class="::{'active': server.updPending}">
-                <td class="update-column">
-                    <i class="fa fa-flag" ng-if="server.updPending"></i>
-                    <i class="fa fa-ban" ng-if="!server.updPending"></i>
-                </td>
+                <td ng-class="{'red': server.updPending}"><strong>{{::server.updPending}}</strong></td>
                 <td>{{::server.hostName}}</td>
                 <td>{{::server.domainName}}</td>
-                <td>{{::server.cdnName}}</td>
-                <td>{{::server.cachegroup}}</td>
-                <td>{{::server.type}}</td>
-                <td>{{::server.physLocation}}</td>
                 <td><a ng-click="ssh(server.ipAddress, $event)">{{::server.ipAddress}}</a></td>
                 <td>{{::server.ip6Address}}</td>
                 <td>
                     <span ng-if="!isOffline(server.status)">{{::server.status}}</span>
                     <span ng-if="isOffline(server.status)" uib-popover="{{::offlineReason(server)}}" popover-title="Offline Reason" popover-trigger="mouseenter" popover-placement="bottom" popover-append-to-body="true">{{::server.status}}</span>
                 </td>
+                <td>{{::server.type}}</td>
                 <td>{{::server.profile}}</td>
-                <td>{{::server.iloIpAddress}}</td>
-                <td>{{::server.iloIpGateway}}</td>
+                <td>{{::server.cdnName}}</td>
+                <td>{{::server.cachegroup}}</td>
+                <td><a ng-click="ssh(server.iloIpAddress, $event)">{{::server.iloIpAddress}}</a></td>
             </tr>
             </tbody>
         </table>
diff --git a/traffic_portal/app/src/common/modules/table/servers/table.servers.tpl.html b/traffic_portal/app/src/common/modules/table/servers/table.servers.tpl.html
index b5e82cc45d..b47289b8c9 100644
--- a/traffic_portal/app/src/common/modules/table/servers/table.servers.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/servers/table.servers.tpl.html
@@ -44,23 +44,21 @@
             <thead>
             <tr class="headings">
                 <th>Update?</th>
-                <th>hostName</th>
-                <th>domainName</th>
-                <th>ipAddress</th>
-                <th>ip6Address</th>
-                <th>status</th>
-                <th>type</th>
-                <th>profile</th>
-                <th>cdn</th>
-                <th>cachegroup</th>
+                <th>Host Name</th>
+                <th>Domain Name</th>
+                <th>IP</th>
+                <th>IPv6</th>
+                <th>Status</th>
+                <th>Type</th>
+                <th>Profile</th>
+                <th>CDN</th>
+                <th>Cache Group</th>
+                <th>ILO</th>
             </tr>
             </thead>
             <tbody>
             <tr ng-click="editServer(server.id)" ng-repeat="server in ::servers" ng-class="::{'active': server.updPending}">
-                <td class="update-column">
-                    <i class="fa fa-flag" ng-if="server.updPending"></i>
-                    <i class="fa fa-ban" ng-if="!server.updPending"></i>
-                </td>
+                <td ng-class="{'red': server.updPending}"><strong>{{::server.updPending}}</strong></td>
                 <td>{{::server.hostName}}</td>
                 <td>{{::server.domainName}}</td>
                 <td><a ng-click="ssh(server.ipAddress, $event)">{{::server.ipAddress}}</a></td>
@@ -73,6 +71,7 @@
                 <td>{{::server.profile}}</td>
                 <td>{{::server.cdnName}}</td>
                 <td>{{::server.cachegroup}}</td>
+                <td><a ng-click="ssh(server.iloIpAddress, $event)">{{::server.iloIpAddress}}</a></td>
             </tr>
             </tbody>
         </table>
diff --git a/traffic_portal/app/src/common/modules/table/statusServers/table.statusServers.tpl.html b/traffic_portal/app/src/common/modules/table/statusServers/table.statusServers.tpl.html
index d7dd1fac32..79ff068b12 100644
--- a/traffic_portal/app/src/common/modules/table/statusServers/table.statusServers.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/statusServers/table.statusServers.tpl.html
@@ -35,23 +35,21 @@
             <thead>
             <tr class="headings">
                 <th>Update?</th>
-                <th>hostName</th>
-                <th>domainName</th>
-                <th>ipAddress</th>
-                <th>ip6Address</th>
-                <th>status</th>
-                <th>type</th>
-                <th>profile</th>
-                <th>cdn</th>
-                <th>cachegroup</th>
+                <th>Host Name</th>
+                <th>Domain Name</th>
+                <th>IP</th>
+                <th>IPv6</th>
+                <th>Status</th>
+                <th>Type</th>
+                <th>Profile</th>
+                <th>CDN</th>
+                <th>Cache Group</th>
+                <th>ILO</th>
             </tr>
             </thead>
             <tbody>
             <tr ng-click="editServer(server.id)" ng-repeat="server in ::servers" ng-class="::{'active': server.updPending}">
-                <td class="update-column">
-                    <i class="fa fa-flag" ng-if="server.updPending"></i>
-                    <i class="fa fa-ban" ng-if="!server.updPending"></i>
-                </td>
+                <td ng-class="{'red': server.updPending}"><strong>{{::server.updPending}}</strong></td>
                 <td>{{::server.hostName}}</td>
                 <td>{{::server.domainName}}</td>
                 <td><a ng-click="ssh(server.ipAddress, $event)">{{::server.ipAddress}}</a></td>
@@ -64,6 +62,7 @@
                 <td>{{::server.profile}}</td>
                 <td>{{::server.cdnName}}</td>
                 <td>{{::server.cachegroup}}</td>
+                <td><a ng-click="ssh(server.iloIpAddress, $event)">{{::server.iloIpAddress}}</a></td>
             </tr>
             </tbody>
         </table>
diff --git a/traffic_portal/app/src/common/modules/table/typeServers/table.typeServers.tpl.html b/traffic_portal/app/src/common/modules/table/typeServers/table.typeServers.tpl.html
index 375b6bceb5..9dbe5c10ba 100644
--- a/traffic_portal/app/src/common/modules/table/typeServers/table.typeServers.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/typeServers/table.typeServers.tpl.html
@@ -35,23 +35,21 @@
             <thead>
             <tr class="headings">
                 <th>Update?</th>
-                <th>hostName</th>
-                <th>domainName</th>
-                <th>ipAddress</th>
-                <th>ip6Address</th>
-                <th>status</th>
-                <th>type</th>
-                <th>profile</th>
-                <th>cdn</th>
-                <th>cachegroup</th>
+                <th>Host Name</th>
+                <th>Domain Name</th>
+                <th>IP</th>
+                <th>IPv6</th>
+                <th>Status</th>
+                <th>Type</th>
+                <th>Profile</th>
+                <th>CDN</th>
+                <th>Cache Group</th>
+                <th>ILO</th>
             </tr>
             </thead>
             <tbody>
             <tr ng-click="editServer(server.id)" ng-repeat="server in ::servers" ng-class="::{'active': server.updPending}">
-                <td class="update-column">
-                    <i class="fa fa-flag" ng-if="server.updPending"></i>
-                    <i class="fa fa-ban" ng-if="!server.updPending"></i>
-                </td>
+                <td ng-class="{'red': server.updPending}"><strong>{{::server.updPending}}</strong></td>
                 <td>{{::server.hostName}}</td>
                 <td>{{::server.domainName}}</td>
                 <td><a ng-click="ssh(server.ipAddress, $event)">{{::server.ipAddress}}</a></td>
@@ -64,6 +62,7 @@
                 <td>{{::server.profile}}</td>
                 <td>{{::server.cdnName}}</td>
                 <td>{{::server.cachegroup}}</td>
+                <td><a ng-click="ssh(server.iloIpAddress, $event)">{{::server.iloIpAddress}}</a></td>
             </tr>
             </tbody>
         </table>