From e12582c2c253a977bd777ec2b4c2e0ac3aad5a31 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 28 Mar 2017 21:16:44 -0400 Subject: [PATCH] UI tweaks for org invites --- src/app/accounts/accountsLoginController.js | 6 ++-- .../accountsOrganizationAcceptController.js | 2 +- .../accounts/accountsRegisterController.js | 4 ++- .../views/accountsOrganizationAccept.html | 13 ++++++-- src/app/accounts/views/accountsRegister.html | 2 +- src/app/config.js | 8 +++-- .../views/organizationPeople.html | 30 ++++++++++++------- src/less/vault.less | 19 ++++++++++++ 8 files changed, 62 insertions(+), 22 deletions(-) diff --git a/src/app/accounts/accountsLoginController.js b/src/app/accounts/accountsLoginController.js index 92e3f2c592..02402f9ff9 100644 --- a/src/app/accounts/accountsLoginController.js +++ b/src/app/accounts/accountsLoginController.js @@ -5,10 +5,10 @@ angular $state, appSettings, $analytics) { var returnState = $state.params.returnState; var rememberedEmail = $cookies.get(appSettings.rememberedEmailCookieName); - if (rememberedEmail) { + if (rememberedEmail || $state.params.email) { $scope.model = { - email: rememberedEmail, - rememberEmail: true + email: $state.params.email ? $state.params.email : rememberedEmail, + rememberEmail: rememberedEmail !== null }; } diff --git a/src/app/accounts/accountsOrganizationAcceptController.js b/src/app/accounts/accountsOrganizationAcceptController.js index 4f76292ba9..806d85a6d3 100644 --- a/src/app/accounts/accountsOrganizationAcceptController.js +++ b/src/app/accounts/accountsOrganizationAcceptController.js @@ -7,7 +7,7 @@ angular params: $state.params }; - if (!$state.params.organizationId || !$state.params.organizationUserId || !$state.params.token) { + if (!$state.params.organizationId || !$state.params.organizationUserId || !$state.params.token || !$state.params.email) { $state.go('frontend.login.info').then(function () { toastr.error('Invalid parameters.'); }); diff --git a/src/app/accounts/accountsRegisterController.js b/src/app/accounts/accountsRegisterController.js index a2e84a5e22..24b5b0f099 100644 --- a/src/app/accounts/accountsRegisterController.js +++ b/src/app/accounts/accountsRegisterController.js @@ -4,12 +4,14 @@ angular .controller('accountsRegisterController', function ($scope, $location, apiService, cryptoService, validationService, $analytics, $state) { var params = $location.search(); + var stateParams = $state.params; $scope.returnState = $state.params.returnState; $scope.success = false; $scope.model = { - email: params.email + email: params.email ? params.email : stateParams.email }; + $scope.readOnlyEmail = stateParams.email !== null; $scope.registerPromise = null; $scope.register = function (form) { diff --git a/src/app/accounts/views/accountsOrganizationAccept.html b/src/app/accounts/views/accountsOrganizationAccept.html index 24fc67140d..3078d2c862 100644 --- a/src/app/accounts/views/accountsOrganizationAccept.html +++ b/src/app/accounts/views/accountsOrganizationAccept.html @@ -11,17 +11,24 @@
+

{{state.params.email}}

- You've been invited to join the ____ organization. To accept the invitation, you need to log in or + You've been invited to join the an organization. To accept the invitation, you need to log in or create a new bitwarden account.

-

Log In

+

+ Log In +

-

Create Account

+

+ Create Account +

diff --git a/src/app/accounts/views/accountsRegister.html b/src/app/accounts/views/accountsRegister.html index 5ecfd280ac..f53133fc40 100644 --- a/src/app/accounts/views/accountsRegister.html +++ b/src/app/accounts/views/accountsRegister.html @@ -22,7 +22,7 @@
+ ng-readonly="readOnlyEmail" required api-field />

You'll use your email address to log in.

diff --git a/src/app/config.js b/src/app/config.js index 71b2c59c02..4d09508d16 100644 --- a/src/app/config.js +++ b/src/app/config.js @@ -150,7 +150,8 @@ angular templateUrl: 'app/accounts/views/accountsLogin.html', controller: 'accountsLoginController', params: { - returnState: null + returnState: null, + email: null }, data: { bodyClass: 'login-page' @@ -201,7 +202,8 @@ angular templateUrl: 'app/accounts/views/accountsRegister.html', controller: 'accountsRegisterController', params: { - returnState: null + returnState: null, + email: null }, data: { pageTitle: 'Register', @@ -209,7 +211,7 @@ angular } }) .state('frontend.organizationAccept', { - url: '^/accept-organization?organizationId&organizationUserId&token', + url: '^/accept-organization?organizationId&organizationUserId&token&email', templateUrl: 'app/accounts/views/accountsOrganizationAccept.html', controller: 'accountsOrganizationAcceptController', data: { diff --git a/src/app/organization/views/organizationPeople.html b/src/app/organization/views/organizationPeople.html index 88e986658e..7c474cd369 100644 --- a/src/app/organization/views/organizationPeople.html +++ b/src/app/organization/views/organizationPeople.html @@ -19,35 +19,45 @@ Loading...
- +
- - - - - diff --git a/src/less/vault.less b/src/less/vault.less index 6cc3c1bbee..b046f563c8 100644 --- a/src/less/vault.less +++ b/src/less/vault.less @@ -113,6 +113,15 @@ form .btn .loading-icon { margin-right: 8px; } +.dropdown-menu { + border-color: #ccc; + + > li > a > .fa { + margin-right: 0; + margin-left: -5px; + } +} + /* Modals */ .modal-footer { @@ -131,6 +140,10 @@ form .btn .loading-icon { } } +.table-vmiddle td { + vertical-align: middle !important; +} + /* Callouts */ .callout.callout-default { @@ -244,6 +257,12 @@ form .btn .loading-icon { } } +/* Typography */ + +h1, h2, h3, h4, h5, h6 { + margin-top: 0; +} + /* Misc */ .strike {
+
+ User Image + {{user.email}}
{{user.name}}
 + {{user.typeName}} + {{user.statusName}}