From f7d1b8821ce43df98453f94391899d99e1af79b0 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 8 May 2017 22:18:07 -0400
Subject: [PATCH] ui tweaks

---
 .../organizationGroupsController.js           |  4 ----
 .../views/organizationCollectionsAdd.html     | 20 +++++++++----------
 .../views/organizationCollectionsEdit.html    | 20 +++++++++----------
 .../views/organizationGroups.html             |  5 -----
 4 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/src/app/organization/organizationGroupsController.js b/src/app/organization/organizationGroupsController.js
index e6414f97f4..8573058cca 100644
--- a/src/app/organization/organizationGroupsController.js
+++ b/src/app/organization/organizationGroupsController.js
@@ -47,10 +47,6 @@
             
         };
 
-        $scope.collections = function (collection) {
-            
-        };
-
         $scope.delete = function (group) {
             if (!confirm('Are you sure you want to delete this group (' + group.name + ')?')) {
                 return;
diff --git a/src/app/organization/views/organizationCollectionsAdd.html b/src/app/organization/views/organizationCollectionsAdd.html
index cda513f10f..38799c4524 100644
--- a/src/app/organization/views/organizationCollectionsAdd.html
+++ b/src/app/organization/views/organizationCollectionsAdd.html
@@ -4,16 +4,6 @@
 </div>
 <form name="form" ng-submit="form.$valid && submit(model)" api-form="submitPromise">
     <div class="modal-body">
-        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
-            <h4>Errors have occured</h4>
-            <ul>
-                <li ng-repeat="e in form.$errors">{{e}}</li>
-            </ul>
-        </div>
-        <div class="form-group" show-errors>
-            <label for="email">Name</label>
-            <input type="text" id="name" name="Name" ng-model="model.name" class="form-control" required api-field />
-        </div>
         <div class="callout callout-default">
             <h4><i class="fa fa-info-circle"></i> Note</h4>
             <p>
@@ -24,6 +14,16 @@
                 login from "My vault".
             </p>
         </div>
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occured</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="email">Name</label>
+            <input type="text" id="name" name="Name" ng-model="model.name" class="form-control" required api-field />
+        </div>
     </div>
     <div class="modal-footer">
         <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
diff --git a/src/app/organization/views/organizationCollectionsEdit.html b/src/app/organization/views/organizationCollectionsEdit.html
index 3245b0d3d2..ef501798e1 100644
--- a/src/app/organization/views/organizationCollectionsEdit.html
+++ b/src/app/organization/views/organizationCollectionsEdit.html
@@ -4,16 +4,6 @@
 </div>
 <form name="form" ng-submit="form.$valid && submit(collection)" api-form="submitPromise">
     <div class="modal-body">
-        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
-            <h4>Errors have occured</h4>
-            <ul>
-                <li ng-repeat="e in form.$errors">{{e}}</li>
-            </ul>
-        </div>
-        <div class="form-group" show-errors>
-            <label for="email">Name</label>
-            <input type="text" id="name" name="Name" ng-model="collection.name" class="form-control" required api-field />
-        </div>
         <div class="callout callout-default">
             <h4><i class="fa fa-info-circle"></i> Note</h4>
             <p>
@@ -25,6 +15,16 @@
                 login from "My vault".
             </p>
         </div>
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occured</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="email">Name</label>
+            <input type="text" id="name" name="Name" ng-model="collection.name" class="form-control" required api-field />
+        </div>
     </div>
     <div class="modal-footer">
         <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
diff --git a/src/app/organization/views/organizationGroups.html b/src/app/organization/views/organizationGroups.html
index d7396850d7..b670c1142e 100644
--- a/src/app/organization/views/organizationGroups.html
+++ b/src/app/organization/views/organizationGroups.html
@@ -48,11 +48,6 @@
                                                 <i class="fa fa-fw fa-users"></i> Users
                                             </a>
                                         </li>
-                                        <li>
-                                            <a href="javascript:void(0)" ng-click="collections(group)">
-                                                <i class="fa fa-fw fa-cubes"></i> Collections
-                                            </a>
-                                        </li>
                                         <li>
                                             <a href="javascript:void(0)" ng-click="delete(group)" class="text-red">
                                                 <i class="fa fa-fw fa-trash"></i> Delete