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

Jump to bottom

fix(html): Fix various invalid HTML #6599

Merged
merged 1 commit into from
Feb 21, 2019
Merged

fix(html): Fix various invalid HTML #6599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ <h5>No subnets</h5>
<h5><strong>{{subnet.id}}</strong></h5>
<dl class="dl-horizontal dl-flex">
<dt>Purpose</dt>
<dd>{{subnet.purpose}}</dt>
<dd>{{subnet.purpose}}</dd>

<dt>State</dt>
<dd>{{subnet.state}}</dd>
Expand Down
24 changes: 13 additions & 11 deletions app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ <h3>Rollback {{serverGroup.name}}</h3>
<strong>min</strong>: {{serverGroup.capacity.desired}},
<strong>max</strong>: {{ serverGroup.capacity.max }},
<strong>desired</strong>: {{ serverGroup.capacity.desired }}
]<br/>(minimum capacity pinned at {{serverGroup.capacity.desired}} to prevent autoscaling down during rollback)
<li ng-if="command.rollbackContext.targetHealthyRollbackPercentage < 100">
Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}}
instances to report as healthy
</li>
]
<br/>(minimum capacity pinned at {{serverGroup.capacity.desired}} to prevent autoscaling down during rollback)
<li ng-if="command.rollbackContext.targetHealthyRollbackPercentage < 100">
Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}}
instances to report as healthy
</li>
<li ng-if="command.rollbackContext.delayBeforeDisableSeconds > 0">
Wait {{ command.rollbackContext.delayBeforeDisableSeconds }} seconds
Expand All @@ -104,15 +104,17 @@ <h3>Rollback {{serverGroup.name}}</h3>
<div class="row" ng-if="command.rollbackType === 'PREVIOUS_IMAGE'">
<div class="col-sm-11 col-sm-offset-1">
<ol>
<li>Deploy <em>{{ previousServerGroup.imageId }}</em> [
<li>
Deploy <em>{{ previousServerGroup.imageId }}</em> [
<strong>min</strong>: {{serverGroup.capacity.desired}},
<strong>max</strong>: {{ serverGroup.capacity.max }},
<strong>desired</strong>: {{ serverGroup.capacity.desired }}
]<br/>(minimum capacity pinned at {{serverGroup.capacity.desired}} to prevent autoscaling down during deploy)
<li ng-if="command.rollbackContext.targetHealthyRollbackPercentage < 100">
Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}}
instances to report as healthy
</li>
]
<br/>(minimum capacity pinned at {{serverGroup.capacity.desired}} to prevent autoscaling down during deploy)
</li>
<li ng-if="command.rollbackContext.targetHealthyRollbackPercentage < 100">
Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}}
instances to report as healthy
</li>
<li>Disable {{ serverGroup.name }}</li>
<li>Restore minimum capacity of <em>new server group</em> [
Expand Down
1 change: 1 addition & 0 deletions app/scripts/modules/dcos/loadBalancer/configure/wizard/ports.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@
</select>
</div>
</div>
</div>
</form>
1 change: 1 addition & 0 deletions app/scripts/modules/dcos/loadBalancer/configure/wizard/resources.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,5 @@
name="roles"/>
</div>
</div>
</div>
</form>
1 change: 1 addition & 0 deletions app/scripts/modules/dcos/loadBalancer/details/details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,6 @@ <h3 class="horizontal middle space-between flex-1" select-on-dbl-click>
</ul>
</dd>
</dl>
</collapsible-section>
</div>
</div>
9 changes: 2 additions & 7 deletions app/scripts/modules/ecs/src/instance/details/instanceDetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,15 @@ <h3 class="horizontal middle space-between flex-1" select-on-dbl-click>
text="instance.networkInterface.privateIpv4Address"
tool-tip="'Copy to clipboard'">
</copy-to-clipboard>
</dd>
<dd ng-if="instance.networkInterface.ipv6Address">
Private address (ENI): <a href="http://{{instance.networkInterface.ipv6Address}}" target="_blank">{{instance.networkInterface.ipv6Address}}</a>
<copy-to-clipboard
class="copy-to-clipboard copy-to-clipboard-sm"
text="instance.networkInterface.ipv6Address"
tool-tip="'Copy to clipboard'">
</copy-to-clipboard>
</dd>
<dd ng-if="instance.privateAddress">
Private address (Bridge): <a href="http://{{instance.privateAddress}}" target="_blank">{{instance.privateAddress}}</a>
<copy-to-clipboard
Expand All @@ -137,13 +139,6 @@ <h3 class="horizontal middle space-between flex-1" select-on-dbl-click>
</dd>
</dl>
</collapsible-section>
<collapsible-section heading="Console Output" ng-if="baseIpAddress">
<ul>
<li>
<console-output-link instance="instance"></console-output-link>
</li>
</ul>
</collapsible-section>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this getting removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good question, didn't mean to.
glad you reviewed this :)

