External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 18:09:57 -03:30
Code Issues Packages Projects Releases Wiki Activity

resolve a merge conflict in PR #1709

Browse Source
This commit is contained in:
Leigh Johnson 2016-05-02 23:31:56 -04:00
commit 484106ccf2
4 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/inventories/manage/inventory-manage.controller.js
View File

@ -153,8 +153,6 @@ function InventoriesManage($log, $scope, $rootScope, $location,
}
$scope.removeInventoryLoaded = $scope.$on('InventoryLoaded', function() {
var rows;
// Add groups view
generateList.inject(InventoryGroups, {
mode: 'edit',
id: 'group-list-container',
@ -532,5 +530,5 @@ export default [
'GroupsEdit', 'InventoryUpdate', 'GroupsCancelUpdate', 'ViewUpdateStatus',
'GroupsDelete', 'Store', 'HostsEdit', 'HostsDelete',
'EditInventoryProperties', 'ShowJobSummary', 'InventoryGroupsHelp', 'HelpDialog', 'GroupsCopy',
'HostsCopy', '$stateParams', 'ParamPass', InventoriesManage,
'HostsCopy', '$stateParams', 'ParamPass', InventoriesManage
];

8
awx/ui/client/src/lists/InventoryGroups.js
View File

@ -25,7 +25,13 @@ export default
key: true,
ngClick: "groupSelect(group.id)",
columnClick: "groupSelect(group.id)",
columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6'
columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-3'
},
total_groups: {
nosort: true,
label: '',
type: 'badgeCount',
ngHide: 'group.total_groups == 0',
},
source: {
label: 'Source',

4
awx/ui/client/src/shared/bootstrap-settings.less vendored
View File

@ -19,4 +19,8 @@
:focus{
background: @btn-bg-sel;
}
}
.List-tableRow .badge, {
padding: 3px 15px;
border-radius: 6px;
}

34
awx/ui/client/src/shared/generator-helpers.js
View File

@ -268,29 +268,27 @@ angular.module('GeneratorHelpers', [systemStatus.name])
.factory('BadgeCount', [
function () {
return function (params) {
// Adds a badge count with optional tooltip
var list = params.list,
fld = params.fld,
field = list.fields[fld],
html;
html = "<td class=\"" + fld + "-column";
html += (field.columnClass) ? " " + field.columnClass : "";
html += (field.columnNgClass) ? "\" ng-class=\"" + field.columnNgClass : "";
html += "\">\n";
html += "<a ng-href=\"" + field.ngHref + "\" aw-tool-tip=\"" + field.awToolTip + "\"";
html += (field.dataPlacement) ? " data-placement=\"" + field.dataPlacement + "\"" : "";
html += ">";
html += "<span class=\"badge";
html += (field['class']) ? " " + field['class'] : "";
html += "\">";
html += "{{ " + list.iterator + '.' + fld + " }}";
html += "</span>";
html += (field.badgeLabel) ? " " + field.badgeLabel : "";
html += "</a>\n";
html += "</td>\n";
html = '';
html = "<td class=\"" + fld + "-column";
html += (field.columnClass) ? " " + field.columnClass : "";
html += "\">\n";
html += "<a ng-href=\"" + field.ngHref + "\" aw-tool-tip=\"" + field.awToolTip + "\"";
html += (field.dataPlacement) ? " data-placement=\"" + field.dataPlacement + "\"" : "";
html += ">";
html += "<span class=\"badge";
html += (field['class']) ? " " + field['class'] : "";
html += (field.ngHide) ? "\" ng-hide=\"" + field.ngHide : "";
html += "\">";
html += "{{ " + list.iterator + '.' + fld + " }}";
html += "</span>";
html += (field.badgeLabel) ? " " + field.badgeLabel : "";
html += "</a>\n";
html += "</td>\n";
return html;
};
}