Update 2017-11-09T03:03:27.353Z

2025-12-06 00:03:28 +00:00 · 2017-11-08 22:03:30 -05:00
parent 8839362e8f
commit 9d2a53eca0
9 changed files with 25 additions and 23 deletions
--- a/app/organization/views/organizationBilling.html
+++ b/app/organization/views/organizationBilling.html
@@ -119,7 +119,7 @@
                You plan currently has a total of <b>{{plan.seats}}</b> seats.
            </div>
        </div>
-        <div class="box-footer" ng-if="!selfHosted && !noSubscription">
+        <div class="box-footer" ng-if="!selfHosted && !noSubscription && canAdjustSeats">
            <button type="button" class="btn btn-default btn-flat" ng-click="adjustSeats(true)">
                Add Seats
            </button>
--- a/app/organization/views/organizationDashboard.html
+++ b/app/organization/views/organizationDashboard.html
@@ -7,10 +7,12 @@
 <section class="content">
    <div class="callout callout-warning" ng-if="!orgProfile.enabled">
        <h4><i class="fa fa-warning"></i> Organization Disabled</h4>
-        <p>
-            This organization is currently disabled. Users will not see your shared logins or collections.
-            Contact us if you would like to reinstate this organization.
-        </p>
+        <p>This organization is currently disabled. Users will not see your shared logins or collections.</p>
+        <p ng-if="!selfHosted">Contact us if you would like to reinstate this organization.</p>
+        <p ng-if="selfHosted">Update your license to reinstate this organization.</p>
+        <a ng-if="selfHosted" class="btn btn-default btn-flat" href="#" stop-click ng-click="goBilling()">
+            Billing &amp; Licensing
+        </a>
        <a class="btn btn-default btn-flat" href="https://bitwarden.com/contact/" target="_blank">
            Contact Us
        </a>
--- a/app/settings/views/settingsCreateOrganization.html
+++ b/app/settings/views/settingsCreateOrganization.html
@@ -93,17 +93,17 @@
                    </div>
                    <div class="radio radio-block" ng-if="!model.ownedBusiness" ng-click="changedPlan()">
                        <label>
-                            <input type="radio" ng-model="model.plan" name="PlanType" value="personal">
-                            Personal
+                            <input type="radio" ng-model="model.plan" name="PlanType" value="families">
+                            Families
                            <span>For personal users such as families &amp; friends.</span>
-                            <span>- Add and share with up to 10 users (5 included with base price)</span>
+                            <span>- Add and share with up to 5 users</span>
                            <span>- Create unlimited collections</span>
                            <span>- 1 GB encrypted file storage</span>
+                            <span>- Self-hosting (optional)</span>
                            <span>- Priority customer support</span>
                            <span>- 7 day free trial, cancel anytime</span>
                            <span class="bottom-line">
-                                {{plans.personal.basePrice | currency:'$'}} /month includes {{plans.personal.baseSeats}} users,
-                                additional users {{plans.personal.seatPrice | currency:'$'}} /month
+                                {{plans.families.basePrice | currency:'$'}} /month includes {{plans.families.baseSeats}} users
                            </span>
                        </label>
                    </div>
@@ -243,7 +243,7 @@
                            </span>
                        </label>
                    </div>
-                    <div class="radio radio-block" ng-if="model.plan !== 'personal'">
+                    <div class="radio radio-block" ng-if="model.plan !== 'families'">
                        <label>
                            <input type="radio" ng-model="model.interval" name="BillingInterval" value="month">
                            Monthly
--- a/app/views/userLayout.html
+++ b/app/views/userLayout.html
@@ -36,7 +36,7 @@
            <label for="search" class="sr-only">Search</label>
            <div class="form-group has-feedback">
                <input type="text" id="search" class="form-control" placeholder="Search my vault..."
-                       ng-focus="searchVault()" ng-model="main.searchVaultText" />
+                       ng-focus="searchVault()" ng-model="main.searchVaultText" autofocus />
                <span class="fa fa-search form-control-feedback" aria-hidden="true"></span>
            </div>
        </form>
