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

AC-503 group selectors look a little bit closer or more similar between hosts and groups pages.

Browse Source
This commit is contained in:
chouseknecht 2013-10-08 02:27:26 +00:00
parent b97fbe1905
commit a968ee38f6
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/static/js/helpers/Hosts.js
View File

@ -681,17 +681,19 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H
Rest.setUrl (GetBasePath('inventory') + inventory_id + '/');
Rest.get()
.success( function(data, status, headers, config) {
html += "<div class=\"title\"><i class=\"icon-sitemap\"></i> Group Selector:</div>\n" +
html += "<div class=\"title\">Group Selector:</div>\n" +
"<ul class=\"tree-root\">\n" +
"<li id=\"search-node-1000\" data-state=\"opened\" data-hosts=\"" + data.related.hosts + "\" " +
"data-description=\"" + data.description + "\" " +
"data-failures=\"" + data.has_active_failures + "\" " +
"data-groups=\"" + data.related.groups + "\" " +
"data-name=\"" + data.name + "\" " +
"><a href=\"\" class=\"expand\"><i class=\"icon-caret-down\"></i></a> " +
"<i class=\"field-badge icon-failures-" + data.has_active_failures + "\"" +
"aw-tool-tip=\"" + toolTip + "\" data-placement=\"bottom\"></i> " +
"<a href=\"\" class=\"activate active\">" + data.name + "</a>";
//"><a href=\"\" class=\"expand\"><i class=\"icon-caret-down\"></i></a> " +
">" +
//"<i class=\"field-badge icon-failures-" + data.has_active_failures + "\"" +
//"aw-tool-tip=\"" + toolTip + "\" data-placement=\"bottom\"></i> " +
"<i class=\"icon-sitemap\"></i> " +
"<a href=\"\" class=\"activate active\">" + data.name + " Inventory</a>";
scope.$emit('buildAllGroups', data.name, data.related.tree, data.related.groups);
scope.$emit('refreshHost', null, 'All Hosts');
})

3
awx/ui/static/js/helpers/inventory.js
View File

@ -33,7 +33,7 @@ angular.module('InventoryHelper', [ 'RestServices', 'Utilities', 'OrganizationLi
var treeData =
[{
data: {
title: inventory_name + ' Inventory Groups'
title: inventory_name + ' Inventory'
},
attr: {
type: 'inventory',
@ -161,6 +161,7 @@ angular.module('InventoryHelper', [ 'RestServices', 'Utilities', 'OrganizationLi
scope['treeLoading'] = false;
Wait('stop');
// Force root node styling changes
$('#tree-view').prepend("<div class=\"title\">Group Selector:</div>");
$('#inventory-node ins').first().remove();
$('#inventory-node a ins').first().css('background-image', 'none').append('<i class="icon-sitemap"></i>').css('margin-right','10px');
scope.$emit('treeLoaded');

10
awx/ui/static/less/ansible-ui.less
View File

@ -977,12 +977,11 @@ select.field-mini-height {
}
.search-tree {
padding: 10px 3px 10px 3px;
padding: 10px 3px 10px 10px;
.title {
color: #888;
font-weight: normal;
margin-left: 5px;
margin-bottom: 5px;
margin-top: 0;
}
@ -997,6 +996,8 @@ select.field-mini-height {
}
.activate {
padding-left: 3px;
padding-right: 3px;
word-break: break-all;
}
@ -1006,12 +1007,13 @@ select.field-mini-height {
.active {
font-weight: bold;
padding: 5px 0 5px 0;
padding-top: 5px;
padding-bottom: 5px;
}
.expand {
padding: 3px;
border: 1px solid rgb(245, 245, 245);
/*border: 1px solid rgb(245, 245, 245);*/
}
.expand:hover {