Tweaks to cloud integration page (#7878)

src/panels/config/cloud/account/cloud-account.js

@@ -123,7 +123,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>

src/panels/config/cloud/account/cloud-alexa-pref.ts

@@ -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"
             )}

src/panels/config/cloud/login/cloud-login.js

@@ -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">
@@ -91,9 +100,8 @@ class CloudLogin extends LocalizeMixin(
                   target="_blank"
                   rel="noreferrer"
                 >
-                  Nabu&nbsp;Casa,&nbsp;Inc
+                  Nabu&nbsp;Casa,&nbsp;Inc</a
-                </a>
+                >[[localize('ui.panel.config.cloud.login.introduction2a')]]
-                [[localize('ui.panel.config.cloud.login.introduction2a')]]
               </p>
               <p>
                 [[localize('ui.panel.config.cloud.login.introduction3')]]
@@ -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')]]"
@@ -140,6 +148,13 @@ 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
@@ -147,13 +162,6 @@ class CloudLogin extends LocalizeMixin(
                   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>
 

src/translations/en.json

@@ -1604,7 +1604,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.",
@@ -1678,7 +1678,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.",
@@ -1729,8 +1729,8 @@
           },
           "dialog_certificate": {
             "certificate_information": "Certificate Information",
-            "certificate_expiration_date": "Certificate expiration date",
+            "certificate_expiration_date": "Certificate expiration date:",
-            "will_be_auto_renewed": "Will be automatically renewed",
+            "will_be_auto_renewed": "will be automatically renewed",
             "fingerprint": "Certificate fingerprint:",
             "close": "Close"
           },