External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-10 19:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1848 from jlmitch5/orgPane

Browse Source 
nested org cards into list pane
This commit is contained in:
jlmitch5
2016-05-09 10:56:35 -04:00
parent 685d1e62b3 185c92d2c6
commit 3fe7006697
5 changed files with 40 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/legacy-styles/lists.less
View File

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

1
awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js
View File

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

9
awx/ui/client/src/organizations/list/organizations-list.controller.js
View File

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

76
awx/ui/client/src/organizations/list/organizations-list.partial.html
View File

@@ -1,6 +1,6 @@
<div class="tab-pane" id="organizations"> <div class="tab-pane" id="organizations">
<div ui-view></div> <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-header">
<div class="List-title"> <div class="List-title">
<div class="List-titleText"> <div class="List-titleText">
@@ -18,46 +18,46 @@
</button> </button>
</div> </div>
</div> </div>
</div> <div class="OrgCards">
<div class="OrgCards"> <div class="OrgCards-card"
<div class="OrgCards-card" ng-class="{'OrgCards-card--selected': activeCard === card.id || card.isActiveCard }"
ng-class="{'OrgCards-card--selected': activeCard === card.id || card.isActiveCard }" ng-repeat="card in orgCards track by card.id">
ng-repeat="card in orgCards track by card.id"> <div class="OrgCards-header">
<div class="OrgCards-header"> <h3 class="OrgCards-label">{{ card.name }}</h3>
<h3 class="OrgCards-label">{{ card.name }}</h3> <div class="OrgCards-actionItems">
<div class="OrgCards-actionItems"> <button class="OrgCards-actionItem
<button class="OrgCards-actionItem List-actionButton"
List-actionButton" ng-class="{'List-editButton--selected': (activeCard === card.id || card.isActiveCard) && activeMode === 'edit' }"
ng-class="{'List-editButton--selected': (activeCard === card.id || card.isActiveCard) && activeMode === 'edit' }" ng-click="editOrganization(card.id)">
ng-click="editOrganization(card.id)"> <i class="OrgCards-actionItemIcon fa fa-pencil">
<i class="OrgCards-actionItemIcon fa fa-pencil"> </i>
</i> </button>
</button> <button class="OrgCards-actionItem List-actionButton
<button class="OrgCards-actionItem List-actionButton List-actionButton--delete"
List-actionButton--delete" ng-click="deleteOrganization(card.id, card.name)">
ng-click="deleteOrganization(card.id, card.name)"> <i class="OrgCards-actionItemIcon
<i class="OrgCards-actionItemIcon fa fa-trash-o">
fa fa-trash-o"> </i>
</i> </button>
</button> </div>
</div> </div>
</div> <p class="OrgCards-description">{{ card.description || "Place organization description here" }}</p>
<p class="OrgCards-description">{{ card.description || "Place organization description here" }}</p> <div class="OrgCards-links">
<div class="OrgCards-links"> <div class="OrgCards-link" ng-repeat="link in card.links">
<div class="OrgCards-link" ng-repeat="link in card.links"> <span class="badge List-titleBadge
<span class="badge List-titleBadge OrgCards-linkBadge"
OrgCards-linkBadge" ng-class="{'List-titleBadge--selected': (activeCard === card.id || card.isActiveCard) && activeMode === link.activeMode }">
ng-class="{'List-titleBadge--selected': (activeCard === card.id || card.isActiveCard) && activeMode === link.activeMode }"> {{ link.count }}
{{ link.count }} </span>
</span> <a class="OrgCards-linkName"
<a class="OrgCards-linkName" ng-href="{{ link.href }}">
ng-href="{{ link.href }}"> {{ link.name }}
{{ link.name }} </a>
</a> </div>
</div> </div>
</div> </div>
</div> </div>
</div> <div id="pagination-container" ng-hide="organization_num_pages < 2">
<div id="pagination-container" ng-hide="organization_num_pages < 2"> </div>
</div> </div>
</div> </div>

1
awx/ui/client/src/search/tagSearch.block.less
View File

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