<instance-links address="baseIpAddress" application="application" instance="instance" moniker="moniker" environment="environment"></instance-links>
</div>
<div class="content" ng-if="!state.loading && !instance">
Expand Down
10 changes: 4 additions & 6 deletions app/scripts/modules/ecs/src/serverGroup/events/events.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,19 @@ <h3>Server Group Events for {{$ctrl.serverGroup.name}}</h3>
<p>There was an error loading events for {{$ctrl.serverGroup.name}}. Please try again later.</p>
</div>
<div ng-if="!$ctrl.viewState.loading && !$ctrl.viewState.error && !$ctrl.events.length" class="text-center">
No scaling events found for {{$ctrl.serverGroup.name}}.</p>
<p>No scaling events found for {{$ctrl.serverGroup.name}}.</p>
</div>

<div ng-repeat="event in $ctrl.events" ng-if="!$ctrl.viewState.loading">
<p class="clearfix">
<div ng-if="event.status ==git ad= 'Success'">
<p class="clearfix"></p>
<div ng-if="event.status === 'Success'">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont know how these angular conditionals work but this change looks suspicious

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The old markup is nonsense and I suspect a typo:

 <div ng-if="event.status ==git ad= 'Success'">

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right on

<span class="label label-success pull-left">{{event.status}}</span>
</div>
<div ng-if="event.status != 'Success'">
<div ng-if="event.status !== 'Success'">
<span class="label label-{{event.status === 'Transition' ? 'info' : 'danger'}} pull-left">{{event.status}}</span>
</div>

<span class="label label-default pull-right">{{event.createdAt | timestamp}}</span>
</p>
<p>&nbsp;</p>
<div>
{{event.message}}
</div>
Expand Down
1 change: 0 additions & 1 deletion app/scripts/modules/google/src/loadBalancer/configure/common/commonCreateLoadBalancer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
mark-complete-on-view="false">
<ng-include src="ctrl.pages.backendService"></ng-include>
</v2-wizard-page>
</v2-wizard-page>
<v2-wizard-page key="healthCheck" label="Health Check" mark-complete-on-view="false">
<ng-include src="ctrl.pages.healthCheck"></ng-include>
</v2-wizard-page>
Expand Down
1 change: 0 additions & 1 deletion ...dules/google/src/loadBalancer/configure/http/backendService/backendService.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,5 @@
class="form-control input-sm"/>
</div>
</div>
</div>
</ng-form>
</div>
6 changes: 3 additions & 3 deletions ...cripts/modules/google/src/loadBalancer/configure/http/backendService/backendServices.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<p><i class="fa fa-exclamation-triangle"></i>
The following backend services have not been associated with a host or path rule, or set as this
load balancer's default service:
<ul>
<li ng-repeat="service in ctrl.command.getUnusedBackendServices(ctrl.command)" ng-bind-html="service"></li>
</ul>
</p>
<ul>
<li ng-repeat="service in ctrl.command.getUnusedBackendServices(ctrl.command)" ng-bind-html="service"></li>
</ul>
<p class="text-right">
<a class="btn btn-sm btn-default dirty-flag-dismiss"
href ng-click="ctrl.command.removeUnusedBackendServices(ctrl.command)">Remove backend services</a>
Expand Down
6 changes: 3 additions & 3 deletions app/scripts/modules/google/src/loadBalancer/configure/http/healthCheck/healthChecks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<div class="alert alert-warning">
<p><i class="fa fa-exclamation-triangle"></i>
The following health checks have not been associated with a backend service:
<ul>
<li ng-repeat="service in ctrl.command.getUnusedHealthChecks(ctrl.command)" ng-bind-html="service"></li>
</ul>
</p>
<ul>
<li ng-repeat="service in ctrl.command.getUnusedHealthChecks(ctrl.command)" ng-bind-html="service"></li>
</ul>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This p tag might be applying styles to the ul that we're losing here, worth a look

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not worried about it. <ul> is not legal inside a <p> tag (only inline content is legal).

When the browser parses this, it puts the <ul> as a peer to (not inside of) the <p> tag.

screen shot 2019-02-21 at 4 50 41 pm

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look at that! Thanks for the tip.

