Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 6b3cadb03 -> 15158ba8c
adds human readable ds qstringignore values to ds table Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/95fd945d Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/95fd945d Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/95fd945d Branch: refs/heads/master Commit: 95fd945d18f35b13d6e99d249135fe7e8cf24adb Parents: 1073ce6 Author: Jeremy Mitchell <mitchell...@gmail.com> Authored: Tue Aug 15 13:24:35 2017 -0600 Committer: David Neuman <david.neuma...@gmail.com> Committed: Wed Aug 16 15:31:29 2017 -0600 ---------------------------------------------------------------------- .../src/common/modules/form/tenant/form.tenant.tpl.html | 2 +- .../app/src/common/modules/header/header.tpl.html | 10 +++++----- .../deliveryServices/TableDeliveryServicesController.js | 10 ++++++++++ .../deliveryServices/table.deliveryServices.tpl.html | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/95fd945d/traffic_portal/app/src/common/modules/form/tenant/form.tenant.tpl.html ---------------------------------------------------------------------- diff --git a/traffic_portal/app/src/common/modules/form/tenant/form.tenant.tpl.html b/traffic_portal/app/src/common/modules/form/tenant/form.tenant.tpl.html index d0533a0..9f0cadd 100644 --- a/traffic_portal/app/src/common/modules/form/tenant/form.tenant.tpl.html +++ b/traffic_portal/app/src/common/modules/form/tenant/form.tenant.tpl.html @@ -19,7 +19,7 @@ under the License. <div class="x_panel"> <div class="x_title"> - <ol class="breadcrumb"> + <ol class="breadcrumb pull-left"> <li><a ng-click="navigateToPath('/admin/tenants')">Tenants</a></li> <li class="active">{{tenantName}}</li> </ol> http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/95fd945d/traffic_portal/app/src/common/modules/header/header.tpl.html ---------------------------------------------------------------------- diff --git a/traffic_portal/app/src/common/modules/header/header.tpl.html b/traffic_portal/app/src/common/modules/header/header.tpl.html index 5788cc6..f58122a 100644 --- a/traffic_portal/app/src/common/modules/header/header.tpl.html +++ b/traffic_portal/app/src/common/modules/header/header.tpl.html @@ -61,11 +61,11 @@ under the License. </ul> </div> </li> - <li> - <div class="btn-group" title="Download DB"> - <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="Download DB">--> + <!--<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> http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/95fd945d/traffic_portal/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js ---------------------------------------------------------------------- diff --git a/traffic_portal/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js b/traffic_portal/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js index b186872..89e3f6e 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js +++ b/traffic_portal/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js @@ -26,6 +26,12 @@ var TableDeliveryServicesController = function(deliveryServices, $scope, $state, 3: "HTTP TO HTTPS" }; + var qstrings = { + 0: "USE", + 1: "IGNORE", + 2: "DROP" + }; + var createDeliveryService = function(typeName) { var path = '/configure/delivery-services/new?type=' + typeName; locationUtils.navigateToPath(path); @@ -46,6 +52,10 @@ var TableDeliveryServicesController = function(deliveryServices, $scope, $state, return protocols[ds.protocol]; }; + $scope.qstring = function(ds) { + return qstrings[ds.qstringIgnore]; + }; + $scope.selectDSType = function() { var params = { title: 'Create Delivery Service', http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/95fd945d/traffic_portal/app/src/common/modules/table/deliveryServices/table.deliveryServices.tpl.html ---------------------------------------------------------------------- diff --git a/traffic_portal/app/src/common/modules/table/deliveryServices/table.deliveryServices.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServices/table.deliveryServices.tpl.html index e213601..ebd2250 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServices/table.deliveryServices.tpl.html +++ b/traffic_portal/app/src/common/modules/table/deliveryServices/table.deliveryServices.tpl.html @@ -58,7 +58,7 @@ under the License. <td>{{::deliveryService.ipv6RoutingEnabled}}</td> <td>{{::deliveryService.dscp}}</td> <td>{{::deliveryService.signed}}</td> - <td>{{::deliveryService.qstringIgnore}}</td> + <td>{{::qstring(deliveryService)}}</td> </tr> </tbody> </table>
