Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(provider/aws): Add help text to the LB internal checkbox #4209

Merged
merged 2 commits into from
Oct 3, 2017
+2 −1
Merged

feat(provider/aws): Add help text to the LB internal checkbox #4209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f28dba1
feat(provider/aws): Add help text to the LB internal checkbox
Oct 3, 2017
1827fb4
Merge branch 'master' into lb-internal-help
anotherchrisberry Oct 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/scripts/modules/amazon/src/help/amazon.help.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const helpContents: {[key: string]: string} = {
'aws.loadBalancer.detail':
`<p>(Optional) <b>Detail</b> is a string of free-form alphanumeric characters; by convention, we recommend using "frontend".</p>
<p>However, if your stack name needs to be longer (load balancer names are limited to 32 characters), consider changing it to "elb", or omit it altogether.</p>`,
'aws.loadBalancer.internal': 'Controls the load balancer scheme, <strong>not</strong> the subnet. By default, load balancers are created with a DNS name that resolves to public IP addresses. Specify internal to create a load balancer with a DNS name that resolves to private IP addresses.',
'aws.loadBalancer.stack': '(Optional) <b>Stack</b> is one of the core naming components of a cluster, used to create vertical stacks of dependent services for integration testing.',
'aws.loadBalancer.targetGroups': 'Add a target group if you want to associate this with an Application Load Balancer (ALB)',
'aws.loadBalancer.loadBalancers': 'And a load balancer directly if you created a Classic Load Balancer (a classic load balancer does not have target groups)',
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/modules/amazon/src/loadBalancer/configure/common/createLoadBalancerLocation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
on-change="ctrl.subnetUpdated()"></subnet-select-field>
<!--Adding support for public facing elb. Display only for vpc-->
<div class="form-group" ng-if="ctrl.loadBalancerCommand.vpcId && !ctrl.viewState.hideInternalFlag">
<div class="col-md-3 sm-label-right"><b>Internal</b></div>
<div class="col-md-3 sm-label-right"><b>Internal</b> <help-field key="aws.loadBalancer.internal"></help-field></div>
<div class="col-md-7 checkbox">
<label><input type="checkbox"
ng-change="ctrl.internalFlagChanged()"
Expand Down