jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-20 07:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always show locationName in Title (#602)

Browse Source 
* Always show locationName in Title

* Handle if no name set

* Fix lint

* Feedback

* Readd L66-L68

* Feedback and fix for default_view

* Fix c&p

* Change default name for default_view to "Default view"

* Make everyone happy

* Make everyone happy2

* Fix CP

* Handle no homeassistant.name in config
This commit is contained in:
c727 2018-01-19 07:10:04 +01:00 committed by Paulus Schoutsen
parent 8b8ba5875f
commit 85d58ba134
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/layouts/partial-cards.html
View File

@ -49,7 +49,7 @@
<app-header effects="waterfall" condenses fixed slot="header"> <app-header effects="waterfall" condenses fixed slot="header">
<app-toolbar> <app-toolbar>
<ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button> <ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
<div main-title>[[computeTitle(views, locationName)]]</div> <div main-title>[[computeTitle(views, defaultView, locationName)]]</div>
<ha-start-voice-button hass='[[hass]]'></ha-start-voice-button> <ha-start-voice-button hass='[[hass]]'></ha-start-voice-button>
</app-toolbar> </app-toolbar>
@ -65,7 +65,7 @@
on-tap='scrollToTop' on-tap='scrollToTop'
> >
<template is='dom-if' if='[[!defaultView]]'> <template is='dom-if' if='[[!defaultView]]'>
[[locationName]] Home
</template> </template>
<template is='dom-if' if='[[defaultView]]'> <template is='dom-if' if='[[defaultView]]'>
<template <template
@ -296,18 +296,11 @@
return routeMatch ? routeData.view : ''; return routeMatch ? routeData.view : '';
} }
computeTitle(views, locationName) { computeTitle(views, defaultView, locationName) {
return views && views.length > 0 ? 'Home Assistant' : locationName; return (views && views.length > 0 && !defaultView && locationName === 'Home') || !locationName ? 'Home Assistant' : locationName;
} }
computeStateName(stateObj) { computeStateName(stateObj) {
if (stateObj.entity_id === DEFAULT_VIEW_ENTITY_ID) {
if (stateObj.attributes.friendly_name &&
stateObj.attributes.friendly_name !== 'default_view') {
return stateObj.attributes.friendly_name;
}
return this.computeLocationName(this.hass);
}
return window.hassUtil.computeStateName(stateObj); return window.hassUtil.computeStateName(stateObj);
} }