From 810fd802b59935d2ec720d7a900f4012694a6c5e Mon Sep 17 00:00:00 2001 From: yosilevy <37745463+yosilevy@users.noreply.github.com> Date: Sun, 3 Feb 2019 08:06:36 +0200 Subject: [PATCH 1/7] Lovelace editor - flex spacing (#2666) * Converted lovelace editor to flex spacing * Removed margin-top leftover --- src/panels/lovelace/editor/card-editor/hui-edit-card.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/panels/lovelace/editor/card-editor/hui-edit-card.ts b/src/panels/lovelace/editor/card-editor/hui-edit-card.ts index 7c8998aa21..3898e7b9ac 100644 --- a/src/panels/lovelace/editor/card-editor/hui-edit-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-edit-card.ts @@ -435,9 +435,14 @@ export class HuiEditCard extends LitElement { .content { display: flex; flex-direction: column; + margin: 0 -10px; } .content hui-card-preview { margin-top: 16px; + margin: 0 10px; + } + .content .element-editor { + margin: 0 10px; } @media (min-width: 1200px) { @@ -453,7 +458,7 @@ export class HuiEditCard extends LitElement { flex: auto; } .content hui-card-preview { - margin: 0 24px; + margin: 0 10px; flex: 490px; max-width: 490px; } From 69aff1e20419867bf7d7661f63f74fc9dc13f95a Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sat, 2 Feb 2019 22:06:53 -0800 Subject: [PATCH 2/7] Don't include some UI elements from base bundle (#2665) --- src/layouts/ha-init-page.ts | 8 +++++++- src/layouts/hass-loading-screen.js | 6 +++--- src/layouts/partial-panel-resolver.ts | 9 ++++++++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/layouts/ha-init-page.ts b/src/layouts/ha-init-page.ts index f8476643ec..737346c6f4 100644 --- a/src/layouts/ha-init-page.ts +++ b/src/layouts/ha-init-page.ts @@ -1,4 +1,3 @@ -import "@polymer/paper-button/paper-button"; import "@polymer/paper-spinner/paper-spinner-lite"; import { @@ -62,6 +61,13 @@ class HaInitPage extends LitElement { `; } + protected updated(changedProps) { + super.updated(changedProps); + if (changedProps.has("error") && this.error) { + import(/* webpackChunkName: "paper-button" */ "@polymer/paper-button/paper-button"); + } + } + private _retry() { location.reload(); } diff --git a/src/layouts/hass-loading-screen.js b/src/layouts/hass-loading-screen.js index 025f6ee84a..d97813833b 100644 --- a/src/layouts/hass-loading-screen.js +++ b/src/layouts/hass-loading-screen.js @@ -1,6 +1,6 @@ import "@polymer/app-layout/app-toolbar/app-toolbar"; import "@polymer/iron-flex-layout/iron-flex-layout-classes"; -import "@polymer/paper-spinner/paper-spinner"; +import "@polymer/paper-spinner/paper-spinner-lite"; import { html } from "@polymer/polymer/lib/utils/html-tag"; import { PolymerElement } from "@polymer/polymer/polymer-element"; @@ -25,10 +25,10 @@ class HassLoadingScreen extends PolymerElement { narrow="[[narrow]]" show-menu="[[showMenu]]" > -
[[title]]
+
[[title]]
- +
`; diff --git a/src/layouts/partial-panel-resolver.ts b/src/layouts/partial-panel-resolver.ts index 97be0f8be4..1b58560bb2 100644 --- a/src/layouts/partial-panel-resolver.ts +++ b/src/layouts/partial-panel-resolver.ts @@ -6,7 +6,6 @@ import { } from "lit-element"; import "./hass-loading-screen"; -import "./hass-error-screen"; import { HomeAssistant, Panel, PanelElement, Route } from "../types"; // Cache of panel loading promises. @@ -168,7 +167,15 @@ class PartialPanelResolver extends LitElement { `; } + protected firstUpdated(changedProps: PropertyValues) { + super.firstUpdated(changedProps); + // Load it before it's needed, because it will be shown if user is offline + // and a panel has to be loaded. + import(/* webpackChunkName: "hass-error-screen" */ "./hass-error-screen"); + } + protected updated(changedProps: PropertyValues) { + super.updated(changedProps); if (!this.hass) { return; } From dadb5f92ee20367063a52af9607c57f97f7a5838 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sat, 2 Feb 2019 22:07:02 -0800 Subject: [PATCH 3/7] Fix menu button on dev-info page (#2663) --- src/panels/dev-info/ha-panel-dev-info.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panels/dev-info/ha-panel-dev-info.ts b/src/panels/dev-info/ha-panel-dev-info.ts index 1a6ca63b6c..b19a134cf5 100644 --- a/src/panels/dev-info/ha-panel-dev-info.ts +++ b/src/panels/dev-info/ha-panel-dev-info.ts @@ -62,7 +62,7 @@ class HaPanelDevInfo extends LitElement {
About
 From acce6f0b2f7c880e653820949bb9ab0cbed150df Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 3 Feb 2019 10:58:57 -0800 Subject: [PATCH 4/7] Fix sidebar issues (#2667) --- src/layouts/home-assistant-main.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/layouts/home-assistant-main.ts b/src/layouts/home-assistant-main.ts index bd26de067a..8f94618e62 100644 --- a/src/layouts/home-assistant-main.ts +++ b/src/layouts/home-assistant-main.ts @@ -24,6 +24,14 @@ import { PolymerChangedEvent } from "../polymer-types"; const NON_SWIPABLE_PANELS = ["kiosk", "map"]; +declare global { + // for fire event + interface HASSDomEvents { + "hass-open-menu": undefined; + "hass-close-menu": undefined; + } +} + class HomeAssistantMain extends LitElement { public hass?: HomeAssistant; public route?: Route; @@ -32,7 +40,7 @@ class HomeAssistantMain extends LitElement { static get properties(): PropertyDeclarations { return { hass: {}, - narrow: {}, + _narrow: {}, route: {}, }; } @@ -50,7 +58,7 @@ class HomeAssistantMain extends LitElement { Date: Sun, 3 Feb 2019 11:19:14 -0800 Subject: [PATCH 5/7] Fix more info on light/thermostat pushing content (#2669) --- src/panels/lovelace/cards/hui-light-card.ts | 11 ++++++----- src/panels/lovelace/cards/hui-thermostat-card.ts | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts index 52e3589ca8..e6e1c2678b 100644 --- a/src/panels/lovelace/cards/hui-light-card.ts +++ b/src/panels/lovelace/cards/hui-light-card.ts @@ -5,6 +5,7 @@ import { PropertyDeclarations, TemplateResult, } from "lit-element"; +import "@polymer/paper-icon-button/paper-icon-button"; import { fireEvent } from "../../../common/dom/fire_event"; import { styleMap } from "lit-html/directives/style-map"; @@ -96,11 +97,11 @@ export class HuiLightCard extends LitElement implements LovelaceCard { ` : html` - + >
@@ -286,10 +287,10 @@ export class HuiLightCard extends LitElement implements LovelaceCard { padding: 8px; } .more-info { - float: right; + position: absolute; cursor: pointer; - padding-top: 16px; - padding-right: 16px; + top: 0; + right: 0; z-index: 25; color: var(--secondary-text-color); } diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts index 4813e8b642..8ddd773838 100644 --- a/src/panels/lovelace/cards/hui-thermostat-card.ts +++ b/src/panels/lovelace/cards/hui-thermostat-card.ts @@ -6,6 +6,7 @@ import { TemplateResult, } from "lit-element"; import { classMap } from "lit-html/directives/class-map"; +import "@polymer/paper-icon-button/paper-icon-button"; import "../../../components/ha-card"; import "../../../components/ha-icon"; @@ -123,11 +124,11 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard { small: !this._broadCard, })}">
- + >
${this._config.name || @@ -548,10 +549,10 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard { margin-left: var(--uom-margin-left); } .more-info { - float: right; + position: absolute; cursor: pointer; - padding-top: 16px; - padding-right: 16px; + top: 0; + right: 0; z-index: 25; color: var(--secondary-text-color); } From ef395d4c9f753126cbd9f4e6144b42aa9e2ac0e2 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 3 Feb 2019 11:27:12 -0800 Subject: [PATCH 6/7] Update translations --- translations/da.json | 2 +- translations/en.json | 11 ++++++++-- translations/he.json | 14 +++++++++--- translations/hu.json | 29 ++++++++++++++++++++++--- translations/ko.json | 45 ++++++++++++++++++++++++++++++++++----- translations/nb.json | 43 +++++++++++++++++++++++++++++++++---- translations/pt-BR.json | 18 +++++++++++++--- translations/ru.json | 14 +++++++++--- translations/zh-Hant.json | 14 +++++++++--- 9 files changed, 163 insertions(+), 27 deletions(-) diff --git a/translations/da.json b/translations/da.json index 7b1e550f7d..c646247b8a 100644 --- a/translations/da.json +++ b/translations/da.json @@ -145,7 +145,7 @@ "high_demand": "Høj efterspørgsel", "heat_pump": "Varmepumpe", "gas": "Gas", - "manual": "brugervejledning" + "manual": "Manual" }, "configurator": { "configure": "Konfigurer", diff --git a/translations/en.json b/translations/en.json index 84aae10969..9ba5fc07e4 100644 --- a/translations/en.json +++ b/translations/en.json @@ -301,7 +301,8 @@ "period": "Period" }, "logbook": { - "showing_entries": "Showing entries for" + "showing_entries": "Showing entries for", + "period": "Period" }, "mailbox": { "empty": "You do not have any messages", @@ -789,10 +790,16 @@ "para_sure": "Are you sure you want to take control of your user interface?", "cancel": "Never mind", "save": "Take control" + }, + "menu": { + "raw_editor": "Raw config editor" } }, "menu": { - "configure_ui": "Configure UI" + "configure_ui": "Configure UI", + "unused_entities": "Unused entities", + "help": "Help", + "refresh": "Refresh" } } }, diff --git a/translations/he.json b/translations/he.json index 78e30fb999..204ca0327c 100644 --- a/translations/he.json +++ b/translations/he.json @@ -301,7 +301,8 @@ "period": "תקופה" }, "logbook": { - "showing_entries": "מציג רשומות עבור" + "showing_entries": "מציג רשומות עבור", + "period": "תקופה" }, "mailbox": { "empty": "אין לך הודעות", @@ -788,10 +789,16 @@ "para_sure": "האם אתה בטוח שאתה רוצה לקחת שליטה על ממשק המשתמש?", "cancel": "לא משנה", "save": "קח שליטה" + }, + "menu": { + "raw_editor": "עורך הקונפיגורציה" } }, "menu": { - "configure_ui": "הגדר UI" + "configure_ui": "הגדר UI", + "unused_entities": "ישויות שאינן בשימוש", + "help": "עזרה", + "refresh": "רענן" } } }, @@ -1023,7 +1030,8 @@ "updater": "המעדכן", "weblink": "קישור", "zwave": "Z-Wave", - "vacuum": "שואב אבק" + "vacuum": "שואב אבק", + "system_health": "בריאות מערכת" }, "attribute": { "weather": { diff --git a/translations/hu.json b/translations/hu.json index a00a3ee8b9..7f99f3fcf0 100644 --- a/translations/hu.json +++ b/translations/hu.json @@ -301,7 +301,8 @@ "period": "Időtartam" }, "logbook": { - "showing_entries": "Bejegyzések megjelenítése" + "showing_entries": "Bejegyzések megjelenítése", + "period": "Időszak" }, "mailbox": { "empty": "Nincsenek üzeneteid", @@ -433,6 +434,13 @@ "hours": "Óra", "minutes": "Perc", "seconds": "Másodperc" + }, + "geo_location": { + "source": "Forrás", + "zone": "Zóna", + "event": "Esemény:", + "enter": "Érkezés", + "leave": "Távozás" } } }, @@ -566,6 +574,12 @@ "zha": { "caption": "ZHA", "description": "Zigbee Home Automation hálózat menedzsment" + }, + "area_registry": { + "description": "Az összes otthoni terület áttekintése." + }, + "entity_registry": { + "description": "Az összes ismert entitás áttekintése." } }, "profile": { @@ -734,6 +748,9 @@ "checked_items": "Bejelölt tételek", "clear_items": "Bejelölt tételek törlése", "add_item": "Tétel hozzáadása" + }, + "empty_state": { + "title": "Üdv Itthon" } }, "editor": { @@ -768,7 +785,10 @@ } }, "menu": { - "configure_ui": "Felhasználói felület konfigurálása" + "configure_ui": "Felhasználói felület konfigurálása", + "unused_entities": "Nem használt entitások", + "help": "Súgó", + "refresh": "Frissítés" } } }, @@ -1001,7 +1021,10 @@ "weblink": "Hivatkozás", "zwave": "Z-Wave", "vacuum": "Porszívó", - "zha": "ZHA" + "zha": "ZHA", + "hassio": "Hass.io", + "homeassistant": "Home Assistant", + "lovelace": "Lovelace" }, "attribute": { "weather": { diff --git a/translations/ko.json b/translations/ko.json index 0539807d1d..1d3acfe9e4 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -301,7 +301,8 @@ "period": "기간" }, "logbook": { - "showing_entries": "다음 날짜의 항목을 표시" + "showing_entries": "다음 날짜의 항목을 표시", + "period": "기간" }, "mailbox": { "empty": "메시지가 존재하지 않습니다", @@ -433,6 +434,14 @@ "hours": "시간", "minutes": "분", "seconds": "초" + }, + "geo_location": { + "label": "위치정보", + "source": "소스", + "zone": "구역", + "event": "이벤트:", + "enter": "입장", + "leave": "퇴장" } } }, @@ -565,7 +574,18 @@ }, "zha": { "caption": "ZHA", - "description": "Zigbee 홈 자동화 네트워크 관리" + "description": "Zigbee 홈 자동화 네트워크 관리", + "services": { + "reconfigure": "ZHA 장치를 다시 구성 합니다. (장치 복구). 장치에 문제가 있는 경우 사용해주세요. 장치가 배터리로 작동하는 경우, 이 서비스를 사용할 때 장치가 켜져있고 통신이 가능한 상태여야 합니다." + } + }, + "area_registry": { + "caption": "영역 등록", + "description": "집에 등록된 모든 영역" + }, + "entity_registry": { + "caption": "구성요소 등록", + "description": "모든 구성요소" } }, "profile": { @@ -608,7 +628,7 @@ "delete_failed": "액세스 토큰을 삭제할 수 없습니다.", "create": "토큰 만들기", "create_failed": "액세스 토큰을 생성을 할 수 없습니다.", - "prompt_name": "토큰 이름을 지어 주세요.", + "prompt_name": "토큰 이름을 지어주세요.", "prompt_copy_token": "Ctrl + C 를 눌러 액세스 토큰을 복사하세요. 이 안내는 다시 표시되지 않습니다.", "empty_state": "장기 액세스 토큰이 없습니다.", "last_used": "{date} 에 {location} 에서 마지막으로 사용됨", @@ -734,6 +754,11 @@ "checked_items": "선택한 항목", "clear_items": "선택한 항목 삭제", "add_item": "항목 추가" + }, + "empty_state": { + "title": "집에 오신 것을 환영합니다", + "no_devices": "이 페이지에서 장치를 제어 할 수 있지만, 장치가 아직 설정되지 않은 것 같습니다. 시작하려면 통합 페이지로 이동해주세요.", + "go_to_integrations_page": "통합 페이지로 이동하기." } }, "editor": { @@ -765,10 +790,16 @@ "para_sure": "사용자 인터페이스를 직접 관리하시겠습니까?", "cancel": "아닙니다", "save": "직접 관리할게요" + }, + "menu": { + "raw_editor": "구성 코드 편집기" } }, "menu": { - "configure_ui": "UI 구성" + "configure_ui": "UI 구성", + "unused_entities": "미사용 구성요소", + "help": "도움말", + "refresh": "새로고침" } } }, @@ -1001,7 +1032,11 @@ "weblink": "웹링크", "zwave": "Z-Wave", "vacuum": "청소기", - "zha": "ZHA" + "zha": "ZHA", + "hassio": "Hass.io", + "homeassistant": "Home Assistant", + "lovelace": "Lovelace", + "system_health": "시스템 상태" }, "attribute": { "weather": { diff --git a/translations/nb.json b/translations/nb.json index 82a3d10eab..22a2344315 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -301,7 +301,8 @@ "period": "Periode" }, "logbook": { - "showing_entries": "Viser oppføringer for" + "showing_entries": "Viser oppføringer for", + "period": "Periode" }, "mailbox": { "empty": "Du har ingen meldinger", @@ -433,6 +434,14 @@ "hours": "Timer", "minutes": "Minutter", "seconds": "Sekunder" + }, + "geo_location": { + "label": "Geolokasjon", + "source": "Kilde", + "zone": "Sone", + "event": "Hendelse:", + "enter": "Ankommer", + "leave": "Foralter" } } }, @@ -565,7 +574,18 @@ }, "zha": { "caption": "ZHA", - "description": "ZigBee Home Automation nettverksadministrasjon" + "description": "ZigBee Home Automation nettverksadministrasjon", + "services": { + "reconfigure": "Rekonfigurer ZHA-enhet (heal enhet). Bruk dette hvis du har problemer med enheten. Hvis den aktuelle enheten er en batteridrevet enhet, sørg for at den er våken og aksepterer kommandoer når du bruker denne tjenesten." + } + }, + "area_registry": { + "caption": "Områderegister", + "description": "Oversikt over alle områder i ditt hjem." + }, + "entity_registry": { + "caption": "Enhetsregister", + "description": "Oversikt over alle kjente enheter." } }, "profile": { @@ -734,6 +754,11 @@ "checked_items": "Merkede elementer", "clear_items": "Fjern merkede elementer", "add_item": "Legg til" + }, + "empty_state": { + "title": "Velkommen hjem", + "no_devices": "Denne siden lar deg styre enhetene dine, men det ser ut til at du ikke har konfigurert noen enheter ennå. Gå til integrasjonssiden for å komme i gang.", + "go_to_integrations_page": "Gå til integrasjonssiden." } }, "editor": { @@ -765,10 +790,16 @@ "para_sure": "Er du sikker på at du vil ta kontroll over brukergrensesnittet ditt?", "cancel": "Glem det", "save": "Ta kontroll" + }, + "menu": { + "raw_editor": "Tekstbasert konfigurasjonsredigering" } }, "menu": { - "configure_ui": "Konfigurer brukergrensesnitt" + "configure_ui": "Konfigurer brukergrensesnitt", + "unused_entities": "Ubrukte enheter", + "help": "Hjelp", + "refresh": "Oppdater" } } }, @@ -1001,7 +1032,11 @@ "weblink": "Lenke", "zwave": "Z-Wave", "vacuum": "Støvsuger", - "zha": "ZHA" + "zha": "ZHA", + "hassio": "Hass.io", + "homeassistant": "Home Assistant", + "lovelace": "Lovelace", + "system_health": "Systemhelse" }, "attribute": { "weather": { diff --git a/translations/pt-BR.json b/translations/pt-BR.json index 3f3547b3e2..428951e43c 100644 --- a/translations/pt-BR.json +++ b/translations/pt-BR.json @@ -301,7 +301,8 @@ "period": "Período" }, "logbook": { - "showing_entries": "Exibindo entradas para" + "showing_entries": "Exibindo entradas para", + "period": "Período" }, "mailbox": { "empty": "Você não tem mensagens", @@ -427,6 +428,10 @@ "webhook": { "label": "Webhook", "webhook_id": "ID da Webhook" + }, + "time_pattern": { + "hours": "Horas", + "minutes": "Minutos" } } }, @@ -724,6 +729,9 @@ "checked_items": "Itens marcados", "clear_items": "Limpar itens marcados", "add_item": "Adicionar item" + }, + "empty_state": { + "go_to_integrations_page": "Vá para a página de integrações." } }, "editor": { @@ -758,7 +766,10 @@ } }, "menu": { - "configure_ui": "Configurar “interface” do usuário" + "configure_ui": "Configurar “interface” do usuário", + "unused_entities": "Entidades não utilizadas", + "help": "Ajuda", + "refresh": "Atualizar" } } }, @@ -977,7 +988,8 @@ "updater": "Atualizador", "weblink": "Weblink", "zwave": "", - "vacuum": "Aspirando" + "vacuum": "Aspirando", + "system_health": "Integridade Do Sistema" }, "attribute": { "weather": { diff --git a/translations/ru.json b/translations/ru.json index 28f7b1d79a..48d5b93d0a 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -301,7 +301,8 @@ "period": "Период" }, "logbook": { - "showing_entries": "Отображение записей за" + "showing_entries": "Отображение записей за", + "period": "Период" }, "mailbox": { "empty": "У вас нет сообщений", @@ -789,10 +790,16 @@ "para_sure": "Вы уверены, что хотите самостоятельно контролировать пользовательский интерфейс?", "cancel": "Оставить как есть", "save": "Получить контроль" + }, + "menu": { + "raw_editor": "Текстовый редактор" } }, "menu": { - "configure_ui": "Настройка интерфейса" + "configure_ui": "Настройка интерфейса", + "unused_entities": "Неиспользуемые объекты", + "help": "Справка", + "refresh": "Обновить" } } }, @@ -1028,7 +1035,8 @@ "zha": "ZHA", "hassio": "Hass.io", "homeassistant": "Home Assistant", - "lovelace": "Lovelace" + "lovelace": "Lovelace", + "system_health": "Статус системы" }, "attribute": { "weather": { diff --git a/translations/zh-Hant.json b/translations/zh-Hant.json index e6b245e612..cac9f9a544 100644 --- a/translations/zh-Hant.json +++ b/translations/zh-Hant.json @@ -301,7 +301,8 @@ "period": "期間長" }, "logbook": { - "showing_entries": "選擇要查看的時間" + "showing_entries": "選擇要查看的時間", + "period": "選擇週期" }, "mailbox": { "empty": "目前沒有任何訊息", @@ -789,10 +790,16 @@ "para_sure": "確定要自行編輯使用者介面？", "cancel": "我再想想", "save": "自行編輯" + }, + "menu": { + "raw_editor": "文字設定編輯器" } }, "menu": { - "configure_ui": "設定 UI" + "configure_ui": "設定 UI", + "unused_entities": "未使用物件", + "help": "說明", + "refresh": "更新" } } }, @@ -1028,7 +1035,8 @@ "zha": "ZHA", "hassio": "Hass.io", "homeassistant": "Home Assistant", - "lovelace": "Lovelace" + "lovelace": "Lovelace", + "system_health": "系統健康" }, "attribute": { "weather": { From f74fe5718e583c4c553c826de4ce65e723984e65 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 3 Feb 2019 11:27:23 -0800 Subject: [PATCH 7/7] Bumped version to 20190203.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index db97ed5e26..19c01b4d00 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="home-assistant-frontend", - version="20190202.0", + version="20190203.0", description="The Home Assistant frontend", url="https://github.com/home-assistant/home-assistant-polymer", author="The Home Assistant Authors",