diff --git a/awx/ui/client/src/lists/Streams.js b/awx/ui/client/src/lists/Streams.js index 0cce80b7f9..9aa718a77b 100644 --- a/awx/ui/client/src/lists/Streams.js +++ b/awx/ui/client/src/lists/Streams.js @@ -13,6 +13,7 @@ export default iterator: 'activity', editTitle: 'Activity Stream', listTitle: 'Activity Stream', + listTitleBadge: false, selectInstructions: '', index: false, hover: true, @@ -26,7 +27,8 @@ export default desc: true, noLink: true, searchable: false, - filter: "longDate" + filter: "longDate", + columnClass: 'col-lg-3 col-md-2 col-sm-3 col-xs-3' }, user: { label: 'Initiated by', @@ -36,14 +38,15 @@ export default //awToolTip: "\{\{ userToolTip \}\}", //dataPlacement: 'top', searchPlaceholder: 'Username', - searchWidget: 1 + searchWidget: 1, + columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-3' }, description: { label: 'Action', ngBindHtml: 'activity.description', nosort: true, searchable: false, - columnClass: 'col-lg-7' + columnClass: 'col-lg-5 col-md-6 col-sm-4 col-xs-4' }, actor: { label: 'System event', @@ -264,6 +267,9 @@ export default }, fieldActions: { + + columnClass: 'col-lg-1 col-md-1 col-sm-2 col-xs-2', + view: { label: 'View', ngClick: "showDetail(activity.id)", diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js index e9137fb7dc..aed7d93652 100644 --- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js +++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js @@ -306,7 +306,11 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate if (list.listTitle) { html += "
" + list.listTitle + "
"; - html += "{{(" + list.iterator + "_total_rows | number:0)}}"; + // We want to show the list title badge by default and only hide it when the list config specifically passes a false flag + list.listTitleBadge = (typeof list.listTitleBadge === 'boolean' && list.listTitleBadge == false) ? false : true; + if(list.listTitleBadge) { + html += "{{(" + list.iterator + "_total_rows | number:0)}}"; + } }