rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix google auth text

This commit is contained in:
loganhz 2019-09-21 09:46:34 +08:00
parent 804ace7031
commit 822e14016e
2 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/global-admin/addon/components/form-google-auth/template.hbs
View File

@ -82,17 +82,6 @@
htmlSafe=true
}}
</span>
{{#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"
}}
<span>
<i class="icon icon-help icon-blue"/>
</span>
{{/tooltip-element}}
</li>
<li>
<b>
@ -110,6 +99,9 @@
<li>
{{t "authPage.googleoauth.notAuthenticated.ul.li2.ul.li3"}}
</li>
<li>
{{t "authPage.googleoauth.notAuthenticated.ul.li2.ul.li4"}}
</li>
</ul>
</div>
@ -156,6 +148,9 @@
<li>
{{t "authPage.googleoauth.notAuthenticated.ul.li3.ul.li4"}}
</li>
<li>
{{t "authPage.googleoauth.notAuthenticated.ul.li3.ul.li5"}}
</li>
</ul>
</div>
<div class="col span-6">
@ -196,6 +191,9 @@
<div class="row">
<div class="col span-6">
<div>
{{t "authPage.googleoauth.stepThree.subHeader" htmlSafe=true}}
</div>
<ul>
<li>
{{t "authPage.googleoauth.notAuthenticated.ul.li4.ul.li1" htmlSafe=true}}
@ -206,12 +204,6 @@
<li>
{{t "authPage.googleoauth.notAuthenticated.ul.li4.ul.li3"}}
</li>
<li>
{{t "authPage.googleoauth.notAuthenticated.ul.li4.ul.li4"}}
</li>
<li>
{{t "authPage.googleoauth.notAuthenticated.ul.li4.ul.li5"}}
</li>
</ul>
</div>
<div class="col span-6">

19
translations/en-us.yaml
View File

@ -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: '<b>Authorized domains:</b> '
li1: '<b>Authorized domains:</b> Top private domain of '
li2: '<b>Application homepage link:</b> '
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: '<b>Authorized Javascript origins:</b> '
li3: '<b>Authorized redirect URIs:</b> '
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: '<a href="https://cloud.google.com/iam/docs/service-accounts" target="blank">Click here</a>, 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 <a href="https://rancher.com/docs/rancher/v2.x/en/admin-settings/authentication/google/#creating-service-account-credentials" target="_blank" rel="nofollow noopener noreferrer">this</a> guide for:'
info: 'Create Service Account credentials'
azuread:
header:
disabled: