Skip to content

Tweaks to cloud integration page #7878

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 4 commits into from
Jan 16, 2021
Merged

Tweaks to cloud integration page #7878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2c747a
Tweaks to cloud page
spacegaier Dec 2, 2020
4f8f14e
Move "forgot password" link to input field suffix
spacegaier Dec 14, 2020
e33a941
Ensure "forgot password" is right aligned
spacegaier Jan 5, 2021
1e4946a
Moved "forgot password" link
spacegaier Jan 15, 2021
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
2 changes: 1 addition & 1 deletion 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 @@ -122,7 +122,7 @@ class CloudAccount extends EventsMixin(LocalizeMixin(PolymerElement)) {
target="_blank"
rel="noreferrer"
>
[[localize('ui.panel.config.cloud.account.integrations_link_all_features')]] </a
[[localize('ui.panel.config.cloud.account.integrations_link_all_features')]]</a
>.
</p>
</div>
Expand Down
5 changes: 4 additions & 1 deletion src/panels/config/cloud/account/cloud-alexa-pref.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ export class CloudAlexaPref extends LitElement {
: ""}
</div>
<div class="card-actions">
<mwc-button @click=${this._handleSync} .disabled=${this._syncing}>
<mwc-button
@click=${this._handleSync}
.disabled=${!alexa_enabled || this._syncing}
>
${this.hass!.localize(
"ui.panel.config.cloud.account.alexa.sync_entities"
)}
Expand Down
30 changes: 19 additions & 11 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 @@ -75,6 +75,15 @@ class CloudLogin extends LocalizeMixin(
right: auto;
left: 8px;
}
.login-form {
display: flex;
flex-direction: column;
}
.pwd-forgot-link {
color: var(--secondary-text-color) !important;
text-align: right !important;
align-self: flex-end;
}
</style>
<hass-subpage hass="[[hass]]" header="Home Assistant Cloud">
<div class="content">
Expand All @@ -91,9 +100,8 @@ class CloudLogin extends LocalizeMixin(
target="_blank"
rel="noreferrer"
>
Nabu&nbsp;Casa,&nbsp;Inc
</a>
[[localize('ui.panel.config.cloud.login.introduction2a')]]
Nabu&nbsp;Casa,&nbsp;Inc</a
>[[localize('ui.panel.config.cloud.login.introduction2a')]]
</p>
<p>
[[localize('ui.panel.config.cloud.login.introduction3')]]
Expand Down Expand Up @@ -122,7 +130,7 @@ class CloudLogin extends LocalizeMixin(
<ha-card
header="[[localize('ui.panel.config.cloud.login.sign_in')]]"
>
<div class="card-content">
<div class="card-content login-form">
<div class="error" hidden$="[[!_error]]">[[_error]]</div>
<paper-input
label="[[localize('ui.panel.config.cloud.login.email')]]"
Expand All @@ -140,20 +148,20 @@ class CloudLogin extends LocalizeMixin(
on-keydown="_keyDown"
error-message="[[localize('ui.panel.config.cloud.login.password_error_msg')]]"
></paper-input>
<button
class="link pwd-forgot-link"
hidden="[[_requestInProgress]]"
on-click="_handleForgotPassword"
>
[[localize('ui.panel.config.cloud.login.forgot_password')]]
</button>
</div>
<div class="card-actions">
<ha-progress-button
on-click="_handleLogin"
progress="[[_requestInProgress]]"
>[[localize('ui.panel.config.cloud.login.sign_in')]]</ha-progress-button
>
<button
class="link"
hidden="[[_requestInProgress]]"
on-click="_handleForgotPassword"
>
[[localize('ui.panel.config.cloud.login.forgot_password')]]
</button>
</div>
</ha-card>

Expand Down
8 changes: 4 additions & 4 deletions src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1595,7 +1595,7 @@
"email_error_msg": "Invalid email",
"password": "Password",
"password_error_msg": "Passwords are at least 8 characters",
"forgot_password": "forgot password?",
"forgot_password": "Forgot password?",
"start_trial": "Start your free 1 month trial",
"trial_info": "No payment information necessary",
"alert_password_change_required": "You need to change your password before logging in.",
Expand Down Expand Up @@ -1662,7 +1662,7 @@
"config_documentation": "Configuration documentation",
"enable_state_reporting": "Enable State Reporting",
"info_state_reporting": "If you enable state reporting, Home Assistant will send all state changes of exposed entities to Amazon. This allows you to always see the latest states in the Alexa app and use the state changes to create routines.",
"sync_entities": "Sync Entities",
"sync_entities": "Sync Entities to Amazon",
"manage_entities": "Manage Entities",
"sync_entities_error": "Failed to sync entities:",
"state_reporting_error": "Unable to {enable_disable} report state.",
Expand Down Expand Up @@ -1713,8 +1713,8 @@
},
"dialog_certificate": {
"certificate_information": "Certificate Information",
"certificate_expiration_date": "Certificate expiration date",
"will_be_auto_renewed": "Will be automatically renewed",
"certificate_expiration_date": "Certificate expiration date:",
"will_be_auto_renewed": "will be automatically renewed",
"fingerprint": "Certificate fingerprint:",
"close": "Close"
},
Expand Down