You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/04/06 20:41:48 UTC
[04/15] incubator-trafficcontrol git commit: adds flag / ban icons to
server table for updates
adds flag / ban icons to server table for updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/60e34c11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/60e34c11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/60e34c11
Branch: refs/heads/master
Commit: 60e34c114f4a599bc2f1ded1306d7720321aad4a
Parents: 714effd
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Fri Mar 3 08:13:48 2017 -0700
Committer: Dewayne Richardson <de...@apache.org>
Committed: Thu Apr 6 14:41:34 2017 -0600
----------------------------------------------------------------------
.../experimental/ui/app/src/common/modules/table/_table.scss | 6 ++++++
.../table/cacheGroupServers/table.cacheGroupServers.tpl.html | 7 +++++--
.../common/modules/table/cdnServers/table.cdnServers.tpl.html | 7 +++++--
.../table.deliveryServiceServers.tpl.html | 5 +++++
.../physLocationServers/table.physLocationServers.tpl.html | 5 +++++
.../table/profileServers/table.profileServers.tpl.html | 5 ++++-
.../src/common/modules/table/servers/table.servers.tpl.html | 7 +++++--
.../modules/table/statusServers/table.statusServers.tpl.html | 5 ++++-
.../modules/table/typeServers/table.typeServers.tpl.html | 5 ++++-
traffic_ops/experimental/ui/app/src/styles/main.scss | 1 +
10 files changed, 44 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/60e34c11/traffic_ops/experimental/ui/app/src/common/modules/table/_table.scss
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/_table.scss b/traffic_ops/experimental/ui/app/src/common/modules/table/_table.scss
new file mode 100644
index 0000000..11fe4af
--- /dev/null
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/_table.scss
@@ -0,0 +1,6 @@
+.update-column {
+ text-align: center;
+ .fa-flag {
+ font-weight: bold;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/60e34c11/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html
index 6044d28..b146972 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html
@@ -36,7 +36,7 @@ under the License.
<table id="serversTable" class="table responsive-utilities jambo_table">
<thead>
<tr class="headings">
- <th></th>
+ <th>Update?</th>
<th>hostName</th>
<th>domainName</th>
<th>cdn</th>
@@ -53,7 +53,10 @@ under the License.
</thead>
<tbody>
<tr ng-click="editServer(server.id)" ng-repeat="server in servers" ng-class="{'active': server.updPending}">
- <td><i class="fa fa-flag" ng-show="server.updPending"></i></td>
+ <td class="update-column">
+ <i class="fa fa-flag" ng-show="server.updPending"></i>
+ <i class="fa fa-ban" ng-show="!server.updPending"></i>
+ </td>
<td>{{server.hostName}}</td>
<td>{{server.domainName}}</td>
<td>{{server.cdnName}}</td>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/60e34c11/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html
index a9925da..9189f43 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html
@@ -36,7 +36,7 @@ under the License.
<table id="serversTable" class="table responsive-utilities jambo_table">
<thead>
<tr class="headings">
- <th></th>
+ <th>Update?</th>
<th>hostName</th>
<th>domainName</th>
<th>cdn</th>
@@ -53,7 +53,10 @@ under the License.
</thead>
<tbody>
<tr ng-click="editServer(server.id)" ng-repeat="server in servers" ng-class="{'active': server.updPending}">
- <td><i class="fa fa-flag" ng-show="server.updPending"></i></td>
+ <td class="update-column">
+ <i class="fa fa-flag" ng-show="server.updPending"></i>
+ <i class="fa fa-ban" ng-show="!server.updPending"></i>
+ </td>
<td>{{server.hostName}}</td>
<td>{{server.domainName}}</td>
<td>{{server.cdnName}}</td>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/60e34c11/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
index 2aa7653..e3a9481 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
@@ -35,6 +35,7 @@ under the License.
<table id="serversTable" class="table responsive-utilities jambo_table">
<thead>
<tr class="headings">
+ <th>Update?</th>
<th>hostName</th>
<th>domainName</th>
<th>cdn</th>
@@ -52,6 +53,10 @@ under the License.
</thead>
<tbody>
<tr ng-repeat="server in servers" ng-class="{'active': server.updPending}">
+ <td class="update-column">
+ <i class="fa fa-flag" ng-show="server.updPending"></i>
+ <i class="fa fa-ban" ng-show="!server.updPending"></i>
+ </td>
<td>{{server.hostName}}</td>
<td>{{server.domainName}}</td>
<td>{{server.cdnName}}</td>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/60e34c11/traffic_ops/experimental/ui/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html
index ffe90e7..bef4077 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html
@@ -34,6 +34,7 @@ under the License.
<table id="serversTable" class="table responsive-utilities jambo_table">
<thead>
<tr class="headings">
+ <th>Update?</th>
<th>hostName</th>
<th>domainName</th>
<th>cdn</th>
@@ -50,6 +51,10 @@ under the License.
</thead>
<tbody>
<tr ng-click="editServer(server.id)" ng-repeat="server in servers">
+ <td class="update-column">
+ <i class="fa fa-flag" ng-show="server.updPending"></i>
+ <i class="fa fa-ban" ng-show="!server.updPending"></i>
+ </td>
<td>{{server.hostName}}</td>
<td>{{server.domainName}}</td>
<td>{{server.cdnName}}</td>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/60e34c11/traffic_ops/experimental/ui/app/src/common/modules/table/profileServers/table.profileServers.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/profileServers/table.profileServers.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/profileServers/table.profileServers.tpl.html
index 05b7f18..e94b619 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/profileServers/table.profileServers.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/profileServers/table.profileServers.tpl.html
@@ -51,7 +51,10 @@ under the License.
</thead>
<tbody>
<tr ng-click="editServer(server.id)" ng-repeat="server in servers" ng-class="{'active': server.updPending}">
- <td><i class="fa fa-flag" ng-show="server.updPending"></i></td>
+ <td class="update-column">
+ <i class="fa fa-flag" ng-show="server.updPending"></i>
+ <i class="fa fa-ban" ng-show="!server.updPending"></i>
+ </td>
<td>{{server.hostName}}</td>
<td>{{server.domainName}}</td>
<td>{{server.cdnName}}</td>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/60e34c11/traffic_ops/experimental/ui/app/src/common/modules/table/servers/table.servers.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/servers/table.servers.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/servers/table.servers.tpl.html
index 982444d..137f046 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/servers/table.servers.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/servers/table.servers.tpl.html
@@ -42,7 +42,7 @@ under the License.
<table id="serversTable" class="table responsive-utilities jambo_table">
<thead>
<tr class="headings">
- <th></th>
+ <th>Update?</th>
<th>hostName</th>
<th>domainName</th>
<th>cdn</th>
@@ -59,7 +59,10 @@ under the License.
</thead>
<tbody>
<tr ng-click="editServer(server.id)" ng-repeat="server in servers" ng-class="{'active': server.updPending}">
- <td><i class="fa fa-flag" ng-show="server.updPending"></i></td>
+ <td class="update-column">
+ <i class="fa fa-flag" ng-show="server.updPending"></i>
+ <i class="fa fa-ban" ng-show="!server.updPending"></i>
+ </td>
<td>{{server.hostName}}</td>
<td>{{server.domainName}}</td>
<td>{{server.cdnName}}</td>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/60e34c11/traffic_ops/experimental/ui/app/src/common/modules/table/statusServers/table.statusServers.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/statusServers/table.statusServers.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/statusServers/table.statusServers.tpl.html
index 5a7300e..815d82f 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/statusServers/table.statusServers.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/statusServers/table.statusServers.tpl.html
@@ -51,7 +51,10 @@ under the License.
</thead>
<tbody>
<tr ng-click="editServer(server.id)" ng-repeat="server in servers" ng-class="{'active': server.updPending}">
- <td><i class="fa fa-flag" ng-show="server.updPending"></i></td>
+ <td class="update-column">
+ <i class="fa fa-flag" ng-show="server.updPending"></i>
+ <i class="fa fa-ban" ng-show="!server.updPending"></i>
+ </td>
<td>{{server.hostName}}</td>
<td>{{server.domainName}}</td>
<td>{{server.cdnName}}</td>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/60e34c11/traffic_ops/experimental/ui/app/src/common/modules/table/typeServers/table.typeServers.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/typeServers/table.typeServers.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/typeServers/table.typeServers.tpl.html
index 49e5ced..99ab56a 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/typeServers/table.typeServers.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/typeServers/table.typeServers.tpl.html
@@ -51,7 +51,10 @@ under the License.
</thead>
<tbody>
<tr ng-click="editServer(server.id)" ng-repeat="server in servers" ng-class="{'active': server.updPending}">
- <td><i class="fa fa-flag" ng-show="server.updPending"></i></td>
+ <td class="update-column">
+ <i class="fa fa-flag" ng-show="server.updPending"></i>
+ <i class="fa fa-ban" ng-show="!server.updPending"></i>
+ </td>
<td>{{server.hostName}}</td>
<td>{{server.domainName}}</td>
<td>{{server.cdnName}}</td>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/60e34c11/traffic_ops/experimental/ui/app/src/styles/main.scss
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/styles/main.scss b/traffic_ops/experimental/ui/app/src/styles/main.scss
index 653e961..19d70ce 100755
--- a/traffic_ops/experimental/ui/app/src/styles/main.scss
+++ b/traffic_ops/experimental/ui/app/src/styles/main.scss
@@ -31,6 +31,7 @@ $fa-font-path: "../assets/fonts";
@import "../common/modules/header/header";
@import "../common/modules/message/message";
@import "../common/modules/navigation/navigation";
+@import "../common/modules/table/table";
@import "../common/modules/release/release";
// public