External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -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
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.setUrl (GetBasePath('inventory') + inventory_id + '/');
Rest.get() Rest.get()
.success( function(data, status, headers, config) { .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" + "<ul class=\"tree-root\">\n" +
"<li id=\"search-node-1000\" data-state=\"opened\" data-hosts=\"" + data.related.hosts + "\" " + "<li id=\"search-node-1000\" data-state=\"opened\" data-hosts=\"" + data.related.hosts + "\" " +
"data-description=\"" + data.description + "\" " + "data-description=\"" + data.description + "\" " +
"data-failures=\"" + data.has_active_failures + "\" " + "data-failures=\"" + data.has_active_failures + "\" " +
"data-groups=\"" + data.related.groups + "\" " + "data-groups=\"" + data.related.groups + "\" " +
"data-name=\"" + data.name + "\" " + "data-name=\"" + data.name + "\" " +
"><a href=\"\" class=\"expand\"><i class=\"icon-caret-down\"></i></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=\"field-badge icon-failures-" + data.has_active_failures + "\"" +
"<a href=\"\" class=\"activate active\">" + data.name + "</a>"; //"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('buildAllGroups', data.name, data.related.tree, data.related.groups);
scope.$emit('refreshHost', null, 'All Hosts'); 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 = var treeData =
[{ [{
data: { data: {
title: inventory_name + ' Inventory Groups' title: inventory_name + ' Inventory'
}, },
attr: { attr: {
type: 'inventory', type: 'inventory',
@@ -161,6 +161,7 @@ angular.module('InventoryHelper', [ 'RestServices', 'Utilities', 'OrganizationLi
scope['treeLoading'] = false; scope['treeLoading'] = false;
Wait('stop'); Wait('stop');
// Force root node styling changes // Force root node styling changes
$('#tree-view').prepend("<div class=\"title\">Group Selector:</div>");
$('#inventory-node ins').first().remove(); $('#inventory-node ins').first().remove();
$('#inventory-node a ins').first().css('background-image', 'none').append('<i class="icon-sitemap"></i>').css('margin-right','10px'); $('#inventory-node a ins').first().css('background-image', 'none').append('<i class="icon-sitemap"></i>').css('margin-right','10px');
scope.$emit('treeLoaded'); scope.$emit('treeLoaded');

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

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