Merge pull request #1848 from jlmitch5/orgPane

nested org cards into list pane
This commit is contained in:
jlmitch5
2016-05-09 10:56:35 -04:00
5 changed files with 40 additions and 48 deletions

View File

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

View File

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

View File

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

View File

@@ -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 }"
@@ -61,3 +60,4 @@
<div id="pagination-container" ng-hide="organization_num_pages < 2">
</div>
</div>
</div>

View File

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