From cc62237ab5d1e84c138d2f661135757c5fd929f3 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 28 Apr 2017 15:28:00 -0400 Subject: [PATCH] UI/UX tweaks --- src/app/global/mainController.js | 16 ++++++++-------- src/app/global/sideNavController.js | 8 ++++++++ .../organizationCollectionsController.js | 4 ++++ .../organization/organizationPeopleController.js | 4 ++++ .../views/organizationCollectionsAdd.html | 7 +++++-- .../views/organizationCollectionsEdit.html | 8 +++++--- .../views/organizationVaultLoginCollections.html | 2 +- src/app/views/organizationLayout.html | 14 ++++++++++++++ 8 files changed, 49 insertions(+), 14 deletions(-) diff --git a/src/app/global/mainController.js b/src/app/global/mainController.js index fdf4928f..76bae441 100644 --- a/src/app/global/mainController.js +++ b/src/app/global/mainController.js @@ -40,14 +40,6 @@ angular } }); - $scope.searchVault = function () { - $state.go('backend.user.vault'); - }; - - $scope.searchOrganizationVault = function () { - $state.go('backend.org.vault', { orgId: $state.params.orgId }); - }; - $scope.addLogin = function () { $scope.$broadcast('vaultAddLogin'); }; @@ -60,6 +52,14 @@ angular $scope.$broadcast('organizationVaultAddLogin'); }; + $scope.addOrganizationCollection = function () { + $scope.$broadcast('organizationCollectionsAdd'); + }; + + $scope.inviteOrganizationUser = function () { + $scope.$broadcast('organizationPeopleInvite'); + }; + // Append dropdown menu somewhere else var bodyScrollbarWidth, appendedDropdownMenu, diff --git a/src/app/global/sideNavController.js b/src/app/global/sideNavController.js index 7383cfe8..f591ca2b 100644 --- a/src/app/global/sideNavController.js +++ b/src/app/global/sideNavController.js @@ -40,6 +40,14 @@ angular $state.go('backend.org.dashboard', { orgId: org.id }); }; + $scope.searchVault = function () { + $state.go('backend.user.vault'); + }; + + $scope.searchOrganizationVault = function () { + $state.go('backend.org.vault', { orgId: $state.params.orgId }); + }; + $scope.isOrgOwner = function (org) { return org && org.type === 0; }; diff --git a/src/app/organization/organizationCollectionsController.js b/src/app/organization/organizationCollectionsController.js index c761fab2..98457b17 100644 --- a/src/app/organization/organizationCollectionsController.js +++ b/src/app/organization/organizationCollectionsController.js @@ -9,6 +9,10 @@ loadList(); }); + $scope.$on('organizationCollectionsAdd', function (event, args) { + $scope.add(); + }); + $scope.add = function () { var modal = $uibModal.open({ animation: true, diff --git a/src/app/organization/organizationPeopleController.js b/src/app/organization/organizationPeopleController.js index 1f9f0b1f..4a5bea7e 100644 --- a/src/app/organization/organizationPeopleController.js +++ b/src/app/organization/organizationPeopleController.js @@ -55,6 +55,10 @@ }); }; + $scope.$on('organizationPeopleInvite', function (event, args) { + $scope.invite(); + }); + $scope.invite = function () { var modal = $uibModal.open({ animation: true, diff --git a/src/app/organization/views/organizationCollectionsAdd.html b/src/app/organization/views/organizationCollectionsAdd.html index bb483cad..cda513f1 100644 --- a/src/app/organization/views/organizationCollectionsAdd.html +++ b/src/app/organization/views/organizationCollectionsAdd.html @@ -1,6 +1,6 @@ 
-

Add Collection

+

Add New Collection

@@ -19,7 +19,10 @@

After creating the collection, you can associate a user to it by selecting a specific user on the "People" page.

-

You can associate logins to the collection by sharing from "My vault".

+

+ You can associate new logins to the collection from your organization's "Vault" or by sharing an existing + login from "My vault". +

diff --git a/src/app/organization/views/organizationCollectionsEdit.html b/src/app/organization/views/organizationCollectionsEdit.html index 41c732ef..3245b0d3 100644 --- a/src/app/organization/views/organizationCollectionsEdit.html +++ b/src/app/organization/views/organizationCollectionsEdit.html @@ -18,9 +18,12 @@

Note

Select "Users" from the listing options to manage existing users for this collection. Associate new users by - managing the user's collection access on the "People" page. + editing the user's access on the "People" page. +

+

+ You can associate new logins to the collection from your organization's "Vault" or by sharing an existing + login from "My vault".

-

You can associate logins to this collection by sharing from "My vault".

@@ -30,4 +33,3 @@
- \ No newline at end of file diff --git a/src/app/organization/views/organizationVaultLoginCollections.html b/src/app/organization/views/organizationVaultLoginCollections.html index 1e7b861a..8ba3f890 100644 --- a/src/app/organization/views/organizationVaultLoginCollections.html +++ b/src/app/organization/views/organizationVaultLoginCollections.html @@ -12,7 +12,7 @@
-

No collections to manage.

+

There are no collections yet for your organization.

diff --git a/src/app/views/organizationLayout.html b/src/app/views/organizationLayout.html index 7d484d69..354aa5c1 100644 --- a/src/app/views/organizationLayout.html +++ b/src/app/views/organizationLayout.html @@ -60,11 +60,25 @@ Collections +
  • People +