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

AC-231 title for Hosts section of inventory detail page now appears on 2 lines.

Browse Source
This commit is contained in:
chouseknecht 2013-07-23 00:02:00 -04:00
parent 2f2331092b
commit 6e2a5bb722
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/static/css/ansible-ui.css
View File

@ -511,13 +511,20 @@
padding-top: 10px;
}
#hosts-title {
margin-bottom: 15px;
#hosts-title p {
font-size: 12px;
}
#hosts-title h4 {
margin: 5px 0;
}
#hosts-well .search-widget {
margin-top: 10px;
}
.parse-selection {
font-size: 12px;
margin: 5px 0 10px 0;
margin: 5px 0 8px 0;
}
.parse-selection .radio.inline {

8
awx/ui/static/js/controllers/Inventories.js
View File

@ -207,7 +207,7 @@ function InventoriesEdit ($scope, $rootScope, $compile, $location, $log, $routeP
scope.inventoryLoadedRemove();
}
scope.inventoryLoadedRemove = scope.$on('inventoryLoaded', function() {
scope.groupTitle = 'All Hosts';
scope.groupTitle = '<h4>All Hosts</h4>';
scope.createButtonShow = false;
scope.search(scope.relatedSets['hosts'].iterator);
TreeInit(scope.TreeParams);
@ -396,8 +396,8 @@ function InventoriesEdit ($scope, $rootScope, $compile, $location, $log, $routeP
scope.createButtonShow = true;
scope.group_id = node.attr('group_id');
scope.groupName = n.data;
scope.groupTitle = n.data;
scope.groupTitle += (node.attr('description')) ? ' -' + node.attr('description') : '';
scope.groupTitle = '<h4>' + n.data + '</h4>';
scope.groupTitle += (node.attr('description')) ? '<p>' + node.attr('description') + '</p>' : '';
}
else if (type == 'inventory') {
url = node.attr('hosts');
@ -406,7 +406,7 @@ function InventoriesEdit ($scope, $rootScope, $compile, $location, $log, $routeP
scope.groupDeleteHide = true;
scope.createButtonShow = false;
scope.groupName = 'All Hosts';
scope.groupTitle = 'All Hosts';
scope.groupTitle = '<h4>All Hosts</h4>';
scope.group_id = null;
}
scope.relatedSets['hosts'] = { url: url, iterator: 'host' };

2
awx/ui/static/js/forms/Inventories.js
View File

@ -106,7 +106,7 @@ angular.module('InventoryFormDefinition', [])
hosts: {
type: 'treeview',
title: "{{ groupTitle }}",
title: "groupTitle",
iterator: 'host',
actions: {
select: {

2
awx/ui/static/lib/ansible/form-generator.js
View File

@ -855,7 +855,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
else {
html += "<div id=\"group-view\" class=\"span7\">\n";
html += "<div id=\"hosts-well\" class=\"well\">\n";
html += "<h4 id=\"hosts-title\">" + form.related[itm].title + "</h4>\n";
html += "<div id=\"hosts-title\" ng-bind-html-unsafe=\"" + form.related[itm].title + "\"></div>\n";
html += SearchWidget({ iterator: form.related[itm].iterator, template: form.related[itm], mini: true });
// Add actions(s)