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/07/18 14:53:20 UTC
[2/3] incubator-trafficcontrol git commit: tp v2 ui tweaks ranging
from rearranging form items to stronger ui validation to better confirmation
messages
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/common/modules/table/parameterProfiles/table.parameterProfiles.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/table/parameterProfiles/table.parameterProfiles.tpl.html b/traffic_portal/app/src/common/modules/table/parameterProfiles/table.parameterProfiles.tpl.html
index 61fd49a..a89022d 100644
--- a/traffic_portal/app/src/common/modules/table/parameterProfiles/table.parameterProfiles.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/parameterProfiles/table.parameterProfiles.tpl.html
@@ -44,7 +44,7 @@ under the License.
<tr ng-repeat="parameterProfile in ::parameterProfiles">
<td>{{::parameterProfile.name}}</td>
<td>{{::parameterProfile.description}}</td>
- <td><button type="button" class="btn btn-link" title="Unlink Profile from Parameter" ng-click="removeProfile(parameterProfile.id)"><i class="fa fa-chain-broken"></i></button></td>
+ <td><button type="button" class="btn btn-link" title="Unlink Profile from Parameter" ng-click="confirmRemoveProfile(parameterProfile)"><i class="fa fa-chain-broken"></i></button></td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/common/modules/table/parameters/table.parameters.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/table/parameters/table.parameters.tpl.html b/traffic_portal/app/src/common/modules/table/parameters/table.parameters.tpl.html
index 3c61a00..3cb183e 100644
--- a/traffic_portal/app/src/common/modules/table/parameters/table.parameters.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/parameters/table.parameters.tpl.html
@@ -36,6 +36,7 @@ under the License.
<th>name</th>
<th>configFile</th>
<th>value</th>
+ <th>secure</th>
</tr>
</thead>
<tbody>
@@ -43,6 +44,7 @@ under the License.
<td>{{::parameter.name}}</td>
<td>{{::parameter.configFile}}</td>
<td>{{::parameter.value}}</td>
+ <td>{{::parameter.secure}}</td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/common/modules/table/profileDeliveryServices/table.profileDeliveryServices.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/table/profileDeliveryServices/table.profileDeliveryServices.tpl.html b/traffic_portal/app/src/common/modules/table/profileDeliveryServices/table.profileDeliveryServices.tpl.html
index 8074d08..ee7bd97 100644
--- a/traffic_portal/app/src/common/modules/table/profileDeliveryServices/table.profileDeliveryServices.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/profileDeliveryServices/table.profileDeliveryServices.tpl.html
@@ -34,6 +34,7 @@ under the License.
<table id="deliveryServicesTable" class="table responsive-utilities jambo_table">
<thead>
<tr class="headings">
+ <th>tenant</th>
<th>xmlId</th>
<th>orgServerFqdn</th>
<th>cdn</th>
@@ -52,6 +53,7 @@ under the License.
</thead>
<tbody>
<tr ng-click="editDeliveryService(deliveryService)" ng-repeat="deliveryService in ::deliveryServices">
+ <td>{{::deliveryService.tenant}}</td>
<td>{{::deliveryService.xmlId}}</td>
<td>{{::deliveryService.orgServerFqdn}}</td>
<td>{{::deliveryService.cdnName}}</td>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/common/modules/table/profileParameters/TableProfileParametersController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/table/profileParameters/TableProfileParametersController.js b/traffic_portal/app/src/common/modules/table/profileParameters/TableProfileParametersController.js
index 8486f7c..65ce765 100644
--- a/traffic_portal/app/src/common/modules/table/profileParameters/TableProfileParametersController.js
+++ b/traffic_portal/app/src/common/modules/table/profileParameters/TableProfileParametersController.js
@@ -17,13 +17,13 @@
* under the License.
*/
-var TableProfileParametersController = function(profile, profileParameters, $scope, $state, $uibModal, locationUtils, profileParameterService) {
+var TableProfileParametersController = function(profile, profileParameters, $scope, $state, $uibModal, locationUtils, deliveryServiceService, profileParameterService, serverService) {
$scope.profile = profile;
$scope.profileParameters = profileParameters;
- $scope.removeParameter = function(paramId) {
+ var removeParameter = function(paramId) {
profileParameterService.unlinkProfileParameter(profile.id, paramId)
.then(
function() {
@@ -32,6 +32,56 @@ var TableProfileParametersController = function(profile, profileParameters, $sco
);
};
+ $scope.confirmRemoveParam = function(parameter) {
+ if (profile.type == 'DS_PROFILE') { // if this is a ds profile, then it is used by delivery service(s) so we'll fetch the ds count...
+ deliveryServiceService.getDeliveryServices({ profile: profile.id }).
+ then(function(result) {
+ var params = {
+ title: 'Remove Parameter from Profile?',
+ message: 'The ' + profile.name + ' profile is used by ' + result.length + ' delivery service(s). Are you sure you want to remove the ' + parameter.name + ' parameter from this profile?'
+ };
+ var modalInstance = $uibModal.open({
+ templateUrl: 'common/modules/dialog/confirm/dialog.confirm.tpl.html',
+ controller: 'DialogConfirmController',
+ size: 'md',
+ resolve: {
+ params: function () {
+ return params;
+ }
+ }
+ });
+ modalInstance.result.then(function() {
+ removeParameter(parameter.id);
+ }, function () {
+ // do nothing
+ });
+ });
+ } else { // otherwise the profile is used by servers so we'll fetch the server count...
+ serverService.getServers({ profileId: profile.id }).
+ then(function(result) {
+ var params = {
+ title: 'Remove Parameter from Profile?',
+ message: 'The ' + profile.name + ' profile is used by ' + result.length + ' server(s). Are you sure you want to remove the ' + parameter.name + ' parameter from this profile?'
+ };
+ var modalInstance = $uibModal.open({
+ templateUrl: 'common/modules/dialog/confirm/dialog.confirm.tpl.html',
+ controller: 'DialogConfirmController',
+ size: 'md',
+ resolve: {
+ params: function () {
+ return params;
+ }
+ }
+ });
+ modalInstance.result.then(function() {
+ removeParameter(parameter.id);
+ }, function () {
+ // do nothing
+ });
+ });
+ }
+ };
+
$scope.refresh = function() {
$state.reload(); // reloads all the resolves for the view
};
@@ -42,7 +92,7 @@ var TableProfileParametersController = function(profile, profileParameters, $sco
controller: 'TableProfileParamsUnassignedController',
size: 'lg',
resolve: {
- profile: function(parameterService) {
+ profile: function() {
return profile;
},
parameters: function(parameterService) {
@@ -78,5 +128,5 @@ var TableProfileParametersController = function(profile, profileParameters, $sco
};
-TableProfileParametersController.$inject = ['profile', 'profileParameters', '$scope', '$state', '$uibModal', 'locationUtils', 'profileParameterService'];
+TableProfileParametersController.$inject = ['profile', 'profileParameters', '$scope', '$state', '$uibModal', 'locationUtils', 'deliveryServiceService', 'profileParameterService', 'serverService'];
module.exports = TableProfileParametersController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/common/modules/table/profileParameters/table.profileParameters.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/table/profileParameters/table.profileParameters.tpl.html b/traffic_portal/app/src/common/modules/table/profileParameters/table.profileParameters.tpl.html
index 24d1693..32259ec 100644
--- a/traffic_portal/app/src/common/modules/table/profileParameters/table.profileParameters.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/profileParameters/table.profileParameters.tpl.html
@@ -35,20 +35,20 @@ under the License.
<table id="profileParametersTable" class="table responsive-utilities jambo_table">
<thead>
<tr class="headings">
- <th>id</th>
<th>name</th>
<th>configFile</th>
<th>value</th>
+ <th>secure</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="parameter in ::profileParameters">
- <td>{{::parameter.id}}</td>
<td>{{::parameter.name}}</td>
<td>{{::parameter.configFile}}</td>
<td>{{::parameter.value}}</td>
- <td><button type="button" class="btn btn-link" title="Unlink Parameter from Profile" ng-click="removeParameter(parameter.id)"><i class="fa fa-chain-broken"></i></button></td>
+ <td>{{::parameter.secure}}</td>
+ <td><button type="button" class="btn btn-link" title="Unlink Parameter from Profile" ng-click="confirmRemoveParam(parameter)"><i class="fa fa-chain-broken"></i></button></td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html b/traffic_portal/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html
index b01962e..db76eec 100644
--- a/traffic_portal/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html
@@ -44,6 +44,7 @@ under the License.
<table id="deliveryServicesTable" class="table responsive-utilities jambo_table">
<thead>
<tr class="headings">
+ <th>tenant</th>
<th>xmlId</th>
<th>orgServerFqdn</th>
<th>active</th>
@@ -59,6 +60,7 @@ under the License.
</thead>
<tbody>
<tr ng-repeat="deliveryService in ::serverDeliveryServices">
+ <td>{{::deliveryService.tenant}}</td>
<td>{{::deliveryService.xmlId}}</td>
<td>{{::deliveryService.orgServerFqdn}}</td>
<td>{{::deliveryService.active}}</td>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/common/modules/table/typeDeliveryServices/table.typeDeliveryServices.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/table/typeDeliveryServices/table.typeDeliveryServices.tpl.html b/traffic_portal/app/src/common/modules/table/typeDeliveryServices/table.typeDeliveryServices.tpl.html
index 7473c3b..6fb66a4 100644
--- a/traffic_portal/app/src/common/modules/table/typeDeliveryServices/table.typeDeliveryServices.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/typeDeliveryServices/table.typeDeliveryServices.tpl.html
@@ -34,6 +34,7 @@ under the License.
<table id="deliveryServicesTable" class="table responsive-utilities jambo_table">
<thead>
<tr class="headings">
+ <th>tenant</th>
<th>xmlId</th>
<th>orgServerFqdn</th>
<th>active</th>
@@ -48,6 +49,7 @@ under the License.
</thead>
<tbody>
<tr ng-click="editDeliveryService(deliveryService)" ng-repeat="deliveryService in ::deliveryServices">
+ <td>{{::deliveryService.tenant}}</td>
<td>{{::deliveryService.xmlId}}</td>
<td>{{::deliveryService.orgServerFqdn}}</td>
<td>{{::deliveryService.active}}</td>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html b/traffic_portal/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html
index c0122cb..5540231 100644
--- a/traffic_portal/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html
@@ -35,6 +35,7 @@ under the License.
<table id="deliveryServicesTable" class="table responsive-utilities jambo_table">
<thead>
<tr class="headings">
+ <th>tenant</th>
<th>xmlId</th>
<th>orgServerFqdn</th>
<th>cdn</th>
@@ -43,6 +44,7 @@ under the License.
</thead>
<tbody>
<tr ng-repeat="deliveryService in ::userDeliveryServices">
+ <td>{{::deliveryService.tenant}}</td>
<td>{{::deliveryService.xmlId}}</td>
<td>{{::deliveryService.orgServerFqdn}}</td>
<td>{{::deliveryService.cdnName}}</td>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/common/modules/table/users/table.users.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/table/users/table.users.tpl.html b/traffic_portal/app/src/common/modules/table/users/table.users.tpl.html
index 928b4aa..519e0de 100644
--- a/traffic_portal/app/src/common/modules/table/users/table.users.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/users/table.users.tpl.html
@@ -36,6 +36,7 @@ under the License.
<th>Full Name</th>
<th>Username</th>
<th>Email</th>
+ <th>Tenant</th>
<th>Role</th>
</tr>
</thead>
@@ -44,6 +45,7 @@ under the License.
<td>{{::user.fullName}}</td>
<td>{{::user.username}}</td>
<td>{{::user.email}}</td>
+ <td>{{::user.tenant}}</td>
<td>{{::user.rolename}}</td>
</tr>
</tbody>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/common/modules/widget/cacheGroups/widget.cacheGroups.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/widget/cacheGroups/widget.cacheGroups.tpl.html b/traffic_portal/app/src/common/modules/widget/cacheGroups/widget.cacheGroups.tpl.html
index 38fa790..07bcd9e 100644
--- a/traffic_portal/app/src/common/modules/widget/cacheGroups/widget.cacheGroups.tpl.html
+++ b/traffic_portal/app/src/common/modules/widget/cacheGroups/widget.cacheGroups.tpl.html
@@ -19,11 +19,6 @@ under the License.
<div class="x_title">
<h2>Cache Groups <small>{{cacheGroupHealth.totalOnline/(cacheGroupHealth.totalOnline + cacheGroupHealth.totalOffline) | percentFilter}} online</small></h2>
- <ul class="nav navbar-right panel_toolbox">
- <li><a class="collapse-link" ng-click="navigateToPath('/monitor/map')"><i class="fa fa-map-marker"></i></a></li>
- <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a></li>
- <li><a class="close-link"><i class="fa fa-close"></i></a></li>
- </ul>
<div class="clearfix"></div>
</div>
<div class="x_content">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/common/modules/widget/capacity/widget.capacity.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/widget/capacity/widget.capacity.tpl.html b/traffic_portal/app/src/common/modules/widget/capacity/widget.capacity.tpl.html
index 8dd89e2..5a6f66c 100644
--- a/traffic_portal/app/src/common/modules/widget/capacity/widget.capacity.tpl.html
+++ b/traffic_portal/app/src/common/modules/widget/capacity/widget.capacity.tpl.html
@@ -19,10 +19,6 @@ under the License.
<div class="x_title">
<h2>Overall Capacity</h2>
- <ul class="nav navbar-right panel_toolbox">
- <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a></li>
- <li><a class="close-link"><i class="fa fa-close"></i></a></li>
- </ul>
<div class="clearfix"></div>
</div>
<div class="x_content">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/common/modules/widget/cdnChart/widget.cdnChart.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/widget/cdnChart/widget.cdnChart.tpl.html b/traffic_portal/app/src/common/modules/widget/cdnChart/widget.cdnChart.tpl.html
index 157f6c2..0c6fb1e 100644
--- a/traffic_portal/app/src/common/modules/widget/cdnChart/widget.cdnChart.tpl.html
+++ b/traffic_portal/app/src/common/modules/widget/cdnChart/widget.cdnChart.tpl.html
@@ -20,10 +20,6 @@ under the License.
<div id="{{::randomId}}" class="dashboard_graph">
<div class="x_title">
<h2><a ng-click="navigateToPath('/admin/cdns/' + cdn.id)">{{::cdn.name}}</a></h2>
- <ul class="nav navbar-right panel_toolbox">
- <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a></li>
- <li><a class="close-link"><i class="fa fa-close"></i></a></li>
- </ul>
<div class="clearfix"></div>
</div>
<div class="col-md-9 col-sm-9 col-xs-12">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/common/modules/widget/changeLogs/widget.changeLogs.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/widget/changeLogs/widget.changeLogs.tpl.html b/traffic_portal/app/src/common/modules/widget/changeLogs/widget.changeLogs.tpl.html
index 15c615d..632226d 100644
--- a/traffic_portal/app/src/common/modules/widget/changeLogs/widget.changeLogs.tpl.html
+++ b/traffic_portal/app/src/common/modules/widget/changeLogs/widget.changeLogs.tpl.html
@@ -19,10 +19,6 @@ under the License.
<div class="x_title">
<h2>Change Logs</h2>
- <ul class="nav navbar-right panel_toolbox">
- <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a></li>
- <li><a class="close-link"><i class="fa fa-close"></i></a></li>
- </ul>
<div class="clearfix"></div>
</div>
<div class="x_content">
@@ -33,7 +29,7 @@ under the License.
<div class="block_content">
<h2 class="title">{{::changeLog.level}}</h2>
<div class="byline">
- <span>{{::getRelativeTime(changeLog.lastUpdated)}}</span> by <a>{{::changeLog.user}}</a>
+ <span>{{::getRelativeTime(changeLog.lastUpdated)}}</span> by {{::changeLog.user}}
</div>
<p class="excerpt">{{::changeLog.message}}</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/common/modules/widget/routing/widget.routing.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/widget/routing/widget.routing.tpl.html b/traffic_portal/app/src/common/modules/widget/routing/widget.routing.tpl.html
index 6af1369..85b747b 100644
--- a/traffic_portal/app/src/common/modules/widget/routing/widget.routing.tpl.html
+++ b/traffic_portal/app/src/common/modules/widget/routing/widget.routing.tpl.html
@@ -19,10 +19,6 @@ under the License.
<div class="x_title">
<h2>Routing Methods</h2>
- <ul class="nav navbar-right panel_toolbox">
- <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a></li>
- <li><a class="close-link"><i class="fa fa-close"></i></a></li>
- </ul>
<div class="clearfix"></div>
</div>
<div class="x_content">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9b26ecee/traffic_portal/app/src/traffic_portal_properties.json
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/traffic_portal_properties.json b/traffic_portal/app/src/traffic_portal_properties.json
index 5b0fa1f..d7c7a4e 100644
--- a/traffic_portal/app/src/traffic_portal_properties.json
+++ b/traffic_portal/app/src/traffic_portal_properties.json
@@ -4,7 +4,14 @@
"name": "Traffic Portal",
"customMenu": {
"_comments": "These are custom items you want to add to the menu. 'items' is an array of hashes where each hash has 'name' (the menu item name), 'embed' (true|false to determine if content is embedded in TP or not), and 'url' (the url of the content)",
- "items": []
+ "name": "Other",
+ "items": [
+ {
+ "name": "Docs",
+ "embed": false,
+ "url": "http://trafficcontrol.apache.org/"
+ }
+ ]
}
}
}