Skip to content

Add link to conference #7636

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 2 commits into from
Nov 9, 2020
Merged

Add link to conference #7636

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
26ff4a2
Add link to conference
balloob Nov 9, 2020
2a1f253
Do not translate Home Assistant Cloud
balloob Nov 9, 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
Binary file added public/static/images/conference.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 2 additions & 4 deletions src/panels/config/cloud/account/cloud-account.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,10 @@ class CloudAccount extends EventsMixin(LocalizeMixin(PolymerElement)) {
color: var(--primary-color);
}
</style>
<hass-subpage header="[[localize('ui.panel.config.cloud.caption')]]">
<hass-subpage header="Home Assistant Cloud">
<div class="content">
<ha-config-section is-wide="[[isWide]]">
<span slot="header"
>[[localize('ui.panel.config.cloud.caption')]]</span
>
<span slot="header">Home Assistant Cloud</span>
<div slot="introduction">
<p>
[[localize('ui.panel.config.cloud.account.thank_you_note')]]
Expand Down
6 changes: 2 additions & 4 deletions src/panels/config/cloud/login/cloud-login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,10 @@ class CloudLogin extends LocalizeMixin(
left: 8px;
}
</style>
<hass-subpage header="[[localize('ui.panel.config.cloud.caption')]]">
<hass-subpage header="Home Assistant Cloud">
<div class="content">
<ha-config-section is-wide="[[isWide]]">
<span slot="header"
>[[localize('ui.panel.config.cloud.caption')]]</span
>
<span slot="header">Home Assistant Cloud</span>
<div slot="introduction">
<p>
[[localize('ui.panel.config.cloud.login.introduction')]]
Expand Down
33 changes: 32 additions & 1 deletion src/panels/config/dashboard/ha-config-dashboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import { configSections } from "../ha-panel-config";
import "./ha-config-navigation";
import { mdiCloudLock } from "@mdi/js";

const CONF_HAPPENING = new Date() < new Date("2020-12-13T23:00:00Z");

@customElement("ha-config-dashboard")
class HaConfigDashboard extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant;
Expand Down Expand Up @@ -58,7 +60,7 @@ class HaConfigDashboard extends LitElement {
{
component: "cloud",
path: "/config/cloud",
translationKey: "ui.panel.config.cloud.caption",
name: "Home Assistant Cloud",
info: this.cloudStatus,
iconPath: mdiCloudLock,
},
Expand All @@ -67,6 +69,19 @@ class HaConfigDashboard extends LitElement {
</ha-card>
`
: ""}
${CONF_HAPPENING
? html`
<ha-card class="conf-card"
><a
target="_blank"
href="https://www.home-assistant.io/conference"
rel="noopener noreferrer"
>
<img src="/static/images/conference.png" />
<div class="carrot"><ha-icon-next></ha-icon-next></div></a
></ha-card>
`
: ""}
${Object.values(configSections).map(
(section) => html`
<ha-card>
Expand Down Expand Up @@ -165,6 +180,22 @@ class HaConfigDashboard extends LitElement {
text-decoration: none;
color: var(--primary-text-color);
}
.conf-card {
position: relative;
}
.conf-card img {
display: block;
width: 100%;
}
.conf-card .carrot {
position: absolute;
top: 0;
right: 16px;
bottom: 0;
display: flex;
align-items: center;
color: white;
}
.promo-advanced {
text-align: center;
color: var(--secondary-text-color);
Expand Down
3 changes: 2 additions & 1 deletion src/panels/config/dashboard/ha-config-navigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ class HaConfigNavigation extends LitElement {
slot="item-icon"
></ha-svg-icon>
<paper-item-body two-line>
${this.hass.localize(
${page.name ||
this.hass.localize(
page.translationKey ||
`ui.panel.config.${page.component}.caption`
)}
Expand Down
1 change: 0 additions & 1 deletion src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1497,7 +1497,6 @@
}
},
"cloud": {
"caption": "Home Assistant Cloud",
"description_login": "Logged in as {email}",
"description_not_login": "Not logged in",
"description_features": "Control away from home, integrate with Alexa and Google Assistant.",
Expand Down