Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Issue-942] - adds ilo column to servers tables #1399

Merged
merged 1 commit into from
Oct 13, 2017
Merged

[Issue-942] - adds ilo column to servers tables #1399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions ...ic_portal/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
25 changes: 12 additions & 13 deletions traffic_portal/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
25 changes: 12 additions & 13 deletions ...app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
37 changes: 15 additions & 22 deletions ...ortal/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
37 changes: 15 additions & 22 deletions traffic_portal/app/src/common/modules/table/profileServers/table.profileServers.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
25 changes: 12 additions & 13 deletions traffic_portal/app/src/common/modules/table/servers/table.servers.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
25 changes: 12 additions & 13 deletions traffic_portal/app/src/common/modules/table/statusServers/table.statusServers.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
25 changes: 12 additions & 13 deletions traffic_portal/app/src/common/modules/table/typeServers/table.typeServers.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down