From fb817f1ca72998acb1382f2b42c678666a33ed48 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 11 Oct 2019 11:22:21 -0400 Subject: [PATCH] more a11y fixes --- src/app/accounts/lock.component.html | 4 ++-- src/app/accounts/login.component.html | 4 ++-- .../two-factor-options.component.html | 2 +- src/app/accounts/two-factor.component.html | 2 +- src/app/components/callout.component.html | 2 +- src/app/layouts/navbar.component.html | 12 +++++----- .../organization-layout.component.html | 10 ++++---- .../manage/collection-add-edit.component.html | 2 +- .../manage/collections.component.html | 15 +++++++----- .../manage/entity-events.component.html | 5 ++-- .../manage/entity-users.component.html | 5 ++-- .../manage/events.component.html | 2 +- .../manage/group-add-edit.component.html | 2 +- .../manage/groups.component.html | 10 ++++---- .../manage/people.component.html | 19 +++++++-------- .../manage/user-add-edit.component.html | 2 +- .../manage/user-confirm.component.html | 2 +- .../manage/user-groups.component.html | 2 +- .../settings/adjust-seats.component.html | 4 ++-- .../settings/api-key.component.html | 2 +- .../settings/change-plan.component.html | 4 ++-- .../delete-organization.component.html | 2 +- .../settings/download-license.component.html | 6 ++--- .../organization-subscription.component.html | 2 +- .../settings/rotate-api-key.component.html | 2 +- .../organizations/vault/vault.component.html | 2 +- src/app/settings/add-credit.component.html | 4 ++-- .../deauthorize-sessions.component.html | 2 +- .../settings/delete-account.component.html | 2 +- src/app/settings/domain-rules.component.html | 12 +++++----- .../organization-plans.component.html | 4 ++-- src/app/settings/organizations.component.html | 13 ++++++----- src/app/settings/payment.component.html | 8 +++---- src/app/settings/premium.component.html | 12 +++++----- src/app/settings/purge-vault.component.html | 2 +- .../two-factor-authenticator.component.html | 2 +- .../settings/two-factor-duo.component.html | 2 +- .../settings/two-factor-email.component.html | 2 +- .../two-factor-recovery.component.html | 2 +- .../settings/two-factor-u2f.component.html | 10 ++++---- .../two-factor-yubikey.component.html | 2 +- src/app/settings/update-key.component.html | 2 +- src/app/settings/user-billing.component.html | 8 +++---- .../password-generator-history.component.html | 2 +- src/app/vault/add-edit.component.html | 6 ++--- src/app/vault/attachments.component.html | 7 +++--- src/app/vault/bulk-delete.component.html | 2 +- src/app/vault/bulk-move.component.html | 2 +- src/app/vault/bulk-share.component.html | 2 +- src/app/vault/ciphers.component.html | 19 +++++++-------- src/app/vault/collections.component.html | 2 +- src/app/vault/folder-add-edit.component.html | 2 +- src/app/vault/share.component.html | 2 +- src/app/vault/vault.component.html | 23 ++++++++++--------- 54 files changed, 147 insertions(+), 137 deletions(-) diff --git a/src/app/accounts/lock.component.html b/src/app/accounts/lock.component.html index 6c5f0b4f4d2..24ce14321a7 100644 --- a/src/app/accounts/lock.component.html +++ b/src/app/accounts/lock.component.html @@ -2,7 +2,7 @@

- +

{{'yourVaultIsLocked' | i18n}}

@@ -26,7 +26,7 @@
- {{'createAccount' | i18n}} + {{'createAccount' | i18n}}
diff --git a/src/app/accounts/two-factor-options.component.html b/src/app/accounts/two-factor-options.component.html index 4e291461d93..4380f9bf0ac 100644 --- a/src/app/accounts/two-factor-options.component.html +++ b/src/app/accounts/two-factor-options.component.html @@ -3,7 +3,7 @@

{{'twoStepOptions' | i18n}}

