mirror of
https://github.com/ansible/awx.git
synced 2026-01-11 18:09:57 -03:30
AC-191 changed host name label from 'Name' to 'Host Name' and added a tool tip giving examples of host name values.
This commit is contained in:
parent
39ff1551cf
commit
ea4d7abd4b
@ -24,7 +24,6 @@
|
||||
border-color: #e3e3e3;
|
||||
}
|
||||
|
||||
|
||||
/* Attempt to make button heights consistent. For some reason success, info, etc. are
|
||||
taller than plain .btn */
|
||||
.btn-success, .btn-danger, .btn-info, .btn-primary {
|
||||
@ -532,7 +531,7 @@
|
||||
|
||||
.horizontal-narrow .control-label {
|
||||
float: left;
|
||||
width: 80px;
|
||||
width: 120px;
|
||||
padding-top: 5px;
|
||||
text-align: right;
|
||||
}
|
||||
@ -540,16 +539,16 @@
|
||||
.horizontal-narrow .controls {
|
||||
*display: inline-block;
|
||||
*padding-left: 20px;
|
||||
margin-left: 100px;
|
||||
margin-left: 140px;
|
||||
*margin-left: 0;
|
||||
}
|
||||
|
||||
.horizontal-narrow .controls:first-child {
|
||||
*padding-left: 100px;
|
||||
*padding-left: 140px;
|
||||
}
|
||||
|
||||
.modal-input-xlarge {
|
||||
width: 400px;
|
||||
width: 350px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -18,10 +18,19 @@ angular.module('HostFormDefinition', [])
|
||||
|
||||
fields: {
|
||||
name: {
|
||||
label: 'Name',
|
||||
label: 'Host Name',
|
||||
type: 'text',
|
||||
addRequired: true,
|
||||
editRequired: true
|
||||
editRequired: true,
|
||||
awPopOver: "<p>Provide a host name, ip address, or ip address:port. Examples include:</p>" +
|
||||
"<blockquote>myserver.domain.com<br/>" +
|
||||
"127.0.0.1<br />" +
|
||||
"10.1.0.140:25<br />" +
|
||||
"server.example.com:25" +
|
||||
"</blockquote>",
|
||||
dataTitle: 'Host Name',
|
||||
dataPlacement: 'right',
|
||||
dataContainer: '#form-modal'
|
||||
},
|
||||
description: {
|
||||
label: 'Description',
|
||||
|
||||
@ -115,7 +115,7 @@ angular.module('InventoryFormDefinition', [])
|
||||
fields: {
|
||||
name: {
|
||||
key: true,
|
||||
label: 'Name',
|
||||
label: 'Host Name',
|
||||
ngClick: "editHost(\{\{ host.id \}\}, '\{\{ host.name \}\}')"
|
||||
},
|
||||
has_active_failures: {
|
||||
|
||||
@ -204,8 +204,9 @@ angular.module('AWDirectives', ['RestServices'])
|
||||
return function(scope, element, attrs) {
|
||||
var placement = (attrs.placement != undefined && attrs.placement != null) ? attrs.placement : 'left';
|
||||
var title = (attrs.title != undefined && attrs.title != null) ? attrs.title : 'Help';
|
||||
var container = (attrs.container !== undefined) ? attrs.container : false;
|
||||
$(element).popover({ placement: placement, delay: 0, title: title,
|
||||
content: attrs.awPopOver, delay: 0, trigger: 'click', html: true });
|
||||
content: attrs.awPopOver, delay: 0, trigger: 'click', html: true, container: container });
|
||||
$(document).bind('keydown', function(e) {
|
||||
if (e.keyCode === 27) {
|
||||
$(element).popover('hide');
|
||||
|
||||
@ -200,6 +200,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
|
||||
html += "<a href=\"\" " + this.attr(field,'awPopOver');
|
||||
html += (field.dataTitle) ? this.attr(field, 'dataTitle') : "";
|
||||
html += (field.dataPlacement) ? this.attr(field, 'dataPlacement') : "";
|
||||
html += (field.dataContainer) ? this.attr(field, 'dataContainer') : "";
|
||||
html += "><i class=\"icon-info-sign\"></i></a> ";
|
||||
}
|
||||
html += (field.icon) ? this.icon(field.icon) : "";
|
||||
|
||||
@ -55,6 +55,9 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
|
||||
case 'dataPlacement':
|
||||
result = "data-placement=\"" + obj[key] + "\" ";
|
||||
break;
|
||||
case 'dataContainer':
|
||||
result = "data-container=\"" + obj[key] + "\" ";
|
||||
break;
|
||||
default:
|
||||
result = key + "=\"" + obj[key] + "\" ";
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user