Skip to content

picture entity editor fix #3783

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
iantrich merged 2 commits into from
Sep 22, 2019
Merged

picture entity editor fix #3783

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
e580acd
forgot to push commit
iantrich Sep 22, 2019
22f4d05
resolve broken build
iantrich Sep 22, 2019
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
56 changes: 41 additions & 15 deletions src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import {
} from "lit-element";
import "@polymer/paper-input/paper-input";
import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
import "@polymer/paper-toggle-button/paper-toggle-button";
import "@polymer/paper-item/paper-item";
import "@polymer/paper-listbox/paper-listbox";

import "../../components/hui-action-editor";
import "../../components/hui-entity-editor";
import "../../../../components/ha-switch";

import { struct } from "../../common/structs/struct";
import {
Expand Down Expand Up @@ -104,29 +104,35 @@ export class HuiPictureEntityCardEditor extends LitElement
${configElementStyle}
<div class="card-config">
<ha-entity-picker
label="${this.hass.localize(
"ui.panel.lovelace.editor.card.entity_required"
)}"
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.entity"
)} (${this.hass.localize("ui.panel.lovelace.editor.card.required")})"
.hass="${this.hass}"
.value="${this._entity}"
.configValue=${"entity"}
@change="${this._valueChanged}"
allow-custom-entity
></ha-entity-picker>
<paper-input
label="Name (Optional)"
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.name"
)} (${this.hass.localize("ui.panel.lovelace.editor.card.optional")})"
.value="${this._name}"
.configValue="${"name"}"
@value-changed="${this._valueChanged}"
></paper-input>
<paper-input
label="Image Url (Optional)"
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.image"
)} (${this.hass.localize("ui.panel.lovelace.editor.card.optional")})"
.value="${this._image}"
.configValue="${"image"}"
@value-changed="${this._valueChanged}"
></paper-input>
<ha-entity-picker
label="Camera Image (Optional)"
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.camera_image"
)} (${this.hass.localize("ui.panel.lovelace.editor.card.optional")})"
.hass="${this.hass}"
.value="${this._camera_image}"
.configValue=${"camera_image"}
Expand All @@ -136,7 +142,11 @@ export class HuiPictureEntityCardEditor extends LitElement
></ha-entity-picker>
<div class="side-by-side">
<paper-dropdown-menu
label="Camera View (Optional)"
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.camera_view"
)} (${this.hass.localize(
"ui.panel.lovelace.editor.card.optional"
)})"
.configValue="${"camera_view"}"
@value-changed="${this._valueChanged}"
>
Expand All @@ -152,38 +162,54 @@ export class HuiPictureEntityCardEditor extends LitElement
</paper-listbox>
</paper-dropdown-menu>
<paper-input
label="Aspect Ratio (Optional)"
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.aspect_ratio"
)} (${this.hass.localize(
"ui.panel.lovelace.editor.card.optional"
)})"
type="number"
.value="${Number(this._aspect_ratio.replace("%", ""))}"
.configValue="${"aspect_ratio"}"
@value-changed="${this._valueChanged}"
></paper-input>
</div>
<div class="side-by-side">
<paper-toggle-button
<ha-switch
?checked="${this._show_name !== false}"
.configValue="${"show_name"}"
@change="${this._valueChanged}"
>Show Name?</paper-toggle-button
>${this.hass.localize(
"ui.panel.lovelace.editor.card.show_name"
)}</ha-switch
>
<paper-toggle-button
<ha-switch
?checked="${this._show_state !== false}"
.configValue="${"show_state"}"
@change="${this._valueChanged}"
>Show State?</paper-toggle-button
>${this.hass.localize(
"ui.panel.lovelace.editor.card.show_state"
)}</ha-switch
>
</div>
<div class="side-by-side">
<hui-action-editor
label="Tap Action (Optional)"
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.tap_action"
)} (${this.hass.localize(
"ui.panel.lovelace.editor.card.optional"
)})"
.hass="${this.hass}"
.config="${this._tap_action}"
.actions="${actions}"
.configValue="${"tap_action"}"
@action-changed="${this._valueChanged}"
></hui-action-editor>
<hui-action-editor
label="Hold Action (Optional)"
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.hold_action"
)} (${this.hass.localize(
"ui.panel.lovelace.editor.card.optional"
)})"
.hass="${this.hass}"
.config="${this._hold_action}"
.actions="${actions}"
Expand Down
20 changes: 13 additions & 7 deletions src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,14 +1111,20 @@
"para_migrate": "Home Assistant can add ID's to all your cards and views automatically for you by pressing the 'Migrate config' button.",
"migrate": "Migrate config"
},
"theme": {
"theme": "Theme (Optional)"
},
"card": {
"entity": {
"required": "Entity (Required)",
"optitional": "Entity (Optional)"
}
"required": "Required",
"optional": "Optional",
"aspect_ratio": "Aspect Ratio",
"camera_image": "Camera Entity",
"camera_view": "Camera View",
"entity": "Entity",
"hold_action": "Hold Action",
"image": "Image Path",
"name": "Name",
"show_name": "Show Name?",
"show_state": "Show State?",
"tap_action": "Tap Action",
"theme": "Theme"
}
},
"warning": {
Expand Down