<p class="text-right">
<a class="btn btn-sm btn-default dirty-flag-dismiss"
href ng-click="ctrl.command.removeUnusedHealthChecks(ctrl.command)">Remove health checks</a>
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</select>
</div>
</div>
</br>
<br/>
<div class="form-group">
<div class="col-md-12">
<table class="table table-condensed packed tags">
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<div class="col-md-2">
<input type="number" class="form-control input-sm" name="details" ng-model="port.nodePort"
min="1" max="{{portsController.maxPort}}"
ng-disabled="!(loadBalancer.serviceType === 'NodePort' || loadBalancer.serviceType === 'LoadBalancer')"/></input>
ng-disabled="!(loadBalancer.serviceType === 'NodePort' || loadBalancer.serviceType === 'LoadBalancer')"/>
</div>
<div class="col-md-3 sm-label-right">
Protocol
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/replicas.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</div>
</div>
</div>
</br>
<br/>
<div class="form-group">
<div class="col-md-3 sm-label-right">
CPU Target
Expand Down
2 changes: 0 additions & 2 deletions app/scripts/modules/openstack/src/loadBalancer/configure/wizard/healthCheck.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<select class="form-control input-sm"
ng-model="loadBalancer.healthMonitor.type"
ng-options="protocol for protocol in ['HTTP', 'HTTPS', 'PING', 'TCP']"></select>
</select>
</div>
<div class="col-md-3 sm-label-right">
Interval
Expand Down Expand Up @@ -46,7 +45,6 @@
<select class="form-control input-sm"
ng-model="loadBalancer.healthMonitor.httpMethod"
ng-options="method for method in ['GET', 'POST', 'HEAD']"></select>
</select>
</div>
</div>
<div class="form-group" ng-if="loadBalancer.healthMonitor.type === 'HTTP' || loadBalancer.healthMonitor.type === 'HTTPS'">
Expand Down
3 changes: 1 addition & 2 deletions app/scripts/modules/openstack/src/loadBalancer/configure/wizard/listeners.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
required/></td>
<td ng-if="ctrl.showSslCertificateIdField() && listener.externalProtocol !== 'TERMINATED_HTTPS'"></td>
<td ng-if="listener.externalProtocol === 'TERMINATED_HTTPS'">
<input class="form-control input-sm" type="text" ng-model="listener.sslCertificateId"
required/></td>
<input class="form-control input-sm" type="text" ng-model="listener.sslCertificateId" required/>
</td>
<td ng-if="loadBalancer.listeners.length > 1"><a href class="sm-label" ng-click="ctrl.removeListener($index)"><span
class="glyphicon glyphicon-trash"></span></a></td>
Expand Down
3 changes: 1 addition & 2 deletions app/scripts/modules/openstack/src/serverGroup/configure/wizard/access/accessSettings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
</label>
</div>
</div>
</ng-form>
</div>

<div ng-if="command.associatePublicIpAddress === true" class="form-group">
Expand All @@ -59,6 +60,4 @@
help-key="openstack.network.floatpool"
filter="{ account: command.credentials }"></network-select-field>
</div>
</ng-form>
</div>
</div>
1 change: 0 additions & 1 deletion app/scripts/modules/openstack/src/serverGroup/details/serverGroupDetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ <h3 class="horizontal middle space-between flex-1" select-on-dbl-click>
<dd ng-repeat-end>{{value}}</dd>
</dl>
</collapsible-section>
</div>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suspicious

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suspicious? What do you mean?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wanted to make sure prettier wasn't removing a closing tag erroneously and possibly breaking the layout. It wasn't obvious to me if this was just an extraneous tag or not.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah I see. This commit wasn't prettier, this was all by hand to fix the HTML spec issues prettier pointed out

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah! Sorry to waste yer time

<collapsible-section heading="Logs">
<ul>
<li>TBD</li>
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/modules/titus/src/instance/details/instanceDetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ <h3 class="horizontal middle space-between flex-1" select-on-dbl-click>
<dd>{{instance.resources.networkMbps}} Mbps</dd>
<dt>GPU(s)</dt>
<dd>{{instance.resources.gpu}}</dd>
</dl>-->
</collapsible-section>
</dl>
</collapsible-section>-->
<collapsible-section heading="Console Output">
<ul>
<li>
Expand Down
9 changes: 4 additions & 5 deletions app/scripts/modules/titus/src/serverGroup/details/rollback/rollbackServerGroup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ <h3>Rollback {{serverGroup.name}}</h3>
Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}}
instances to report as healthy
</li>
</li>
<li>Disable {{ serverGroup.name }}</li>
<li>Restore minimum capacity of <em>{{ command.rollbackContext.restoreServerGroupName || 'previous server group' }}</em> [
<strong>min</strong>: {{ serverGroup.capacity.min }}
Expand All @@ -103,10 +102,10 @@ <h3>Rollback {{serverGroup.name}}</h3>
<strong>max</strong>: {{ serverGroup.capacity.max }},
<strong>desired</strong>: {{ serverGroup.capacity.desired }}
]<br/>(minimum capacity pinned at {{serverGroup.capacity.desired}} to prevent autoscaling down during deploy)
<li ng-if="command.rollbackContext.targetHealthyRollbackPercentage < 100">
Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}}
instances to report as healthy
</li>
</li>
<li ng-if="command.rollbackContext.targetHealthyRollbackPercentage < 100">
Wait for at least {{minHealthy(command.rollbackContext.targetHealthyRollbackPercentage)}}
instances to report as healthy
</li>
<li>Disable <em>{{ serverGroup.name }}</em></li>
<li>Restore minimum capacity of <em>new server group</em> [
Expand Down
1 change: 0 additions & 1 deletion app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ <h3 class="horizontal middle space-between flex-1" select-on-dbl-click>
<account-tag account="serverGroup.account" pad="right"></account-tag>
{{serverGroup.region}}
</dd>
</dd>
<dt>Job Id</dt>
<dd><a href="{{titusUiEndpoint}}jobs/{{serverGroup.id}}" target="_blank">{{serverGroup.id}}</a></dd>
<entity-source metadata="serverGroup.entityTags.creationMetadata"></entity-source>
Expand Down