Resolve the ui changes issues (#10955)

This commit is contained in:
cyprain-okeke 2024-09-09 18:21:09 +01:00 committed by GitHub
parent 8a199a1f66
commit e786eac87d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 17 deletions

View File

@ -4,7 +4,7 @@
{{ "upgradeFreeOrganization" | i18n: currentPlanName }} {{ "upgradeFreeOrganization" | i18n: currentPlanName }}
</span> </span>
<div bitDialogContent> <div bitDialogContent>
<p>{{ "upgradePlan" | i18n }}</p> <p>{{ "upgradePlans" | i18n }}</p>
<div class="tw-mb-3 tw-flex tw-justify-between"> <div class="tw-mb-3 tw-flex tw-justify-between">
<span class="tw-text-lg tw-pr-1 tw-font-bold">{{ "selectAPlan" | i18n }}</span> <span class="tw-text-lg tw-pr-1 tw-font-bold">{{ "selectAPlan" | i18n }}</span>
<div class="tw-items-center tw-gap-2"> <div class="tw-items-center tw-gap-2">
@ -52,9 +52,21 @@
tabindex="0" tabindex="0"
> >
<div class="tw-relative"> <div class="tw-relative">
<div class="tw-px-2 tw-py-4"> <div
*ngIf="selectableProduct === selectedPlan"
class="tw-bg-primary-600 tw-text-center !tw-text-contrast tw-text-sm tw-font-bold tw-py-1 group-hover:tw-bg-primary-700"
>
{{ "recommended" | i18n }}
</div>
<div
class="tw-px-2 tw-py-4"
[ngClass]="{
'tw-py-1': !(selectableProduct === selectedPlan),
'tw-py-0': selectableProduct === selectedPlan,
}"
>
<h3 class="tw-text-lg tw-font-bold"> <h3 class="tw-text-lg tw-font-bold">
<span class="tw-uppercase">{{ <span class="tw-capitalize">{{
selectableProduct.nameLocalizationKey | i18n selectableProduct.nameLocalizationKey | i18n
}}</span> }}</span>
<span bitBadge variant="secondary" *ngIf="selectableProduct === currentPlan"> <span bitBadge variant="secondary" *ngIf="selectableProduct === currentPlan">
@ -73,9 +85,8 @@
) | currency: "$" ) | currency: "$"
}} }}
</b> </b>
<span class="tw-text-xs tw-px-0"> /{{ "monthPerMember" | i18n }}</span>
<b class="tw-text-sm tw-font-semibold"> <b class="tw-text-sm tw-font-semibold">
/{{ "month" | i18n }}
{{ "includesXMembers" | i18n: selectableProduct.PasswordManager.baseSeats }}
<ng-container <ng-container
*ngIf="selectableProduct.PasswordManager.hasAdditionalSeatsOption" *ngIf="selectableProduct.PasswordManager.hasAdditionalSeatsOption"
> >
@ -108,7 +119,7 @@
| currency: "$") | currency: "$")
}} }}
</b> </b>
<b class="tw-text-sm tw-font-semibold"> /{{ "monthPerMember" | i18n }}</b> <span class="tw-text-xs tw-px-0"> /{{ "monthPerMember" | i18n }}</span>
</span> </span>
<span *ngIf="selectableProduct.productTier == productTypes.Free" <span *ngIf="selectableProduct.productTier == productTypes.Free"
>{{ "freeForever" | i18n }} >{{ "freeForever" | i18n }}
@ -125,7 +136,7 @@
<p class="tw-text-xs tw-px-2 tw-font-semibold" *ngIf="organization.useSecretsManager"> <p class="tw-text-xs tw-px-2 tw-font-semibold" *ngIf="organization.useSecretsManager">
{{ "bitwardenPasswordManager" | i18n }} {{ "bitwardenPasswordManager" | i18n }}
</p> </p>
<p class="tw-text-xs tw-px-2">{{ "upgradeEnterpriseMessage" | i18n }}</p> <p class="tw-text-xs tw-px-2">{{ "enterprisePlanUpgradeMessage" | i18n }}</p>
<ul class="bwi-ul tw-text-xs"> <ul class="bwi-ul tw-text-xs">
<li> <li>
@ -193,13 +204,13 @@
*ngIf="selectableProduct.productTier === productTypes.Teams" *ngIf="selectableProduct.productTier === productTypes.Teams"
class="tw-text-xs tw-px-2" class="tw-text-xs tw-px-2"
> >
{{ "upgradeTeamsMessage" | i18n }} {{ "teamsPlanUpgradeMessage" | i18n }}
</p> </p>
<p <p
*ngIf="selectableProduct.productTier === productTypes.Families" *ngIf="selectableProduct.productTier === productTypes.Families"
class="tw-text-xs tw-px-2" class="tw-text-xs tw-px-2"
> >
{{ "upgradeFamilyMessage" | i18n }} {{ "familyPlanUpgradeMessage" | i18n }}
</p> </p>
<ul <ul
class="bwi-ul tw-text-xs" class="bwi-ul tw-text-xs"

View File

@ -4035,6 +4035,9 @@
"selected": { "selected": {
"message": "Selected" "message": "Selected"
}, },
"recommended": {
"message": "Recommended"
},
"ownership": { "ownership": {
"message": "Ownership" "message": "Ownership"
}, },
@ -8980,8 +8983,8 @@
} }
} }
}, },
"upgradePlan": { "upgradePlans": {
"message": "Upgrade your plan to invite more members and gain access to additional Bitwarden features" "message": "Upgrade your plan to invite members and experience powerful security features."
}, },
"upgradeDiscount": { "upgradeDiscount": {
"message": "Save $AMOUNT$%", "message": "Save $AMOUNT$%",
@ -8992,11 +8995,11 @@
} }
} }
}, },
"upgradeEnterpriseMessage": { "enterprisePlanUpgradeMessage": {
"message": "Advanced capabilities for larger businesses" "message": "Advanced capabilities for larger organizations"
}, },
"upgradeTeamsMessage": { "teamsPlanUpgradeMessage": {
"message": "Businesses looking for powerful security" "message": "Resilient protection for growing teams"
}, },
"teamsInviteMessage": { "teamsInviteMessage": {
"message": "Invite unlimited members" "message": "Invite unlimited members"
@ -9007,8 +9010,8 @@
"syncGroupsAndUsersFromDirectory": { "syncGroupsAndUsersFromDirectory": {
"message": "Sync groups and users from a directory" "message": "Sync groups and users from a directory"
}, },
"upgradeFamilyMessage": { "familyPlanUpgradeMessage": {
"message": "Share with families and friends" "message": "Secure your family logins"
}, },
"accessToPremiumFeatures": { "accessToPremiumFeatures": {
"message": "Access to Premium features" "message": "Access to Premium features"