diff --git a/src/components/ha-sidebar.html b/src/components/ha-sidebar.html index 9d245ebd6f..d364163c8f 100644 --- a/src/components/ha-sidebar.html +++ b/src/components/ha-sidebar.html @@ -113,6 +113,9 @@ + diff --git a/src/layouts/home-assistant-main.html b/src/layouts/home-assistant-main.html index e22045039e..01920bf39e 100644 --- a/src/layouts/home-assistant-main.html +++ b/src/layouts/home-assistant-main.html @@ -8,6 +8,7 @@ + @@ -49,6 +50,9 @@ + diff --git a/src/layouts/home-assistant-main.js b/src/layouts/home-assistant-main.js index f3b46ed7b9..e0bcafd0ce 100644 --- a/src/layouts/home-assistant-main.js +++ b/src/layouts/home-assistant-main.js @@ -16,6 +16,7 @@ require('../layouts/partial-map'); require('../layouts/partial-dev-call-service'); require('../layouts/partial-dev-fire-event'); require('../layouts/partial-dev-set-state'); +require('../layouts/partial-dev-info'); require('../managers/notification-manager'); require('../dialogs/more-info-dialog'); require('../dialogs/ha-voice-command-dialog'); @@ -72,6 +73,11 @@ export default new Polymer({ bindNuclear: navigationGetters.isActivePane('devService'), }, + isSelectedDevInfo: { + type: Boolean, + bindNuclear: navigationGetters.isActivePane('devInfo'), + }, + showSidebar: { type: Boolean, bindNuclear: navigationGetters.showSidebar, diff --git a/src/layouts/partial-dev-call-service.html b/src/layouts/partial-dev-call-service.html index 761c1c4beb..3494f0ccdc 100644 --- a/src/layouts/partial-dev-call-service.html +++ b/src/layouts/partial-dev-call-service.html @@ -13,6 +13,7 @@ .form { padding: 24px; background-color: white; + margin-top: 64px; } .ha-form { diff --git a/src/layouts/partial-dev-fire-event.html b/src/layouts/partial-dev-fire-event.html index 37b71e3747..f11a0a3e9f 100644 --- a/src/layouts/partial-dev-fire-event.html +++ b/src/layouts/partial-dev-fire-event.html @@ -13,6 +13,7 @@ .form { padding: 24px; background-color: white; + margin-top: 64px; } .ha-form { diff --git a/src/layouts/partial-dev-info.html b/src/layouts/partial-dev-info.html new file mode 100644 index 0000000000..d86900905f --- /dev/null +++ b/src/layouts/partial-dev-info.html @@ -0,0 +1,90 @@ + + + + + + + + + + + + diff --git a/src/layouts/partial-dev-info.js b/src/layouts/partial-dev-info.js new file mode 100644 index 0000000000..1ae261e09c --- /dev/null +++ b/src/layouts/partial-dev-info.js @@ -0,0 +1,60 @@ +import { + configGetters, + errorLogActions, +} from '../util/home-assistant-js-instance'; + +import Polymer from '../polymer'; +import nuclearObserver from '../util/bound-nuclear-behavior'; + +require('./partial-base'); + +export default new Polymer({ + is: 'partial-dev-info', + + behaviors: [nuclearObserver], + + properties: { + narrow: { + type: Boolean, + value: false, + }, + + showMenu: { + type: Boolean, + value: false, + }, + + hassVersion: { + type: String, + bindNuclear: configGetters.serverVersion, + }, + + polymerVersion: { + type: String, + value: Polymer.version, + }, + + nuclearVersion: { + type: String, + value: '1.2.1', + }, + + errorLog: { + type: String, + value: '', + }, + }, + + attached() { + this.refreshErrorLog(); + }, + + refreshErrorLog(ev) { + if (ev) ev.preventDefault(); + + this.errorLog = 'Loading error log…'; + + errorLogActions.fetchErrorLog().then( + log => this.errorLog = log || 'No errors have been reported.'); + }, +}); diff --git a/src/layouts/partial-dev-set-state.html b/src/layouts/partial-dev-set-state.html index ff75313956..7a3f9fa8d7 100644 --- a/src/layouts/partial-dev-set-state.html +++ b/src/layouts/partial-dev-set-state.html @@ -13,6 +13,7 @@ .form { padding: 24px; background-color: white; + margin-top: 64px; } .ha-form { diff --git a/src/layouts/partial-zone.html b/src/layouts/partial-zone.html index 90966bda45..cb77bed661 100644 --- a/src/layouts/partial-zone.html +++ b/src/layouts/partial-zone.html @@ -10,21 +10,6 @@ display: block; background-color: #E5E5E5; } - - .content .listening { - position: absolute; - top: 0; - left: 0; - right: 0; - z-index: 1; - - border-radius: 2px; - box-shadow: rgba(0, 0, 0, 0.098) 0px 2px 4px, rgba(0, 0, 0, 0.098) 0px 0px 3px; - padding: 16px; - background-color: rgba(255, 255, 255, 0.95); - line-height: 2em; - cursor: pointer; - }