-
Notifications
You must be signed in to change notification settings - Fork 903
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.
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
fix(html): Fix various invalid HTML #6599
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,4 +44,5 @@ | |
</select> | ||
</div> | ||
</div> | ||
</div> | ||
</form> |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -45,4 +45,5 @@ | |
name="roles"/> | ||
</div> | ||
</div> | ||
</div> | ||
</form> |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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'"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The old markup is nonsense and I suspect a typo:
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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> </p> | ||
<div> | ||
{{event.message}} | ||
</div> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -149,6 +149,5 @@ | |
class="form-control input-sm"/> | ||
</div> | ||
</div> | ||
</div> | ||
</ng-form> | ||
</div> |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe 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> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. suspicious There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. suspicious? What do you mean? There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 There was a problem hiding this comment. Choose a reason for hiding this commentThe 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> | ||
|
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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 :)