diff --git a/lib/global-admin/addon/components/form-google-auth/template.hbs b/lib/global-admin/addon/components/form-google-auth/template.hbs index a81cb00fe..e15b7f57e 100644 --- a/lib/global-admin/addon/components/form-google-auth/template.hbs +++ b/lib/global-admin/addon/components/form-google-auth/template.hbs @@ -82,17 +82,6 @@ htmlSafe=true }} - {{#tooltip-element - type="tooltip-basic" - model=(t "authPage.googleoauth.notAuthenticated.ul.li2.helperText" clusterId=cluster.id htmlSafe=true) - tooltipTemplate="tooltip-static" - aria-describedby="tooltip-base" - baseClass="text-left" - }} - - - - {{/tooltip-element}}
  • @@ -110,6 +99,9 @@
  • {{t "authPage.googleoauth.notAuthenticated.ul.li2.ul.li3"}}
  • +
  • + {{t "authPage.googleoauth.notAuthenticated.ul.li2.ul.li4"}} +
  • @@ -156,6 +148,9 @@
  • {{t "authPage.googleoauth.notAuthenticated.ul.li3.ul.li4"}}
  • +
  • + {{t "authPage.googleoauth.notAuthenticated.ul.li3.ul.li5"}} +
  • @@ -196,6 +191,9 @@
    +
    + {{t "authPage.googleoauth.stepThree.subHeader" htmlSafe=true}} +
    • {{t "authPage.googleoauth.notAuthenticated.ul.li4.ul.li1" htmlSafe=true}} @@ -206,12 +204,6 @@
    • {{t "authPage.googleoauth.notAuthenticated.ul.li4.ul.li3"}}
    • -
    • - {{t "authPage.googleoauth.notAuthenticated.ul.li4.ul.li4"}} -
    • -
    • - {{t "authPage.googleoauth.notAuthenticated.ul.li4.ul.li5"}} -
    diff --git a/translations/en-us.yaml b/translations/en-us.yaml index e20d19d60..16cd25712 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -549,25 +549,23 @@ authPage: li1: 'Login to your account. Navigate to "APIs & Services" and then select "OAuth consent screen".' li2: text: 'Navigate to the "OAuth consent screen" tab and fill in the form:' - helperText: 'Note: This must be a fully qualified domain name; IP addresses are not valid.' ul: - li1: 'Authorized domains: ' + li1: 'Authorized domains: Top private domain of ' li2: 'Application homepage link: ' li3: 'Under Scopes for Google APIs, enable "email", "profile", and "openid".' - li4: 'Authorization callback URL:' + li4: 'Click on "Save".' li3: ul: li1: 'Select the "Create Credentials" dropdown, and select "OAuth clientID", then select "Web application".' li2: 'Authorized Javascript origins: ' li3: 'Authorized redirect URIs: ' - li4: 'Click "Create", and then click on the Download JSON button.' + li4: 'Click "Create", and then click on the "Download JSON" button.' + li5: 'Upload the downloaded JSON file in the OAuth credentials box.' li4: ul: - li1: 'Click here, for information on creating and managing your service account.' - li2: 'Select the "Create Credentials" dropdown, and select Service Account key.' - li3: 'Select your service account.' - li4: 'Select JSON for your Key type and then click "Create".' - li5: 'A JSON file will be automatically saved locally.' + li1: 'Creating a service account.' + li2: 'Generating a key for the service account.' + li3: 'Adding the service account as an OAuth client in your google domain.' form: oauthCredential: labelText: OAuth Credentials @@ -599,7 +597,8 @@ authPage: info: 'Navigate to the "Credentials" tab to create your OAuth client ID' stepThree: header: 'Step Three:' - info: 'Navigate to the "Credentials" tab again to create your Service account key' + subHeader: 'Follow this guide for:' + info: 'Create Service Account credentials' azuread: header: disabled: