diff --git a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/list/index.hbs b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/list/index.hbs index 247b0dd8fc9..fd5950447f4 100644 --- a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/list/index.hbs +++ b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/list/index.hbs @@ -7,34 +7,29 @@ class="consul-lock-session-list" ...attributes @items={{@items}} -as |item index|> + as |item index| +> - {{#if item.Name}} - {{item.Name}} - {{else}} - - {{item.ID}} - - - {{/if}} + {{#if item.Name}} + {{item.Name}} + {{else}} + + {{item.ID}} + + + {{/if}} {{#if item.Name}} -
-
- ID -
-
- - {{item.ID}} -
-
+
+
+ ID +
+
+ + {{item.ID}} +
+
{{/if}}
@@ -43,43 +38,37 @@ as |item index|>
{{duration-from item.LockDelay}}
-
+
TTL
- {{#if (eq item.TTL "")}} -
-
- {{else}} -
{{item.TTL}}
- {{/if}} + {{#if (eq item.TTL "")}} +
-
+ {{else}} +
{{item.TTL}}
+ {{/if}}
-
+
Behavior
{{item.Behavior}}
-{{#let (union item.NodeChecks item.ServiceChecks) as |checks|}} -
-
- Checks -
-
-{{#if (gt checks.length 0)}} - {{#each checks as |item|}} - {{item}} - {{/each}} -{{else}} - - -{{/if}} -
-
-{{/let}} + {{#let (union item.NodeChecks item.ServiceChecks) as |checks|}} +
+
+ Checks +
+
+ {{#if (gt checks.length 0)}} + {{#each checks as |item|}} + {{item}} + {{/each}} + {{else}} + - + {{/if}} +
+
+ {{/let}} > @@ -99,15 +88,15 @@ as |item index|>

diff --git a/ui/packages/consul-peerings/app/components/consul/peer/address/list/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/address/list/index.hbs index bc6294e015f..aabada41ad1 100644 --- a/ui/packages/consul-peerings/app/components/consul/peer/address/list/index.hbs +++ b/ui/packages/consul-peerings/app/components/consul/peer/address/list/index.hbs @@ -18,7 +18,7 @@
{{address}}
- +
-
- - {{t 'components.app.skip_to_content'}} - {{!-- +
+ + {{t 'components.app.skip_to_content'}} + {{! In order to add further skip links from within other templates use: Skip to subcontent from within your template - --}} - -
+ }} + +
- + - -
- - {{yield exported to="home-nav"}} -
-{{!-- + +
+ + {{yield exported to='home-nav'}} +
+ {{! The viewport tolerances here give us a 10 pixel buffer to make sure the menu is marked as out of the viewport, we use all sides so we don't need to change this should any CSS change ---}} +}} -{{!-- + {{! Whilst this has a role of navigation, it is 'complementary navigation' we don't want to change the navigation role here, but we do want to label it as 'complementary' to the main content. The phrase 'complementary navigation' as read by a screenreader should convey the meaning we are after here. ---}} +}}
-
-
-
- {{yield exported to="notifications"}} - -
- {{yield exported to="main"}} -
-
- {{yield exported to="content-info"}} -
-
+
+
+
+ {{yield exported to='notifications'}} + +
+ {{yield exported to='main'}} +
+
+ {{yield exported to='content-info'}} +
+
{{/let}} \ No newline at end of file diff --git a/ui/packages/consul-ui/app/components/code-editor/README.mdx b/ui/packages/consul-ui/app/components/code-editor/README.mdx index 6e38d2d45ac..44e2445a473 100644 --- a/ui/packages/consul-ui/app/components/code-editor/README.mdx +++ b/ui/packages/consul-ui/app/components/code-editor/README.mdx @@ -6,41 +6,39 @@ state: needs-love # CodeEditor ```hbs preview-template - - <:label> - Rules (HCL Format) - - <:content> - {"content": "Initial Content"} - + + <:label> + Rules + (HCL Format) + + <:content> + {"content": "Initial Content"} + ``` A code-editor with syntax highlighting supporting multiple languages (JSON, HCL, YAML), validation and simple tools such as "Copy to clipboard" - ### Arguments -| Argument | Type | Default | Description | -| --- | --- | --- | --- | -| `readonly` | `Boolean` | false | If true, the content (value) of the CodeEditor cannot be changed by the user | -| `name` | `String` | | The name attribute of the form element | -| `syntax` | `String` | | Identifies the language used to validate/syntax highlight the code (possible values: hcl, json, yaml) | -| `oninput` | `Action` | noop | Action/callback that is triggered when the user inputs data | +| Argument | Type | Default | Description | +| ---------- | --------- | ------- | ----------------------------------------------------------------------------------------------------- | +| `readonly` | `Boolean` | false | If true, the content (value) of the CodeEditor cannot be changed by the user | +| `name` | `String` | | The name attribute of the form element | +| `syntax` | `String` | | Identifies the language used to validate/syntax highlight the code (possible values: hcl, json, yaml) | +| `oninput` | `Action` | noop | Action/callback that is triggered when the user inputs data | ### Named Blocks -| Name | Description | Behaviour if empty | -| --- | --- | --- | -| `:label` | Used to define the title that's displayed on the left inside the toolbar above the CodeEditor | Nothing is displayed | -| `:tools` | Used to define tools, buttons, widgets that will be displayed on the right inside the toolbar above the CodeEditor | By default it renders a `language selector` dropdown (if `readonly`== false and `syntax` is falsy) and a `CopyButton` -| `:content` | Used to display specific content such as code templates inside the CodeEditor | if the block is defined, @value will be displayed instead | - +| Name | Description | Behaviour if empty | +| ---------- | ------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------- | +| `:label` | Used to define the title that's displayed on the left inside the toolbar above the CodeEditor | Nothing is displayed | +| `:tools` | Used to define tools, buttons, widgets that will be displayed on the right inside the toolbar above the CodeEditor | By default it renders a `language selector` dropdown (if `readonly`== false and `syntax` is falsy) and a `ConsulCopyButton` | +| `:content` | Used to display specific content such as code templates inside the CodeEditor | if the block is defined, @value will be displayed instead | ### See diff --git a/ui/packages/consul-ui/app/components/code-editor/index.hbs b/ui/packages/consul-ui/app/components/code-editor/index.hbs index 03487d32f0b..a0d3d9cd5ab 100644 --- a/ui/packages/consul-ui/app/components/code-editor/index.hbs +++ b/ui/packages/consul-ui/app/components/code-editor/index.hbs @@ -3,30 +3,29 @@ SPDX-License-Identifier: BUSL-1.1 }} -
-
-