UI/UX tweaks

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,

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;
         };

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,

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,

src/app/organization/views/organizationCollectionsAdd.html

@@ -1,6 +1,6 @@
 <div class="modal-header">
     <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-    <h4 class="modal-title"><i class="fa fa-cubes"></i> Add Collection</h4>
+    <h4 class="modal-title"><i class="fa fa-cubes"></i> Add New Collection</h4>
 </div>
 <form name="form" ng-submit="form.$valid && submit(model)" api-form="submitPromise">
     <div class="modal-body">
@@ -19,7 +19,10 @@
             <p>
                 After creating the collection, you can associate a user to it by selecting a specific user on the "People" page.
             </p>
-            <p>You can associate logins to the collection by sharing from "My vault".</p>
+            <p>
+                You can associate new logins to the collection from your organization's "Vault" or by sharing an existing
+                login from "My vault".
+            </p>
         </div>
     </div>
     <div class="modal-footer">

src/app/organization/views/organizationCollectionsEdit.html

@@ -18,9 +18,12 @@
             <h4><i class="fa fa-info-circle"></i> Note</h4>
             <p>
                 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.
+            </p>
+            <p>
+                You can associate new logins to the collection from your organization's "Vault" or by sharing an existing
+                login from "My vault".
             </p>
-            <p>You can associate logins to this collection by sharing from "My vault".</p>
         </div>
     </div>
     <div class="modal-footer">
@@ -30,4 +33,3 @@
         <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
     </div>
 </form>
- 

src/app/organization/views/organizationVaultLoginCollections.html

@@ -12,7 +12,7 @@
             </ul>
         </div>
         <div ng-show="!collections.length" class="callout callout-default">
-            <p>No collections to manage.</p>
+            <p>There are no collections yet for your organization.</p>
         </div>
         <div class="table-responsive" ng-show="collections.length" style="margin: 0;">
             <table class="table table-striped table-hover" style="margin: 0;">

src/app/views/organizationLayout.html

@@ -60,11 +60,25 @@
                 <a ui-sref="backend.org.collections({orgId: params.orgId})">
                     <i class="fa fa-cubes fa-fw"></i> <span>Collections</span>
                 </a>
+                <ul class="treeview-menu" ng-class="{'menu-open': $state.includes('backend.org.collections')}">
+                    <li>
+                        <a href="javascript:void(0)" ng-click="addOrganizationCollection()">
+                            <i class="fa fa-plus-circle fa-fw"></i> New Collection
+                        </a>
+                    </li>
+                </ul>
             </li>
             <li ng-class="{active: $state.is('backend.org.people')}">
                 <a ui-sref="backend.org.people({orgId: params.orgId})">
                     <i class="fa fa-users fa-fw"></i> <span>People</span>
                 </a>
+                <ul class="treeview-menu" ng-class="{'menu-open': $state.includes('backend.org.people')}">
+                    <li>
+                        <a href="javascript:void(0)" ng-click="inviteOrganizationUser()">
+                            <i class="fa fa-plus-circle fa-fw"></i> Invite a User
+                        </a>
+                    </li>
+                </ul>
             </li>
             <li ng-class="{active: $state.is('backend.org.groups')}">
                 <a ui-sref="backend.org.groups({orgId: params.orgId})">