You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2018/09/17 14:07:44 UTC
[1/3] brooklyn-ui git commit: allow palette footer to be customised
Repository: brooklyn-ui
Updated Branches:
refs/heads/master d11f6e3b7 -> de857cfec
allow palette footer to be customised
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/837c6dc5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/837c6dc5
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/837c6dc5
Branch: refs/heads/master
Commit: 837c6dc58fc1044f152a8999af026865188a1bcc
Parents: d11f6e3
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Sep 17 14:01:02 2018 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Sep 17 14:01:02 2018 +0100
----------------------------------------------------------------------
.../components/catalog-selector/catalog-selector.directive.js | 3 +++
.../components/catalog-selector/catalog-selector.template.html | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/837c6dc5/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
----------------------------------------------------------------------
diff --git a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index 348d0c0..80f6397 100644
--- a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++ b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -235,6 +235,9 @@ function controller($scope, $element, $q, $uibModal, $log, $templateCache, palet
// downstream can override this to insert lines below the header
$scope.customSubHeadTemplateName = 'composer-palette-empty-sub-head';
$templateCache.put($scope.customSubHeadTemplateName, '');
+
+ $scope.customFooterTemplateName = 'composer-palette-empty-foort';
+ $templateCache.put($scope.customFooterTemplateName, '');
// allow downstream to configure this controller and/or scope
(composerOverrides.configurePaletteController || function() {})(this, $scope, $element);
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/837c6dc5/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
----------------------------------------------------------------------
diff --git a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
index 40c9bd6..3b5f1d1 100644
--- a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
+++ b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.template.html
@@ -61,7 +61,7 @@
<!-- here and below, col-xs-3 or -4 or -2 all work giving different densities;
this could be configurable ("compressed"=xs-2 w no labels, "normal"=xs-3, "big"=xs-4) -->
<div class="col-xs-3 catalog-palette-item"
- ng-repeat="item in searchedItems = (filterPaletteItems(items) | catalogSelectorSearch:search | catalogSelectorSort:family) | orderBy:state.currentOrder | limitTo:pagination.itemsPerPage:(pagination.page-1)*pagination.itemsPerPage track by (item.containingBundle + ':' + item.symbolicName + ':' + item.version)"
+ ng-repeat="item in searchedItems = (filterPaletteItems(items | catalogSelectorSearch:search) | catalogSelectorSort:family) | orderBy:state.currentOrder | limitTo:pagination.itemsPerPage:(pagination.page-1)*pagination.itemsPerPage track by (item.containingBundle + ':' + item.symbolicName + ':' + item.version)"
ng-click="onSelectItem(item)">
<div class="item" draggable="true" ng-dragstart="onDragItem(item, $event)" ng-dragend="onDragEnd(item, $event)">
<div class="item-logo">
@@ -95,6 +95,8 @@
</div>
<div uib-pagination total-items="searchedItems.length" items-per-page="pagination.itemsPerPage" ng-model="pagination.page" boundary-link-numbers="true" rotate="false" max-size="4" ng-show="searchedItems.length > pagination.itemsPerPage" class="pagination-sm pull-right"></div>
+
+ <ng-include src="customFooterTemplateName"/>
</div>
</div>
[3/3] brooklyn-ui git commit: This closes #71
Posted by he...@apache.org.
This closes #71
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/de857cfe
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/de857cfe
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/de857cfe
Branch: refs/heads/master
Commit: de857cfec3e71c31cd1f97b9211359b135ea8696
Parents: d11f6e3 39d2a38
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Sep 17 15:07:23 2018 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Sep 17 15:07:23 2018 +0100
----------------------------------------------------------------------
.../components/catalog-selector/catalog-selector.directive.js | 5 +++++
.../components/catalog-selector/catalog-selector.template.html | 4 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] brooklyn-ui git commit: fix minor typos/comments as per PR
review
Posted by he...@apache.org.
fix minor typos/comments as per PR review
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/39d2a384
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/39d2a384
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/39d2a384
Branch: refs/heads/master
Commit: 39d2a3843721885721d29be56bf00aac4764e8c8
Parents: 837c6dc
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Sep 17 15:07:03 2018 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Sep 17 15:07:03 2018 +0100
----------------------------------------------------------------------
.../components/catalog-selector/catalog-selector.directive.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/39d2a384/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
----------------------------------------------------------------------
diff --git a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index 80f6397..733a2ce 100644
--- a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++ b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -230,13 +230,15 @@ function controller($scope, $element, $q, $uibModal, $log, $templateCache, palet
});
$scope.items = items;
});
+ // this can be overridden for third-party filters.
+ // it receives result of filtering based on search so filters can adjust based on number of search resullts
$scope.filterPaletteItems = (items) => items;
// downstream can override this to insert lines below the header
$scope.customSubHeadTemplateName = 'composer-palette-empty-sub-head';
$templateCache.put($scope.customSubHeadTemplateName, '');
- $scope.customFooterTemplateName = 'composer-palette-empty-foort';
+ $scope.customFooterTemplateName = 'composer-palette-empty-footer';
$templateCache.put($scope.customFooterTemplateName, '');
// allow downstream to configure this controller and/or scope