adds cdn domain name
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/61fa6c0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/61fa6c0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/61fa6c0c Branch: refs/heads/master Commit: 61fa6c0c3c40242dcbd8f0ea407ba943cfb719b3 Parents: 60e34c1 Author: Jeremy Mitchell <mitchell...@gmail.com> Authored: Fri Mar 10 11:10:51 2017 -0700 Committer: Dewayne Richardson <dewr...@apache.org> Committed: Thu Apr 6 14:41:34 2017 -0600 ---------------------------------------------------------------------- .../modules/form/cdn/FormCDNController.js | 6 ------ .../common/modules/form/cdn/form.cdn.tpl.html | 21 ++++++++++++++------ .../modules/table/cdns/table.cdns.tpl.html | 2 ++ 3 files changed, 17 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/61fa6c0c/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js index d71e8ef..28fc0c4 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js +++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/FormCDNController.js @@ -21,12 +21,6 @@ var FormCDNController = function(cdn, $scope, $location, formUtils, stringUtils, $scope.cdn = cdn; - $scope.props = [ - { name: 'name', type: 'text', required: true, maxLength: 45 } - ]; - - $scope.labelize = stringUtils.labelize; - $scope.falseTrue = [ { value: false, label: 'false' }, { value: true, label: 'true' } http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/61fa6c0c/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 ef2822d..0dae223 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 @@ -47,13 +47,22 @@ under the License. <div class="x_content"> <br> <form name="cdnForm" class="form-horizontal form-label-left" novalidate> - <div class="form-group" ng-class="{'has-error': hasError(cdnForm[prop.name]), 'has-feedback': hasError(cdnForm[prop.name])}" ng-repeat="prop in props"> - <label class="control-label col-md-2 col-sm-2 col-xs-12">{{labelize(prop.name)}} <span ng-show="prop.required">*</span></label> + <div class="form-group" ng-class="{'has-error': hasError(cdnForm.name), 'has-feedback': hasError(cdnForm.name)}"> + <label class="control-label col-md-2 col-sm-2 col-xs-12">Name *</label> <div class="col-md-10 col-sm-10 col-xs-12"> - <input id="{{prop.name}}" name="{{prop.name}}" type="{{prop.type}}" class="form-control" ng-model="cdn[prop.name]" ng-readonly="prop.readonly" ng-required="prop.required" ng-maxlength="prop.maxLength" autofocus> - <small class="input-error" ng-show="hasPropertyError(cdnForm[prop.name], 'required')">Required</small> - <small class="input-error" ng-show="hasPropertyError(cdnForm[prop.name], 'maxlength')">Too Long</small> - <span ng-show="hasError(cdnForm[prop.name])" class="form-control-feedback"><i class="fa fa-times"></i></span> + <input id="name" name="name" type="text" class="form-control" ng-model="cdn.name" ng-required="true" ng-maxlength="45" autofocus> + <small class="input-error" ng-show="hasPropertyError(cdnForm.name, 'required')">Required</small> + <small class="input-error" ng-show="hasPropertyError(cdnForm.name, 'maxlength')">Too Long</small> + <span ng-show="hasError(cdnForm.name)" class="form-control-feedback"><i class="fa fa-times"></i></span> + </div> + </div> + <div class="form-group" ng-class="{'has-error': hasError(cdnForm.domainName), 'has-feedback': hasError(cdnForm.domainName)}"> + <label class="control-label col-md-2 col-sm-2 col-xs-12">Domain *</label> + <div class="col-md-10 col-sm-10 col-xs-12"> + <input id="domainName" name="domainName" type="text" class="form-control" ng-model="cdn.domainName" ng-required="true" ng-maxlength="255" autofocus> + <small class="input-error" ng-show="hasPropertyError(cdnForm.domainName, 'required')">Required</small> + <small class="input-error" ng-show="hasPropertyError(cdnForm.domainName, 'maxlength')">Too Long</small> + <span ng-show="hasError(cdnForm.domainName)" class="form-control-feedback"><i class="fa fa-times"></i></span> </div> </div> <div class="form-group" ng-class="{'has-error': hasError(cdnForm.dnssecEnabled), 'has-feedback': hasError(cdnForm.dnssecEnabled)}"> http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/61fa6c0c/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/table.cdns.tpl.html ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/table.cdns.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/table.cdns.tpl.html index c9d8827..9199b55 100644 --- a/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/table.cdns.tpl.html +++ b/traffic_ops/experimental/ui/app/src/common/modules/table/cdns/table.cdns.tpl.html @@ -34,12 +34,14 @@ under the License. <thead> <tr class="headings"> <th>name</th> + <th>domainName</th> <th>dnssecEnabled</th> </tr> </thead> <tbody> <tr ng-click="editCDN(cdn.id)" ng-repeat="cdn in cdns"> <td>{{cdn.name}}</td> + <td>{{cdn.domainName}}</td> <td>{{cdn.dnssecEnabled}}</td> </tr> </tbody>