--- a/index.html
+++ b/index.html
@@ -62,9 +62,9 @@
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
          integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
    <meta name="x-stylesheet-test" content="" class="fa invisible" />
-    <script src="js/fallback-styles.min.js?v=rwbz9f6r"></script>
+    <script src="js/fallback-styles.min.js?v=xmlmrpjsjor"></script>

-    <link rel="stylesheet" href="css/vault.min.css?v=rwbz9f6r" />
+    <link rel="stylesheet" href="css/vault.min.css?v=xmlmrpjsjor" />
    <link rel="apple-touch-icon" sizes="180x180" href="images/icons/apple-touch-icon.png">
    <link rel="icon" type="image/png" sizes="32x32" href="images/icons/favicon-32x32.png">
    <link rel="icon" type="image/png" sizes="16x16" href="images/icons/favicon-16x16.png">
@@ -82,11 +82,11 @@
            integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.3/angular.min.js"
            integrity="sha384-AH/e+s4V4kUifvnNED2x1XZqArO5qTFU4YKRzUXbz4IgPG1H0Xmz6fP1XUmO4vT/" crossorigin="anonymous"></script>
-    <script src="js/fallback-scripts.min.js?v=rwbz9f6r"></script>
-    <script src="js/settings.js?v=rwbz9f6r"></script>
+    <script src="js/fallback-scripts.min.js?v=xmlmrpjsjor"></script>
+    <script src="js/settings.js?v=xmlmrpjsjor"></script>

-    <script src="js/lib.min.js?v=rwbz9f6r"></script>
-    <script src="js/bw.min.js?v=rwbz9f6r"></script>
-    <script src="js/app.min.js?v=rwbz9f6r"></script>
+    <script src="js/lib.min.js?v=xmlmrpjsjor"></script>
+    <script src="js/bw.min.js?v=xmlmrpjsjor"></script>
+    <script src="js/app.min.js?v=xmlmrpjsjor"></script>
 </body>
 </html>
--- a/js/app.min.js
+++ b/js/app.min.js
--- a/js/fallback-styles.min.js
+++ b/js/fallback-styles.min.js
@@ -1 +1 @@
-function loadStylesheetIfMissing(e,t,s){var i=document.getElementsByTagName("SCRIPT"),l=i[i.length-1].previousElementSibling,n=document.defaultView&&document.defaultView.getComputedStyle?document.defaultView.getComputedStyle(l):l.currentStyle;if(n&&n[e]!==t)for(var o=0;o<s.length;o++)document.write('<link rel="stylesheet" href="'+s[o]+"?v="+cacheTag+'" />')}var cacheTag="rwbz9f6r";loadStylesheetIfMissing("visibility","hidden",["lib/bootstrap/css/bootstrap.min.css"]),loadStylesheetIfMissing("fontFamily","FontAwesome",["lib/font-awesome/css/font-awesome.min.css"]);
+function loadStylesheetIfMissing(e,t,s){var i=document.getElementsByTagName("SCRIPT"),l=i[i.length-1].previousElementSibling,o=document.defaultView&&document.defaultView.getComputedStyle?document.defaultView.getComputedStyle(l):l.currentStyle;if(o&&o[e]!==t)for(var n=0;n<s.length;n++)document.write('<link rel="stylesheet" href="'+s[n]+"?v="+cacheTag+'" />')}var cacheTag="xmlmrpjsjor";loadStylesheetIfMissing("visibility","hidden",["lib/bootstrap/css/bootstrap.min.css"]),loadStylesheetIfMissing("fontFamily","FontAwesome",["lib/font-awesome/css/font-awesome.min.css"]);
--- a/js/lib.min.js
+++ b/js/lib.min.js
--- a/u2f-connector.html
+++ b/u2f-connector.html
@@ -5,6 +5,6 @@
    <title>U2F Connector</title>
 </head>
 <body>
-    <script src="js/u2f.min.js?v=rwbz9f6r"></script>
+    <script src="js/u2f.min.js?v=xmlmrpjsjor"></script>
 </body>
 </html>