-
diff --git a/src/app/accounts/two-factor.component.html b/src/app/accounts/two-factor.component.html index 94f516854d3..0dbedf5cafb 100644 --- a/src/app/accounts/two-factor.component.html +++ b/src/app/accounts/two-factor.component.html @@ -67,7 +67,7 @@ *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo && selectedProviderType !== providerType.OrganizationDuo && selectedProviderType !== providerType.U2f"> - {{'continue' | i18n}} + {{'continue' | i18n}} diff --git a/src/app/components/callout.component.html b/src/app/components/callout.component.html index 0093b78c2d1..31e1d10e963 100644 --- a/src/app/components/callout.component.html +++ b/src/app/components/callout.component.html @@ -1,6 +1,6 @@
- + {{'organizationIsDisabled' | i18n}}
@@ -17,25 +17,25 @@
  • - + {{'vault' | i18n}}
  • - + {{'manage' | i18n}}
  • - + {{'tools' | i18n}}
  • - + {{'settings' | i18n}}
    • diff --git a/src/app/organizations/manage/collection-add-edit.component.html b/src/app/organizations/manage/collection-add-edit.component.html index 3993423ae82..e5caf303e33 100644 --- a/src/app/organizations/manage/collection-add-edit.component.html +++ b/src/app/organizations/manage/collection-add-edit.component.html @@ -3,7 +3,7 @@

    {{title}}

    -
    diff --git a/src/app/organizations/manage/collections.component.html b/src/app/organizations/manage/collections.component.html index bf6e919d84b..f3a00cb4a1a 100644 --- a/src/app/organizations/manage/collections.component.html +++ b/src/app/organizations/manage/collections.component.html @@ -7,12 +7,15 @@ [(ngModel)]="searchText">
- + + + {{'loading' | i18n}} +

{{'noCollectionsInList' | i18n}}

@@ -24,16 +27,16 @@ diff --git a/src/app/organizations/manage/events.component.html b/src/app/organizations/manage/events.component.html index 6f5d7ebf54b..d09a877415c 100644 --- a/src/app/organizations/manage/events.component.html +++ b/src/app/organizations/manage/events.component.html @@ -12,7 +12,7 @@ diff --git a/src/app/organizations/manage/group-add-edit.component.html b/src/app/organizations/manage/group-add-edit.component.html index dc9e35cd93a..43973b7db59 100644 --- a/src/app/organizations/manage/group-add-edit.component.html +++ b/src/app/organizations/manage/group-add-edit.component.html @@ -3,7 +3,7 @@

{{title}}

-
diff --git a/src/app/organizations/manage/groups.component.html b/src/app/organizations/manage/groups.component.html index 6e2800f4cac..045668bb9fb 100644 --- a/src/app/organizations/manage/groups.component.html +++ b/src/app/organizations/manage/groups.component.html @@ -7,7 +7,7 @@ [(ngModel)]="searchText"> @@ -27,16 +27,16 @@ @@ -70,31 +70,32 @@ @@ -108,7 +108,7 @@ {{'refundNoun' | i18n}}
- + {{'users' | i18n}} - + {{'delete' | i18n}}
diff --git a/src/app/organizations/manage/entity-events.component.html b/src/app/organizations/manage/entity-events.component.html index 32d4e51e981..6484ceda62c 100644 --- a/src/app/organizations/manage/entity-events.component.html +++ b/src/app/organizations/manage/entity-events.component.html @@ -6,7 +6,7 @@ {{'eventLogs' | i18n}} {{name}} -
@@ -28,7 +28,8 @@ diff --git a/src/app/organizations/manage/entity-users.component.html b/src/app/organizations/manage/entity-users.component.html index 00452684397..9c3cda3c55e 100644 --- a/src/app/organizations/manage/entity-users.component.html +++ b/src/app/organizations/manage/entity-users.component.html @@ -6,7 +6,7 @@ {{'userAccess' | i18n}} {{entityName}} - @@ -74,7 +74,8 @@ 		- + {{'userAccessAllItems' | i18n}}
- + {{'users' | i18n}} - + {{'delete' | i18n}}
diff --git a/src/app/organizations/manage/people.component.html b/src/app/organizations/manage/people.component.html index 810ecb63fb0..81305f6099a 100644 --- a/src/app/organizations/manage/people.component.html +++ b/src/app/organizations/manage/people.component.html @@ -25,7 +25,7 @@ [(ngModel)]="searchText">
@@ -57,7 +57,7 @@ 		- + {{'userUsingTwoStep' | i18n}}
- + {{'resendInvitation' | i18n}} - + {{'confirm' | i18n}} - + {{'groups' | i18n}} - + {{'eventLogs' | i18n}} - + {{'remove' | i18n}}
diff --git a/src/app/organizations/manage/user-add-edit.component.html b/src/app/organizations/manage/user-add-edit.component.html index a0fc94dadae..9d937bd87f1 100644 --- a/src/app/organizations/manage/user-add-edit.component.html +++ b/src/app/organizations/manage/user-add-edit.component.html @@ -6,7 +6,7 @@ {{title}} {{name}} -
diff --git a/src/app/organizations/manage/user-confirm.component.html b/src/app/organizations/manage/user-confirm.component.html index 15c5901eb01..a4651f94787 100644 --- a/src/app/organizations/manage/user-confirm.component.html +++ b/src/app/organizations/manage/user-confirm.component.html @@ -6,7 +6,7 @@ {{'confirmUser' | i18n}} {{name}} - diff --git a/src/app/organizations/manage/user-groups.component.html b/src/app/organizations/manage/user-groups.component.html index d8f68b084cf..b4ab72b74cf 100644 --- a/src/app/organizations/manage/user-groups.component.html +++ b/src/app/organizations/manage/user-groups.component.html @@ -6,7 +6,7 @@ {{'groupAccess' | i18n}} {{name}} - diff --git a/src/app/organizations/settings/adjust-seats.component.html b/src/app/organizations/settings/adjust-seats.component.html index 968334b79bf..dbb15fa4fbc 100644 --- a/src/app/organizations/settings/adjust-seats.component.html +++ b/src/app/organizations/settings/adjust-seats.component.html @@ -1,7 +1,7 @@
- +

