1
0
mirror of https://github.com/bitwarden/web synced 2025-12-12 14:23:18 +00:00

notes about sharing

This commit is contained in:
Kyle Spearrin
2017-04-11 17:29:45 -04:00
parent d619167c02
commit 5f130bdda7
4 changed files with 71 additions and 41 deletions

View File

@@ -14,6 +14,13 @@
<label for="email">Name</label> <label for="email">Name</label>
<input type="text" id="name" name="Name" ng-model="model.name" class="form-control" required api-field /> <input type="text" id="name" name="Name" ng-model="model.name" class="form-control" required api-field />
</div> </div>
<div class="callout callout-default">
<h4><i class="fa fa-info-circle"></i> Note</h4>
<p>
After creating the subvault, you can associate a user to it by selecting a specific user on the "People" page.
</p>
<p>You can associate logins to the subvault by sharing from "My vault".</p>
</div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading"> <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
@@ -22,4 +29,3 @@
<button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button> <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
</div> </div>
</form> </form>

View File

@@ -14,6 +14,14 @@
<label for="email">Name</label> <label for="email">Name</label>
<input type="text" id="name" name="Name" ng-model="subvault.name" class="form-control" required api-field /> <input type="text" id="name" name="Name" ng-model="subvault.name" class="form-control" required api-field />
</div> </div>
<div class="callout callout-default">
<h4><i class="fa fa-info-circle"></i> Note</h4>
<p>
Select "Users" from the listing options to manage existing users for this subvault. Associate new users by
managing the user's subvault access on the "People" page.
</p>
<p>You can associate logins to this subvault by sharing from "My vault".</p>
</div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading"> <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">

View File

@@ -1,7 +1,8 @@
angular angular
.module('bit.vault') .module('bit.vault')
.controller('vaultShareController', function ($scope, apiService, $uibModalInstance, authService, cipherService, loginId, $analytics) { .controller('vaultShareController', function ($scope, apiService, $uibModalInstance, authService, cipherService,
loginId, $analytics, $state) {
$analytics.eventTrack('vaultShareController', { category: 'Modal' }); $analytics.eventTrack('vaultShareController', { category: 'Modal' });
$scope.model = {}; $scope.model = {};
$scope.login = {}; $scope.login = {};
@@ -30,7 +31,7 @@
setFirstOrg = false; setFirstOrg = false;
for (var i in profile.organizations) { for (var i in profile.organizations) {
if (profile.organizations.hasOwnProperty(i)) { if (profile.organizations.hasOwnProperty(i) && profile.organizations[i].enabled) {
orgs.push({ orgs.push({
id: profile.organizations[i].id, id: profile.organizations[i].id,
name: profile.organizations[i].name name: profile.organizations[i].name
@@ -111,4 +112,10 @@
$scope.close = function () { $scope.close = function () {
$uibModalInstance.dismiss('cancel'); $uibModalInstance.dismiss('cancel');
}; };
$scope.createOrg = function () {
$state.go('backend.user.settingsCreateOrg').then(function () {
$uibModalInstance.dismiss('cancel');
});
};
}); });

View File

@@ -11,6 +11,14 @@
<li ng-repeat="e in form.$errors">{{e}}</li> <li ng-repeat="e in form.$errors">{{e}}</li>
</ul> </ul>
</div> </div>
<div ng-show="!organizations.length" class="callout callout-default">
<h4><i class="fa fa-info-circle"></i> No Organizations</h4>
<p>You do not belong to any organizations.</p>
<a ng-click="createOrg()" class="btn btn-default btn-flat">
Create an Organization
</a>
</div>
<div ng-show="organizations.length">
<div class="form-group"> <div class="form-group">
<label for="organization">Organization</label> <span>*</span> <label for="organization">Organization</label> <span>*</span>
<select id="organization" name="Organization" ng-model="model.organizationId" class="form-control"> <select id="organization" name="Organization" ng-model="model.organizationId" class="form-control">
@@ -53,6 +61,7 @@
</table> </table>
</div> </div>
</div> </div>
</div>
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading"> <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
<i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Save <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Save