Skip to content

Commit 097a54c

Browse files
patternfly-buildpatternfly-build
committed
Merge branch 'master-local' into master-dist
2 parents 257573a + 7ba6b12 commit 097a54c

File tree

67 files changed

+894
-291
lines changed

Some content is hidden

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

67 files changed

+894
-291
lines changed

‎dist/angular-patternfly.js‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3459,6 +3459,101 @@ angular.module('patternfly.card').component('pfCard', {
34593459
</file>
34603460
</example>
34613461
*/
3462+
;/**
3463+
* @ngdoc directive
3464+
* @name patternfly.card.component:pfInfoStatusCard
3465+
* @restrict E
3466+
*
3467+
* @param {object} status Status configuration information<br/>
3468+
* <ul style='list-style-type: none'>
3469+
* <li>.title - the main title of the info status card
3470+
* <li>.href - the href to navigate to if one clicks on the title or count
3471+
* <li>.iconClass - an icon to display to the left of the count
3472+
* <li>.iconImage - an image to display to the left of Infrastructure
3473+
* <li>.info - an array of strings to display, each element in the array is on a new line, accepts HTML content
3474+
* </ul>
3475+
* @param {boolean=} show-top-border Show/hide the top border, true shows top border, false (default) hides top border
3476+
* @param {boolean} htmlContent Flag to allow HTML content within the info options
3477+
*
3478+
* @description
3479+
* Component for easily displaying textual information
3480+
*
3481+
* @example
3482+
<example module="patternfly.card">
3483+
3484+
<file name="index.html">
3485+
<div ng-controller="CardDemoCtrl" style="display:inline-block;">
3486+
<div class="col-md-10">
3487+
<label>With Top Border, Icon Class, Href</label>
3488+
<pf-info-status-card status="infoStatus" show-top-border="true"></pf-info-status-card>
3489+
<br/>
3490+
<label>No Top Border, Icon Image, No Title</label>
3491+
<pf-info-status-card status="infoStatusTitless"></pf-info-status-card>
3492+
<br/>
3493+
<label>With HTML</label>
3494+
<pf-info-status-card status="infoStatusAlt" html-content="true"></pf-info-status-card>
3495+
</div>
3496+
</div>
3497+
</file>
3498+
3499+
<file name="script.js">
3500+
angular.module( 'patternfly.card' ).controller( 'CardDemoCtrl', function( $scope ) {
3501+
$scope.infoStatus = {
3502+
"title":"TinyCore-local",
3503+
"href":"#",
3504+
"iconClass": "fa fa-shield",
3505+
"info":[
3506+
"VM Name: aapdemo002",
3507+
"Host Name: localhost.localdomian",
3508+
"IP Address: 10.9.62.100",
3509+
"Power status: on"
3510+
]
3511+
};
3512+
3513+
$scope.infoStatusTitless = {
3514+
"iconImage":"img/OpenShift-logo.svg",
3515+
"info":[
3516+
"Infastructure: VMware",
3517+
"Vmware: 1 CPU (1 socket x 1 core), 1024 MB",
3518+
"12 Snapshots",
3519+
"Drift History: 1"
3520+
]
3521+
};
3522+
3523+
$scope.infoStatusAlt = {
3524+
"title":"Favorite Things",
3525+
"iconClass":"fa fa-heart",
3526+
"info":[
3527+
"<i class='fa fa-coffee'>",
3528+
"<i class='fa fa-motorcycle'>",
3529+
"<b>Tacos</b>"
3530+
]
3531+
};
3532+
});
3533+
</file>
3534+
3535+
</example>
3536+
*/
3537+
3538+
angular.module( 'patternfly.card' ).component('pfInfoStatusCard', {
3539+
bindings: {
3540+
status: '=',
3541+
showTopBorder: '@?',
3542+
htmlContent: '@?'
3543+
},
3544+
templateUrl: 'card/info-status/info-status-card.html',
3545+
controller: ["$sce", function ($sce) {
3546+
'use strict';
3547+
var ctrl = this;
3548+
ctrl.$onInit = function () {
3549+
ctrl.shouldShowTopBorder = (ctrl.showTopBorder === 'true');
3550+
ctrl.shouldShowHtmlContent = (ctrl.htmlContent === 'true');
3551+
ctrl.trustAsHtml = function (html) {
3552+
return $sce.trustAsHtml(html);
3553+
};
3554+
};
3555+
}]
3556+
});
34623557
;(function () {
34633558
'use strict';
34643559

@@ -18346,6 +18441,11 @@ angular.module('patternfly.wizard').component('pfWizard', {
1834618441
"<div ng-class=\"$ctrl.showTopBorder === 'true' ? 'card-pf card-pf-accented' : 'card-pf'\"><div ng-if=$ctrl.showHeader() ng-class=\"$ctrl.shouldShowTitlesSeparator ? 'card-pf-heading' : 'card-pf-heading-no-bottom'\"><div ng-if=$ctrl.showFilterInHeader() ng-include=\"'card/basic/card-filter.html'\"></div><h2 class=card-pf-title>{{$ctrl.headTitle}}</h2></div><span ng-if=$ctrl.subTitle class=card-pf-subtitle>{{$ctrl.subTitle}}</span><div class=card-pf-body><div ng-transclude></div></div><div ng-if=$ctrl.footer class=card-pf-footer><div ng-if=$ctrl.showFilterInFooter() ng-include=\"'card/basic/card-filter.html'\"></div><p><a ng-if=$ctrl.footer.href href={{$ctrl.footer.href}} ng-class=\"{'card-pf-link-with-icon':$ctrl.footer.iconClass,'card-pf-link':!$ctrl.footer.iconClass}\"><span ng-if=$ctrl.footer.iconClass class=\"{{$ctrl.footer.iconClass}} card-pf-footer-text\"></span> <span ng-if=$ctrl.footer.text class=card-pf-footer-text>{{$ctrl.footer.text}}</span></a> <a ng-if=\"$ctrl.footer.callBackFn && !$ctrl.footer.href\" ng-click=$ctrl.footerCallBackFn() ng-class=\"{'card-pf-link-with-icon':$ctrl.footer.iconClass,'card-pf-link':!$ctrl.footer.iconClass}\"><span class=\"{{$ctrl.footer.iconClass}} card-pf-footer-text\" ng-if=$ctrl.footer.iconClass></span> <span class=card-pf-footer-text ng-if=$ctrl.footer.text>{{$ctrl.footer.text}}</span></a> <span ng-if=\"!$ctrl.footer.href && !$ctrl.footer.callBackFn\"><span ng-if=$ctrl.footer.iconClass class=\"{{$ctrl.footer.iconClass}} card-pf-footer-text\" ng-class=\"{'card-pf-link-with-icon':$ctrl.footer.iconClass,'card-pf-link':!$ctrl.footer.iconClass}\"></span> <span ng-if=$ctrl.footer.text class=card-pf-footer-text>{{$ctrl.footer.text}}</span></span></p></div></div>"
1834718442
);
1834818443

18444+
18445+
$templateCache.put('card/info-status/info-status-card.html',
18446+
"<div class=\"card-pf card-pf-info-status\" ng-class=\"{'card-pf-accented': $ctrl.shouldShowTopBorder}\"><div class=info-image-container><img ng-if=$ctrl.status.iconImage ng-src={{$ctrl.status.iconImage}} alt=\"\" class=\"info-img\"> <span class=\"info-icon {{$ctrl.status.iconClass}}\"></span></div><div><h2 class=card-pf-title ng-if=$ctrl.status.title><a href={{$ctrl.status.href}} ng-if=$ctrl.status.href><span>{{$ctrl.status.title}}</span></a> <span ng-if=!$ctrl.status.href><span>{{$ctrl.status.title}}</span></span></h2><p ng-if=$ctrl.shouldShowHtmlContent ng-bind-html=$ctrl.trustAsHtml(item) ng-repeat=\"item in $ctrl.status.info track by $index\"></p><p ng-if=!$ctrl.shouldShowHtmlContent ng-bind=item ng-repeat=\"item in $ctrl.status.info track by $index\"></p></div></div>"
18447+
);
18448+
1834918449
}]);
1835018450
;angular.module('patternfly.charts').run(['$templateCache', function($templateCache) {
1835118451
'use strict';

‎dist/angular-patternfly.min.js‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,22 @@ accordion > .panel-group .panel-open .panel-title > a:before {
7171
font-size: 10px;
7272
font-weight: 400;
7373
}
74+
.card-pf-info-status {
75+
display: flex;
76+
}
77+
.card-pf-info-status .info-image-container {
78+
display: flex;
79+
align-items: center;
80+
justify-content: center;
81+
flex-direction: column;
82+
margin-right: 10px;
83+
}
84+
.card-pf-info-status .info-image-container .info-icon {
85+
font-size: 50px;
86+
}
87+
.card-pf-info-status .info-image-container .info-img {
88+
max-height: 50px;
89+
}
7490
pf-c3-chart {
7591
display: block;
7692
}

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

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3459,6 +3459,101 @@ angular.module('patternfly.card').component('pfCard', {
34593459
</file>
34603460
</example>
34613461
*/
3462+
;/**
3463+
* @ngdoc directive
3464+
* @name patternfly.card.component:pfInfoStatusCard
3465+
* @restrict E
3466+
*
3467+
* @param {object} status Status configuration information<br/>
3468+
* <ul style='list-style-type: none'>
3469+
* <li>.title - the main title of the info status card
3470+
* <li>.href - the href to navigate to if one clicks on the title or count
3471+
* <li>.iconClass - an icon to display to the left of the count
3472+
* <li>.iconImage - an image to display to the left of Infrastructure
3473+
* <li>.info - an array of strings to display, each element in the array is on a new line, accepts HTML content
3474+
* </ul>
3475+
* @param {boolean=} show-top-border Show/hide the top border, true shows top border, false (default) hides top border
3476+
* @param {boolean} htmlContent Flag to allow HTML content within the info options
3477+
*
3478+
* @description
3479+
* Component for easily displaying textual information
3480+
*
3481+
* @example
3482+
<example module="patternfly.card">
3483+
3484+
<file name="index.html">
3485+
<div ng-controller="CardDemoCtrl" style="display:inline-block;">
3486+
<div class="col-md-10">
3487+
<label>With Top Border, Icon Class, Href</label>
3488+
<pf-info-status-card status="infoStatus" show-top-border="true"></pf-info-status-card>
3489+
<br/>
3490+
<label>No Top Border, Icon Image, No Title</label>
3491+
<pf-info-status-card status="infoStatusTitless"></pf-info-status-card>
3492+
<br/>
3493+
<label>With HTML</label>
3494+
<pf-info-status-card status="infoStatusAlt" html-content="true"></pf-info-status-card>
3495+
</div>
3496+
</div>
3497+
</file>
3498+
3499+
<file name="script.js">
3500+
angular.module( 'patternfly.card' ).controller( 'CardDemoCtrl', function( $scope ) {
3501+
$scope.infoStatus = {
3502+
"title":"TinyCore-local",
3503+
"href":"#",
3504+
"iconClass": "fa fa-shield",
3505+
"info":[
3506+
"VM Name: aapdemo002",
3507+
"Host Name: localhost.localdomian",
3508+
"IP Address: 10.9.62.100",
3509+
"Power status: on"
3510+
]
3511+
};
3512+
3513+
$scope.infoStatusTitless = {
3514+
"iconImage":"img/OpenShift-logo.svg",
3515+
"info":[
3516+
"Infastructure: VMware",
3517+
"Vmware: 1 CPU (1 socket x 1 core), 1024 MB",
3518+
"12 Snapshots",
3519+
"Drift History: 1"
3520+
]
3521+
};
3522+
3523+
$scope.infoStatusAlt = {
3524+
"title":"Favorite Things",
3525+
"iconClass":"fa fa-heart",
3526+
"info":[
3527+
"<i class='fa fa-coffee'>",
3528+
"<i class='fa fa-motorcycle'>",
3529+
"<b>Tacos</b>"
3530+
]
3531+
};
3532+
});
3533+
</file>
3534+
3535+
</example>
3536+
*/
3537+
3538+
angular.module( 'patternfly.card' ).component('pfInfoStatusCard', {
3539+
bindings: {
3540+
status: '=',
3541+
showTopBorder: '@?',
3542+
htmlContent: '@?'
3543+
},
3544+
templateUrl: 'card/info-status/info-status-card.html',
3545+
controller: ["$sce", function ($sce) {
3546+
'use strict';
3547+
var ctrl = this;
3548+
ctrl.$onInit = function () {
3549+
ctrl.shouldShowTopBorder = (ctrl.showTopBorder === 'true');
3550+
ctrl.shouldShowHtmlContent = (ctrl.htmlContent === 'true');
3551+
ctrl.trustAsHtml = function (html) {
3552+
return $sce.trustAsHtml(html);
3553+
};
3554+
};
3555+
}]
3556+
});
34623557
;(function () {
34633558
'use strict';
34643559

@@ -18346,6 +18441,11 @@ angular.module('patternfly.wizard').component('pfWizard', {
1834618441
"<div ng-class=\"$ctrl.showTopBorder === 'true' ? 'card-pf card-pf-accented' : 'card-pf'\"><div ng-if=$ctrl.showHeader() ng-class=\"$ctrl.shouldShowTitlesSeparator ? 'card-pf-heading' : 'card-pf-heading-no-bottom'\"><div ng-if=$ctrl.showFilterInHeader() ng-include=\"'card/basic/card-filter.html'\"></div><h2 class=card-pf-title>{{$ctrl.headTitle}}</h2></div><span ng-if=$ctrl.subTitle class=card-pf-subtitle>{{$ctrl.subTitle}}</span><div class=card-pf-body><div ng-transclude></div></div><div ng-if=$ctrl.footer class=card-pf-footer><div ng-if=$ctrl.showFilterInFooter() ng-include=\"'card/basic/card-filter.html'\"></div><p><a ng-if=$ctrl.footer.href href={{$ctrl.footer.href}} ng-class=\"{'card-pf-link-with-icon':$ctrl.footer.iconClass,'card-pf-link':!$ctrl.footer.iconClass}\"><span ng-if=$ctrl.footer.iconClass class=\"{{$ctrl.footer.iconClass}} card-pf-footer-text\"></span> <span ng-if=$ctrl.footer.text class=card-pf-footer-text>{{$ctrl.footer.text}}</span></a> <a ng-if=\"$ctrl.footer.callBackFn && !$ctrl.footer.href\" ng-click=$ctrl.footerCallBackFn() ng-class=\"{'card-pf-link-with-icon':$ctrl.footer.iconClass,'card-pf-link':!$ctrl.footer.iconClass}\"><span class=\"{{$ctrl.footer.iconClass}} card-pf-footer-text\" ng-if=$ctrl.footer.iconClass></span> <span class=card-pf-footer-text ng-if=$ctrl.footer.text>{{$ctrl.footer.text}}</span></a> <span ng-if=\"!$ctrl.footer.href && !$ctrl.footer.callBackFn\"><span ng-if=$ctrl.footer.iconClass class=\"{{$ctrl.footer.iconClass}} card-pf-footer-text\" ng-class=\"{'card-pf-link-with-icon':$ctrl.footer.iconClass,'card-pf-link':!$ctrl.footer.iconClass}\"></span> <span ng-if=$ctrl.footer.text class=card-pf-footer-text>{{$ctrl.footer.text}}</span></span></p></div></div>"
1834718442
);
1834818443

18444+
18445+
$templateCache.put('card/info-status/info-status-card.html',
18446+
"<div class=\"card-pf card-pf-info-status\" ng-class=\"{'card-pf-accented': $ctrl.shouldShowTopBorder}\"><div class=info-image-container><img ng-if=$ctrl.status.iconImage ng-src={{$ctrl.status.iconImage}} alt=\"\" class=\"info-img\"> <span class=\"info-icon {{$ctrl.status.iconClass}}\"></span></div><div><h2 class=card-pf-title ng-if=$ctrl.status.title><a href={{$ctrl.status.href}} ng-if=$ctrl.status.href><span>{{$ctrl.status.title}}</span></a> <span ng-if=!$ctrl.status.href><span>{{$ctrl.status.title}}</span></span></h2><p ng-if=$ctrl.shouldShowHtmlContent ng-bind-html=$ctrl.trustAsHtml(item) ng-repeat=\"item in $ctrl.status.info track by $index\"></p><p ng-if=!$ctrl.shouldShowHtmlContent ng-bind=item ng-repeat=\"item in $ctrl.status.info track by $index\"></p></div></div>"
18447+
);
18448+
1834918449
}]);
1835018450
;angular.module('patternfly.charts').run(['$templateCache', function($templateCache) {
1835118451
'use strict';

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

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/docs/partials/api/patternfly.autofocus.pfFocused.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/autofocus/autofocus.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/4336131/src/autofocus/autofocus.js#L39" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFocused</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/autofocus/autofocus.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/4a1ecb9/src/autofocus/autofocus.js#L39" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFocused</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly</code>
33
</span>
44
</div>

‎dist/docs/partials/api/patternfly.canvas.directive.pfCanvas.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvas.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/4336131/src/canvas-view/examples/canvas.js#L329" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvas</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvas.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/4a1ecb9/src/canvas-view/examples/canvas.js#L329" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvas</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.canvas</code>
33
</span>
44
</div>

‎dist/docs/partials/api/patternfly.canvas.directive.pfCanvasEditor.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvasEditor.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/4336131/src/canvas-view/examples/canvasEditor.js#L344" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvasEditor</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvasEditor.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/4a1ecb9/src/canvas-view/examples/canvasEditor.js#L344" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvasEditor</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.canvas</code>
33
</span>
44
</div>

‎dist/docs/partials/api/patternfly.card.component.pfAggregateStatusCard.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/aggregate-status/aggregate-status-card.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/4336131/src/card/aggregate-status/aggregate-status-card.component.js#L132" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfAggregateStatusCard</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/aggregate-status/aggregate-status-card.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/4a1ecb9/src/card/aggregate-status/aggregate-status-card.component.js#L132" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfAggregateStatusCard</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
33
</span>
44
</div>

‎dist/docs/partials/api/patternfly.card.component.pfCard - Timeframe Filters.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-timeframe.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/4336131/src/card/examples/card-timeframe.js#L84" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Timeframe Filters</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-timeframe.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/4a1ecb9/src/card/examples/card-timeframe.js#L84" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Timeframe Filters</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
33
</span>
44
</div>

0 commit comments

Comments
 (0)