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

* updated tos/privacy policy acceptance

* Removed variables/logic now found in superclass

* update jslib (d84d6da -> 5e50aa1)

* Added content-row UI
This commit is contained in:
Vincent Salucci 2020-11-05 13:13:46 -06:00 committed by GitHub
parent 0e42893d1c
commit 6f6a5461b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 2 deletions

2
jslib

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

View File

@ -1353,5 +1353,17 @@
}, },
"masterPasswordPolicyRequirementsNotMet": { "masterPasswordPolicyRequirementsNotMet": {
"message": "Your new master password does not meet the policy requirements." "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."
},
"termsOfService": {
"message": "Terms of Service"
},
"privacyPolicy": {
"message": "Privacy Policy"
} }
} }

View File

@ -54,7 +54,7 @@
{{'masterPassDesc' | i18n}} {{'masterPassDesc' | i18n}}
</div> </div>
</div> </div>
<div class="box last"> <div class="box">
<div class="box-content"> <div class="box-content">
<div class="box-content-row box-content-row-flex" appBoxRow> <div class="box-content-row box-content-row-flex" appBoxRow>
<div class="row-main"> <div class="row-main">
@ -80,5 +80,19 @@
{{'masterPassHintDesc' | i18n}} {{'masterPassHintDesc' | i18n}}
</div> </div>
</div> </div>
<div class="box last" *ngIf="showTerms">
<div class="box-content">
<div class="box-footer box-content-row 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>
</content> </content>
</form> </form>

View File

@ -307,3 +307,19 @@ app-vault-icon {
input[type="password"]::-ms-reveal { input[type="password"]::-ms-reveal {
display: none; display: none;
} }
.checkbox {
position: relative;
display: block;
padding-left: 18px;
label {
margin-bottom: 0;
}
input[type="checkbox"] {
position: absolute;
margin-top: 4px;
margin-left: -18px;
}
}