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/02/13 16:46:54 UTC
[2/7] incubator-trafficcontrol git commit: moves buttons around
basically
moves buttons around basically
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9661a4e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9661a4e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9661a4e8
Branch: refs/heads/master
Commit: 9661a4e8f807c4d4b025eeaa2ddecfc29727834d
Parents: 3003b93
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Thu Feb 2 21:10:17 2017 -0700
Committer: Dewayne Richardson <de...@apache.org>
Committed: Mon Feb 13 09:46:58 2017 -0700
----------------------------------------------------------------------
.../common/modules/form/cacheGroup/form.cacheGroup.tpl.html | 5 ++---
.../ui/app/src/common/modules/form/cdn/form.cdn.tpl.html | 5 ++---
.../ui/app/src/common/modules/form/server/form.server.tpl.html | 6 +++---
.../cacheGroupServers/TableCacheGroupServersController.js | 6 +++++-
.../table/cacheGroupServers/table.cacheGroupServers.tpl.html | 5 ++++-
.../table.deliveryServiceServers.tpl.html | 2 +-
.../private/configure/deliveryServices/servers/index.js | 2 +-
7 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9661a4e8/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/form.cacheGroup.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/form.cacheGroup.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/form.cacheGroup.tpl.html
index dadadcb..7338fa1 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/form.cacheGroup.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/form.cacheGroup.tpl.html
@@ -24,6 +24,8 @@ under the License.
<li class="active">{{cacheGroupName}}</li>
</ol>
<div class="pull-right" ng-show="!settings.isNew">
+ <button class="btn btn-success" ng-click="queueUpdates()">Queue Server Updates <i class="fa fa-flag"></i></button>
+ <button class="btn btn-danger" ng-click="dequeueUpdates()">Dequeue Server Updates <i class="fa fa-times"></i></button>
<button class="btn btn-primary" ng-click="viewServers()">View Servers <i class="fa fa-server"></i></button>
<div class="btn-group" role="group" uib-dropdown is-open="more.isopen">
<button type="button" class="btn btn-default dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
@@ -31,9 +33,6 @@ under the License.
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
- <li role="menuitem"><a ng-click="queueUpdates()">Queue Server Updates</a></li>
- <li role="menuitem"><a ng-click="dequeueUpdates()">Dequeue Server Updates</a></li>
- <li class="divider"></li>
<li role="menuitem"><a ng-click="viewAsns()">View ASNs</a></li>
<li role="menuitem"><a ng-click="viewParams()">View Parameters</a></li>
<li role="menuitem"><a ng-click="viewStaticDnsEntries()">View Static DNS Entries</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9661a4e8/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html
index 3dbda0f..e594174 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/form.cdn.tpl.html
@@ -24,6 +24,8 @@ under the License.
<li class="active">{{cdnName}}</li>
</ol>
<div class="pull-right" ng-show="!settings.isNew">
+ <button class="btn btn-success" ng-click="queueUpdates()">Queue Server Updates <i class="fa fa-flag"></i></button>
+ <button class="btn btn-danger" ng-click="dequeueUpdates()">Dequeue Server Updates <i class="fa fa-times"></i></button>
<button class="btn btn-primary" ng-click="manageSnapshots()">Snapshot CDN Config <i class="fa fa-camera"></i></button>
<div class="btn-group" role="group" uib-dropdown is-open="more.isopen">
<button type="button" class="btn btn-default dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
@@ -34,9 +36,6 @@ under the License.
<li role="menuitem"><a ng-click="manageDNSSEC()">Manage DNSSEC Keys</a></li>
<li role="menuitem"><a ng-click="manageSSL()">Manage SSL Keys</a></li>
<li class="divider"></li>
- <li role="menuitem"><a ng-click="queueUpdates()">Queue Server Updates</a></li>
- <li role="menuitem"><a ng-click="dequeueUpdates()">Dequeue Server Updates</a></li>
- <li class="divider"></li>
<li role="menuitem"><a ng-click="cachegroupHealth()">View Cachegroup Health</a></li>
<li role="menuitem"><a ng-click="viewServers()">View Servers</a></li>
<li role="menuitem"><a ng-click="viewDeliveryServices()">View Delivery Services</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9661a4e8/traffic_ops/experimental/ui/app/src/common/modules/form/server/form.server.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/server/form.server.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/server/form.server.tpl.html
index cadd289..c14b264 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/server/form.server.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/server/form.server.tpl.html
@@ -24,10 +24,10 @@ under the License.
<li class="active">{{serverName}}</li>
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
- <button class="btn btn-danger" ng-click="offlineServer()">Offline Server</button>
- <button class="btn btn-success" ng-click="onlineServer()">Online Server</button>
+ <button class="btn btn-danger" ng-click="offlineServer()">Offline Server <i class="fa fa-warning"></i></button>
+ <!--<button class="btn btn-success" ng-click="onlineServer()">Online Server</button>-->
<button class="btn btn-primary" ng-show="!server.updPending" ng-click="queueUpdates()">Queue Update <i class="fa fa-flag"></i></button>
- <button class="btn btn-primary" ng-show="server.updPending" ng-click="dequeueUpdates()">Dequeue Update <i class="fa fa-flag"></i></button>
+ <button class="btn btn-primary" ng-show="server.updPending" ng-click="dequeueUpdates()">Dequeue Update <i class="fa fa-times"></i></button>
<div class="btn-group" role="group" uib-dropdown is-open="more.isopen">
<button type="button" class="btn btn-default dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9661a4e8/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupServers/TableCacheGroupServersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupServers/TableCacheGroupServersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupServers/TableCacheGroupServersController.js
index 89c44d4..da3986c 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupServers/TableCacheGroupServersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupServers/TableCacheGroupServersController.js
@@ -28,7 +28,11 @@ var TableCacheGroupsServersController = function(cacheGroup, servers, $scope, lo
};
$scope.queueUpdates = function() {
- alert('not hooked up yet: queuing updates for all cdn servers');
+ alert('not hooked up yet: queuing updates for all cachegroup servers');
+ };
+
+ $scope.dequeueUpdates = function() {
+ alert('not hooked up yet: dequeuing updates for all cachegroup servers');
};
$scope.navigateToPath = locationUtils.navigateToPath;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9661a4e8/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 3b821b5..632934f 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
@@ -24,7 +24,10 @@ under the License.
<li><a ng-click="navigateToPath('/configure/cache-groups/' + cacheGroup.id)">{{cacheGroup.name}}</a></li>
<li class="active">Servers</li>
</ol>
- <button class="btn btn-primary pull-right" ng-click="queueUpdates()">Queue Updates <i class="fa fa-flag"></i></button>
+ <div class="pull-right">
+ <button class="btn btn-success" ng-click="queueUpdates()">Queue Server Updates <i class="fa fa-flag"></i></button>
+ <button class="btn btn-danger" ng-click="dequeueUpdates()">Dequeue Server Updates <i class="fa fa-times"></i></button>
+ </div>
<div class="clearfix"></div>
</div>
<div class="x_content">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9661a4e8/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 0eb0633..e6f3f80 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
@@ -63,7 +63,7 @@ under the License.
<td>{{server.profile}}</td>
<td>{{server.iloIpAddress}}</td>
<td>{{server.iloIpGateway}}</td>
- <td><button type="button" class="btn btn-link" title="Remove from Delivery Service" ng-click="removeServer()"><i class="fa fa-trash-o"></i></button></td>
+ <td><button type="button" class="btn btn-link" title="Remove from Delivery Service" ng-show="server.type == 'EDGE'" ng-click="removeServer()"><i class="fa fa-trash-o"></i></button></td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9661a4e8/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/servers/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/servers/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/servers/index.js
index 4b6bf57..f53525e 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/servers/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/deliveryServices/servers/index.js
@@ -31,7 +31,7 @@ module.exports = angular.module('trafficOps.private.configure.deliveryServices.s
return deliveryServiceService.getDeliveryService($stateParams.deliveryServiceId);
},
servers: function($stateParams, serverService) {
- return serverService.getDeliveryServiceServers($stateParams.deliveryServiceId);
+ return serverService.getServers({ dsId: $stateParams.deliveryServiceId });
}
}
}