External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-17 04:31:21 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5406 from mabashian/5401-lookup-modal-spacing

Browse Source 
Don't include list actions in lookups
This commit is contained in:
Michael Abashian 2017-02-17 09:56:08 -05:00 committed by GitHub
commit 53ffa9d01e
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,25 +171,24 @@ export default ['$location', '$compile', '$rootScope', 'Attr', 'Icon',
if (options.mode !== 'lookup' && (list.well === undefined || list.well)) {
html += `<div class="${list.name}List List-well">`;
}
// List actions
html += "<div class=\"List-actionHolder\">";
html += "<div class=\"List-actions\">";
html += `<div ng-include="'${templateUrl('shared/list-generator/list-actions')}'">`;
// List actions
html += "<div class=\"List-actionHolder\">";
html += "<div class=\"List-actions\">";
html += `<div ng-include="'${templateUrl('shared/list-generator/list-actions')}'">`;
for (action in list.actions) {
list.actions[action] = _.defaults(list.actions[action], { dataPlacement: "top" });
}
for (action in list.actions) {
list.actions[action] = _.defaults(list.actions[action], { dataPlacement: "top" });
html += "</div>";
if (list.toolbarAuxAction) {
html += `<div class="List-auxAction">${list.toolbarAuxAction}</div>`;
}
html += "\n</div>";
html += "</div>";
// End list actions
}
html += "</div>";
if (list.toolbarAuxAction) {
html += `<div class="List-auxAction">${list.toolbarAuxAction}</div>`;
}
html += "\n</div>";
html += "</div>";
// End list actions
html += (list.searchRowActions) ? "<div class='row'><div class=\"col-lg-8 col-md-8 col-sm-8 col-xs-12\">" : "";
if (list.searchRowActions && !list.searchSize) {
list.searchSize = 'col-lg-7 col-md-12 col-sm-12 col-xs-12';

2
awx/ui/client/src/shared/paginate/paginate.partial.html
View File

@ -1,5 +1,5 @@
<div class="Paginate page-row" ng-hide="dataset.count < 1">
<div class="Paginate-wrapper" ng-hide="dataset.count < pageSize">
<div class="Paginate-wrapper" ng-hide="dataset.count <= pageSize">
<ul class="Paginate-controls pagination">
<!-- first -->
<li class="Paginate-controls--first Paginate-controls--item" ng-hide="pageRange.length < 10 || {{current}} === 1">