{{(add ? 'addSeats' : 'removeSeats') | i18n}}

diff --git a/src/app/organizations/settings/api-key.component.html b/src/app/organizations/settings/api-key.component.html index b77f3b51356..d17e198d74d 100644 --- a/src/app/organizations/settings/api-key.component.html +++ b/src/app/organizations/settings/api-key.component.html @@ -3,7 +3,7 @@

{{'apiKey' | i18n}}

-
diff --git a/src/app/organizations/settings/change-plan.component.html b/src/app/organizations/settings/change-plan.component.html index bf6787dc831..df0e641f4a8 100644 --- a/src/app/organizations/settings/change-plan.component.html +++ b/src/app/organizations/settings/change-plan.component.html @@ -1,7 +1,7 @@
- +

{{'changeBillingPlan' | i18n}}

{{'changeBillingPlanUpgrade' | i18n}}

{{'deleteOrganization' | i18n}}

-
diff --git a/src/app/organizations/settings/download-license.component.html b/src/app/organizations/settings/download-license.component.html index 2a3e1b9adc7..77936a6a837 100644 --- a/src/app/organizations/settings/download-license.component.html +++ b/src/app/organizations/settings/download-license.component.html @@ -1,7 +1,7 @@
- +

{{'downloadLicense' | i18n}}

@@ -9,7 +9,7 @@ - +
{{sub.expiration | date:'mediumDate'}} - + {{'licenseIsExpired' | i18n}} diff --git a/src/app/organizations/settings/rotate-api-key.component.html b/src/app/organizations/settings/rotate-api-key.component.html index b58d172a9a9..7d88237c5ce 100644 --- a/src/app/organizations/settings/rotate-api-key.component.html +++ b/src/app/organizations/settings/rotate-api-key.component.html @@ -3,7 +3,7 @@

{{'rotateApiKey' | i18n}}

-
diff --git a/src/app/organizations/vault/vault.component.html b/src/app/organizations/vault/vault.component.html index 1b62948a470..216f13c4e5a 100644 --- a/src/app/organizations/vault/vault.component.html +++ b/src/app/organizations/vault/vault.component.html @@ -19,7 +19,7 @@
+ PayPal
+ Bitcoin
diff --git a/src/app/settings/deauthorize-sessions.component.html b/src/app/settings/deauthorize-sessions.component.html index dea74b2f7d4..7175c2f9b20 100644 --- a/src/app/settings/deauthorize-sessions.component.html +++ b/src/app/settings/deauthorize-sessions.component.html @@ -3,7 +3,7 @@

{{'deauthorizeSessions' | i18n}}

-
diff --git a/src/app/settings/delete-account.component.html b/src/app/settings/delete-account.component.html index 2dc71a18aad..47721b2ca50 100644 --- a/src/app/settings/delete-account.component.html +++ b/src/app/settings/delete-account.component.html @@ -3,7 +3,7 @@

{{'deleteAccount' | i18n}}

-
diff --git a/src/app/settings/domain-rules.component.html b/src/app/settings/domain-rules.component.html index 3248a77e052..6525f2be0c2 100644 --- a/src/app/settings/domain-rules.component.html +++ b/src/app/settings/domain-rules.component.html @@ -21,7 +21,7 @@
{{'newCustomDomainDesc' | i18n}} @@ -41,22 +41,22 @@
- + {{'exclude' | i18n}} - + {{'include' | i18n}} - + {{'customize' | i18n}}
diff --git a/src/app/settings/organization-plans.component.html b/src/app/settings/organization-plans.component.html index b454e310526..b3383860ce0 100644 --- a/src/app/settings/organization-plans.component.html +++ b/src/app/settings/organization-plans.component.html @@ -8,7 +8,7 @@ class="form-text text-muted">{{'licenseFileDesc' | i18n : 'bitwarden_organization_license.json'}}
@@ -211,7 +211,7 @@
@@ -48,7 +48,7 @@

