Merge pull request #1848 from jlmitch5/orgPane

nested org cards into list pane

awx/ui/client/legacy-styles/lists.less

@@ -151,6 +151,7 @@ table, tbody {
 .List-header {
     display: flex;
     align-items: center;
+    min-height: 34px;
 }
 
 .List-title {

awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js

@@ -59,7 +59,6 @@ export default ['$scope', '$stateParams', '$state', 'Rest', 'UserList', 'Invento
                 list,
                 url,
                 generator = GenerateList;
-            $scope.$parent.hideListHeader = true;
             $scope.$parent.activeCard = parseInt($stateParams.organization_id);
             $scope.$parent.activeMode = mode;
 

awx/ui/client/src/organizations/list/organizations-list.controller.js

@@ -122,7 +122,6 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
                         return card;
                     });
                 }
-                $scope.hideListHeader = false;
             }
         });
 
@@ -131,14 +130,6 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
             getOrganization(id);
         });
 
-        $scope.$on("HideOrgListHeader", function() {
-            $scope.hideListHeader = true;
-        });
-
-        $scope.$on("ShowOrgListHeader", function() {
-            $scope.hideListHeader = false;
-        });
-
         getOrganization();
 
         $rootScope.flashMessage = null;

awx/ui/client/src/organizations/list/organizations-list.partial.html

@@ -1,6 +1,6 @@
 <div class="tab-pane" id="organizations">
     <div ui-view></div>
-    <div ng-cloak id="htmlTemplate" class="Panel" ng-hide="hideListHeader">
+    <div ng-cloak id="htmlTemplate" class="Panel">
         <div class="List-header">
             <div class="List-title">
                 <div class="List-titleText">
@@ -18,7 +18,6 @@
                 </button>
             </div>
         </div>
-    </div>
         <div class="OrgCards">
             <div class="OrgCards-card"
                 ng-class="{'OrgCards-card--selected': activeCard === card.id || card.isActiveCard }"
@@ -60,4 +59,5 @@
         </div>
         <div id="pagination-container" ng-hide="organization_num_pages < 2">
         </div>
+    </div>
 </div>

awx/ui/client/src/search/tagSearch.block.less

@@ -2,6 +2,7 @@
 
 .TagSearch {
     margin-bottom: 10px;
+    min-height: 45px;
 }
 
 .TagSearch-bar {