[GDPR] Adjusted TOS/Privacy acceptance (#579)

* initial commit gdpr acceptance

* Removed variables/logic now found in superclass

* update jslib (d84d6da -> 5e50aa1)
This commit is contained in:
Vincent Salucci 2020-11-02 16:32:58 -06:00 committed by GitHub
parent be95ee9328
commit bcc8bc0c80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 2 deletions

2
jslib

@ -1 +1 @@
Subproject commit d84d6da7f77ec89ba69299b1ff982f083fd77203
Subproject commit 5e50aa1a195bde11fdc14e9bdf71542766fdbb8d

View File

@ -41,7 +41,7 @@
{{'masterPassDesc' | i18n}}
</div>
</div>
<div class="box last">
<div class="box">
<div class="box-content">
<div class="box-content-row box-content-row-flex" appBoxRow>
<div class="row-main">
@ -66,6 +66,18 @@
{{'masterPassHintDesc' | i18n}}
</div>
</div>
<div class="box last" *ngIf="showTerms">
<div class="box-footer checkbox">
<input type="checkbox" id="acceptPolicies" [(ngModel)]="acceptPolicies" name="AcceptPolicies">
<label for="acceptPolicies">
{{'acceptPolicies' | i18n}}<br>
<a href="https://bitwarden.com/terms/" target="_blank"
rel="noopener">{{'termsOfService' | i18n}}</a>,
<a href="https://bitwarden.com/privacy/" target="_blank"
rel="noopener">{{'privacyPolicy' | i18n}}</a>
</label>
</div>
</div>
<div class="buttons">
<button type="submit" class="btn primary block" [disabled]="form.loading" appBlurClick>
<b [hidden]="form.loading">{{'submit' | i18n}}</b>

View File

@ -1401,5 +1401,11 @@
},
"masterPasswordPolicyRequirementsNotMet": {
"message": "Your new master password does not meet the policy requirements."
},
"acceptPolicies": {
"message": "By checking this box you agree to the following:"
},
"acceptPoliciesError": {
"message": "Terms of Service and Privacy Policy have not been acknowledged."
}
}