bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 09:43:23 +00:00
Code Issues Releases Wiki Activity

fix subvault collapse and add org plan details

Browse Source
This commit is contained in:
Kyle Spearrin
2017-04-07 13:50:34 -04:00
parent 05d153e1d2
commit b11d7be990
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/settings/views/settings.html
View File

@@ -117,7 +117,7 @@
<a ng-repeat="org in model.organizations | orderBy: ['name']" <a ng-repeat="org in model.organizations | orderBy: ['name']"
href="javascript:void(0)" ng-click="org.type !== 2 && viewOrganization(org.id)" class="list-group-item"> href="javascript:void(0)" ng-click="org.type !== 2 && viewOrganization(org.id)" class="list-group-item">
<letter-avatar data="{{org.name}}" round="false" avwidth="25" avheight="25" <letter-avatar data="{{org.name}}" round="false" avwidth="25" avheight="25"
avclass="img-rounded" fontsize="14"></letter-avatar> avclass="img-rounded" fontsize="10"></letter-avatar>
{{org.name}} {{org.name}}
</a> </a>
</div> </div>

14
src/app/settings/views/settingsCreateOrganization.html
View File

@@ -60,6 +60,8 @@
<input type="radio" ng-model="model.plan" name="PlanType" value="free"> <input type="radio" ng-model="model.plan" name="PlanType" value="free">
Free Free
<span>For personal users to share with 1 other user.</span> <span>For personal users to share with 1 other user.</span>
<span>- Limit 2 users (including you)</span>
<span>- Limit 2 subvaults</span>
</label> </label>
</div> </div>
<div class="radio radio-block" ng-show="!model.ownedBusiness" ng-click="changedPlan()"> <div class="radio radio-block" ng-show="!model.ownedBusiness" ng-click="changedPlan()">
@@ -67,6 +69,10 @@
<input type="radio" ng-model="model.plan" name="PlanType" value="personal"> <input type="radio" ng-model="model.plan" name="PlanType" value="personal">
Personal Personal
<span>For personal users such as families &amp; friends.</span> <span>For personal users such as families &amp; friends.</span>
<span>- Add and share with unlimited users</span>
<span>- Create unlimited subvaults</span>
<span>- Priority customer support</span>
<span style="margin-bottom: 5px;">- 7 day free trial, cancel anytime</span>
<span> <span>
{{plans.personal.basePrice | currency:'$'}} /month for {{plans.personal.baseUsers}} users, {{plans.personal.basePrice | currency:'$'}} /month for {{plans.personal.baseUsers}} users,
additional users {{plans.personal.userPrice | currency:'$'}} /month additional users {{plans.personal.userPrice | currency:'$'}} /month
@@ -78,6 +84,10 @@
<input type="radio" ng-model="model.plan" name="PlanType" value="teams"> <input type="radio" ng-model="model.plan" name="PlanType" value="teams">
Teams Teams
<span>For businesses and other team organizations.</span> <span>For businesses and other team organizations.</span>
<span>- Add and share with unlimited users</span>
<span>- Create unlimited subvaults</span>
<span>- Priority customer support</span>
<span style="margin-bottom: 5px;">- 7 day free trial, cancel anytime</span>
<span> <span>
{{plans.teams.basePrice | currency:'$'}} /month for {{plans.teams.baseUsers}} users, {{plans.teams.basePrice | currency:'$'}} /month for {{plans.teams.baseUsers}} users,
additional users {{plans.teams.userPrice | currency:'$'}} /month additional users {{plans.teams.userPrice | currency:'$'}} /month
@@ -119,7 +129,7 @@
<div class="radio radio-block"> <div class="radio radio-block">
<label> <label>
<input type="radio" ng-model="model.interval" name="BillingInterval" value="year"> <input type="radio" ng-model="model.interval" name="BillingInterval" value="year">
Bill me annually Annually
<span> <span>
Base price: Base price:
{{plans[model.plan].basePrice | currency:"$":2}} &times;12 mo. = {{plans[model.plan].basePrice | currency:"$":2}} &times;12 mo. =
@@ -135,7 +145,7 @@
<div class="radio radio-block" ng-if="model.plan !== 'personal'"> <div class="radio radio-block" ng-if="model.plan !== 'personal'">
<label> <label>
<input type="radio" ng-model="model.interval" name="BillingInterval" value="month"> <input type="radio" ng-model="model.interval" name="BillingInterval" value="month">
Bill me monthly Monthly
<span> <span>
Base price: Base price:
{{plans[model.plan].monthlyBasePrice | currency:"$":2}} /month {{plans[model.plan].monthlyBasePrice | currency:"$":2}} /month

2
src/app/vault/vaultSubvaultsController.js
View File

@@ -51,7 +51,7 @@
$localStorage.collapsedSubvaults = {}; $localStorage.collapsedSubvaults = {};
} }
if (subvault.id in $localStorage.collapsedFolders) { if (subvault.id in $localStorage.collapsedSubvaults) {
delete $localStorage.collapsedSubvaults[subvault.id]; delete $localStorage.collapsedSubvaults[subvault.id];
} }
else { else {