Skip to content

Commit e88a21e

Browse files
patternfly-buildpatternfly-build
committed
Merge branch 'master' into master-dist
2 parents 912114f + cf2ec76 commit e88a21e

File tree

47 files changed

+182
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+182
-57
lines changed

‎dist/angular-patternfly.js‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8115,7 +8115,8 @@ angular.module('patternfly.views').directive('pfCardView', ["pfUtils", function
81158115
};
81168116
81178117
$scope.enableButtonForItemFn = function(action, item) {
8118-
return (action.name !=='Action 2') || (item.name !== "Frank Livingston");
8118+
return !((action.name ==='Action 2') && (item.name === "Frank Livingston")) &&
8119+
!(action.name === 'Start' && item.started);
81198120
};
81208121
81218122
$scope.updateMenuActionForItemFn = function(action, item) {
@@ -8222,18 +8223,32 @@ angular.module('patternfly.views').directive('pfCardView', ["pfUtils", function
82228223
$scope.eventText = item.name + " : " + action.name + "\r\n" + $scope.eventText;
82238224
};
82248225
8225-
var buttonInclude = '<span class="fa fa-plus"></span>{{actionButton.name}}';
8226+
var startServer = function (action, item) {
8227+
$scope.eventText = item.name + " : " + action.name + "\r\n" + $scope.eventText;
8228+
item.started = true;
8229+
};
82268230
8231+
var buttonInclude = '<span class="fa fa-plus"></span>{{actionButton.name}}';
82278232
$templateCache.put('my-button-template', buttonInclude);
8233+
8234+
var startButtonInclude = '<span ng-disabled="item.started">{{item.started ? "Starting" : "Start"}}</span>';
8235+
$templateCache.put('start-button-template', startButtonInclude);
8236+
82288237
$scope.actionButtons = [
8238+
{
8239+
name: 'Start',
8240+
class: 'btn-primary',
8241+
include: 'start-button-template',
8242+
title: 'Start the server',
8243+
actionFn: startServer
8244+
},
82298245
{
82308246
name: 'Action 1',
82318247
title: 'Perform an action',
82328248
actionFn: performAction
82338249
},
82348250
{
82358251
name: 'Action 2',
8236-
class: 'btn-primary',
82378252
title: 'Do something else',
82388253
actionFn: performAction
82398254
},
@@ -10026,7 +10041,7 @@ angular.module('patternfly.wizard').directive('pfWizardSubstep', function () {
1002610041

1002710042

1002810043
$templateCache.put('views/listview/list-view.html',
10029-
"<div class=list-view-pf><div class=\"list-group-item {{item.rowClass}}\" ng-repeat=\"item in items track by $index\" ng-class=\"{'pf-selectable': selectItems, 'active': isSelected(item), 'disabled': checkDisabled(item)}\"><div class=list-view-pf-checkbox ng-if=config.showSelectBox><input type=checkbox value=item.selected ng-model=item.selected ng-disabled=checkDisabled(item) ng-change=\"checkBoxChange(item)\"></div><div class=list-view-pf-actions ng-if=\"(actionButtons && actionButtons.length > 0) || (menuActions && menuActions.length > 0)\"><button class=\"btn btn-default {{actionButton.class}}\" ng-repeat=\"actionButton in actionButtons\" title=actionButton.title ng-class=\"{'disabled' : checkDisabled(item) || !enableButtonForItem(actionButton, item)}\" ng-click=\"handleButtonAction(actionButton, item)\"><div ng-if=actionButton.include class=actionButton.includeClass ng-include src=actionButton.include></div><span ng-if=!actionButton.include>{{actionButton.name}}</span></button><div class=\"{{dropdownClass}} pull-right dropdown-kebab-pf {{getMenuClassForItem(item)}} {{hideMenuForItem(item) ? 'invisible' : ''}}\" id=kebab_{{$index}} ng-if=\"menuActions && menuActions.length > 0\"><button class=\"btn btn-link dropdown-toggle\" type=button id=dropdownKebabRight_{{$index}} ng-class=\"{'disabled': checkDisabled(item)}\" ng-click=\"setupActions(item, $event)\" data-toggle=dropdown aria-haspopup=true aria-expanded=true><span class=\"fa fa-ellipsis-v\"></span></button><ul class=\"dropdown-menu dropdown-menu-right {{$index}}\" aria-labelledby=dropdownKebabRight_{{$index}}><li ng-repeat=\"menuAction in menuActions\" ng-if=\"menuAction.isVisible !== false\" role=\"{{menuAction.isSeparator === true ? 'separator' : 'menuitem'}}\" ng-class=\"{'divider': (menuAction.isSeparator === true), 'disabled': (menuAction.isDisabled === true)}\"><a ng-if=\"menuAction.isSeparator !== true\" title={{menuAction.title}} ng-click=\"handleMenuAction(menuAction, item)\">{{menuAction.name}}</a></li></ul></div></div><div pf-transclude=parent class=list-view-pf-main-info ng-click=\"itemClick($event, item)\" ng-dblclick=\"dblClick($event, item)\"></div></div></div>"
10044+
"<div class=list-view-pf><div class=\"list-group-item {{item.rowClass}}\" ng-repeat=\"item in items track by $index\" ng-class=\"{'pf-selectable': selectItems, 'active': isSelected(item), 'disabled': checkDisabled(item)}\"><div class=list-view-pf-checkbox ng-if=config.showSelectBox><input type=checkbox value=item.selected ng-model=item.selected ng-disabled=checkDisabled(item) ng-change=\"checkBoxChange(item)\"></div><div class=list-view-pf-actions ng-if=\"(actionButtons && actionButtons.length > 0) || (menuActions && menuActions.length > 0)\"><button class=\"btn btn-default {{actionButton.class}}\" ng-repeat=\"actionButton in actionButtons\" title={{actionButton.title}} ng-class=\"{'disabled' : checkDisabled(item) || !enableButtonForItem(actionButton, item)}\" ng-click=\"handleButtonAction(actionButton, item)\"><div ng-if=actionButton.include class=actionButton.includeClass ng-include src=actionButton.include></div><span ng-if=!actionButton.include>{{actionButton.name}}</span></button><div class=\"{{dropdownClass}} pull-right dropdown-kebab-pf {{getMenuClassForItem(item)}} {{hideMenuForItem(item) ? 'invisible' : ''}}\" id=kebab_{{$index}} ng-if=\"menuActions && menuActions.length > 0\"><button class=\"btn btn-link dropdown-toggle\" type=button id=dropdownKebabRight_{{$index}} ng-class=\"{'disabled': checkDisabled(item)}\" ng-click=\"setupActions(item, $event)\" data-toggle=dropdown aria-haspopup=true aria-expanded=true><span class=\"fa fa-ellipsis-v\"></span></button><ul class=\"dropdown-menu dropdown-menu-right {{$index}}\" aria-labelledby=dropdownKebabRight_{{$index}}><li ng-repeat=\"menuAction in menuActions\" ng-if=\"menuAction.isVisible !== false\" role=\"{{menuAction.isSeparator === true ? 'separator' : 'menuitem'}}\" ng-class=\"{'divider': (menuAction.isSeparator === true), 'disabled': (menuAction.isDisabled === true)}\"><a ng-if=\"menuAction.isSeparator !== true\" title={{menuAction.title}} ng-click=\"handleMenuAction(menuAction, item)\">{{menuAction.name}}</a></li></ul></div></div><div pf-transclude=parent class=list-view-pf-main-info ng-click=\"itemClick($event, item)\" ng-dblclick=\"dblClick($event, item)\"></div></div></div>"
1003010045
);
1003110046

1003210047
}]);

‎dist/angular-patternfly.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/docs/css/patternfly-additions.css‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3446,8 +3446,14 @@ a.disabled {
34463446
.list-view-pf .list-group-item {
34473447
-ms-flex-align: start;
34483448
align-items: flex-start;
3449+
background-clip: padding-box;
3450+
border-color: transparent #fff;
3451+
border-style: solid;
3452+
border-width: 1px;
34493453
display: -ms-flexbox;
34503454
display: flex;
3455+
-ms-flex-wrap: wrap;
3456+
flex-wrap: wrap;
34513457
padding-bottom: 0;
34523458
padding-top: 0;
34533459
}
@@ -3459,13 +3465,29 @@ a.disabled {
34593465
.list-view-pf .list-group-item:after {
34603466
clear: both;
34613467
}
3468+
.list-view-pf .list-group-item.list-view-pf-expand-active {
3469+
background-color: #ededed;
3470+
}
34623471
.list-view-pf .list-group-item.active {
34633472
color: #555;
34643473
background-color: #def3ff;
3474+
background-clip: border-box;
3475+
border-color: #39a5dc transparent transparent;
34653476
z-index: auto;
34663477
}
34673478
.list-view-pf .list-group-item:hover {
34683479
background-color: #ededed;
3480+
border-left-color: transparent;
3481+
border-right-color: transparent;
3482+
}
3483+
.list-view-pf .list-group-item.list-view-pf-expand-active {
3484+
border: solid 1px #39a5dc;
3485+
}
3486+
.list-view-pf .list-group-item.list-view-pf-expand-active:first-child {
3487+
border-top-color: #39a5dc;
3488+
}
3489+
.list-view-pf .list-group-item:first-child {
3490+
border-top: 1px solid transparent;
34693491
}
34703492
@media (min-width: 992px) {
34713493
.list-view-pf .list-group-item {
@@ -3728,8 +3750,51 @@ a.disabled {
37283750
width: auto;
37293751
}
37303752
.list-view-pf-view {
3753+
background: #ededed;
3754+
border: none;
37313755
margin-top: 30px;
37323756
}
3757+
.list-group-item-header {
3758+
box-sizing: content-box;
3759+
cursor: pointer;
3760+
margin: 0 -15px;
3761+
padding: 0 15px;
3762+
width: 100%;
3763+
}
3764+
.list-view-pf-expand {
3765+
cursor: pointer;
3766+
float: left;
3767+
margin-bottom: 20px;
3768+
margin-right: 2px;
3769+
margin-top: 20px;
3770+
padding: 3px 0;
3771+
}
3772+
.list-view-pf-expand.active,
3773+
.list-view-pf-expand:hover {
3774+
color: #0088ce;
3775+
}
3776+
.list-view-pf-additional-info-item .list-view-pf-expand {
3777+
margin: 0;
3778+
padding: 0;
3779+
}
3780+
.list-view-pf-expand .fa-angle-right {
3781+
cursor: pointer;
3782+
font-size: 17px;
3783+
margin-right: 5px;
3784+
margin-top: 2px;
3785+
width: 10px;
3786+
}
3787+
.list-group-item-container {
3788+
background: #fff;
3789+
border-top: solid 1px #39a5dc;
3790+
box-sizing: content-box;
3791+
margin: -1px -15px 0;
3792+
-ms-flex-order: 3;
3793+
order: 3;
3794+
padding: 10px 15px;
3795+
position: relative;
3796+
width: 100%;
3797+
}
37333798
.login-pf {
37343799
height: 100%;
37353800
}

‎dist/docs/grunt-scripts/angular-patternfly.js‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8115,7 +8115,8 @@ angular.module('patternfly.views').directive('pfCardView', ["pfUtils", function
81158115
};
81168116
81178117
$scope.enableButtonForItemFn = function(action, item) {
8118-
return (action.name !=='Action 2') || (item.name !== "Frank Livingston");
8118+
return !((action.name ==='Action 2') && (item.name === "Frank Livingston")) &&
8119+
!(action.name === 'Start' && item.started);
81198120
};
81208121
81218122
$scope.updateMenuActionForItemFn = function(action, item) {
@@ -8222,18 +8223,32 @@ angular.module('patternfly.views').directive('pfCardView', ["pfUtils", function
82228223
$scope.eventText = item.name + " : " + action.name + "\r\n" + $scope.eventText;
82238224
};
82248225
8225-
var buttonInclude = '<span class="fa fa-plus"></span>{{actionButton.name}}';
8226+
var startServer = function (action, item) {
8227+
$scope.eventText = item.name + " : " + action.name + "\r\n" + $scope.eventText;
8228+
item.started = true;
8229+
};
82268230
8231+
var buttonInclude = '<span class="fa fa-plus"></span>{{actionButton.name}}';
82278232
$templateCache.put('my-button-template', buttonInclude);
8233+
8234+
var startButtonInclude = '<span ng-disabled="item.started">{{item.started ? "Starting" : "Start"}}</span>';
8235+
$templateCache.put('start-button-template', startButtonInclude);
8236+
82288237
$scope.actionButtons = [
8238+
{
8239+
name: 'Start',
8240+
class: 'btn-primary',
8241+
include: 'start-button-template',
8242+
title: 'Start the server',
8243+
actionFn: startServer
8244+
},
82298245
{
82308246
name: 'Action 1',
82318247
title: 'Perform an action',
82328248
actionFn: performAction
82338249
},
82348250
{
82358251
name: 'Action 2',
8236-
class: 'btn-primary',
82378252
title: 'Do something else',
82388253
actionFn: performAction
82398254
},
@@ -10026,7 +10041,7 @@ angular.module('patternfly.wizard').directive('pfWizardSubstep', function () {
1002610041

1002710042

1002810043
$templateCache.put('views/listview/list-view.html',
10029-
"<div class=list-view-pf><div class=\"list-group-item {{item.rowClass}}\" ng-repeat=\"item in items track by $index\" ng-class=\"{'pf-selectable': selectItems, 'active': isSelected(item), 'disabled': checkDisabled(item)}\"><div class=list-view-pf-checkbox ng-if=config.showSelectBox><input type=checkbox value=item.selected ng-model=item.selected ng-disabled=checkDisabled(item) ng-change=\"checkBoxChange(item)\"></div><div class=list-view-pf-actions ng-if=\"(actionButtons && actionButtons.length > 0) || (menuActions && menuActions.length > 0)\"><button class=\"btn btn-default {{actionButton.class}}\" ng-repeat=\"actionButton in actionButtons\" title=actionButton.title ng-class=\"{'disabled' : checkDisabled(item) || !enableButtonForItem(actionButton, item)}\" ng-click=\"handleButtonAction(actionButton, item)\"><div ng-if=actionButton.include class=actionButton.includeClass ng-include src=actionButton.include></div><span ng-if=!actionButton.include>{{actionButton.name}}</span></button><div class=\"{{dropdownClass}} pull-right dropdown-kebab-pf {{getMenuClassForItem(item)}} {{hideMenuForItem(item) ? 'invisible' : ''}}\" id=kebab_{{$index}} ng-if=\"menuActions && menuActions.length > 0\"><button class=\"btn btn-link dropdown-toggle\" type=button id=dropdownKebabRight_{{$index}} ng-class=\"{'disabled': checkDisabled(item)}\" ng-click=\"setupActions(item, $event)\" data-toggle=dropdown aria-haspopup=true aria-expanded=true><span class=\"fa fa-ellipsis-v\"></span></button><ul class=\"dropdown-menu dropdown-menu-right {{$index}}\" aria-labelledby=dropdownKebabRight_{{$index}}><li ng-repeat=\"menuAction in menuActions\" ng-if=\"menuAction.isVisible !== false\" role=\"{{menuAction.isSeparator === true ? 'separator' : 'menuitem'}}\" ng-class=\"{'divider': (menuAction.isSeparator === true), 'disabled': (menuAction.isDisabled === true)}\"><a ng-if=\"menuAction.isSeparator !== true\" title={{menuAction.title}} ng-click=\"handleMenuAction(menuAction, item)\">{{menuAction.name}}</a></li></ul></div></div><div pf-transclude=parent class=list-view-pf-main-info ng-click=\"itemClick($event, item)\" ng-dblclick=\"dblClick($event, item)\"></div></div></div>"
10044+
"<div class=list-view-pf><div class=\"list-group-item {{item.rowClass}}\" ng-repeat=\"item in items track by $index\" ng-class=\"{'pf-selectable': selectItems, 'active': isSelected(item), 'disabled': checkDisabled(item)}\"><div class=list-view-pf-checkbox ng-if=config.showSelectBox><input type=checkbox value=item.selected ng-model=item.selected ng-disabled=checkDisabled(item) ng-change=\"checkBoxChange(item)\"></div><div class=list-view-pf-actions ng-if=\"(actionButtons && actionButtons.length > 0) || (menuActions && menuActions.length > 0)\"><button class=\"btn btn-default {{actionButton.class}}\" ng-repeat=\"actionButton in actionButtons\" title={{actionButton.title}} ng-class=\"{'disabled' : checkDisabled(item) || !enableButtonForItem(actionButton, item)}\" ng-click=\"handleButtonAction(actionButton, item)\"><div ng-if=actionButton.include class=actionButton.includeClass ng-include src=actionButton.include></div><span ng-if=!actionButton.include>{{actionButton.name}}</span></button><div class=\"{{dropdownClass}} pull-right dropdown-kebab-pf {{getMenuClassForItem(item)}} {{hideMenuForItem(item) ? 'invisible' : ''}}\" id=kebab_{{$index}} ng-if=\"menuActions && menuActions.length > 0\"><button class=\"btn btn-link dropdown-toggle\" type=button id=dropdownKebabRight_{{$index}} ng-class=\"{'disabled': checkDisabled(item)}\" ng-click=\"setupActions(item, $event)\" data-toggle=dropdown aria-haspopup=true aria-expanded=true><span class=\"fa fa-ellipsis-v\"></span></button><ul class=\"dropdown-menu dropdown-menu-right {{$index}}\" aria-labelledby=dropdownKebabRight_{{$index}}><li ng-repeat=\"menuAction in menuActions\" ng-if=\"menuAction.isVisible !== false\" role=\"{{menuAction.isSeparator === true ? 'separator' : 'menuitem'}}\" ng-class=\"{'divider': (menuAction.isSeparator === true), 'disabled': (menuAction.isDisabled === true)}\"><a ng-if=\"menuAction.isSeparator !== true\" title={{menuAction.title}} ng-click=\"handleMenuAction(menuAction, item)\">{{menuAction.name}}</a></li></ul></div></div><div pf-transclude=parent class=list-view-pf-main-info ng-click=\"itemClick($event, item)\" ng-dblclick=\"dblClick($event, item)\"></div></div></div>"
1003010045
);
1003110046

1003210047
}]);

‎dist/docs/js/docs-setup.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)