{{'noOrganizationsList' | i18n}}

- + {{'newOrganization' | i18n}} @@ -69,12 +69,13 @@
- + {{'leave' | i18n}}
diff --git a/src/app/settings/payment.component.html b/src/app/settings/payment.component.html index 2cdd97e17f3..7862b445cb8 100644 --- a/src/app/settings/payment.component.html +++ b/src/app/settings/payment.component.html @@ -3,25 +3,25 @@ + {{'creditCard' | i18n}}
+ {{'bankAccount' | i18n}}
+ PayPal
+ {{'accountCredit' | i18n}}
diff --git a/src/app/settings/premium.component.html b/src/app/settings/premium.component.html index 733a9b7906e..417b92cac01 100644 --- a/src/app/settings/premium.component.html +++ b/src/app/settings/premium.component.html @@ -8,27 +8,27 @@

{{'premiumUpgradeUnlockFeatures' | i18n}}

  • - + {{'premiumSignUpStorage' | i18n}}
  • - + {{'premiumSignUpTwoStep' | i18n}}
  • - + {{'premiumSignUpReports' | i18n}}
  • - + {{'premiumSignUpTotp' | i18n}}
  • - + {{'premiumSignUpSupport' | i18n}}
  • - + {{'premiumSignUpFuture' | i18n}}
diff --git a/src/app/settings/purge-vault.component.html b/src/app/settings/purge-vault.component.html index a8076bc9724..837f12933b7 100644 --- a/src/app/settings/purge-vault.component.html +++ b/src/app/settings/purge-vault.component.html @@ -3,7 +3,7 @@

{{'purgeVault' | i18n}}

-
diff --git a/src/app/settings/two-factor-authenticator.component.html b/src/app/settings/two-factor-authenticator.component.html index f82f08e8234..40b741d595d 100644 --- a/src/app/settings/two-factor-authenticator.component.html +++ b/src/app/settings/two-factor-authenticator.component.html @@ -6,7 +6,7 @@ {{'twoStepLogin' | i18n}} {{'authenticatorAppTitle' | i18n}} - diff --git a/src/app/settings/two-factor-duo.component.html b/src/app/settings/two-factor-duo.component.html index ccb58c7145d..d4d82c690ce 100644 --- a/src/app/settings/two-factor-duo.component.html +++ b/src/app/settings/two-factor-duo.component.html @@ -6,7 +6,7 @@ {{'twoStepLogin' | i18n}} Duo - diff --git a/src/app/settings/two-factor-email.component.html b/src/app/settings/two-factor-email.component.html index 5d72c70e085..05fe7257b00 100644 --- a/src/app/settings/two-factor-email.component.html +++ b/src/app/settings/two-factor-email.component.html @@ -6,7 +6,7 @@ {{'twoStepLogin' | i18n}} {{'emailTitle' | i18n}} - diff --git a/src/app/settings/two-factor-recovery.component.html b/src/app/settings/two-factor-recovery.component.html index bfaeeddba72..d5a054ebd02 100644 --- a/src/app/settings/two-factor-recovery.component.html +++ b/src/app/settings/two-factor-recovery.component.html @@ -6,7 +6,7 @@ {{'twoStepLogin' | i18n}} {{'recoveryCodeTitle' | i18n}} - diff --git a/src/app/settings/two-factor-u2f.component.html b/src/app/settings/two-factor-u2f.component.html index 8359c7cefb6..4c79addcf43 100644 --- a/src/app/settings/two-factor-u2f.component.html +++ b/src/app/settings/two-factor-u2f.component.html @@ -6,7 +6,7 @@ {{'twoStepLogin' | i18n}} FIDO U2F - @@ -71,19 +71,19 @@ {{'readKey' | i18n}} - + - + {{'twoFactorU2fWaiting' | i18n}}... - + {{'twoFactorU2fClickSave' | i18n}} - + {{'twoFactorU2fProblemReadingTryAgain' | i18n}} diff --git a/src/app/settings/two-factor-yubikey.component.html b/src/app/settings/two-factor-yubikey.component.html index bf4fa9a9cd2..76aa16bf36d 100644 --- a/src/app/settings/two-factor-yubikey.component.html +++ b/src/app/settings/two-factor-yubikey.component.html @@ -6,7 +6,7 @@ {{'twoStepLogin' | i18n}} YubiKey - diff --git a/src/app/settings/update-key.component.html b/src/app/settings/update-key.component.html index c0b89b7330c..84d81f42807 100644 --- a/src/app/settings/update-key.component.html +++ b/src/app/settings/update-key.component.html @@ -3,7 +3,7 @@

