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

Merge pull request #892 from mabashian/empty-list-text

Browse Source 
Made empty list text configurable
This commit is contained in:
Michael Abashian
2016-02-09 16:53:02 -05:00
parent dea865da26 635634b12d
commit ca665a548f
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,6 +266,7 @@ table, tbody {
border: 1px solid @list-no-items-bord; border: 1px solid @list-no-items-bord;
background-color: @list-no-items-bg; background-color: @list-no-items-bg;
color: @list-no-items-txt; color: @list-no-items-txt;
text-transform: uppercase;
} }
.List-editButton--selected { .List-editButton--selected {

1
awx/ui/client/src/lists/Streams.js
View File

@@ -14,6 +14,7 @@ export default
editTitle: 'Activity Stream', editTitle: 'Activity Stream',
listTitle: 'Activity Stream<span ng-show="streamSubTitle"><div class="List-titleLockup"></div>{{streamSubTitle}}<span>', listTitle: 'Activity Stream<span ng-show="streamSubTitle"><div class="List-titleLockup"></div>{{streamSubTitle}}<span>',
listTitleBadge: false, listTitleBadge: false,
emptyListText: 'There are no events to display at this time',
selectInstructions: '', selectInstructions: '',
index: false, index: false,
hover: true, hover: true,

4
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@@ -353,7 +353,9 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate
} }
// Show the "no items" box when loading is done and the user isn't actively searching and there are no results // Show the "no items" box when loading is done and the user isn't actively searching and there are no results
html += "<div class=\"List-noItems\" ng-show=\"" + list.iterator + "Loading == false && " + list.iterator + "_active_search == false && " + list.iterator + "_total_rows < 1\">PLEASE ADD ITEMS TO THIS LIST</div>"; html += "<div class=\"List-noItems\" ng-show=\"" + list.iterator + "Loading == false && " + list.iterator + "_active_search == false && " + list.iterator + "_total_rows < 1\">";
html += (list.emptyListText) ? list.emptyListText : "PLEASE ADD ITEMS TO THIS LIST";
html += "</div>";
if (options.showSearch=== undefined || options.showSearch === true) { if (options.showSearch=== undefined || options.showSearch === true) {
// Only show the search bar if we are loading results or if we have at least 1 base result // Only show the search bar if we are loading results or if we have at least 1 base result