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/06/01 17:31:43 UTC
[1/3] incubator-trafficcontrol git commit: updates default table size
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master c14d84639 -> 1744e550c
updates default table size
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5728657f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5728657f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5728657f
Branch: refs/heads/master
Commit: 5728657fd57440310e2e601234b84fc729c8dada
Parents: c14d846
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue May 30 15:35:31 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Thu Jun 1 11:31:36 2017 -0600
----------------------------------------------------------------------
.../ui/app/src/common/modules/table/asns/TableASNsController.js | 2 +-
.../modules/table/cacheGroupAsns/TableCacheGroupAsnsController.js | 2 +-
.../cacheGroupParameters/TableCacheGroupParametersController.js | 2 +-
.../table/cacheGroupServers/TableCacheGroupServersController.js | 2 +-
.../TableCacheGroupStaticDnsEntriesController.js | 2 +-
.../common/modules/table/cacheGroups/TableCacheGroupsController.js | 2 +-
.../cdnDeliveryServices/TableCDNDeliveryServicesController.js | 2 +-
.../common/modules/table/cdnProfiles/TableCDNProfilesController.js | 2 +-
.../common/modules/table/cdnServers/TableCDNServersController.js | 2 +-
.../ui/app/src/common/modules/table/cdns/TableCDNsController.js | 2 +-
.../deliveryServiceJobs/TableDeliveryServiceJobsController.js | 2 +-
.../TableDeliveryServiceRegexesController.js | 2 +-
.../TableDeliveryServiceServersController.js | 2 +-
.../TableDeliveryServiceStaticDnsEntriesController.js | 2 +-
.../deliveryServiceUsers/TableDeliveryServiceUsersController.js | 2 +-
.../table/deliveryServices/TableDeliveryServicesController.js | 2 +-
.../table/divisionRegions/TableDivisionRegionsController.js | 2 +-
.../src/common/modules/table/divisions/TableDivisionsController.js | 2 +-
.../parameterCacheGroups/TableParameterCacheGroupsController.js | 2 +-
.../table/parameterProfiles/TableParameterProfilesController.js | 2 +-
.../common/modules/table/parameters/TableParametersController.js | 2 +-
.../physLocationServers/TablePhysLocationServersController.js | 2 +-
.../modules/table/physLocations/TablePhysLocationsController.js | 2 +-
.../TableProfileDeliveryServicesController.js | 2 +-
.../table/profileParameters/TableProfileParametersController.js | 2 +-
.../modules/table/profileServers/TableProfileServersController.js | 2 +-
.../src/common/modules/table/profiles/TableProfilesController.js | 2 +-
.../regionPhysLocations/TableRegionPhysLocationsController.js | 2 +-
.../app/src/common/modules/table/regions/TableRegionsController.js | 2 +-
.../TableServerDeliveryServicesController.js | 2 +-
.../app/src/common/modules/table/servers/TableServersController.js | 2 +-
.../modules/table/statusServers/TableStatusServersController.js | 2 +-
.../src/common/modules/table/statuses/TableStatusesController.js | 2 +-
.../app/src/common/modules/table/tenants/TableTenantsController.js | 2 +-
.../table/typeCacheGroups/TableTypeCacheGroupsController.js | 2 +-
.../typeDeliveryServices/TableTypeDeliveryServicesController.js | 2 +-
.../common/modules/table/typeServers/TableTypeServersController.js | 2 +-
.../typeStaticDnsEntries/TableTypeStaticDnsEntriesController.js | 2 +-
.../ui/app/src/common/modules/table/types/TableTypesController.js | 2 +-
.../userDeliveryServices/TableUserDeliveryServicesController.js | 2 +-
.../ui/app/src/common/modules/table/users/TableUsersController.js | 2 +-
41 files changed, 41 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/asns/TableASNsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/asns/TableASNsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/asns/TableASNsController.js
index 0b0489f..93da7eb 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/asns/TableASNsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/asns/TableASNsController.js
@@ -36,7 +36,7 @@ var TableASNsController = function(asns, $scope, $state, locationUtils) {
angular.element(document).ready(function () {
$('#asnsTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupAsns/TableCacheGroupAsnsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupAsns/TableCacheGroupAsnsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupAsns/TableCacheGroupAsnsController.js
index 2a31fa1..f5b9dc0 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupAsns/TableCacheGroupAsnsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupAsns/TableCacheGroupAsnsController.js
@@ -36,7 +36,7 @@ var TableCacheGroupAsnsController = function(cacheGroup, asns, $scope, $state, l
angular.element(document).ready(function () {
$('#parametersTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupParameters/TableCacheGroupParametersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupParameters/TableCacheGroupParametersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupParameters/TableCacheGroupParametersController.js
index a50ae02..3bab653 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupParameters/TableCacheGroupParametersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupParameters/TableCacheGroupParametersController.js
@@ -71,7 +71,7 @@ var TableCacheGroupParametersController = function(cacheGroup, cacheGroupParamet
angular.element(document).ready(function () {
$('#parametersTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/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 f4d8a08..26c0198 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
@@ -108,7 +108,7 @@ var TableCacheGroupsServersController = function(cacheGroup, servers, $scope, $s
angular.element(document).ready(function () {
$('#serversTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupStaticDnsEntries/TableCacheGroupStaticDnsEntriesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupStaticDnsEntries/TableCacheGroupStaticDnsEntriesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupStaticDnsEntries/TableCacheGroupStaticDnsEntriesController.js
index 87e6ef2..889fc5c 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupStaticDnsEntries/TableCacheGroupStaticDnsEntriesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupStaticDnsEntries/TableCacheGroupStaticDnsEntriesController.js
@@ -32,7 +32,7 @@ var TableCacheGroupsStaticDnsEntriesController = function(cacheGroup, staticDnsE
angular.element(document).ready(function () {
$('#staticDnsEntriesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/TableCacheGroupsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/TableCacheGroupsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/TableCacheGroupsController.js
index 053d0d4..c1a2857 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/TableCacheGroupsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroups/TableCacheGroupsController.js
@@ -36,7 +36,7 @@ var TableCacheGroupsController = function(cacheGroups, $scope, $state, locationU
angular.element(document).ready(function () {
$('#cacheGroupsTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/cdnDeliveryServices/TableCDNDeliveryServicesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cdnDeliveryServices/TableCDNDeliveryServicesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/cdnDeliveryServices/TableCDNDeliveryServicesController.js
index 7d8c27a..be8505b 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cdnDeliveryServices/TableCDNDeliveryServicesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cdnDeliveryServices/TableCDNDeliveryServicesController.js
@@ -36,7 +36,7 @@ var TableCDNDeliveryServicesController = function(cdn, deliveryServices, $scope,
angular.element(document).ready(function () {
$('#deliveryServicesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/cdnProfiles/TableCDNProfilesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cdnProfiles/TableCDNProfilesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/cdnProfiles/TableCDNProfilesController.js
index ccb04c8..04785a1 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cdnProfiles/TableCDNProfilesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cdnProfiles/TableCDNProfilesController.js
@@ -36,7 +36,7 @@ var TableCDNProfilesController = function(cdn, profiles, $scope, $state, locatio
angular.element(document).ready(function () {
$('#profilesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/TableCDNServersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/TableCDNServersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/TableCDNServersController.js
index cfb36c0..8670fdc 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/TableCDNServersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cdnServers/TableCDNServersController.js
@@ -58,7 +58,7 @@ var TableCDNServersController = function(cdn, servers, $scope, $state, locationU
angular.element(document).ready(function () {
$('#serversTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/TableCDNsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/TableCDNsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/TableCDNsController.js
index 6ce5b19..094a81a 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/TableCDNsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/TableCDNsController.js
@@ -36,7 +36,7 @@ var TableCDNsController = function(cdns, $scope, $state, locationUtils) {
angular.element(document).ready(function () {
$('#cdnsTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceJobs/TableDeliveryServiceJobsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceJobs/TableDeliveryServiceJobsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceJobs/TableDeliveryServiceJobsController.js
index c5327ae..58f2deb 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceJobs/TableDeliveryServiceJobsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceJobs/TableDeliveryServiceJobsController.js
@@ -36,7 +36,7 @@ var TableDeliveryServiceJobsController = function(deliveryService, jobs, $scope,
angular.element(document).ready(function () {
$('#dsJobsTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceRegexes/TableDeliveryServiceRegexesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceRegexes/TableDeliveryServiceRegexesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceRegexes/TableDeliveryServiceRegexesController.js
index d08e930..736c265 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceRegexes/TableDeliveryServiceRegexesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceRegexes/TableDeliveryServiceRegexesController.js
@@ -40,7 +40,7 @@ var TableDeliveryServiceRegexesController = function(deliveryService, regexes, $
angular.element(document).ready(function () {
$('#regexesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
index 1a91c00..ec56313 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
@@ -73,7 +73,7 @@ var TableDeliveryServiceServersController = function(deliveryService, servers, $
angular.element(document).ready(function () {
$('#serversTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceStaticDnsEntries/TableDeliveryServiceStaticDnsEntriesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceStaticDnsEntries/TableDeliveryServiceStaticDnsEntriesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceStaticDnsEntries/TableDeliveryServiceStaticDnsEntriesController.js
index 24013ae..99f191d 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceStaticDnsEntries/TableDeliveryServiceStaticDnsEntriesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceStaticDnsEntries/TableDeliveryServiceStaticDnsEntriesController.js
@@ -32,7 +32,7 @@ var TableDeliveryServiceStaticDnsEntriesController = function(deliveryService, s
angular.element(document).ready(function () {
$('#staticDnsEntriesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceUsers/TableDeliveryServiceUsersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceUsers/TableDeliveryServiceUsersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceUsers/TableDeliveryServiceUsersController.js
index 253285d..f16131f 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceUsers/TableDeliveryServiceUsersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceUsers/TableDeliveryServiceUsersController.js
@@ -44,7 +44,7 @@ var TableDeliveryServiceUsersController = function(deliveryService, users, $scop
angular.element(document).ready(function () {
$('#usersTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js
index 09f839b..44d82f8 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js
@@ -63,7 +63,7 @@ var TableDeliveryServicesController = function(deliveryServices, $scope, $state,
angular.element(document).ready(function () {
$('#deliveryServicesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/divisionRegions/TableDivisionRegionsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/divisionRegions/TableDivisionRegionsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/divisionRegions/TableDivisionRegionsController.js
index e09ee5e..e953251 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/divisionRegions/TableDivisionRegionsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/divisionRegions/TableDivisionRegionsController.js
@@ -36,7 +36,7 @@ var TableDivisionRegionsController = function(division, divisionRegions, $scope,
angular.element(document).ready(function () {
$('#regionsTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/TableDivisionsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/TableDivisionsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/TableDivisionsController.js
index 3c168cf..b4e5831 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/TableDivisionsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/divisions/TableDivisionsController.js
@@ -36,7 +36,7 @@ var TableDivisionsController = function(divisions, $scope, $state, locationUtils
angular.element(document).ready(function () {
$('#divisionsTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/parameterCacheGroups/TableParameterCacheGroupsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/parameterCacheGroups/TableParameterCacheGroupsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/parameterCacheGroups/TableParameterCacheGroupsController.js
index 28914d0..fc3dbea 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/parameterCacheGroups/TableParameterCacheGroupsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/parameterCacheGroups/TableParameterCacheGroupsController.js
@@ -40,7 +40,7 @@ var TableParameterCacheGroupsController = function(parameter, cacheGroups, $scop
angular.element(document).ready(function () {
$('#cacheGroupsTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/parameterProfiles/TableParameterProfilesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/parameterProfiles/TableParameterProfilesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/parameterProfiles/TableParameterProfilesController.js
index c6eaf07..3fb44f6 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/parameterProfiles/TableParameterProfilesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/parameterProfiles/TableParameterProfilesController.js
@@ -76,7 +76,7 @@ var TableParameterProfilesController = function(parameter, parameterProfiles, $s
angular.element(document).ready(function () {
$('#parameterProfilesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/TableParametersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/TableParametersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/TableParametersController.js
index 573a5be..4ed957c 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/TableParametersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/parameters/TableParametersController.js
@@ -36,7 +36,7 @@ var TableParametersController = function(parameters, $scope, $state, locationUti
angular.element(document).ready(function () {
$('#parametersTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/physLocationServers/TablePhysLocationServersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/physLocationServers/TablePhysLocationServersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/physLocationServers/TablePhysLocationServersController.js
index 205c71b..c7f69fc 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/physLocationServers/TablePhysLocationServersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/physLocationServers/TablePhysLocationServersController.js
@@ -40,7 +40,7 @@ var TablePhysLocationServersController = function(physLocation, servers, $scope,
angular.element(document).ready(function () {
$('#serversTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/physLocations/TablePhysLocationsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/physLocations/TablePhysLocationsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/physLocations/TablePhysLocationsController.js
index eefc39a..9d6468b 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/physLocations/TablePhysLocationsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/physLocations/TablePhysLocationsController.js
@@ -36,7 +36,7 @@ var TablePhysLocationsController = function(physLocations, $scope, $state, locat
angular.element(document).ready(function () {
$('#physLocationsTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/profileDeliveryServices/TableProfileDeliveryServicesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/profileDeliveryServices/TableProfileDeliveryServicesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/profileDeliveryServices/TableProfileDeliveryServicesController.js
index 01fa63e..79020c7 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/profileDeliveryServices/TableProfileDeliveryServicesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/profileDeliveryServices/TableProfileDeliveryServicesController.js
@@ -36,7 +36,7 @@ var TableProfileDeliveryServicesController = function(profile, deliveryServices,
angular.element(document).ready(function () {
$('#deliveryServicesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/profileParameters/TableProfileParametersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/profileParameters/TableProfileParametersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/profileParameters/TableProfileParametersController.js
index 33a6c67..8486f7c 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/profileParameters/TableProfileParametersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/profileParameters/TableProfileParametersController.js
@@ -71,7 +71,7 @@ var TableProfileParametersController = function(profile, profileParameters, $sco
angular.element(document).ready(function () {
$('#profileParametersTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/profileServers/TableProfileServersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/profileServers/TableProfileServersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/profileServers/TableProfileServersController.js
index 0e6bbef..7d4f5d5 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/profileServers/TableProfileServersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/profileServers/TableProfileServersController.js
@@ -40,7 +40,7 @@ var TableProfileServersController = function(profile, servers, $scope, $state, l
angular.element(document).ready(function () {
$('#serversTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/TableProfilesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/TableProfilesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/TableProfilesController.js
index 04ed8e6..5a8383b 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/TableProfilesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/profiles/TableProfilesController.js
@@ -44,7 +44,7 @@ var TableProfilesController = function(profiles, $scope, $state, locationUtils)
angular.element(document).ready(function () {
$('#profilesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/regionPhysLocations/TableRegionPhysLocationsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/regionPhysLocations/TableRegionPhysLocationsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/regionPhysLocations/TableRegionPhysLocationsController.js
index 0e80fe8..aee580a 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/regionPhysLocations/TableRegionPhysLocationsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/regionPhysLocations/TableRegionPhysLocationsController.js
@@ -40,7 +40,7 @@ var TableRegionPhysLocationsController = function(region, physLocations, $scope,
angular.element(document).ready(function () {
$('#physLocationsTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/regions/TableRegionsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/regions/TableRegionsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/regions/TableRegionsController.js
index 3e9438d..3eed487 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/regions/TableRegionsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/regions/TableRegionsController.js
@@ -36,7 +36,7 @@ var TableRegionsController = function(regions, $scope, $state, locationUtils) {
angular.element(document).ready(function () {
$('#regionsTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js
index 0869200..f418ac6 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js
@@ -49,7 +49,7 @@ var TableServerDeliveryServicesController = function(server, serverDeliveryServi
angular.element(document).ready(function () {
$('#deliveryServicesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/servers/TableServersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/servers/TableServersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/servers/TableServersController.js
index ae824bc..93b6503 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/servers/TableServersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/servers/TableServersController.js
@@ -113,7 +113,7 @@ var TableServersController = function(servers, $scope, $state, $uibModal, locati
angular.element(document).ready(function () {
$('#serversTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/statusServers/TableStatusServersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/statusServers/TableStatusServersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/statusServers/TableStatusServersController.js
index b92b7f8..4aafa0a 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/statusServers/TableStatusServersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/statusServers/TableStatusServersController.js
@@ -40,7 +40,7 @@ var TableStatusServersController = function(status, servers, $scope, $state, loc
angular.element(document).ready(function () {
$('#serversTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/TableStatusesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/TableStatusesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/TableStatusesController.js
index 0e8b5f8..51c31cf 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/TableStatusesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/statuses/TableStatusesController.js
@@ -36,7 +36,7 @@ var TableStatusesController = function(statuses, $scope, $state, locationUtils)
angular.element(document).ready(function () {
$('#statusesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/TableTenantsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/TableTenantsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/TableTenantsController.js
index 5d997d5..0e1a214 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/TableTenantsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/tenants/TableTenantsController.js
@@ -36,7 +36,7 @@ var TableTenantsController = function(tenants, $scope, $state, locationUtils) {
angular.element(document).ready(function () {
$('#tenantsTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/typeCacheGroups/TableTypeCacheGroupsController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/typeCacheGroups/TableTypeCacheGroupsController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/typeCacheGroups/TableTypeCacheGroupsController.js
index c85911b..e05b5bc 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/typeCacheGroups/TableTypeCacheGroupsController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/typeCacheGroups/TableTypeCacheGroupsController.js
@@ -36,7 +36,7 @@ var TableTypeCacheGroupsController = function(type, cacheGroups, $scope, $state,
angular.element(document).ready(function () {
$('#cacheGroupsTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/typeDeliveryServices/TableTypeDeliveryServicesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/typeDeliveryServices/TableTypeDeliveryServicesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/typeDeliveryServices/TableTypeDeliveryServicesController.js
index 3cfc99a..e41053c 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/typeDeliveryServices/TableTypeDeliveryServicesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/typeDeliveryServices/TableTypeDeliveryServicesController.js
@@ -36,7 +36,7 @@ var TableTypeDeliveryServicesController = function(type, deliveryServices, $scop
angular.element(document).ready(function () {
$('#deliveryServicesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/typeServers/TableTypeServersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/typeServers/TableTypeServersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/typeServers/TableTypeServersController.js
index 28bf631..f0e30d4 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/typeServers/TableTypeServersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/typeServers/TableTypeServersController.js
@@ -40,7 +40,7 @@ var TableTypeServersController = function(type, servers, $scope, $state, locatio
angular.element(document).ready(function () {
$('#serversTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/typeStaticDnsEntries/TableTypeStaticDnsEntriesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/typeStaticDnsEntries/TableTypeStaticDnsEntriesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/typeStaticDnsEntries/TableTypeStaticDnsEntriesController.js
index 03faf48..add4ae5 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/typeStaticDnsEntries/TableTypeStaticDnsEntriesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/typeStaticDnsEntries/TableTypeStaticDnsEntriesController.js
@@ -32,7 +32,7 @@ var TableTypeStaticDnsEntriesController = function(type, staticDnsEntries, $scop
angular.element(document).ready(function () {
$('#staticDnsEntriesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/types/TableTypesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/types/TableTypesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/types/TableTypesController.js
index 93346f3..d6f73b9 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/types/TableTypesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/types/TableTypesController.js
@@ -36,7 +36,7 @@ var TableTypesController = function(types, $scope, $state, locationUtils) {
angular.element(document).ready(function () {
$('#typesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/userDeliveryServices/TableUserDeliveryServicesController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/userDeliveryServices/TableUserDeliveryServicesController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/userDeliveryServices/TableUserDeliveryServicesController.js
index 57327d7..a04bbf8 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/userDeliveryServices/TableUserDeliveryServicesController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/userDeliveryServices/TableUserDeliveryServicesController.js
@@ -40,7 +40,7 @@ var TableUserDeliveryServicesController = function(user, userDeliveryServices, $
angular.element(document).ready(function () {
$('#deliveryServicesTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": 100,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5728657f/traffic_ops/experimental/ui/app/src/common/modules/table/users/TableUsersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/users/TableUsersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/users/TableUsersController.js
index 029dfb9..867bddf 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/users/TableUsersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/users/TableUsersController.js
@@ -36,7 +36,7 @@ var TableUsersController = function(users, $scope, $state, locationUtils) {
angular.element(document).ready(function () {
$('#usersTable').dataTable({
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
- "iDisplayLength": -1,
+ "iDisplayLength": 25,
"aaSorting": []
});
});
[2/3] incubator-trafficcontrol git commit: ui tweaks (i know great
commit message huh?)
Posted by de...@apache.org.
ui tweaks (i know great commit message huh?)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c494a883
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c494a883
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c494a883
Branch: refs/heads/master
Commit: c494a8835e9ce11ab5411be1316c7240284f437b
Parents: 5728657
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue May 30 21:46:38 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Thu Jun 1 11:31:37 2017 -0600
----------------------------------------------------------------------
.../ui/app/src/common/api/CDNService.js | 27 ++++++++-
.../ui/app/src/common/api/CacheGroupService.js | 2 +-
.../ui/app/src/common/api/ServerService.js | 6 +-
.../form/cacheGroup/form.cacheGroup.tpl.html | 17 ++++--
.../common/modules/form/cdn/form.cdn.tpl.html | 21 ++++---
.../form.deliveryService.DNS.tpl.html | 15 +++--
.../form.deliveryService.HTTP.tpl.html | 15 +++--
.../form.deliveryService.Steering.tpl.html | 15 +++--
.../form.deliveryService.anyMap.tpl.html | 15 +++--
.../form/division/form.division.tpl.html | 10 +---
.../form/parameter/form.parameter.tpl.html | 14 +----
.../physLocation/form.physLocation.tpl.html | 10 +---
.../form/profile/FormProfileController.js | 2 +-
.../modules/form/profile/form.profile.tpl.html | 3 +-
.../modules/form/region/form.region.tpl.html | 10 +---
.../modules/form/server/FormServerController.js | 8 ++-
.../modules/form/server/form.server.tpl.html | 2 +-
.../modules/form/status/form.status.tpl.html | 10 +---
.../modules/form/user/FormUserController.js | 12 +++-
.../common/modules/form/user/form.user.tpl.html | 57 ++++++++++---------
.../common/modules/header/HeaderController.js | 58 ++++++++++++++++++--
.../src/common/modules/header/header.tpl.html | 10 ++++
.../table.cacheGroupParameters.tpl.html | 2 +-
.../table.cacheGroupServers.tpl.html | 15 +++--
.../table/cdnServers/table.cdnServers.tpl.html | 12 +++-
.../table.deliveryServiceServers.tpl.html | 4 +-
.../table.parameterProfiles.tpl.html | 2 +-
.../table.profileParameters.tpl.html | 2 +-
.../table.serverDeliveryServices.tpl.html | 4 +-
.../table/servers/table.servers.tpl.html | 2 +-
.../table.userDeliveryServices.tpl.html | 2 +-
.../private/admin/cdns/config/config.tpl.html | 24 ++++----
.../modules/private/admin/cdns/list/index.js | 2 +-
.../private/configure/servers/new/index.js | 3 +-
.../monitor/dashboard/DashboardController.js | 5 +-
35 files changed, 262 insertions(+), 156 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/api/CDNService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/CDNService.js b/traffic_ops/experimental/ui/app/src/common/api/CDNService.js
index 54e56d2..e9221d0 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/CDNService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/CDNService.js
@@ -19,10 +19,31 @@
var CDNService = function($http, $q, Restangular, locationUtils, messageModel, ENV) {
- this.getCDNs = function(queryParams) {
- return Restangular.all('cdns').getList(queryParams);
+ this.getCDNs = function(all) {
+ var request = $q.defer();
+
+ $http.get(ENV.api['root'] + "cdns")
+ .then(
+ function(result) {
+ var response;
+ if (all) { // there is a CDN called "ALL" that is not really a CDN but you might want it...
+ response = result.data.response;
+ } else {
+ response = _.filter(result.data.response, function(cdn) {
+ return cdn.name != 'ALL';
+ });
+ }
+ request.resolve(response);
+ },
+ function(fault) {
+ request.reject();
+ }
+ );
+
+ return request.promise;
};
+
this.getCDN = function(id) {
return Restangular.one("cdns", id).get();
};
@@ -80,7 +101,7 @@ var CDNService = function($http, $q, Restangular, locationUtils, messageModel, E
return Restangular.one("cdns", id).customPOST( { action: "dequeue"}, "queue_update" )
.then(
function() {
- messageModel.setMessages([ { level: 'success', text: 'Cancelled CDN server updates' } ], false);
+ messageModel.setMessages([ { level: 'success', text: 'Cleared CDN server updates' } ], false);
},
function(fault) {
messageModel.setMessages(fault.data.alerts, false);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js b/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js
index f2172cd..cec928e 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js
@@ -80,7 +80,7 @@ var CacheGroupService = function($http, $q, Restangular, locationUtils, messageM
return Restangular.one("cachegroups", cgId).customPOST( { action: "dequeue", cdnId: cdnId}, "queue_update" )
.then(
function() {
- messageModel.setMessages([ { level: 'success', text: 'Cancelled cache group server updates' } ], false);
+ messageModel.setMessages([ { level: 'success', text: 'Cleared cache group server updates' } ], false);
},
function(fault) {
messageModel.setMessages(fault.data.alerts, false);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/api/ServerService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/ServerService.js b/traffic_ops/experimental/ui/app/src/common/api/ServerService.js
index fd950fd..b6c7563 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/ServerService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/ServerService.js
@@ -30,9 +30,9 @@ var ServerService = function($http, $q, Restangular, locationUtils, messageModel
this.createServer = function(server) {
return Restangular.service('servers').post(server)
.then(
- function() {
+ function(response) {
messageModel.setMessages([ { level: 'success', text: 'Server created' } ], true);
- locationUtils.navigateToPath('/configure/servers');
+ locationUtils.navigateToPath('/configure/servers/' + response.id);
},
function(fault) {
messageModel.setMessages(fault.data.alerts, false);
@@ -88,7 +88,7 @@ var ServerService = function($http, $q, Restangular, locationUtils, messageModel
return Restangular.one("servers", id).customPOST( { action: "dequeue"}, "queue_update" )
.then(
function() {
- messageModel.setMessages([ { level: 'success', text: 'Cancelled server updates' } ], false);
+ messageModel.setMessages([ { level: 'success', text: 'Cleared server updates' } ], false);
},
function(fault) {
messageModel.setMessages(fault.data.alerts, false);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/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 40beeb4..2965029 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,17 +24,22 @@ under the License.
<li class="active">{{cacheGroupName}}</li>
</ol>
<div class="pull-right" ng-show="!settings.isNew">
- <button class="btn btn-primary" title="Queue Server Updates" ng-click="confirmQueueServerUpdates(cacheGroup)"><i class="fa fa-flag"></i></button>
- <button class="btn btn-primary" title="Clear Server Updates" ng-click="confirmClearServerUpdates(cacheGroup)"><i class="fa fa-ban"></i></button>
+ <div class="btn-group" role="group" uib-dropdown is-open="queue.isopen">
+ <button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
+ Queue Updates
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
+ <li role="menuitem"><a ng-click="confirmQueueServerUpdates(cacheGroup)"><i class="fa fa-flag"></i> Queue {{cacheGroupName}} Server Updates</a></li>
+ <li role="menuitem"><a ng-click="confirmClearServerUpdates(cacheGroup)"><i class="fa fa-ban"></i> Clear {{cacheGroupName}} Server Updates</a></li>
+ </ul>
+ </div>
<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">
- More
+ More
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
- <li role="menuitem"><a ng-click="confirmQueueServerUpdates(cacheGroup)">Queue Server Updates</a></li>
- <li role="menuitem"><a ng-click="confirmQueueServerUpdates(cacheGroup)">Clear 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="viewServers()">View Servers</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/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 ef0f752..b3d6f0d 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,20 +24,23 @@ under the License.
<li class="active">{{cdnName}}</li>
</ol>
<div class="pull-right" ng-show="!settings.isNew">
- <button class="btn btn-primary" title="View / Snapshot {{cdn.name}} Config Changes" ng-click="viewConfig()"><i class="fa fa-camera"></i></button>
- <button class="btn btn-primary" title="Queue {{cdn.name}} Server Updates" ng-click="queueServerUpdates(cdn)"><i class="fa fa-flag"></i></button>
- <button class="btn btn-primary" title="Clear {{cdn.name}} Server Updates" ng-click="clearServerUpdates(cdn)"><i class="fa fa-ban"></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">
- More
+ <button class="btn btn-primary" title="Diff CDN Snapshot" ng-click="viewConfig()"><i class="fa fa-camera"></i> Diff CDN Config Snapshot</button>
+ <div class="btn-group" role="group" uib-dropdown is-open="queue.isopen">
+ <button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
+ Queue Updates
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
- <li role="menuitem"><a ng-click="viewConfig()">View / Snapshot {{cdn.name}} Config Changes</a></li>
- <li class="divider"></li>
<li role="menuitem"><a ng-click="queueServerUpdates(cdn)">Queue {{cdn.name}} Server Updates</a></li>
<li role="menuitem"><a ng-click="clearServerUpdates(cdn)">Clear {{cdn.name}} Server Updates</a></li>
- <li class="divider"></li>
+ </ul>
+ </div>
+ <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">
+ More
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
<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>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
index ae992ed..42600b8 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
@@ -24,15 +24,22 @@ under the License.
<li class="active">{{deliveryServiceName}}</li>
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
- <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">
- More
+ <div class="btn-group" role="group" uib-dropdown is-open="keys.isopen">
+ <button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
+ <i class="fa fa-key"></i>
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
<li role="menuitem"><a ng-click="manageSslKeys()">Manage SSL Keys</a></li>
<li role="menuitem"><a ng-click="manageUrlSigKeys()">Manage URL Sig Keys</a></li>
- <li class="divider"></li>
+ </ul>
+ </div>
+ <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">
+ More
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
<li role="menuitem"><a ng-click="viewServers()">View Servers</a></li>
<li role="menuitem"><a ng-click="viewRegexes()">View Regexes</a></li>
<li role="menuitem"><a ng-click="viewJobs()">View Invalidate Content Jobs</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
index 5e0b4a7..8d26395 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
@@ -24,15 +24,22 @@ under the License.
<li class="active">{{deliveryServiceName}}</li>
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
- <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">
- More
+ <div class="btn-group" role="group" uib-dropdown is-open="keys.isopen">
+ <button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
+ <i class="fa fa-key"></i>
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
<li role="menuitem"><a ng-click="manageSslKeys()">Manage SSL Keys</a></li>
<li role="menuitem"><a ng-click="manageUrlSigKeys()">Manage URL Sig Keys</a></li>
- <li class="divider"></li>
+ </ul>
+ </div>
+ <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">
+ More
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
<li role="menuitem"><a ng-click="viewServers()">View Servers</a></li>
<li role="menuitem"><a ng-click="viewRegexes()">View Regexes</a></li>
<li role="menuitem"><a ng-click="viewJobs()">View Invalidate Content Jobs</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
index 13a7dbb..5f67348 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
@@ -24,15 +24,22 @@ under the License.
<li class="active">{{deliveryServiceName}}</li>
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
- <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">
- More
+ <div class="btn-group" role="group" uib-dropdown is-open="keys.isopen">
+ <button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
+ <i class="fa fa-key"></i>
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
<li role="menuitem"><a ng-click="manageSslKeys()">Manage SSL Keys</a></li>
<li role="menuitem"><a ng-click="manageUrlSigKeys()">Manage URL Sig Keys</a></li>
- <li class="divider"></li>
+ </ul>
+ </div>
+ <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">
+ More
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
<li role="menuitem"><a ng-click="viewServers()">View Servers</a></li>
<li role="menuitem"><a ng-click="viewRegexes()">View Regexes</a></li>
<li role="menuitem"><a ng-click="viewJobs()">View Invalidate Content Jobs</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
index 4ca3bd3..ca04ef2 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
@@ -24,15 +24,22 @@ under the License.
<li class="active">{{deliveryServiceName}}</li>
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
- <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">
- More
+ <div class="btn-group" role="group" uib-dropdown is-open="keys.isopen">
+ <button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
+ <i class="fa fa-key"></i>
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
<li role="menuitem"><a ng-click="manageSslKeys()">Manage SSL Keys</a></li>
<li role="menuitem"><a ng-click="manageUrlSigKeys()">Manage URL Sig Keys</a></li>
- <li class="divider"></li>
+ </ul>
+ </div>
+ <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">
+ More
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
<li role="menuitem"><a ng-click="viewServers()">View Servers</a></li>
<li role="menuitem"><a ng-click="viewRegexes()">View Regexes</a></li>
<li role="menuitem"><a ng-click="viewJobs()">View Invalidate Content Jobs</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/form/division/form.division.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/division/form.division.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/division/form.division.tpl.html
index 983d9ac..bd87a3c 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/division/form.division.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/division/form.division.tpl.html
@@ -24,15 +24,7 @@ under the License.
<li class="active">{{divisionName}}</li>
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
- <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">
- More
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
- <li role="menuitem"><a ng-click="viewRegions()">View Regions</a></li>
- </ul>
- </div>
+ <button class="btn btn-primary" title="View Regions" ng-click="viewRegions()">View Regions</button>
</div>
<div class="clearfix"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/form.parameter.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/form.parameter.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/form.parameter.tpl.html
index b05a89c..6f31745 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/form.parameter.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/form.parameter.tpl.html
@@ -24,17 +24,9 @@ under the License.
<li class="active">{{parameterName}}</li>
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
- <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">
- More
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
- <!--todo: show cache groups for a parameter-->
- <!--<li role="menuitem"><a ng-click="viewCacheGroups()">View Cache Groups</a></li>-->
- <li role="menuitem"><a ng-click="viewProfiles()">View Profiles</a></li>
- </ul>
- </div>
+ <button class="btn btn-primary" title="View Profiles" ng-click="viewProfiles()">View Profiles</button>
+ <!-- todo: show cachegroups for a parameter -->
+ <!--<button class="btn btn-primary" title="View Cache Groups" ng-click="viewCacheGroups()">View Cache Groups</button>-->
</div>
<div class="clearfix"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/form/physLocation/form.physLocation.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/physLocation/form.physLocation.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/physLocation/form.physLocation.tpl.html
index baaf28f..c2d66d4 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/physLocation/form.physLocation.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/physLocation/form.physLocation.tpl.html
@@ -24,15 +24,7 @@ under the License.
<li class="active">{{physLocationName}}</li>
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
- <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">
- More
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
- <li role="menuitem"><a ng-click="viewServers()">View Servers</a></li>
- </ul>
- </div>
+ <button class="btn btn-primary" title="View Servers" ng-click="viewServers()">View Servers</button>
</div>
<div class="clearfix"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/form/profile/FormProfileController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/FormProfileController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/FormProfileController.js
index 20797b7..1523ee0 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/FormProfileController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/FormProfileController.js
@@ -20,7 +20,7 @@
var FormProfileController = function(profile, $scope, $location, formUtils, locationUtils, cdnService) {
var getCDNs = function() {
- cdnService.getCDNs()
+ cdnService.getCDNs(true)
.then(function(result) {
$scope.cdns = result;
});
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/form/profile/form.profile.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/form.profile.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/form.profile.tpl.html
index 00c41a7..e88ff0d 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/form.profile.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/form.profile.tpl.html
@@ -24,9 +24,10 @@ under the License.
<li class="active">{{profileName}}</li>
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
+ <button class="btn btn-primary" title="View Parameters" ng-click="viewParams()">View Parameters</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">
- More
+ More
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/form/region/form.region.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/region/form.region.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/region/form.region.tpl.html
index 4dfaaf7..a37325e 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/region/form.region.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/region/form.region.tpl.html
@@ -24,15 +24,7 @@ under the License.
<li class="active">{{regionName}}</li>
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
- <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">
- More
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
- <li role="menuitem"><a ng-click="viewPhysLocations()">View Physical Locations</a></li>
- </ul>
- </div>
+ <button class="btn btn-primary" title="View Phys Locations" ng-click="viewPhysLocations()">View Phys Locations</button>
</div>
<div class="clearfix"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/form/server/FormServerController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/server/FormServerController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/server/FormServerController.js
index 84df4ce..fa81e5f 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/server/FormServerController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/server/FormServerController.js
@@ -41,7 +41,7 @@ var FormServerController = function(server, $scope, $location, $state, $uibModal
};
var getCDNs = function() {
- cdnService.getCDNs()
+ cdnService.getCDNs(true)
.then(function(result) {
$scope.cdns = result;
});
@@ -55,9 +55,11 @@ var FormServerController = function(server, $scope, $location, $state, $uibModal
};
var getProfiles = function() {
- profileService.getProfiles()
+ profileService.getProfiles({ orderby: 'name' })
.then(function(result) {
- $scope.profiles = result;
+ $scope.profiles = _.filter(result, function(profile) {
+ return profile.type != 'DS_PROFILE';
+ });
});
};
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/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 c5e4a54..c075944 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
@@ -30,7 +30,7 @@ under the License.
<button class="btn btn-primary" title="Clear Server Updates" ng-show="server.updPending" ng-click="clearServerUpdates(server)"><i class="fa fa-ban"></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">
- More
+ More
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/form/status/form.status.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/status/form.status.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/status/form.status.tpl.html
index 8cfa805..d8733d7 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/status/form.status.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/status/form.status.tpl.html
@@ -24,15 +24,7 @@ under the License.
<li class="active">{{statusName}}</li>
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
- <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">
- More
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
- <li role="menuitem"><a ng-click="viewServers()">View Servers</a></li>
- </ul>
- </div>
+ <button class="btn btn-primary" title="View Servers" ng-click="viewServers()">View Servers</button>
</div>
<div class="clearfix"></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/form/user/FormUserController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/user/FormUserController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/user/FormUserController.js
index 8ba1699..8561601 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/user/FormUserController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/user/FormUserController.js
@@ -17,7 +17,7 @@
* under the License.
*/
-var FormUserController = function(user, $scope, $location, formUtils, stringUtils, locationUtils, roleService) {
+var FormUserController = function(user, $scope, $location, formUtils, stringUtils, locationUtils, roleService, tenantService) {
var getRoles = function() {
roleService.getRoles()
@@ -26,6 +26,13 @@ var FormUserController = function(user, $scope, $location, formUtils, stringUtil
});
};
+ var getTenants = function() {
+ tenantService.getTenants()
+ .then(function(result) {
+ $scope.tenants = result;
+ });
+ };
+
$scope.user = user;
$scope.labelize = stringUtils.labelize;
@@ -42,10 +49,11 @@ var FormUserController = function(user, $scope, $location, formUtils, stringUtil
var init = function () {
getRoles();
+ getTenants();
};
init();
};
-FormUserController.$inject = ['user', '$scope', '$location', 'formUtils', 'stringUtils', 'locationUtils', 'roleService'];
+FormUserController.$inject = ['user', '$scope', '$location', 'formUtils', 'stringUtils', 'locationUtils', 'roleService', 'tenantService'];
module.exports = FormUserController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/form/user/form.user.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/user/form.user.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/user/form.user.tpl.html
index ba333d2..b6cd309 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/user/form.user.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/user/form.user.tpl.html
@@ -25,15 +25,7 @@ under the License.
<li class="active">{{userName}}</li>
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
- <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">
- More
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
- <li role="menuitem"><a ng-click="viewDeliveryServices()">View Delivery Services</a></li>
- </ul>
- </div>
+ <button class="btn btn-primary" title="View Delivery Services" ng-click="viewDeliveryServices()">View Delivery Services</button>
</div>
<div class="clearfix"></div>
</div>
@@ -49,14 +41,14 @@ under the License.
<span ng-show="hasError(userForm.fullName)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
-
- <div class="form-group" ng-class="{'has-error': hasError(userForm.role), 'has-feedback': hasError(userForm.role)}">
- <label class="control-label col-md-2 col-sm-2 col-xs-12">Role *</label>
+ <div class="form-group" ng-class="{'has-error': hasError(userForm.username), 'has-feedback': hasError(userForm.username)}">
+ <label class="control-label col-md-2 col-sm-2 col-xs-12">Username *</label>
<div class="col-md-10 col-sm-10 col-xs-12">
- <select id="role" name="role" class="form-control" ng-model="user.role" ng-options="role.id as role.name for role in roles" required>
- <option value="">Select...</option>
- </select>
- <small class="input-error" ng-show="hasPropertyError(userForm.role, 'required')">Required</small>
+ <input id="username" name="username" type="text" class="form-control" ng-model="user.username" ng-required="true" ng-maxlength="128" ng-pattern="/^\S*$/" autofocus>
+ <small class="input-error" ng-show="hasPropertyError(userForm.username, 'required')">Required</small>
+ <small class="input-error" ng-show="hasPropertyError(userForm.username, 'maxlength')">Too Long</small>
+ <small class="input-error" ng-show="hasPropertyError(userForm.username, 'pattern')">No Spaces</small>
+ <span ng-show="hasError(userForm.username)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
<div class="form-group" ng-class="{'has-error': hasError(userForm.email), 'has-feedback': hasError(userForm.email)}">
@@ -68,33 +60,46 @@ under the License.
<span ng-show="hasError(userForm.email)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
- <div class="form-group" ng-class="{'has-error': hasError(userForm.username), 'has-feedback': hasError(userForm.username)}">
- <label class="control-label col-md-2 col-sm-2 col-xs-12">Username *</label>
+ <div class="form-group" ng-class="{'has-error': hasError(userForm.role), 'has-feedback': hasError(userForm.role)}">
+ <label class="control-label col-md-2 col-sm-2 col-xs-12">Role *</label>
<div class="col-md-10 col-sm-10 col-xs-12">
- <input id="username" name="username" type="text" class="form-control" ng-model="user.username" ng-required="true" ng-maxlength="128" ng-pattern="/^\S*$/" autofocus>
- <small class="input-error" ng-show="hasPropertyError(userForm.username, 'required')">Required</small>
- <small class="input-error" ng-show="hasPropertyError(userForm.username, 'maxlength')">Too Long</small>
- <small class="input-error" ng-show="hasPropertyError(userForm.username, 'pattern')">No Spaces</small>
- <span ng-show="hasError(userForm.username)" class="form-control-feedback"><i class="fa fa-times"></i></span>
+ <select id="role" name="role" class="form-control" ng-model="user.role" ng-options="role.id as role.name for role in roles" required>
+ <option value="">Select...</option>
+ </select>
+ <small class="input-error" ng-show="hasPropertyError(userForm.role, 'required')">Required</small>
+ </div>
+ </div>
+ <div class="form-group" ng-class="{'has-error': hasError(userForm.tenantId), 'has-feedback': hasError(userForm.tenantId)}">
+ <label class="control-label col-md-2 col-sm-2 col-xs-12">Tenant</label>
+ <div class="col-md-10 col-sm-10 col-xs-12">
+ <select id="tenantId" name="tenantId" class="form-control" ng-model="user.tenantId" ng-options="tenant.id as tenant.name for tenant in tenants">
+ <option value="">Select...</option>
+ </select>
</div>
</div>
<div class="form-group" ng-class="{'has-error': hasError(userForm.password), 'has-feedback': hasError(userForm.password)}">
- <label class="control-label col-md-2 col-sm-2 col-xs-12">Password *</label>
+ <label class="control-label col-md-2 col-sm-2 col-xs-12">Password <span ng-if="settings.isNew">*</span></label>
<div class="col-md-10 col-sm-10 col-xs-12">
- <input id="password" name="password" type="password" class="form-control" ng-model="user.localPasswd" ng-required="true" ng-maxlength="40" ng-minlength="6" autofocus>
+ <input id="password" name="password" type="password" class="form-control" ng-model="user.localPasswd" ng-required="settings.isNew" ng-maxlength="40" ng-minlength="8" autofocus>
<small class="input-error" ng-show="hasPropertyError(userForm.password, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(userForm.password, 'maxlength')">Too Long</small>
<span ng-show="hasError(userForm.password)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
<div class="form-group" ng-class="{'has-error': hasError(userForm.confirmPassword), 'has-feedback': hasError(userForm.confirmPassword)}">
- <label class="control-label col-md-2 col-sm-2 col-xs-12">Confirm Password *</label>
+ <label class="control-label col-md-2 col-sm-2 col-xs-12">Confirm Password <span ng-if="settings.isNew">*</span></label>
<div class="col-md-10 col-sm-10 col-xs-12">
<input id="confirmPassword" name="confirmPassword" type="password" class="form-control" ng-model="user.confirmLocalPasswd" match="user.localPasswd">
<small class="input-error" ng-show="hasPropertyError(userForm.confirmPassword, 'match')">[ Doesn't Match ]</small>
<span ng-show="hasError(userForm.confirmPassword)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
+ <div class="form-group">
+ <label class="control-label col-md-2 col-sm-2 col-xs-12">Public SSH Key</label>
+ <div class="col-md-10 col-sm-10 col-xs-12">
+ <textarea id="publicSshKey" name="publicSshKey" rows="5" class="form-control" ng-model="user.publicSshKey"></textarea>
+ </div>
+ </div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" ng-show="!settings.isNew" ng-click="confirmDelete(user)">Delete</button>
<button type="button" class="btn btn-success" ng-disabled="userForm.$pristine || userForm.$invalid" ng-click="confirmSave(user, userForm.username)">{{settings.saveLabel}}</button>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js b/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js
index 1070b7b..629079f 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/header/HeaderController.js
@@ -17,7 +17,7 @@
* under the License.
*/
-var HeaderController = function($rootScope, $scope, $state, $anchorScroll, locationUtils, authService, trafficOpsService, changeLogService, changeLogModel, userModel) {
+var HeaderController = function($rootScope, $scope, $state, $uibModal, $location, $anchorScroll, locationUtils, authService, trafficOpsService, changeLogService, cdnService, changeLogModel, userModel) {
$scope.isCollapsed = true;
@@ -53,11 +53,61 @@ var HeaderController = function($rootScope, $scope, $state, $anchorScroll, locat
};
$scope.dumpDB = function() {
- trafficOpsService.dumpDB();
+ alert('not working yet');
+ // trafficOpsService.dumpDB();
};
- $scope.navigateToPath = locationUtils.navigateToPath;
+ $scope.confirmQueueServerUpdates = function() {
+ var params = {
+ title: 'Queue Server Updates',
+ message: "Please select a CDN"
+ };
+ var modalInstance = $uibModal.open({
+ templateUrl: 'common/modules/dialog/select/dialog.select.tpl.html',
+ controller: 'DialogSelectController',
+ size: 'md',
+ resolve: {
+ params: function () {
+ return params;
+ },
+ collection: function(cdnService) {
+ return cdnService.getCDNs();
+ }
+ }
+ });
+ modalInstance.result.then(function(cdn) {
+ cdnService.queueServerUpdates(cdn.id);
+ }, function () {
+ // do nothing
+ });
+ };
+ $scope.snapshot = function() {
+ var params = {
+ title: 'Diff CDN Config Snapshot',
+ message: "Please select a CDN"
+ };
+ var modalInstance = $uibModal.open({
+ templateUrl: 'common/modules/dialog/select/dialog.select.tpl.html',
+ controller: 'DialogSelectController',
+ size: 'md',
+ resolve: {
+ params: function () {
+ return params;
+ },
+ collection: function(cdnService) {
+ return cdnService.getCDNs();
+ }
+ }
+ });
+ modalInstance.result.then(function(cdn) {
+ $location.path('/admin/cdns/' + cdn.id + '/config/changes');
+ }, function () {
+ // do nothing
+ });
+ };
+
+ $scope.navigateToPath = locationUtils.navigateToPath;
var scrollToTop = function() {
$anchorScroll(); // hacky?
@@ -109,5 +159,5 @@ var HeaderController = function($rootScope, $scope, $state, $anchorScroll, locat
init();
};
-HeaderController.$inject = ['$rootScope', '$scope', '$state', '$anchorScroll', 'locationUtils', 'authService', 'trafficOpsService', 'changeLogService', 'changeLogModel', 'userModel'];
+HeaderController.$inject = ['$rootScope', '$scope', '$state', '$uibModal', '$location', '$anchorScroll', 'locationUtils', 'authService', 'trafficOpsService', 'changeLogService', 'cdnService', 'changeLogModel', 'userModel'];
module.exports = HeaderController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html
index a69ad7b..cf6ad47 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/header/header.tpl.html
@@ -66,6 +66,16 @@ under the License.
<button type="button" class="btn btn-link" ng-click="dumpDB()"><i class="fa fa-download"></i></button>
</div>
</li>
+ <li>
+ <div class="btn-group" title="Queue CDN Server Updates">
+ <button type="button" class="btn btn-link" ng-click="confirmQueueServerUpdates()"><i class="fa fa-flag"></i></button>
+ </div>
+ </li>
+ <li>
+ <div class="btn-group" title="Diff CDN Config Snapshot">
+ <button type="button" class="btn btn-link" ng-click="snapshot()"><i class="fa fa-camera"></i></button>
+ </div>
+ </li>
</ul>
</nav>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupParameters/table.cacheGroupParameters.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupParameters/table.cacheGroupParameters.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupParameters/table.cacheGroupParameters.tpl.html
index d8f51d1..d9e0127 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupParameters/table.cacheGroupParameters.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cacheGroupParameters/table.cacheGroupParameters.tpl.html
@@ -25,7 +25,7 @@ under the License.
<li class="active">Parameters</li>
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
- <button class="btn btn-primary" title="Link Parameter to Cache Group" ng-click="selectParams()"><i class="fa fa-link"></i></button>
+ <button class="btn btn-primary" title="Link Parameters to Cache Group" ng-click="selectParams()"><i class="fa fa-link"></i></button>
<button class="btn btn-default" title="Refresh" ng-click="refresh()"><i class="fa fa-refresh"></i></button>
</div>
<div class="clearfix"></div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/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 6ed2d7b..ad3df4a 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
@@ -25,8 +25,16 @@ under the License.
<li class="active">Servers</li>
</ol>
<div class="pull-right">
- <button class="btn btn-primary" title="Queue {{::cacheGroup.name}} server updates" ng-click="confirmQueueServerUpdates(cacheGroup)"><i class="fa fa-flag"></i></button>
- <button class="btn btn-primary" title="Clear {{::cacheGroup.name}} server updates" ng-click="confirmClearServerUpdates(cacheGroup)"><i class="fa fa-ban"></i></button>
+ <div class="btn-group" role="group" uib-dropdown is-open="queue.isopen">
+ <button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
+ Queue Updates
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
+ <li role="menuitem"><a ng-click="confirmQueueServerUpdates(cacheGroup)"><i class="fa fa-flag"></i> Queue {{::cacheGroup.name}} Server Updates</a></li>
+ <li role="menuitem"><a ng-click="confirmClearServerUpdates(cacheGroup)"><i class="fa fa-ban"></i> Clear {{::cacheGroup.name}} Server Updates</a></li>
+ </ul>
+ </div>
<button class="btn btn-default" title="Refresh" ng-click="refresh()"><i class="fa fa-refresh"></i></button>
</div>
<div class="clearfix"></div>
@@ -54,8 +62,7 @@ under the License.
<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>
+ <i class="fa fa-flag" title="Server Update Pending" ng-if="server.updPending"></i>
</td>
<td>{{::server.hostName}}</td>
<td>{{::server.domainName}}</td>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/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 4401e1e..0f487c4 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
@@ -25,8 +25,16 @@ under the License.
<li class="active">Servers</li>
</ol>
<div class="pull-right">
- <button class="btn btn-primary" title="Queue {{::cdn.name}} Server Updates" ng-click="queueServerUpdates(cdn)"><i class="fa fa-flag"></i></button>
- <button class="btn btn-primary" title="Cancel {{::cdn.name}} Server Updates" ng-click="clearServerUpdates(cdn)"><i class="fa fa-ban"></i></button>
+ <div class="btn-group" role="group" uib-dropdown is-open="queue.isopen">
+ <button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
+ Queue Updates
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
+ <li role="menuitem"><a ng-click="queueServerUpdates(cdn)">Queue {{cdn.name}} Server Updates</a></li>
+ <li role="menuitem"><a ng-click="clearServerUpdates(cdn)">Clear {{cdn.name}} Server Updates</a></li>
+ </ul>
+ </div>
<button class="btn btn-default" title="Refresh" ng-click="refresh()"><i class="fa fa-refresh"></i></button>
</div>
<div class="clearfix"></div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/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 59de788..2907b95 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
@@ -25,7 +25,7 @@ under the License.
<li class="active">Servers</li>
</ol>
<div class="pull-right">
- <button class="btn btn-primary" title="Link Server to Delivery Service" ng-click="selectServers()"><i class="fa fa-link"></i></button>
+ <button class="btn btn-primary" title="Link Servers to Delivery Service" ng-click="selectServers()"><i class="fa fa-link"></i></button>
<button class="btn btn-default" title="Refresh" ng-click="refresh()"><i class="fa fa-refresh"></i></button>
</div>
<div class="clearfix"></div>
@@ -72,7 +72,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 Server from Delivery Service" ng-show="server.type.indexOf('EDGE') != -1" ng-click="removeServer(deliveryService.id, server.id)"><i class="fa fa-chain-broken"></i></button></td>
+ <td><button type="button" class="btn btn-link" title="Unlink Server from Delivery Service" ng-click="removeServer(deliveryService.id, server.id)"><i class="fa fa-chain-broken"></i></button></td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/table/parameterProfiles/table.parameterProfiles.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/parameterProfiles/table.parameterProfiles.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/parameterProfiles/table.parameterProfiles.tpl.html
index a455aac..61fd49a 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/parameterProfiles/table.parameterProfiles.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/parameterProfiles/table.parameterProfiles.tpl.html
@@ -25,7 +25,7 @@ under the License.
<li class="active">Profiles</li>
</ol>
<div class="pull-right">
- <button class="btn btn-primary" title="Link Profile to Parameter" ng-click="selectProfiles()"><i class="fa fa-link"></i></button>
+ <button class="btn btn-primary" title="Link Profiles to Parameter" ng-click="selectProfiles()"><i class="fa fa-link"></i></button>
<button class="btn btn-default" title="Refresh" ng-click="refresh()"><i class="fa fa-refresh"></i></button>
</div>
<div class="clearfix"></div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/table/profileParameters/table.profileParameters.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/profileParameters/table.profileParameters.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/profileParameters/table.profileParameters.tpl.html
index 966b8a5..24d1693 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/profileParameters/table.profileParameters.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/profileParameters/table.profileParameters.tpl.html
@@ -25,7 +25,7 @@ under the License.
<li class="active">Parameters</li>
</ol>
<div class="pull-right">
- <button class="btn btn-primary" title="Link Parameter to Profile" ng-click="selectParams()"><i class="fa fa-link"></i></button>
+ <button class="btn btn-primary" title="Link Parameters to Profile" ng-click="selectParams()"><i class="fa fa-link"></i></button>
<button class="btn btn-default" title="Refresh" ng-click="refresh()"><i class="fa fa-refresh"></i></button>
</div>
<div class="clearfix"></div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html
index a9efa33..2f90b03 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html
@@ -25,11 +25,11 @@ under the License.
<li class="active">Delivery Services</li>
</ol>
<div class="pull-right" role="group">
- <button class="btn btn-primary" title="Link Delivery Service to Server" ng-click="addDeliveryService()"><i class="fa fa-link"></i></button>
+ <button class="btn btn-primary" title="Link Delivery Services to Server" ng-click="addDeliveryService()"><i class="fa fa-link"></i></button>
<button class="btn btn-default" title="Refresh" ng-click="refresh()"><i class="fa fa-refresh"></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">
- More
+ More
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/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 a7be280..6483172 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
@@ -27,7 +27,7 @@ under the License.
<button class="btn btn-default" title="Refresh" ng-click="refresh()"><i class="fa fa-refresh"></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">
- More
+ More
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html
index e5c5a90..1afa120 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html
@@ -25,7 +25,7 @@ under the License.
<li class="active">Delivery Services</li>
</ol>
<div class="pull-right">
- <button class="btn btn-primary" title="Link Delivery Service to User" ng-click="addDeliveryService()"><i class="fa fa-link"></i></button>
+ <button class="btn btn-primary" title="Link Delivery Services to User" ng-click="addDeliveryService()"><i class="fa fa-link"></i></button>
<button class="btn btn-default" title="Refresh" ng-click="refresh()"><i class="fa fa-refresh"></i></button>
</div>
<div class="clearfix"></div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/config/config.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/config/config.tpl.html b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/config/config.tpl.html
index ca87d9f..3e91a36 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/config/config.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/config/config.tpl.html
@@ -34,38 +34,38 @@ under the License.
<div id="snapshotContainer" class="x_content">
<uib-tabset active="active" justified="true">
<uib-tab index="0" class="tab" ng-click="diffConfig(500)">
- <uib-tab-heading>
- General [ <span uib-popover-template="configCount.templateUrl" popover-title="{{configCount.added + configCount.removed}} Total Changes" popover-trigger="mouseenter" popover-placement="bottom" popover-append-to-body="true">{{configCount.added}} | {{configCount.removed}}</span> ]
+ <uib-tab-heading uib-popover-template="configCount.templateUrl" popover-title="{{configCount.added + configCount.removed}} Total Changes" popover-trigger="mouseenter" popover-placement="top" popover-append-to-body="true">
+ General [ {{configCount.added}} | {{configCount.removed}} ]
</uib-tab-heading>
<pre id="config"></pre>
</uib-tab>
<uib-tab index="1" class="tab" ng-click="diffContentRouters(500)">
- <uib-tab-heading>
- Traffic Routers [ <span uib-popover-template="contentRoutersCount.templateUrl" popover-title="{{contentRoutersCount.added + contentRoutersCount.removed}} Total Changes" popover-trigger="mouseenter" popover-placement="bottom" popover-append-to-body="true">{{contentRoutersCount.added}} | {{contentRoutersCount.removed}}</span> ]
+ <uib-tab-heading uib-popover-template="contentRoutersCount.templateUrl" popover-title="{{contentRoutersCount.added + contentRoutersCount.removed}} Total Changes" popover-trigger="mouseenter" popover-placement="top" popover-append-to-body="true">
+ Traffic Routers [ {{contentRoutersCount.added}} | {{contentRoutersCount.removed}} ]
</uib-tab-heading>
<pre id="contentRouters"></pre>
</uib-tab>
<uib-tab index="2" class="tab" ng-click="diffContentServers(500)">
- <uib-tab-heading>
- Traffic Servers [ <span uib-popover-template="contentServersCount.templateUrl" popover-title="{{contentServersCount.added + contentServersCount.removed}} Total Changes" popover-trigger="mouseenter" popover-placement="bottom" popover-append-to-body="true">{{contentServersCount.added}} | {{contentServersCount.removed}}</span> ]
+ <uib-tab-heading uib-popover-template="contentServersCount.templateUrl" popover-title="{{contentServersCount.added + contentServersCount.removed}} Total Changes" popover-trigger="mouseenter" popover-placement="top" popover-append-to-body="true">
+ Traffic Servers [ {{contentServersCount.added}} | {{contentServersCount.removed}} ]
</uib-tab-heading>
<pre id="contentServers"></pre>
</uib-tab>
<uib-tab index="3" class="tab" ng-click="diffDeliveryServices(500)">
- <uib-tab-heading>
- Delivery Services [ <span uib-popover-template="deliveryServicesCount.templateUrl" popover-title="{{deliveryServicesCount.added + deliveryServicesCount.removed}} Total Changes" popover-trigger="mouseenter" popover-placement="bottom" popover-append-to-body="true">{{deliveryServicesCount.added}} | {{deliveryServicesCount.removed}}</span> ]
+ <uib-tab-heading uib-popover-template="deliveryServicesCount.templateUrl" popover-title="{{deliveryServicesCount.added + deliveryServicesCount.removed}} Total Changes" popover-trigger="mouseenter" popover-placement="top" popover-append-to-body="true">
+ Delivery Services [ {{deliveryServicesCount.added}} | {{deliveryServicesCount.removed}} ]
</uib-tab-heading>
<pre id="deliveryServices"></pre>
</uib-tab>
<uib-tab index="4" class="tab" ng-click="diffEdgeLocations(500)">
- <uib-tab-heading>
- Edge Cache Groups [ <span uib-popover-template="edgeLocationsCount.templateUrl" popover-title="{{edgeLocationsCount.added + edgeLocationsCount.removed}} Total Changes" popover-trigger="mouseenter" popover-placement="bottom" popover-append-to-body="true">{{edgeLocationsCount.added}} | {{edgeLocationsCount.removed}}</span> ]
+ <uib-tab-heading uib-popover-template="edgeLocationsCount.templateUrl" popover-title="{{edgeLocationsCount.added + edgeLocationsCount.removed}} Total Changes" popover-trigger="mouseenter" popover-placement="top" popover-append-to-body="true">
+ Edge Cache Groups [ {{edgeLocationsCount.added}} | {{edgeLocationsCount.removed}} ]
</uib-tab-heading>
<pre id="edgeLocations"></pre>
</uib-tab>
<uib-tab index="5" class="tab" ng-click="diffStats(500)">
- <uib-tab-heading>
- Stats [ <span uib-popover-template="statsCount.templateUrl" popover-title="{{statsCount.added + statsCount.removed}} Total Changes" popover-trigger="mouseenter" popover-placement="bottom" popover-append-to-body="true">{{statsCount.added}} | {{statsCount.removed}}</span> ]
+ <uib-tab-heading uib-popover-template="statsCount.templateUrl" popover-title="{{statsCount.added + statsCount.removed}} Total Changes" popover-trigger="mouseenter" popover-placement="top" popover-append-to-body="true">
+ Stats [ {{statsCount.added}} | {{statsCount.removed}} ]
</uib-tab-heading>
<pre id="stats"></pre>
</uib-tab>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/list/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/list/index.js b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/list/index.js
index c50ed67..db79ed7 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/list/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/admin/cdns/list/index.js
@@ -28,7 +28,7 @@ module.exports = angular.module('trafficOps.private.admin.cdns.list', [])
controller: 'TableCDNsController',
resolve: {
cdns: function(cdnService) {
- return cdnService.getCDNs();
+ return cdnService.getCDNs(true);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/new/index.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/new/index.js b/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/new/index.js
index 9a165e7..5a6f4ea 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/new/index.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/configure/servers/new/index.js
@@ -29,7 +29,8 @@ module.exports = angular.module('trafficOps.private.configure.servers.new', [])
resolve: {
server: function() {
return {
- updPending: false
+ updPending: false,
+ statusId: 1 // todo: 1 is the ID of OFFLINE, need to get the ID dynamically
};
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c494a883/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js
index 3bfca25..c08a4e6 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/monitor/dashboard/DashboardController.js
@@ -21,10 +21,7 @@ var DashboardController = function(cacheGroupHealth, cdns, currentStats, serverC
$scope.cacheGroupHealth = cacheGroupHealth;
- $scope.cdns = _.filter(cdns, function(cdn) {
- // we don't want the "ALL" cdn which is not really a cdn
- return cdn.name != 'ALL';
- });
+ $scope.cdns = cdns;
$scope.totalStats = _.find(currentStats.currentStats, function(item) {
// total stats are buried in a hash where cdn = total
[3/3] incubator-trafficcontrol git commit: This closes #638
Posted by de...@apache.org.
This closes #638
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/1744e550
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/1744e550
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/1744e550
Branch: refs/heads/master
Commit: 1744e550c1b2362839b9f9d0a5834f6c7c6f38ef
Parents: c494a88
Author: Dewayne Richardson <de...@apache.org>
Authored: Thu Jun 1 11:31:37 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Thu Jun 1 11:31:37 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------