{{'updateEncryptionKey' | i18n}}

-
diff --git a/src/app/settings/user-billing.component.html b/src/app/settings/user-billing.component.html index a61cea5c2ce..70759d7d190 100644 --- a/src/app/settings/user-billing.component.html +++ b/src/app/settings/user-billing.component.html @@ -3,7 +3,7 @@ {{'billing' | i18n}} @@ -84,11 +84,11 @@
{{i.amount | currency:'$'}} - + {{'paid' | i18n}} - + {{'unpaid' | i18n}} -
- - + +
diff --git a/src/app/vault/bulk-delete.component.html b/src/app/vault/bulk-delete.component.html index fbc45ef3330..59d9fec78ba 100644 --- a/src/app/vault/bulk-delete.component.html +++ b/src/app/vault/bulk-delete.component.html @@ -5,7 +5,7 @@

{{'deleteSelected' | i18n}}

-
diff --git a/src/app/vault/bulk-move.component.html b/src/app/vault/bulk-move.component.html index e202ef66bbb..cda19aa1f58 100644 --- a/src/app/vault/bulk-move.component.html +++ b/src/app/vault/bulk-move.component.html @@ -5,7 +5,7 @@

{{'moveSelected' | i18n}}

- diff --git a/src/app/vault/bulk-share.component.html b/src/app/vault/bulk-share.component.html index 04fe1dbd6f1..36ce98b749e 100644 --- a/src/app/vault/bulk-share.component.html +++ b/src/app/vault/bulk-share.component.html @@ -5,7 +5,7 @@

{{'shareSelected' | i18n}}

- diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html index 3c7487c0cef..4ec98a4d304 100644 --- a/src/app/vault/ciphers.component.html +++ b/src/app/vault/ciphers.component.html @@ -31,43 +31,44 @@
- + {{'copyPassword' | i18n}} - + {{'launch' | i18n}} - + {{'attachments' | i18n}} - + {{'share' | i18n}} - + {{'collections' | i18n}} - + {{'eventLogs' | i18n}} - + {{'delete' | i18n}}
diff --git a/src/app/vault/collections.component.html b/src/app/vault/collections.component.html index e6ec10fc2ed..797ce52fbdd 100644 --- a/src/app/vault/collections.component.html +++ b/src/app/vault/collections.component.html @@ -6,7 +6,7 @@ {{'collections' | i18n}} {{cipher.name}} -
diff --git a/src/app/vault/folder-add-edit.component.html b/src/app/vault/folder-add-edit.component.html index e7a6ae11ffb..8626048844f 100644 --- a/src/app/vault/folder-add-edit.component.html +++ b/src/app/vault/folder-add-edit.component.html @@ -3,7 +3,7 @@

{{title}}

-
diff --git a/src/app/vault/share.component.html b/src/app/vault/share.component.html index 285dcee1d5c..c2142ff8680 100644 --- a/src/app/vault/share.component.html +++ b/src/app/vault/share.component.html @@ -6,7 +6,7 @@ {{'share' | i18n}} {{cipher.name}} - diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html index 2af3f8c34bb..e412015b71b 100644 --- a/src/app/vault/vault.component.html +++ b/src/app/vault/vault.component.html @@ -22,35 +22,36 @@
- + {{'moveSelected' | i18n}} - + {{'shareSelected' | i18n}} - + {{'deleteSelected' | i18n}}
- + {{'selectAll' | i18n}} - + {{'unselectAll' | i18n}}
@@ -62,7 +63,7 @@
- {{'updateKeyTitle' | i18n}} + {{'updateKeyTitle' | i18n}}

{{'updateEncryptionKeyShortDesc' | i18n}}

@@ -74,7 +75,7 @@
- {{'updateBrowser' | i18n}} + {{'updateBrowser' | i18n}}

{{'updateBrowserDesc' | i18n}}

@@ -86,7 +87,7 @@
- {{'goPremium' | i18n}} + {{'goPremium' | i18n}}

{{'premiumUpgradeUnlockFeatures' | i18n}}