Skip to content

Blueprints: Added missing labels & tooltips, optimize input display + text tweaks #7748

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

Merged
bramkragten merged 4 commits into from
Nov 26, 2020
Merged

Blueprints: Added missing labels & tooltips, optimize input display + text tweaks #7748

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bda3a19
Added missing labels & tooltips, optimize input display + text tweaks
spacegaier Nov 20, 2020
4798765
Changes from review
spacegaier Nov 23, 2020
5ee9672
Adjustments for narrow mode
spacegaier Nov 26, 2020
5c8d3a8
Revert blueprint editor changes in favor of 7822
spacegaier Nov 26, 2020
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
3 changes: 2 additions & 1 deletion src/panels/config/automation/blueprint-automation-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ export class HaBlueprintAutomationEditor extends LitElement {
${Object.entries(blueprint.metadata.input).map(
([key, value]) =>
html`<div>
${value?.description}
${value?.selector
? html`<ha-selector
.hass=${this.hass}
Expand All @@ -184,6 +183,7 @@ export class HaBlueprintAutomationEditor extends LitElement {
this.config.use_blueprint.input[key]}
@value-changed=${this._inputChanged}
></paper-input>`}
${value?.description}
</div>`
)}`
: this.hass.localize(
Expand Down Expand Up @@ -286,6 +286,7 @@ export class HaBlueprintAutomationEditor extends LitElement {
}
h3 {
margin-top: 16px;
margin-bottom: 0px;
}
span[slot="introduction"] a {
color: var(--primary-color);
Expand Down
2 changes: 1 addition & 1 deletion src/panels/config/automation/ha-automation-picker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class HaAutomationPicker extends LitElement {
: "hass:pencil-off"}
.disabled=${!automation.attributes.id}
title="${this.hass.localize(
"ui.panel.config.automation.picker.show_info_automation"
"ui.panel.config.automation.picker.edit_automation"
)}"
></ha-icon-button>
</a>
Expand Down
6 changes: 4 additions & 2 deletions src/panels/config/blueprint/dialog-import-blueprint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class DialogImportBlueprint extends LitElement {
html`<b>${this._result.blueprint.metadata.name}</b>`,
"domain",
this._result.blueprint.metadata.domain
)}
)} <br /><br />
${this._result.validation_errors
? html`
<p class="error">
Expand All @@ -89,7 +89,9 @@ class DialogImportBlueprint extends LitElement {
<paper-input
id="input"
.value=${this._result.suggested_filename}
label="Filename"
.label=${this.hass.localize(
"ui.panel.config.blueprint.add.file_name"
)}
></paper-input>
`}
<pre>${this._result.raw_data}</pre>`
Expand Down
13 changes: 11 additions & 2 deletions src/panels/config/blueprint/ha-blueprint-overview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "@material/mwc-fab";
import "@material/mwc-icon-button";
import { mdiPlus, mdiHelpCircle, mdiDelete } from "@mdi/js";
import { mdiPlus, mdiHelpCircle, mdiDelete, mdiRobot } from "@mdi/js";
import "@polymer/paper-tooltip/paper-tooltip";
import {
CSSResult,
Expand Down Expand Up @@ -114,8 +114,14 @@ class HaBlueprintOverview extends LitElement {
? ""
: html`<mwc-icon-button
.blueprint=${blueprint}
.label=${this.hass.localize(
"ui.panel.config.blueprint.overview.use_blueprint"
)}
title=${this.hass.localize(
"ui.panel.config.blueprint.overview.use_blueprint"
)}
@click=${(ev) => this._createNew(ev)}
><ha-svg-icon .path=${mdiPlus}></ha-svg-icon
><ha-svg-icon .path=${mdiRobot}></ha-svg-icon
Comment thread
spacegaier marked this conversation as resolved.
Outdated
></mwc-icon-button>`,
};
columns.delete = {
Expand All @@ -126,6 +132,9 @@ class HaBlueprintOverview extends LitElement {
? ""
: html`<mwc-icon-button
.blueprint=${blueprint}
.label=${this.hass.localize(
"ui.panel.config.blueprint.overview.delete_blueprint"
)}
@click=${(ev) => this._delete(ev)}
><ha-svg-icon .path=${mdiDelete}></ha-svg-icon
></mwc-icon-button>`,
Expand Down
21 changes: 12 additions & 9 deletions src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@
"overflow_menu": "Overflow menu",
"successfully_saved": "Successfully saved",
"successfully_deleted": "Successfully deleted",

"error_required": "Required",
"copied": "Copied"
},
Expand Down Expand Up @@ -1118,8 +1117,9 @@
"dialog_new": {
"header": "Create a new automation",
"how": "How do you want to create your new automation?",

"blueprint": { "use_blueprint": "Use a blueprint" },
"blueprint": {
"use_blueprint": "Use a blueprint"
},
"thingtalk": {
"header": "Describe the automation you want to create",
"intro": "And we will try to create it for you. For example: Turn the lights off when I leave.",
Expand All @@ -1130,7 +1130,7 @@
},
"editor": {
"enable_disable": "Enable/Disable automation",
"introduction": "Use automations to bring your home alive.",
"introduction": "Use automations to bring your home to live.",
"default_name": "New Automation",
"load_error_not_editable": "Only automations in automations.yaml are editable.",
"load_error_unknown": "Error loading automation ({err_no}).",
Expand Down Expand Up @@ -1451,20 +1451,23 @@
"name": "Name"
},
"confirm_delete_header": "Delete this blueprint?",
"confirm_delete_text": "Are you sure you want to delete this blueprint",
"add_blueprint": "Add blueprint"
"confirm_delete_text": "Are you sure you want to delete this blueprint?",
"add_blueprint": "Add blueprint",
"use_blueprint": "Create automation from blueprint",
"delete_blueprint": "Delete blueprint"
},
"add": {
"header": "Add new blueprint",
"import_header": "Import {name} ({domain})",
"import_header": "Import \"{name}\" (type: {domain})",
"import_introduction": "You can import blueprints of other users from Github and the community forums. Enter the URL of the blueprint below.",
"url": "URL of the blueprint",
"importing": "Importing blueprint...",
"import_btn": "Import blueprint",
"saving": "Saving blueprint...",
"save_btn": "Save blueprint",
"error_no_url": "Please enter the URL of the blueprint.",
"unsupported_blueprint": "This blueprint is not supported"
"unsupported_blueprint": "This blueprint is not supported",
"file_name": "Local blueprint file name"
}
},
"script": {
Expand Down Expand Up @@ -1538,7 +1541,7 @@
}
},
"editor": {
"introduction": "Use scenes to bring your home alive.",
"introduction": "Use scenes to bring your home to live.",
"default_name": "New Scene",
"load_error_not_editable": "Only scenes in scenes.yaml are editable.",
"load_error_unknown": "Error loading scene ({err_no}).",
Expand Down